From 563db1bf1921ef1c8f1e83b05f2b8fb475735607 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 8 Feb 2023 10:23:22 +0100 Subject: [PATCH] Merge pull request #11706 from overleaf/jpa-fix-de-translations [web] fix a few German translations GitOrigin-RevId: a19713144a236e367a28bd443919bd81acbb4656 --- .../views/subscriptions/plans-marketing/v2/_mixins.pug | 8 ++++---- services/web/frontend/extracted-translations.json | 2 +- .../components/layout-dropdown-button.js | 2 +- services/web/frontend/stylesheets/app/plans-v2.less | 6 ++++++ services/web/frontend/stylesheets/app/plans.less | 4 ++-- services/web/locales/de.json | 10 +++++----- services/web/locales/en.json | 4 ++-- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug b/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug index 863b008923..ac9dee03e3 100644 --- a/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug +++ b/services/web/app/views/subscriptions/plans-marketing/v2/_mixins.pug @@ -432,8 +432,8 @@ mixin btn_buy_group_collaborator(highlighted, eventTrackingKey) data-ol-location='table-header' class=(highlighted ? 'btn-primary' : 'btn-default') ) - span #{translate("customize")} - span.hidden-mobile #{translate("your_plan_lowercase")} + span.hidden-desktop #{translate("customize")} + span.hidden-mobile #{translate("customize_your_plan")} mixin btn_buy_group_professional(highlighted, eventTrackingKey) a.btn.plans-v2-table-btn-buy( @@ -444,8 +444,8 @@ mixin btn_buy_group_professional(highlighted, eventTrackingKey) data-ol-location='table-header' class=(highlighted ? 'btn-primary' : 'btn-default') ) - span #{translate("customize")} - span.hidden-mobile #{translate("your_plan_lowercase")} + span.hidden-desktop #{translate("customize")} + span.hidden-mobile #{translate("customize_your_plan")} mixin btn_buy_group_organization(highlighted, eventTrackingKey) a.btn.plans-v2-table-btn-buy( diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index c7d5babc3b..b17b9abb6a 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -206,7 +206,7 @@ "edit_dictionary_remove": "", "edit_folder": "", "editing": "", - "editor_and_pdf": "", + "editor_and_pdf": "&", "editor_only_hide_pdf": "", "editor_theme": "", "email": "", diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js b/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js index fe656cb4e7..e25614de2d 100644 --- a/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js +++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js @@ -168,7 +168,7 @@ function LayoutDropdownButton() { /> } icon={} - text={t('editor_and_pdf')} + text={&} /> Gruppen-Abonnements bieten einen <1>Bildungsrabatt für Studenten und Lehrkräfte", - "all_packages_and_templates": "Alle Pakete und <0>__templatesLink__, die du brauchst", + "all_packages_and_templates": "Alle Pakete und <0>Vorlagen, die du brauchst", "all_premium_features": "Alle Premiumfunktionen", "all_projects": "Alle Projekte", "all_templates": "Alle Vorlagen", @@ -270,6 +270,7 @@ "custom_resource_portal": "Benutzerdefiniertes Ressourcenportal", "custom_resource_portal_info": "Du kannst deine eigene benutzerdefinierte Portalseite auf Overleaf haben. Dies ist ein großartiger Ort für die Nutzer, um mehr über Overleaf zu erfahren, auf Vorlagen, FAQs und Hilferessourcen zuzugreifen und sich bei Overleaf anzumelden.", "customize": "Anpassen", + "customize_your_plan": "Abonnement anpassen", "da": "Dänisch", "de": "Deutsch", "december": "Dezember", @@ -347,7 +348,7 @@ "edit_dictionary_empty": "Dein benutzerdefiniertes Wörterbuch ist leer.", "edit_dictionary_remove": "Aus Wörterbuch entfernen", "editing": "Bearbeitung", - "editor_and_pdf": "Editor & PDF", + "editor_and_pdf": "Editor <0> PDF", "editor_disconected_click_to_reconnect": "Editor wurde getrennt", "editor_only_hide_pdf": "Nur Editor <0>(PDF ausblenden)", "editor_resources": "Editor-Literatur", @@ -1095,7 +1096,7 @@ "save_or_cancel-or": "oder", "save_or_cancel-save": "Speichern", "saving": "Speichern", - "saving_20_percent": "Spare 20 %!", + "saving_20_percent": "Du sparst 20 %!", "saving_notification_with_seconds": "__docname__ speichern... (__seconds__ Sekunden ungespeicherter Änderungen)", "search": "Suchen", "search_bib_files": "Nach Autor, Titel, Jahr suchen", @@ -1113,7 +1114,7 @@ "security": "Sicherheit", "security_code": "Kartenprüfnummer", "see_changes_in_your_documents_live": "Verfolge Änderungen in deinen Dokumenten, live", - "see_what_has_been": "Schau nach, was", + "see_what_has_been": "Schau nach, was wurde", "select_a_file": "Datei auswählen", "select_a_project": "Projekt auswählen", "select_a_zip_file": "Wähle eine ZIP-Datei aus", @@ -1441,7 +1442,6 @@ "your_new_plan": "Dein neues Abonnement", "your_plan": "Dein Abo", "your_plan_is_changing_at_term_end": "Dein Abonnement ändert sich am Ende des aktuellen Abrechnungszeitraums in <0>__pendingPlanName__.", - "your_plan_lowercase": "dein Abonnement", "your_projects": "Deine Projekte", "your_sessions": "Deine Sessions", "your_subscription": "Dein Abonnement", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 43091392fe..0a62d56d71 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -302,6 +302,7 @@ "custom_resource_portal": "Custom resource portal", "custom_resource_portal_info": "You can have your own custom portal page on Overleaf. This is a great place for your users to find out more about Overleaf, access templates, FAQs and Help resources, and sign up to Overleaf.", "customize": "Customize", + "customize_your_plan": "Customize your plan", "da": "Danish", "date": "Date", "date_and_owner": "Date and owner", @@ -391,7 +392,7 @@ "edit_dictionary_remove": "Remove from dictionary", "edit_folder": "Edit Folder", "editing": "Editing", - "editor_and_pdf": "Editor & PDF", + "editor_and_pdf": "Editor <0> PDF", "editor_disconected_click_to_reconnect": "Editor disconnected, click anywhere to reconnect.", "editor_only_hide_pdf": "Editor only <0>(hide PDF)", "editor_resources": "Editor Resources", @@ -1667,7 +1668,6 @@ "your_password_has_been_successfully_changed": "Your password has been successfully changed", "your_plan": "Your plan", "your_plan_is_changing_at_term_end": "Your plan is changing to <0>__pendingPlanName__ at the end of the current billing period.", - "your_plan_lowercase": "your plan", "your_projects": "Your Projects", "your_sessions": "Your Sessions", "your_subscription": "Your Subscription",