From 840092678c8b441bf6f5c8d02a95c2f1d597c85d Mon Sep 17 00:00:00 2001 From: Kai Alexander Fischer Date: Wed, 7 Feb 2018 15:03:18 +0100 Subject: [PATCH 1/4] Add "There_are_no_applications" Translation for OAuth Apps. --- packages/rocketchat-i18n/i18n/de.i18n.json | 1 + packages/rocketchat-i18n/i18n/en.i18n.json | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index f1ba20e0e165..861de997fbd2 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -1793,6 +1793,7 @@ "theme-custom-css": "Benutzerdefiniertes CSS", "theme-font-body-font-family": "Schrift-Familie für den Textkörper", "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt", + "There_are_no_applications": "Es wurden bisher keine OAuth Applikationen hinzugefügt.", "There_are_no_integrations": "Es sind keine Integrationen vorhanden", "There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet", "This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet", diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index e9db704bad10..64acb656a72e 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1864,6 +1864,7 @@ "theme-custom-css": "Custom CSS", "theme-font-body-font-family": "Body Font Family", "There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.", + "There_are_no_applications": "There are no OAuth Applications added yet.", "There_are_no_integrations": "There are no integrations", "There_are_no_users_in_this_role": "There are no users in this role.", "This_conversation_is_already_closed": "This conversation is already closed.", From 7860905a0afb282aa7594fe8e0f3b3ecba5d2e59 Mon Sep 17 00:00:00 2001 From: Kai Alexander Fischer Date: Thu, 8 Feb 2018 00:08:04 +0100 Subject: [PATCH 2/4] Revert "Add "There_are_no_applications" Translation for OAuth Apps." This reverts commit 840092678c8b441bf6f5c8d02a95c2f1d597c85d. --- packages/rocketchat-i18n/i18n/de.i18n.json | 1 - packages/rocketchat-i18n/i18n/en.i18n.json | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index 861de997fbd2..f1ba20e0e165 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -1793,7 +1793,6 @@ "theme-custom-css": "Benutzerdefiniertes CSS", "theme-font-body-font-family": "Schrift-Familie für den Textkörper", "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt", - "There_are_no_applications": "Es wurden bisher keine OAuth Applikationen hinzugefügt.", "There_are_no_integrations": "Es sind keine Integrationen vorhanden", "There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet", "This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet", diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 64acb656a72e..e9db704bad10 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1864,7 +1864,6 @@ "theme-custom-css": "Custom CSS", "theme-font-body-font-family": "Body Font Family", "There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.", - "There_are_no_applications": "There are no OAuth Applications added yet.", "There_are_no_integrations": "There are no integrations", "There_are_no_users_in_this_role": "There are no users in this role.", "This_conversation_is_already_closed": "This conversation is already closed.", From 29fdb8d3a4fd4d2f7dd8eaabc1e1907f95029d63 Mon Sep 17 00:00:00 2001 From: Kai Alexander Fischer Date: Thu, 8 Feb 2018 00:08:39 +0100 Subject: [PATCH 3/4] Revert "Revert "Add "There_are_no_applications" Translation for OAuth Apps."" This reverts commit 7860905a0afb282aa7594fe8e0f3b3ecba5d2e59. --- packages/rocketchat-i18n/i18n/de.i18n.json | 1 + packages/rocketchat-i18n/i18n/en.i18n.json | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index f1ba20e0e165..861de997fbd2 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -1793,6 +1793,7 @@ "theme-custom-css": "Benutzerdefiniertes CSS", "theme-font-body-font-family": "Schrift-Familie für den Textkörper", "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt", + "There_are_no_applications": "Es wurden bisher keine OAuth Applikationen hinzugefügt.", "There_are_no_integrations": "Es sind keine Integrationen vorhanden", "There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet", "This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet", diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index e9db704bad10..64acb656a72e 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1864,6 +1864,7 @@ "theme-custom-css": "Custom CSS", "theme-font-body-font-family": "Body Font Family", "There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.", + "There_are_no_applications": "There are no OAuth Applications added yet.", "There_are_no_integrations": "There are no integrations", "There_are_no_users_in_this_role": "There are no users in this role.", "This_conversation_is_already_closed": "This conversation is already closed.", From 9b1be3c724d2f86290eb52bc3094919f15b3272e Mon Sep 17 00:00:00 2001 From: Kai Alexander Fischer Date: Thu, 8 Feb 2018 00:12:01 +0100 Subject: [PATCH 4/4] Optimized translation --- packages/rocketchat-i18n/i18n/de.i18n.json | 4 ++-- packages/rocketchat-i18n/i18n/en.i18n.json | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json index 861de997fbd2..819cca1080f8 100644 --- a/packages/rocketchat-i18n/i18n/de.i18n.json +++ b/packages/rocketchat-i18n/i18n/de.i18n.json @@ -1793,7 +1793,7 @@ "theme-custom-css": "Benutzerdefiniertes CSS", "theme-font-body-font-family": "Schrift-Familie für den Textkörper", "There_are_no_agents_added_to_this_department_yet": "Es wurden bisher keine Agenten zu dieser Abteilung hinzugefügt", - "There_are_no_applications": "Es wurden bisher keine OAuth Applikationen hinzugefügt.", + "There_are_no_applications": "Bisher wurden keine oAuth Anwendungen hinzugefügt.", "There_are_no_integrations": "Es sind keine Integrationen vorhanden", "There_are_no_users_in_this_role": "Es sind dieser Rolle keine Benutzer zugeordnet", "This_conversation_is_already_closed": "Die Unterhaltung wurde bereits beendet", @@ -2063,4 +2063,4 @@ "your_message_optional": "ihre optionale Nachricht", "Your_password_is_wrong": "Falsches Passwort", "Your_push_was_sent_to_s_devices": "Eine Push-Nachricht wurde an %s Geräte gesendet." -} +} \ No newline at end of file diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 64acb656a72e..bb6a9c739901 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1346,8 +1346,8 @@ "Notification_Duration": "Notification Duration", "Notification_Mobile_Default_For": "Push Mobile Notifications For", "Notifications": "Notifications", - "Notifications_Always_Notify_Mobile" : "Always notify mobile", - "Notifications_Always_Notify_Mobile_Description" : "Choose to always notify mobile device regardless of presence status.", + "Notifications_Always_Notify_Mobile": "Always notify mobile", + "Notifications_Always_Notify_Mobile_Description": "Choose to always notify mobile device regardless of presence status.", "Notifications_Duration": "Notifications_Duration", "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications", "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)", @@ -1597,7 +1597,7 @@ "run-migration_description": "Permission to run the migrations", "Running_Instances": "Running Instances", "S_new_messages_since_s": "%s new messages since %s", - "Same_As_Token_Sent_Via" : "Same as \"Token Sent Via\"", + "Same_As_Token_Sent_Via": "Same as \"Token Sent Via\"", "Same_Style_For_Mentions": "Same style for mentions", "SAML": "SAML", "SAML_Custom_Cert": "Custom Certificate", @@ -1864,7 +1864,7 @@ "theme-custom-css": "Custom CSS", "theme-font-body-font-family": "Body Font Family", "There_are_no_agents_added_to_this_department_yet": "There are no agents added to this department yet.", - "There_are_no_applications": "There are no OAuth Applications added yet.", + "There_are_no_applications": "No oAuth Applications have been added yet.", "There_are_no_integrations": "There are no integrations", "There_are_no_users_in_this_role": "There are no users in this role.", "This_conversation_is_already_closed": "This conversation is already closed.", @@ -2157,4 +2157,4 @@ "your_message_optional": "your message (optional)", "Your_password_is_wrong": "Your password is wrong!", "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices" -} +} \ No newline at end of file