Merge branch 'develop' into ccb

# Conflicts:
#	dictation_client/src/translation/de.json
#	dictation_client/src/translation/en.json
#	dictation_client/src/translation/es.json
#	dictation_client/src/translation/fr.json

dictation_client/src/translation/de.json

@@ -24,7 +24,7 @@
       "headerDictations": "Diktate",
       "headerWorkflow": "Arbeitsablauf",
       "headerPartners": "Partner",
-      "headerSupport": "(de)Support",
+      "headerSupport": "Support",
       "tier1": "Admin",
       "tier2": "BC",
       "tier3": "Verteiler",
@@ -76,6 +76,7 @@
       "linkOfEula": "Klicken Sie hier, um die Endbenutzer-Lizenzvereinbarung zu lesen.",
       "linkOfPrivacyNotice": "Klicken Sie hier, um die Datenschutzerklärung zu lesen.",
       "forOdms": "für ODMS Cloud.",
+      "termsCheckBox": "Ja, ich stimme den Nutzungsbedingungen zu.",
       "createAccountButton": "Einreichen"
     }
   },
@@ -179,8 +180,8 @@
       "storageSize": "Lagerung verfügbar",
       "usedSize": "Gebrauchter Lagerung",
       "storageAvailable": "Speicher nicht verfügbar (Menge überschritten)",
-      "licenseLabel": "(de)License",
+      "licenseLabel": "Lizenz",
-      "storageLabel": "(de)Storage"
+      "storageLabel": "Lagerung"
     }
   },
   "licenseOrderPage": {
@@ -206,8 +207,8 @@
       "noPlaybackAuthorization": "Sie haben keine Berechtigung zum Abspielen dieser Datei.",
       "taskToPlaybackNoExists": "Die Datei kann nicht abgespielt werden, da sie bereits transkribiert wurde oder nicht existiert.",
       "taskNotEditable": "Der Transkriptionist kann nicht geändert werden, da die Transkription bereits ausgeführt wird oder die Datei nicht vorhanden ist. Bitte aktualisieren Sie den Bildschirm und prüfen Sie den aktuellen Status.",
-      "backupFailedError": "(de)ファイルのバックアップに失敗したため処理を中断しました。時間をおいて再実行しても解決しない場合はシステム管理者にお問い合わせください。",
+      "backupFailedError": "Der Prozess „Dateisicherung“ ist fehlgeschlagen. Bitte versuchen Sie es später noch einmal. Wenn der Fehler weiterhin besteht, wenden Sie sich an Ihren Systemadministrator.",
-      "cancelFailedError": "(de)タスクのキャンセルに失敗しました。画面を更新し、再度ご確認ください。",
+      "cancelFailedError": "Die Diktate konnten nicht gelöscht werden. Bitte aktualisieren Sie Ihren Bildschirm und versuchen Sie es erneut.",
       "deleteFailedError": "(de)タスクの削除に失敗しました。画面を更新し、再度ご確認ください。"
     },
     "label": {
@@ -251,9 +252,9 @@
       "deleteDictation": "Diktat löschen",
       "selectedTranscriptionist": "Ausgewählter transkriptionist",
       "poolTranscriptionist": "Transkriptionsliste",
-      "fileBackup": "(de)File Backup",
+      "fileBackup": "Dateisicherung",
-      "downloadForBackup": "(de)Download for backup",
+      "downloadForBackup": "Zur Sicherung herunterladen",
-      "applications": "(de)Applications",
+      "applications": "Desktopanwendung",
       "cancelDictation": "Transkription abbrechen"
     }
   },
@@ -472,7 +473,7 @@
       "addAccount": "Konto hinzufügen",
       "name": "Name der Firma",
       "category": "Kontoebene",
-      "accountId": "Konto-ID",
+      "accountId": "Autoren-ID",
       "country": "Land",
       "primaryAdmin": "Hauptadministrator",
       "email": "Email",
@@ -539,22 +540,22 @@
   },
   "supportPage": {
     "label": {
-      "title": "(de)Support",
+      "title": "Support",
-      "howToUse": "(de)How to use the system",
+      "howToUse": "So verwenden Sie das System",
       "supportPageEnglish": "OMDS Cloud User Guide",
-      "supportPageGerman": "OMDS Cloud Benutzerhandbuch",
+      "supportPageGerman": "OMDS Cloud-Benutzerhandbuch",
-      "supportPageFrench": "OMDS Cloud Mode d'emploi",
+      "supportPageFrench": "Guía del usuario de la nube OMDS",
-      "supportPageSpanish": "OMDS Cloud Guía del usuario"
+      "supportPageSpanish": "Guide de l'utilisateur du cloud OMDS"
     },
     "text": {
-      "notResolved": "(de)If the problem persists even after referring to the user guide, please contact a higher-level person in charge."
+      "notResolved": "Informationen zu den Funktionen der ODMS Cloud finden Sie im Benutzerhandbuch. Wenn Sie zusätzlichen Support benötigen, wenden Sie sich bitte an Ihren Administrator oder zertifizierten ODMS Cloud-Händler."
     }
   },
   "filePropertyPopup": {
     "label": {
-      "general": "(de)General",
+      "general": "Allgemein",
-      "job": "(de)Job",
+      "job": "Aufgabe",
-      "close": "(de)Close"
+      "close": "Schließen"
     }
   }
 }

dictation_client/src/translation/en.json

@@ -75,7 +75,7 @@
       "password": "Password",
       "linkOfEula": "Click here to read the End User License Agreement.",
       "linkOfPrivacyNotice": "Click here to read the Privacy Notice.",
-      "forOdms": "for ODMS Cloud.",
+      "forOdms": "for OMDS Cloud.",
       "termsCheckBox": "Yes, I agree to the terms of use.",
       "createAccountButton": "Submit"
     }
@@ -207,8 +207,8 @@
       "noPlaybackAuthorization": "You do not have permission to playback this file.",
       "taskToPlaybackNoExists": "The file cannot be played because it has already been transcribed or does not exist.",
       "taskNotEditable": "The transcriptionist cannot be changed because the transcription is already in progress or the file does not exist. Please refresh the screen and check the latest status.",
-      "backupFailedError": "ファイルのバックアップに失敗したため処理を中断しました。時間をおいて再実行しても解決しない場合はシステム管理者にお問い合わせください。",
+      "backupFailedError": "The \"File Backup\" process has failed. Please try again later. If the error continues, contact your system administrator.",
-      "cancelFailedError": "タスクのキャンセルに失敗しました。画面を更新し、再度ご確認ください。",
+      "cancelFailedError": "Failed to delete the dictations. Please refresh your screen and try again.",
       "deleteFailedError": "タスクの削除に失敗しました。画面を更新し、再度ご確認ください。"
     },
     "label": {
@@ -254,7 +254,7 @@
       "poolTranscriptionist": "Transcription List",
       "fileBackup": "File Backup",
       "downloadForBackup": "Download for backup",
-      "applications": "Applications",
+      "applications": "Desktop Application",
       "cancelDictation": "Cancel Transcription"
     }
   },
@@ -543,12 +543,12 @@
       "title": "Support",
       "howToUse": "How to use the system",
       "supportPageEnglish": "OMDS Cloud User Guide",
-      "supportPageGerman": "OMDS Cloud Benutzerhandbuch",
+      "supportPageGerman": "OMDS Cloud-Benutzerhandbuch",
-      "supportPageFrench": "OMDS Cloud Mode d'emploi",
+      "supportPageFrench": "Guía del usuario de la nube OMDS",
-      "supportPageSpanish": "OMDS Cloud Guía del usuario"
+      "supportPageSpanish": "Guide de l'utilisateur du cloud OMDS"
     },
     "text": {
-      "notResolved": "If the problem persists even after referring to the user guide, please contact a higher-level person in charge."
+      "notResolved": "Please refer to the User Guide for information about the features of the ODMS Cloud. If you require additional support, please contact your administrator or certified ODMS Cloud reseller."
     }
   },
   "filePropertyPopup": {

dictation_client/src/translation/es.json

@@ -24,7 +24,7 @@
       "headerDictations": "Dictado",
       "headerWorkflow": "flujo de trabajo",
       "headerPartners": "Socios",
-      "headerSupport": "(es)Support",
+      "headerSupport": "Soporte",
       "tier1": "Admin",
       "tier2": "BC",
       "tier3": "Distribuidor",
@@ -180,8 +180,8 @@
       "storageSize": "Almacenamiento disponible",
       "usedSize": "Almacenamiento utilizado",
       "storageAvailable": "Almacenamiento no disponible (cantidad excedida)",
-      "licenseLabel": "(es)License",
+      "licenseLabel": "Licencia",
-      "storageLabel": "(es)Storage"
+      "storageLabel": "Almacenamiento"
     }
   },
   "licenseOrderPage": {
@@ -207,8 +207,8 @@
       "noPlaybackAuthorization": "No tienes permiso para reproducir este archivo.",
       "taskToPlaybackNoExists": "El archivo no se puede reproducir porque ya ha sido transcrito o no existe.",
       "taskNotEditable": "No se puede cambiar el transcriptor porque la transcripción ya está en curso o el archivo no existe. Actualice la pantalla y verifique el estado más reciente.",
-      "backupFailedError": "(es)ファイルのバックアップに失敗したため処理を中断しました。時間をおいて再実行しても解決しない場合はシステム管理者にお問い合わせください。",
+      "backupFailedError": "El proceso de \"Copia de seguridad de archivos\" ha fallado. Por favor, inténtelo de nuevo más tarde. Si el error continúa, comuníquese con el administrador del sistema.",
-      "cancelFailedError": "(es)タスクのキャンセルに失敗しました。画面を更新し、再度ご確認ください。",
+      "cancelFailedError": "No se pudieron eliminar los dictados. Actualice su pantalla e inténtelo nuevamente.",
       "deleteFailedError": "(es)タスクの削除に失敗しました。画面を更新し、再度ご確認ください。"
     },
     "label": {
@@ -252,9 +252,9 @@
       "deleteDictation": "Borrar dictado",
       "selectedTranscriptionist": "Transcriptor seleccionado",
       "poolTranscriptionist": "Lista de transcriptor",
-      "fileBackup": "(es)File Backup",
+      "fileBackup": "Copia de seguridad de archivos",
-      "downloadForBackup": "(es)Download for backup",
+      "downloadForBackup": "Descargar para respaldo",
-      "applications": "(es)Applications",
+      "applications": "Aplicación de escritorio",
       "cancelDictation": "Cancelar transcripción"
     }
   },
@@ -473,11 +473,11 @@
       "addAccount": "Añadir cuenta",
       "name": "Nombre de empresa",
       "category": "Nivel de cuenta",
-      "accountId": "ID de la cuenta",
+      "accountId": "ID de autor",
       "country": "País",
       "primaryAdmin": "Administrador primario",
       "email": "Email",
-      "dealerManagement": "Permitir que el concesionario realice los cambios",
+      "dealerManagement": "Permitir que el distribuidor realice los cambios",
       "partners": "Socios",
       "deleteAccount": "Borrar cuenta"
     },
@@ -540,22 +540,22 @@
   },
   "supportPage": {
     "label": {
-      "title": "(es)Support",
+      "title": "Soporte",
-      "howToUse": "(es)How to use the system",
+      "howToUse": "Cómo utilizar el sistema",
       "supportPageEnglish": "OMDS Cloud User Guide",
-      "supportPageGerman": "OMDS Cloud Benutzerhandbuch",
+      "supportPageGerman": "OMDS Cloud-Benutzerhandbuch",
-      "supportPageFrench": "OMDS Cloud Mode d'emploi",
+      "supportPageFrench": "Guía del usuario de la nube OMDS",
-      "supportPageSpanish": "OMDS Cloud Guía del usuario"
+      "supportPageSpanish": "Guide de l'utilisateur du cloud OMDS"
     },
     "text": {
-      "notResolved": "(es)If the problem persists even after referring to the user guide, please contact a higher-level person in charge."
+      "notResolved": "Consulte la Guía del usuario para obtener información sobre las funciones de ODMS Cloud. Si necesita soporte adicional, comuníquese con su administrador o revendedor certificado de ODMS Cloud."
     }
   },
   "filePropertyPopup": {
     "label": {
-      "general": "(es)General",
+      "general": "General",
-      "job": "(es)Job",
+      "job": "Trabajo",
-      "close": "(es)Close"
+      "close": "Cerrar"
     }
   }
 }

dictation_client/src/translation/fr.json

@@ -24,7 +24,7 @@
       "headerDictations": "Dictées",
       "headerWorkflow": "Flux de travail",
       "headerPartners": "Partenaires",
-      "headerSupport": "(fr)Support",
+      "headerSupport": "Support",
       "tier1": "Admin",
       "tier2": "BC",
       "tier3": "Distributeur",
@@ -180,8 +180,8 @@
       "storageSize": "Stockage disponible",
       "usedSize": "Stockage utilisé",
       "storageAvailable": "Stockage indisponible (montant dépassée)",
-      "licenseLabel": "(fr)License",
+      "licenseLabel": "Licence",
-      "storageLabel": "(fr)Storage"
+      "storageLabel": "Stockage"
     }
   },
   "licenseOrderPage": {
@@ -207,8 +207,8 @@
       "noPlaybackAuthorization": "Vous n'êtes pas autorisé à lire ce fichier.",
       "taskToPlaybackNoExists": "Le fichier ne peut pas être lu car il a déjà été transcrit ou n'existe pas.",
       "taskNotEditable": "Le transcripteur ne peut pas être changé car la transcription est déjà en cours ou le fichier n'existe pas. Veuillez actualiser l'écran et vérifier le dernier statut.",
-      "backupFailedError": "(fr)ファイルのバックアップに失敗したため処理を中断しました。時間をおいて再実行しても解決しない場合はシステム管理者にお問い合わせください。",
+      "backupFailedError": "Le processus de « Sauvegarde de fichier » a échoué. Veuillez réessayer plus tard. Si l'erreur persiste, contactez votre administrateur système.",
-      "cancelFailedError": "(fr)タスクのキャンセルに失敗しました。画面を更新し、再度ご確認ください。",
+      "cancelFailedError": "Échec de la suppression des dictées. Veuillez actualiser votre écran et réessayer.",
       "deleteFailedError": "(fr)タスクの削除に失敗しました。画面を更新し、再度ご確認ください。"
     },
     "label": {
@@ -252,9 +252,9 @@
       "deleteDictation": "Supprimer la dictée",
       "selectedTranscriptionist": "Transcriptionniste sélectionné",
       "poolTranscriptionist": "Liste de transcriptionniste",
-      "fileBackup": "(fr)File Backup",
+      "fileBackup": "Sauvegarde de fichiers",
-      "downloadForBackup": "(fr)Download for backup",
+      "downloadForBackup": "Télécharger pour sauvegarde",
-      "applications": "(fr)Applications",
+      "applications": "Application de bureau",
       "cancelDictation": "Annuler la transcription"
     }
   },
@@ -473,11 +473,11 @@
       "addAccount": "Ajouter compte",
       "name": "Nom de l'entreprise",
       "category": "Niveau compte",
-      "accountId": "identifiant de compte",
+      "accountId": "Identifiant Auteur",
       "country": "Pays",
       "primaryAdmin": "Administrateur principal",
       "email": "Email",
-      "dealerManagement": "Autoriser le concessionnaire à modifier les paramètres",
+      "dealerManagement": "Autoriser le revendeur à modifier les paramètres",
       "partners": "Partenaires",
       "deleteAccount": "Supprimer le compte"
     },
@@ -540,22 +540,22 @@
   },
   "supportPage": {
     "label": {
-      "title": "(fr)Support",
+      "title": "Support",
-      "howToUse": "(fr)How to use the system",
+      "howToUse": "Comment utiliser le système",
       "supportPageEnglish": "OMDS Cloud User Guide",
-      "supportPageGerman": "OMDS Cloud Benutzerhandbuch",
+      "supportPageGerman": "OMDS Cloud-Benutzerhandbuch",
-      "supportPageFrench": "OMDS Cloud Mode d'emploi",
+      "supportPageFrench": "Guía del usuario de la nube OMDS",
-      "supportPageSpanish": "OMDS Cloud Guía del usuario"
+      "supportPageSpanish": "Guide de l'utilisateur du cloud OMDS"
     },
     "text": {
-      "notResolved": "(fr)If the problem persists even after referring to the user guide, please contact a higher-level person in charge."
+      "notResolved": "Veuillez vous référer au Guide de l'utilisateur pour plus d'informations sur les fonctionnalités d'ODMS Cloud. Si vous avez besoin d'une assistance supplémentaire, veuillez contacter votre administrateur ou votre revendeur certifié ODMS Cloud."
     }
   },
   "filePropertyPopup": {
     "label": {
-      "general": "(fr)General",
+      "general": "Général",
-      "job": "(fr)Job",
+      "job": "Tâches",
-      "close": "(fr)Close"
+      "close": "Fermer"
     }
   }
 }