From 0124712cd2567cc73c481f9142713f3785f1682c Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Mon, 23 Oct 2023 11:24:11 +0100 Subject: [PATCH] Restore escaped standalone ampersands in translations (#15373) GitOrigin-RevId: 8f505ea4906d9adfddfd72b7609c0c3e465f6b56 --- services/web/locales/da.json | 14 +++++++------- services/web/locales/de.json | 10 +++++----- services/web/locales/fi.json | 4 ++-- services/web/locales/it.json | 4 ++-- services/web/locales/ko.json | 2 +- services/web/locales/no.json | 4 ++-- services/web/locales/pt.json | 4 ++-- services/web/locales/sv.json | 2 +- services/web/locales/tr.json | 2 +- services/web/locales/zh-CN.json | 2 +- services/web/scripts/translations/sanitize.js | 2 ++ 11 files changed, 26 insertions(+), 24 deletions(-) diff --git a/services/web/locales/da.json b/services/web/locales/da.json index e8d4c6a2ac..d66ab87b39 100644 --- a/services/web/locales/da.json +++ b/services/web/locales/da.json @@ -410,7 +410,7 @@ "edit_tag": "Redigér tag", "editing": "Redigering", "editing_captions": "Redigering af billedtekster", - "editor_and_pdf": "Skrivevindue & PDF", + "editor_and_pdf": "Skrivevindue & PDF", "editor_disconected_click_to_reconnect": "Skriveprogrammets forbindelse afbrudt, klik hvor som helst for at forbinde igen.", "editor_only_hide_pdf": "Kun skrivevindue <0>(gem PDF)", "editor_resources": "Læringsmidler til skriveprogrammet", @@ -490,7 +490,7 @@ "featured": "Fremhævet", "featured_latex_templates": "Fremhævede LaTeX-skabeloner", "features": "Funktioner", - "features_and_benefits": "Funktioner & fordele", + "features_and_benefits": "Funktioner & fordele", "february": "Februar", "file_action_created": "Oprettede", "file_action_deleted": "Slettede", @@ -523,13 +523,13 @@ "font_size": "Skriftsstørrelse", "footer_about_us": "Om os", "footer_contact_us": "Kontakt os", - "footer_plans_and_pricing": "Abonnementer & priser", + "footer_plans_and_pricing": "Abonnementer & priser", "for_american_express": "For <0>American Express, de <1>4 tal på <2>forsiden af dit kort.", "for_enterprise": "For virksomheder", "for_enterprises": "For virksomheder", "for_groups": "For grupper", "for_groups_or_site_wide": "For grupper eller organisationsdækkende", - "for_individuals_and_groups": "For individer & grupper", + "for_individuals_and_groups": "For individer & grupper", "for_publishers": "For forlag", "for_students": "For studerende", "for_students_only": "Kun for studerende", @@ -1111,7 +1111,7 @@ "pl": "Polsk", "plan_tooltip": "Du er på __plan__ abonnementet. Klik for at finde ud af hvordan du får mest muligt ud af dine Overleaf Premium-funktioner.", "planned_maintenance": "Planlagt vedligeholdelse", - "plans_amper_pricing": "Abonnementer & priser", + "plans_amper_pricing": "Abonnementer & priser", "plans_and_pricing": "Abonnementer og priser", "please_ask_the_project_owner_to_upgrade_to_track_changes": "Du må bede projektets ejer om at opgradere, for at kunne bruge “Følg ændringer”", "please_change_primary_to_remove": "Skift din primære e-mailadresse for at kunne fjerne denne", @@ -1142,13 +1142,13 @@ "post_on_facebook": "Del på Facebook", "postal_code": "Postnummer", "powerful_latex_editor": "Højtydende LaTeX-skriveprogram", - "powerful_latex_editor_and_realtime_collaboration": "Højtydende LaTeX-skriveprogram & live samarbejde.", + "powerful_latex_editor_and_realtime_collaboration": "Højtydende LaTeX-skriveprogram & live samarbejde.", "powerful_latex_editor_and_realtime_collaboration_info": "Stavekontrol, intelligent autoudførelse, syntaksfremhævning, dusinvis af farvetemaer, vim- og emacs-tastebindinger, hjælp til LaTeX-advarsler og -fejlmeddelelser, med mere. Alle har altid den nyeste version, og du kan se dine samarbejdspartneres markører og ændringer live.", "premium_feature": "Premium-funktion", "premium_features": "Premium-funktioner", "premium_plan_label": "Du bruger Overleaf Premium", "presentation": "Præsentation", - "press_and_awards": "Presse & priser", + "press_and_awards": "Presse & priser", "press_shortcut_to_open_advanced_reference_search": "Tryk __ctrlSpace__ eller __altSpace__ for at åbne Avanceret henvisningssøgning", "price": "Pris", "primary_email_check_question": "Er <0>__email__ stadig din e-mailaddresse?", diff --git a/services/web/locales/de.json b/services/web/locales/de.json index e0f0d39659..7c2fffccab 100644 --- a/services/web/locales/de.json +++ b/services/web/locales/de.json @@ -412,7 +412,7 @@ "edit_tag": "Schlagwort bearbeiten", "editing": "Bearbeitung", "editing_captions": "Beschriftungen bearbeiten", - "editor_and_pdf": "Editor & PDF", + "editor_and_pdf": "Editor & PDF", "editor_disconected_click_to_reconnect": "Editor wurde getrennt", "editor_only_hide_pdf": "Nur Editor <0>(PDF ausblenden)", "editor_resources": "Editor-Literatur", @@ -494,7 +494,7 @@ "featured": "Vorgestellt", "featured_latex_templates": "Ausgewählte LaTeX-Vorlagen", "features": "Features", - "features_and_benefits": "Features & Vorteile", + "features_and_benefits": "Features & Vorteile", "february": "Februar", "file_action_created": "Erstellt", "file_action_deleted": "Gelöscht", @@ -527,13 +527,13 @@ "font_size": "Schriftgröße", "footer_about_us": "Über uns", "footer_contact_us": "Kontaktiere uns", - "footer_plans_and_pricing": "Abos & Preise", + "footer_plans_and_pricing": "Abos & Preise", "for_american_express": "Für <0>American Express die <1>4 Ziffern auf der <2>Vorderseite deiner Karte.", "for_enterprise": "Für Unternehmen", "for_enterprises": "Für Unternehmen", "for_groups": "Für Gruppen", "for_groups_or_site_wide": "Für Gruppen oder standortweit", - "for_individuals_and_groups": "Für Einzelpersonen & Gruppen", + "for_individuals_and_groups": "Für Einzelpersonen & Gruppen", "for_publishers": "Für Verlage", "for_students": "Für Studierende", "for_students_only": "Nur für Studierende", @@ -1117,7 +1117,7 @@ "premium_feature": "Premiumfunktion", "premium_features": "Premiumfunktionen", "presentation": "Präsentation", - "press_and_awards": "Presse & Auszeichnungen", + "press_and_awards": "Presse & Auszeichnungen", "price": "Preis", "primary_email_check_question": "Ist <0>__email__ immer noch deine E-Mail-Adresse?", "priority_support": "Vorrangiger Kundensupport", diff --git a/services/web/locales/fi.json b/services/web/locales/fi.json index 7d3e21b3a0..94ba45dc0a 100644 --- a/services/web/locales/fi.json +++ b/services/web/locales/fi.json @@ -222,7 +222,7 @@ "online_latex_editor": "Verkossa toimiva LaTeX-editori", "optional": "Valinnainen", "or": "tai", - "other_logs_and_files": "Muut lokit & tiedostot", + "other_logs_and_files": "Muut lokit & tiedostot", "over": "yli", "owner": "Omistaja", "page_not_found": "Sivua Ei Löydy", @@ -234,7 +234,7 @@ "personal": "Henkilökohtainen", "pl": "Puola", "planned_maintenance": "Suunniteltu ylläpito", - "plans_amper_pricing": "Sopimukset & Hinnoittelu", + "plans_amper_pricing": "Sopimukset & Hinnoittelu", "plans_and_pricing": "Sopimukset ja hinnoittelu", "please_compile_pdf_before_download": "Käännä projektisi ennen kuin lataat PDF:n", "please_enter_email": "Syötä sähköpostiosoitteesi", diff --git a/services/web/locales/it.json b/services/web/locales/it.json index 541ddc2f5b..07cdee9805 100644 --- a/services/web/locales/it.json +++ b/services/web/locales/it.json @@ -249,7 +249,7 @@ "online_latex_editor": "Editor LaTeX online", "optional": "Opzionale", "or": "o", - "other_logs_and_files": "Altri log & file", + "other_logs_and_files": "Altri log & file", "over": "su", "owner": "Proprietario", "page_not_found": "Pagina Non Trovata", @@ -261,7 +261,7 @@ "personal": "Personale", "pl": "Polacco", "planned_maintenance": "Manutenzione Pianificata", - "plans_amper_pricing": "Piani & Costi", + "plans_amper_pricing": "Piani & Costi", "plans_and_pricing": "Piani e Costi", "please_compile_pdf_before_download": "Per favore, compila il progetto prima di scariare il PDF", "please_compile_pdf_before_word_count": "Per favore, compila il tuo progetto prima di eseguire il conteggio parole", diff --git a/services/web/locales/ko.json b/services/web/locales/ko.json index 4348426dd2..ccb71466cf 100644 --- a/services/web/locales/ko.json +++ b/services/web/locales/ko.json @@ -386,7 +386,7 @@ "personal": "개인", "pl": "폴란드어", "planned_maintenance": "플랜 유지", - "plans_amper_pricing": "플랜 & 가격", + "plans_amper_pricing": "플랜 & 가격", "plans_and_pricing": "플랜 및 가격", "please_ask_the_project_owner_to_upgrade_to_track_changes": "변경 내용 추적을 사용하시려면 프로젝트 소유자에게 업그레이드를 요구하세요.", "please_compile_pdf_before_download": "PDF를 다운로드하기 전에 프로젝트를 컴파일하세요", diff --git a/services/web/locales/no.json b/services/web/locales/no.json index c61729f719..d1360dc1d9 100644 --- a/services/web/locales/no.json +++ b/services/web/locales/no.json @@ -255,7 +255,7 @@ "online_latex_editor": "Online LaTeX-redigeringsprogram", "optional": "Valgfri", "or": "eller", - "other_logs_and_files": "Andre logger & filer", + "other_logs_and_files": "Andre logger & filer", "over": "over", "owner": "Eier", "page_not_found": "Fant ikke siden", @@ -267,7 +267,7 @@ "personal": "Personlig", "pl": "Polsk", "planned_maintenance": "Planlagt vedlikehold", - "plans_amper_pricing": "Planer & Priser", + "plans_amper_pricing": "Planer & Priser", "plans_and_pricing": "Planer og priser", "please_compile_pdf_before_download": "Vennligst kompiler prosjektet før du laster ned PDF", "please_compile_pdf_before_word_count": "Vennligst kompiler prosjektet ditt før du utfører en ordtelling", diff --git a/services/web/locales/pt.json b/services/web/locales/pt.json index e612ae8c16..090353e60c 100644 --- a/services/web/locales/pt.json +++ b/services/web/locales/pt.json @@ -468,7 +468,7 @@ "optional": "Opcional", "or": "ou", "other_actions": "Outras Ações", - "other_logs_and_files": "Outros Logs & Arquivos", + "other_logs_and_files": "Outros Logs & Arquivos", "over": "mais de", "over_x_templates_easy_getting_started": "Existem milhares de __templates__ em nossa galeria de modelos, assim é fácil começar, mesmo que você esteja escrevendo um artigo de revista, tese, currículo ou outra coisa.", "overall_theme": "Tema Geral", @@ -490,7 +490,7 @@ "personal": "Pessoal", "pl": "Polonês", "planned_maintenance": "Manutenção Planejada", - "plans_amper_pricing": "Planos & Preços", + "plans_amper_pricing": "Planos & Preços", "plans_and_pricing": "Planos e Preços", "please_ask_the_project_owner_to_upgrade_to_track_changes": "Solicite ao proprietário do projeto que atualize para utilizar o controle de alterações", "please_check_your_inbox": "Por favor, verifique sua caixa de entrada", diff --git a/services/web/locales/sv.json b/services/web/locales/sv.json index a2924a5c99..ea02ca2048 100644 --- a/services/web/locales/sv.json +++ b/services/web/locales/sv.json @@ -349,7 +349,7 @@ "first_name": "Förnamn", "first_x_days_free_after_that_y_per_month": "De första <0>__trialLen__-dagarna är gratis, därefter <0>__price__ per månad", "folders": "Mappar", - "following_paths_conflict": "Följande filer & mappar har samma sökvägar", + "following_paths_conflict": "Följande filer & mappar har samma sökvägar", "font_family": "Typsnittsfamilj", "font_size": "Teckenstorlek", "forgot_your_password": "Glömt ditt lösenord", diff --git a/services/web/locales/tr.json b/services/web/locales/tr.json index 788a79dfc7..250b67841b 100644 --- a/services/web/locales/tr.json +++ b/services/web/locales/tr.json @@ -249,7 +249,7 @@ "online_latex_editor": "Çevrimiçi LaTeX Editörü", "optional": "İsteğe bağlı", "or": " ya da", - "other_logs_and_files": "Diğer sonuç dökümleri & dosyalar", + "other_logs_and_files": "Diğer sonuç dökümleri & dosyalar", "over": "fazla", "owner": "Sahibi", "page_not_found": "Sayfa Bulunamadı", diff --git a/services/web/locales/zh-CN.json b/services/web/locales/zh-CN.json index c291c184a4..4c903b3c0f 100644 --- a/services/web/locales/zh-CN.json +++ b/services/web/locales/zh-CN.json @@ -709,7 +709,7 @@ "personal": "个人", "pl": "波兰语", "planned_maintenance": "计划中的维护", - "plans_amper_pricing": "套餐 & 价格", + "plans_amper_pricing": "套餐 & 价格", "plans_and_pricing": "套餐及价格", "please_ask_the_project_owner_to_upgrade_to_track_changes": "请要求项目所有者升级以使用历史查询功能。", "please_change_primary_to_remove": "请更改您的主要电子邮件以删除它", diff --git a/services/web/scripts/translations/sanitize.js b/services/web/scripts/translations/sanitize.js index b24e386238..af6d4d9415 100644 --- a/services/web/scripts/translations/sanitize.js +++ b/services/web/scripts/translations/sanitize.js @@ -38,6 +38,8 @@ function sanitize(input) { }) // Restore the escaping again. .replaceAll(/<([/]?[0-9])>/g, '<$1>') + // Restore escaped standalone ampersands + .replaceAll(/ & /g, ' & ') ) }