server/AyaNova/biz/LocaleBiz.cs

@@ -528,7 +528,7 @@ namespace AyaNova.Biz
                         Dictionary<string, string> NewLocaleDict = new Dictionary<string, string>();
                         foreach (var Pair in j.Children())
                         {
-                            var V7Value = Pair.First.Value<string>();
+                            var V7Value = Pair.First.Value<string>().Replace(" && "," ").Replace(" & "," ").Replace("&","");//clean out LT values that had double ampersands for old Windows menu shortcut scheme
                             var V7KeyName = ((JProperty)Pair).Name;
 
                             if (!SkipKeys.Contains(V7KeyName))

server/AyaNova/resource/de.json

@@ -879,12 +879,12 @@
   "UserPunchClock": "Benutzerstechuhr",
   "VendorsSubContractors": "Subunternehmer",
   "VendorsWholesalers": "Großhändler",
-  "GridFilterDialogAddConditionButtonText": "&Bedingung hinzufügen",
+  "GridFilterDialogAddConditionButtonText": "Bedingung hinzufügen",
   "GridFilterDialogAndRadioText": "Und-Bedingungen",
-  "GridFilterDialogCancelButtonText": "Abbre&chen",
+  "GridFilterDialogCancelButtonText": "Abbrechen",
   "GridFilterDialogDeleteButtonText": "Bedingung löschen",
-  "GridFilterDialogOkButtonNoFiltersText": "Keine &Filter",
+  "GridFilterDialogOkButtonNoFiltersText": "Keine Filter",
-  "GridFilterDialogOkButtonText": "&OK",
+  "GridFilterDialogOkButtonText": "OK",
   "GridFilterDialogOrRadioText": "Oder-Bedingungen",
   "GridRowFilterDialogBlanksItem": "(Leere)",
   "GridRowFilterDialogDBNullItem": "(DBNull)",
@@ -908,7 +908,7 @@
   "GridRowFilterRegexErrorCaption": "Ungültiger regulärer Ausdruck",
   "HelpAboutAyaNova": "Über AyaNova",
   "HelpCheckForUpdates": "Nach Aktualisierungen suchen",
-  "HelpContents": "&Inhalt ...",
+  "HelpContents": "Inhalt ...",
   "HelpLicense": "Lizenz",
   "HelpPurchaseLicenses": "Lizenzen kaufen",
   "HelpTechSupport": "Technische Unterstützung",

server/AyaNova/resource/en.json

@@ -225,7 +225,7 @@
   "ErrorUnableToOpenWebUrl": "Unable to open web address",
   "FormFieldDataTypesCurrency": "Money",
   "FormFieldDataTypesDateOnly": "Date",
-  "FormFieldDataTypesDateTime": "Date & Time",
+  "FormFieldDataTypesDateTime": "Date Time",
   "FormFieldDataTypesNumber": "Number",
   "FormFieldDataTypesText": "Text",
   "FormFieldDataTypesTimeOnly": "Time",
@@ -879,12 +879,12 @@
   "UserPunchClock": "User PunchClock",
   "VendorsSubContractors": "SubContractors",
   "VendorsWholesalers": "Wholesalers",
-  "GridFilterDialogAddConditionButtonText": "&Add a condition",
+  "GridFilterDialogAddConditionButtonText": "Add a condition",
   "GridFilterDialogAndRadioText": "And conditions",
-  "GridFilterDialogCancelButtonText": "&Cancel",
+  "GridFilterDialogCancelButtonText": "Cancel",
   "GridFilterDialogDeleteButtonText": "Delete condition",
-  "GridFilterDialogOkButtonNoFiltersText": "N&o filters",
+  "GridFilterDialogOkButtonNoFiltersText": "No filters",
-  "GridFilterDialogOkButtonText": "&OK",
+  "GridFilterDialogOkButtonText": "OK",
   "GridFilterDialogOrRadioText": "Or conditions",
   "GridRowFilterDialogBlanksItem": "(Blanks)",
   "GridRowFilterDialogDBNullItem": "(DBNull)",
@@ -908,7 +908,7 @@
   "GridRowFilterRegexErrorCaption": "Invalid regular expression",
   "HelpAboutAyaNova": "About AyaNova",
   "HelpCheckForUpdates": "Check For Updates",
-  "HelpContents": "&Contents...",
+  "HelpContents": "Contents...",
   "HelpLicense": "License",
   "HelpPurchaseLicenses": "Purchase Licenses",
   "HelpTechSupport": "Technical support",
@@ -966,7 +966,7 @@
   "SelectItem": "Select",
   "SelectPurchaseOrdersToReceive": "Select Purchase Orders to Receive...",
   "SelectVendor": "Select Vendor...",
-  "SetLoginPassword": "Set Login && Password",
+  "SetLoginPassword": "Set Login Password",
   "ShowAll": "Show all...",
   "South": "South",
   "SubTotal": "SubTotal",
@@ -1322,8 +1322,8 @@
   "WorkorderItemLaborServiceDetails": "Service Details",
   "WorkorderItemLaborServiceRateID": "Service Rate",
   "WorkorderItemLaborServiceRateQuantity": "Service Rate Quantity",
-  "WorkorderItemLaborServiceStartDate": "Service Start Date & Time",
+  "WorkorderItemLaborServiceStartDate": "Service Start Date Time",
-  "WorkorderItemLaborServiceStopDate": "Service Stop Date & Time",
+  "WorkorderItemLaborServiceStopDate": "Service Stop Date Time",
   "WorkorderItemLaborTaxCodeID": "Tax Code",
   "WorkorderItemLaborTaxRateSaleID": "Sales tax",
   "WorkorderItemLaborUIBankWarning": "Are you sure you want to Bank this record?\r\n(Once this record is banked it will be locked and can no longer be edited)",
@@ -1411,9 +1411,9 @@
   "WorkorderItemScheduledUserEventPendingAlert": "Work order item scheduled user - Event imminent",
   "WorkorderItemScheduledUserList": "Scheduled User Items",
   "WorkorderItemScheduledUserServiceRateID": "Suggested rate",
-  "WorkorderItemScheduledUserStartDate": "Start Date & Time",
+  "WorkorderItemScheduledUserStartDate": "Start Date Time",
   "WorkorderItemScheduledUserStartDateRelative": "Start (relative)",
-  "WorkorderItemScheduledUserStopDate": "Stop Date & Time",
+  "WorkorderItemScheduledUserStopDate": "Stop Date Time",
   "WorkorderItemScheduledUserUserID": "User",
   "WorkorderItemScheduledUserWarnOutOfRegion": "Warning: User is not in customer's region - won't see this item",
   "WorkorderItemTaskCompletionTypeComplete": "Completed",

server/AyaNova/resource/es.json

@@ -879,12 +879,12 @@
   "UserPunchClock": "Reloj para fichar del usuario",
   "VendorsSubContractors": "Subcontratistas",
   "VendorsWholesalers": "Mayoristas",
-  "GridFilterDialogAddConditionButtonText": "&Añadir una condición",
+  "GridFilterDialogAddConditionButtonText": "Añadir una condición",
   "GridFilterDialogAndRadioText": "Condiciones \"y\"",
-  "GridFilterDialogCancelButtonText": "&Cancelar",
+  "GridFilterDialogCancelButtonText": "Cancelar",
   "GridFilterDialogDeleteButtonText": "Borrar condición",
-  "GridFilterDialogOkButtonNoFiltersText": "&Sin filtros",
+  "GridFilterDialogOkButtonNoFiltersText": "Sin filtros",
-  "GridFilterDialogOkButtonText": "&Aceptar",
+  "GridFilterDialogOkButtonText": "Aceptar",
   "GridFilterDialogOrRadioText": "Condiciones \"o\"",
   "GridRowFilterDialogBlanksItem": "(En blanco)",
   "GridRowFilterDialogDBNullItem": "(DBNull)",
@@ -908,7 +908,7 @@
   "GridRowFilterRegexErrorCaption": "Expresión regular no válida",
   "HelpAboutAyaNova": "Acerca de AyaNova",
   "HelpCheckForUpdates": "Comprobar actualizaciones",
-  "HelpContents": "&Contenido...",
+  "HelpContents": "Contenido...",
   "HelpLicense": "Licencia",
   "HelpPurchaseLicenses": "Licencias de compra",
   "HelpTechSupport": "Asistencia técnica",

server/AyaNova/resource/fr.json

@@ -879,12 +879,12 @@
   "UserPunchClock": "Pointeuse d'utilisateur",
   "VendorsSubContractors": "Sous-traitants",
   "VendorsWholesalers": "Grossistes",
-  "GridFilterDialogAddConditionButtonText": "&Ajouter une condition",
+  "GridFilterDialogAddConditionButtonText": "Ajouter une condition",
   "GridFilterDialogAndRadioText": "Conditions Et",
-  "GridFilterDialogCancelButtonText": "&Annuler",
+  "GridFilterDialogCancelButtonText": "Annuler",
   "GridFilterDialogDeleteButtonText": "Supprimer la condition",
-  "GridFilterDialogOkButtonNoFiltersText": "S&ans filtres",
+  "GridFilterDialogOkButtonNoFiltersText": "Sans filtres",
-  "GridFilterDialogOkButtonText": "&OK",
+  "GridFilterDialogOkButtonText": "OK",
   "GridFilterDialogOrRadioText": "Conditions Ou",
   "GridRowFilterDialogBlanksItem": "(Vides)",
   "GridRowFilterDialogDBNullItem": "(DBNull)",
@@ -908,7 +908,7 @@
   "GridRowFilterRegexErrorCaption": "Expression régulière invalide",
   "HelpAboutAyaNova": "À propos d'AyaNova",
   "HelpCheckForUpdates": "Rechercher des mises à jour",
-  "HelpContents": "&Contenu...",
+  "HelpContents": "Contenu...",
   "HelpLicense": "License",
   "HelpPurchaseLicenses": "Acheter des licences",
   "HelpTechSupport": "Assistance technique",