Skip to content

Commit

Permalink
Merge branch 'develop' into feat/sms-sender-reject
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephanie Moallic committed Mar 7, 2019
2 parents 13c5036 + 51a40a3 commit fa4f78d
Show file tree
Hide file tree
Showing 17 changed files with 78 additions and 65 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"cuc_helper_modal_ok": "OK",
"cuc_helper_cancel": "Abbrechen",
"cuc_helper_edit": "Ändern",
"cuc_helper_modal_cancel": "Abbrechen",
"cuc_helper_delete": "Löschen",
"cuc_helper_global_error": "Bei dem Vorgang ist ein Fehler aufgetreten: {{message}}",
"cuc_helper_global_success": "Der Vorgang wurde erfolgreich beendet.",
"cuc_helper_name_change_modal_title": "Namen ändern",
"cuc_helper_name_change_modal_service_name_label": "Standardname",
"cuc_helper_name_change_modal_display_name_label": "Personalisierter Name",
"cuc_helper_order_success": "Der Bestellschein <a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> wurde erfolgreich gelöscht.",
"cuc_helper_order_error": "Bei der Erstellung des Bestellscheins ist ein Fehler aufgetreten: {{ message }}"
"cuc_helper_cancel": "Annuler",
"cuc_helper_edit": "Modifier",
"cuc_helper_modal_cancel": "Annuler",
"cuc_helper_delete": "Supprimer",
"cuc_helper_global_error": "Une erreur est survenue lors de l'opération : {{message}}",
"cuc_helper_global_success": "L'opération s'est déroulée avec succès.",
"cuc_helper_name_change_modal_title": "Modifier le nom",
"cuc_helper_name_change_modal_service_name_label": "Nom par défaut",
"cuc_helper_name_change_modal_display_name_label": "Nom personnalisé",
"cuc_helper_order_success": "Le bon de commande <a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> a été créé avec succès.",
"cuc_helper_order_error": "Erreur lors de la création du bon de commande: {{ message }}",
"cuc_helper_order_doing": "Création du bon de commande en cours ..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Edit",
"cuc_helper_modal_cancel": "Cancel",
"cuc_helper_delete": "Delete",
"cuc_helper_global_error": "An error has occurred during the operation: {{message}}",
"cuc_helper_global_error": "An error has occurred completing the operation: {{message}}",
"cuc_helper_global_success": "The operation was successfully carried out.",
"cuc_helper_name_change_modal_title": "Change the name",
"cuc_helper_name_change_modal_service_name_label": "Default name",
"cuc_helper_name_change_modal_display_name_label": "Custom name",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> purchase order successfully created. ",
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}"
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}",
"cuc_helper_order_doing": "Creating a purchase order..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Edit",
"cuc_helper_modal_cancel": "Cancel",
"cuc_helper_delete": "Delete",
"cuc_helper_global_error": "An error has occurred during the operation: {{message}}",
"cuc_helper_global_error": "An error has occurred completing the operation: {{message}}",
"cuc_helper_global_success": "The operation was successfully carried out.",
"cuc_helper_name_change_modal_title": "Change the name",
"cuc_helper_name_change_modal_service_name_label": "Default name",
"cuc_helper_name_change_modal_display_name_label": "Custom name",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> purchase order successfully created. ",
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}"
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}",
"cuc_helper_order_doing": "Creating a purchase order..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Edit",
"cuc_helper_modal_cancel": "Cancel",
"cuc_helper_delete": "Delete",
"cuc_helper_global_error": "An error has occurred during the operation: {{message}}",
"cuc_helper_global_error": "An error has occurred completing the operation: {{message}}",
"cuc_helper_global_success": "The operation was successfully carried out.",
"cuc_helper_name_change_modal_title": "Change the name",
"cuc_helper_name_change_modal_service_name_label": "Default name",
"cuc_helper_name_change_modal_display_name_label": "Custom name",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> purchase order successfully created. ",
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}"
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}",
"cuc_helper_order_doing": "Creating a purchase order..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Edit",
"cuc_helper_modal_cancel": "Cancel",
"cuc_helper_delete": "Delete",
"cuc_helper_global_error": "An error has occurred during the operation: {{message}}",
"cuc_helper_global_error": "An error has occurred completing the operation: {{message}}",
"cuc_helper_global_success": "The operation was successfully carried out.",
"cuc_helper_name_change_modal_title": "Change the name",
"cuc_helper_name_change_modal_service_name_label": "Default name",
"cuc_helper_name_change_modal_display_name_label": "Custom name",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> purchase order successfully created. ",
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}"
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}",
"cuc_helper_order_doing": "Creating a purchase order..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Edit",
"cuc_helper_modal_cancel": "Cancel",
"cuc_helper_delete": "Delete",
"cuc_helper_global_error": "An error has occurred during the operation: {{message}}",
"cuc_helper_global_error": "An error has occurred completing the operation: {{message}}",
"cuc_helper_global_success": "The operation was successfully carried out.",
"cuc_helper_name_change_modal_title": "Change the name",
"cuc_helper_name_change_modal_service_name_label": "Default name",
"cuc_helper_name_change_modal_display_name_label": "Custom name",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> purchase order successfully created. ",
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}"
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}",
"cuc_helper_order_doing": "Creating a purchase order..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Editar",
"cuc_helper_modal_cancel": "Cancelar",
"cuc_helper_delete": "Eliminar",
"cuc_helper_global_error": "Se ha producido un error durante la operación: {{message}}",
"cuc_helper_global_error": "Se ha producido un error al realizar la operación: {{message}}",
"cuc_helper_global_success": "La operación se ha realizado correctamente.",
"cuc_helper_name_change_modal_title": "Editar el nombre",
"cuc_helper_name_change_modal_service_name_label": "Nombre por defecto",
"cuc_helper_name_change_modal_display_name_label": "Nombre personalizado",
"cuc_helper_order_success": "Se ha creado la orden de pedido <a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a>.",
"cuc_helper_order_error": "Error al crear la orden de pedido: {{ message }}"
"cuc_helper_order_error": "Error al crear la orden de pedido: {{ message }}",
"cuc_helper_order_doing": "Generando la orden de pedido..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Edit",
"cuc_helper_modal_cancel": "Cancel",
"cuc_helper_delete": "Delete",
"cuc_helper_global_error": "An error has occurred during the operation: {{message}}",
"cuc_helper_global_error": "An error has occurred completing the operation: {{message}}",
"cuc_helper_global_success": "The operation was successfully carried out.",
"cuc_helper_name_change_modal_title": "Change the name",
"cuc_helper_name_change_modal_service_name_label": "Default name",
"cuc_helper_name_change_modal_display_name_label": "Custom name",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> purchase order successfully created. ",
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}"
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}",
"cuc_helper_order_doing": "Creating a purchase order..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Modifier",
"cuc_helper_modal_cancel": "Annuler",
"cuc_helper_delete": "A supprimer",
"cuc_helper_global_error": "Un erreur est survenue lors de l'opération : {{message}}",
"cuc_helper_global_error": "Une erreur est survenue lors de l'opération : {{message}}",
"cuc_helper_global_success": "L'opération s'est déroulée avec succès.",
"cuc_helper_name_change_modal_title": "Modifier le nom",
"cuc_helper_name_change_modal_service_name_label": "Nom par défaut",
"cuc_helper_name_change_modal_display_name_label": "Nom personnalisé",
"cuc_helper_order_success": "Le bon de commande <a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> a été créé avec succès.",
"cuc_helper_order_error": "Erreur lors de la création du bon de commande: {{ message }}"
"cuc_helper_order_error": "Erreur lors de la création du bon de commande: {{ message }}",
"cuc_helper_order_doing": "Création du bon de commande en cours ..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"cuc_helper_name_change_modal_service_name_label": "Nome predefinito",
"cuc_helper_name_change_modal_display_name_label": "Nome personalizzato",
"cuc_helper_order_success": "Il buono d'ordine <a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> è stato creato correttamente.",
"cuc_helper_order_error": "Errore durante la creazione del buono d'ordine: {{ message }}"
"cuc_helper_order_error": "Errore durante la creazione del buono d'ordine: {{ message }}",
"cuc_helper_order_doing": "Creazione dell’ordine in corso..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Edit",
"cuc_helper_modal_cancel": "Cancel",
"cuc_helper_delete": "Delete",
"cuc_helper_global_error": "An error has occurred during the operation: {{message}}",
"cuc_helper_global_error": "An error has occurred completing the operation: {{message}}",
"cuc_helper_global_success": "The operation was successfully carried out.",
"cuc_helper_name_change_modal_title": "Change the name",
"cuc_helper_name_change_modal_service_name_label": "Default name",
"cuc_helper_name_change_modal_display_name_label": "Custom name",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> purchase order successfully created. ",
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}"
"cuc_helper_order_error": "An error has occurred generating your purchase order: {{ message }}",
"cuc_helper_order_doing": "Creating a purchase order..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"cuc_helper_edit": "Wijzigen",
"cuc_helper_modal_cancel": "Annuleren",
"cuc_helper_delete": "Verwijderen",
"cuc_helper_global_error": "Er is een fout opgetreden tijdens de procedure: {{message}}",
"cuc_helper_global_error": "Er is een fout opgetreden tijdens de bewerking: {{message}}",
"cuc_helper_global_success": "De procedure is voltooid. ",
"cuc_helper_name_change_modal_title": "Naam wijzigen",
"cuc_helper_name_change_modal_service_name_label": "Standaard naam",
"cuc_helper_name_change_modal_display_name_label": "Gepersonaliseerde naam",
"cuc_helper_order_success": "<a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a> bestelbon is aangemaakt.",
"cuc_helper_order_error": "Fout bij het aanmaken van de bestelling: {{message}}"
"cuc_helper_order_error": "Fout bij het aanmaken van de bestelling: {{message}}",
"cuc_helper_order_doing": "Aankoop bestelling wordt gemaakt..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"cuc_helper_name_change_modal_service_name_label": "Domyślna nazwa",
"cuc_helper_name_change_modal_display_name_label": "Spersonalizowana nazwa",
"cuc_helper_order_success": "Zamówienie <a href=\"{{orderUrl}}\" target=\"_blank\">{{orderId}}</a>zostało utworzone.",
"cuc_helper_order_error": "Błąd podczas tworzenia zamówienia: {{ message }}"
"cuc_helper_order_error": "Błąd podczas tworzenia zamówienia: {{ message }}",
"cuc_helper_order_doing": "Trwa generowanie zamówienia ..."
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,24 @@
"cuc_region_US_micro": "Stati Uniti ({{ micro }})",
"cuc_region_localize": "Localizza",
"cuc_region_location_SBG": "Europa Centrale (Francia)",
"cuc_region_location_WAW": "Europa centrale (Polonia)",
"cuc_region_location_BHS": "America del Nord (Canada)",
"cuc_region_location_ERI": "Europa occidentale (Gran Bretagna)",
"cuc_region_location_WAW": "Europa Centrale (Polonia)",
"cuc_region_location_BHS": "Nord America (Canada)",
"cuc_region_location_ERI": "Europa Occidentale (Gran Bretagna)",
"cuc_region_location_GRA": "Europa Occidentale (Francia)",
"cuc_region_location_LIM": "Europa centrale (Germania)",
"cuc_region_location_LIM": "Europa Centrale (Germania)",
"cuc_region_location_RBX": "Europa Occidentale (Francia)",
"cuc_region_location_DE": "Europa centrale (Germania)",
"cuc_region_location_UK": "Europa occidentale (Gran Bretagna)",
"cuc_region_location_DE": "Europa Centrale (Germania)",
"cuc_region_location_UK": "Europa Occidentale (Gran Bretagna)",
"cuc_region_location_SGP": "Sud-est asiatico (Singapore)",
"cuc_region_location_SYD": "Oceania (Australia)",
"cuc_region_location_US": "Stati uniti",
"cuc_region_continent_SBG": "Europa centrale",
"cuc_region_continent_WAW": "Europa centrale",
"cuc_region_continent_BHS": "America del Nord",
"cuc_region_continent_GRA": "Europa occidentale",
"cuc_region_continent_RBX": "Europa occidentale",
"cuc_region_continent_DE": "Europa centrale",
"cuc_region_continent_UK": "Europa occidentale",
"cuc_region_continent_SBG": "Europa Centrale",
"cuc_region_continent_WAW": "Europa Centrale",
"cuc_region_continent_BHS": "Nord America ",
"cuc_region_continent_GRA": "Europa Occidentale",
"cuc_region_continent_RBX": "Europa Occidentale",
"cuc_region_continent_DE": "Europa Centrale",
"cuc_region_continent_UK": "Europa Occidentale",
"cuc_region_continent_SGP": "Asia Pacifica",
"cuc_region_continent_SYD": "Oceania",
"cuc_region_continent_US": "Stati uniti"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"cuc_region_SYD": "Sydney",
"cuc_region_SYD_micro": "Sydney ({{ micro }})",
"cuc_region_US": "Stany Zjednoczone",
"cuc_region_US_micro": "États-Unis ({{ micro }})",
"cuc_region_US_micro": "Stany Zjednoczone ({{ micro }})",
"cuc_region_localize": "Lokalizacja",
"cuc_region_location_SBG": "Europa Środkowa (Francja)",
"cuc_region_location_WAW": "Europa Środkowa (Polska)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"unit_size_ZB": "ZB",
"unit_size_YB": "YB",
"unit_size_KiB": "KiB",
"unit_size_MiB": "MB",
"unit_size_MiB": "MiB",
"unit_size_GiB": "GiB",
"unit_size_TiB": "TiB",
"unit_size_PiB": "PiB",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"unit_size_B": "B",
"unit_size_KB": "KB",
"unit_size_MB": "MB",
"unit_size_GB": "GB",
"unit_size_TB": "TB",
"unit_size_PB": "PB",
"unit_size_EB": "EB",
"unit_size_ZB": "ZB",
"unit_size_YB": "YB",
"unit_size_KiB": "KiB",
"unit_size_MiB": "MiB",
"unit_size_GiB": "GiB",
"unit_size_TiB": "TiB",
"unit_size_PiB": "PiB",
"unit_size_EiB": "EiB",
"unit_size_ZiB": "ZiB",
"unit_size_YiB": "YiB"
"unit_size_B": "o",
"unit_size_KB": "ko",
"unit_size_MB": "Mo",
"unit_size_GB": "Go",
"unit_size_TB": "To",
"unit_size_PB": "Po",
"unit_size_EB": "Eo",
"unit_size_ZB": "Zo",
"unit_size_YB": "Yo",
"unit_size_KiB": "Kio",
"unit_size_MiB": "Mio",
"unit_size_GiB": "Gio",
"unit_size_TiB": "Tio",
"unit_size_PiB": "Pio",
"unit_size_EiB": "Eio",
"unit_size_ZiB": "Zio",
"unit_size_YiB": "Yio"
}

0 comments on commit fa4f78d

Please sign in to comment.