From c77e5c4978a6a56ad09779ac3049ac2f68eb89d0 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Fri, 23 Aug 2024 13:30:50 +0300 Subject: [PATCH] fix(i18l): Resolve more translation issues --- assets/translations/ar.json | 2 +- assets/translations/az.json | 2 +- assets/translations/be.json | 2 +- assets/translations/cs.json | 2 +- assets/translations/de.json | 2 +- assets/translations/en.json | 7 +++---- assets/translations/et.json | 2 +- assets/translations/he.json | 2 +- assets/translations/ja.json | 2 +- assets/translations/kk.json | 2 +- assets/translations/pl.json | 2 +- assets/translations/ru.json | 6 +++--- assets/translations/sk.json | 2 +- assets/translations/th.json | 2 +- assets/translations/uk.json | 2 +- assets/translations/zh-Hans.json | 2 +- lib/ui/pages/setup/initializing/initializing.dart | 6 +++++- .../pages/setup/initializing/server_provider_picker.dart | 4 +++- 18 files changed, 28 insertions(+), 23 deletions(-) diff --git a/assets/translations/ar.json b/assets/translations/ar.json index 169f3309..d221d847 100644 --- a/assets/translations/ar.json +++ b/assets/translations/ar.json @@ -29,7 +29,7 @@ "choose_server_type_payment_ip": "{} لعنوان IPv4 العام", "use_this_domain": "هل تريد استخدام هذا النطاق؟", "select_provider": "اختر أي مزود من القائمة التالية. كل منهم يدعم SelfPrivacy", - "connect_to_server_provider": "قم بتسجيل الدخول الآن ", + "connect_to_server_provider": "قم بتسجيل الدخول الآن {provider}", "multiple_domains_found": "لقد وجدت نطاقات عديدة", "steps": { "master_account": "الحساب الرئيسي", diff --git a/assets/translations/az.json b/assets/translations/az.json index 9d8c5fea..f7ed5c5c 100644 --- a/assets/translations/az.json +++ b/assets/translations/az.json @@ -237,7 +237,7 @@ "select_provider_payment_text_do": "Bank kartları, Google Pay, PayPal", "select_provider_email_notice": "Yeni müştərilər üçün e-poçt hostinqi mövcud deyil. İlk ödənişdən sonra onu açmaq mümkün olacaq.", "select_provider_site_button": "Saytı ziyarət edin", - "connect_to_server_provider": "Giriş ", + "connect_to_server_provider": "Giriş {provider}", "how": "API Tokenini necə əldə etmək olar", "provider_bad_key_error": "Provayder API açarı yanlışdır", "could_not_connect": "Provayderə qoşulmaq alınmadı.", diff --git a/assets/translations/be.json b/assets/translations/be.json index 2e449330..10888d4a 100644 --- a/assets/translations/be.json +++ b/assets/translations/be.json @@ -48,7 +48,7 @@ "select_provider_payment_text_do": "Банкаўскія карты, Google Pay, PayPal", "select_provider_email_notice": "Хостынг электроннай пошты недаступны для новых кліентаў. Разблакаваць можна будзе пасля першай аплаты.", "select_provider_site_button": "Наведаць сайт", - "connect_to_server_provider": "Аўтарызавацца ў ", + "connect_to_server_provider": "Аўтарызавацца ў {provider}", "connect_to_server_provider_text": "З дапамогай API токена праграма SelfPrivacy зможа ад вашага імя замовіць і наладзіць сервер", "steps": { "nixos_installation": "Ўсталёўка NixOS", diff --git a/assets/translations/cs.json b/assets/translations/cs.json index 3c0e76e1..3930bd93 100644 --- a/assets/translations/cs.json +++ b/assets/translations/cs.json @@ -146,7 +146,7 @@ "select_provider_payment_text_hetzner": "Kreditní karty, SWIFT, SEPA, PayPal", "select_provider_payment_text_do": "Kreditní karty, Google Pay, PayPal", "select_provider_site_button": "Navštivte stránku", - "connect_to_server_provider": "Nyní se přihlaste ", + "connect_to_server_provider": "Nyní se přihlaste {provider}", "connect_to_server_provider_text": "S tokenem API si SelfPrivacy bude moci pronajmout počítač a nastavit na něm svůj server", "how": "Jak získat token API", "provider_bad_key_error": "Klíč API poskytovatele je neplatný", diff --git a/assets/translations/de.json b/assets/translations/de.json index 03a2c2ce..68ea9d76 100644 --- a/assets/translations/de.json +++ b/assets/translations/de.json @@ -331,7 +331,7 @@ "select_provider_payment_text_do": "Kreditkarten, Google Pay, PayPal", "select_provider_email_notice": "E-Mail-Hosting ist für Neukunden nicht verfügbar. Es wird jedoch freigeschaltet, sobald Sie Ihre erste Zahlung abgeschlossen haben.", "select_provider_site_button": "Webseite besuchen", - "connect_to_server_provider": "Anmelden bei ", + "connect_to_server_provider": "Anmelden bei {provider}", "how": "So erhalten Sie ein API-Token", "provider_bad_key_error": "Der API-Schlüssel des Anbieters ist ungültig", "could_not_connect": "Es konnte keine Verbindung zum Anbieter hergestellt werden.", diff --git a/assets/translations/en.json b/assets/translations/en.json index 700344b9..c1ca6d74 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -446,7 +446,7 @@ "select_provider_payment_text_do": "Credit cards, Google Pay, PayPal", "select_provider_email_notice": "E-mail hosting won't be available for new clients. Nevertheless it will be unlocked as soon as you complete your first payment.", "select_provider_site_button": "Visit site", - "connect_to_server_provider": "Now log in ", + "connect_to_server_provider": "Now log in {provider}", "connect_to_server_provider_text": "With API token SelfPrivacy will be able to rent a machine and setup your server on it", "how": "How to obtain API token", "provider_bad_key_error": "Provider API key is invalid", @@ -479,7 +479,6 @@ "save_domain": "Save domain", "final": "Final step", "create_server": "Create server", - "what": "What does it mean?", "server_rebooted": "Server rebooted. Waiting for the last verification…", "server_started": "Server started. It will be validated and rebooted now…", "server_created": "Server created. DNS checks and server boot in progress…", @@ -543,8 +542,8 @@ "modal_confirmation_description": "If you connect to a wrong server you may lose all your data.", "modal_confirmation_dns_valid": "Reverse DNS is valid", "modal_confirmation_dns_invalid": "Reverse DNS points to another domain", - "modal_confirmation_ip_valid": "IP is the same as in DNS record", - "modal_confirmation_ip_invalid": "IP is not the same as in DNS record" + "modal_confirmation_ip_valid": "IP address is the same as in DNS record", + "modal_confirmation_ip_invalid": "IP address is not the same as in DNS record" }, "devices": { "main_screen": { diff --git a/assets/translations/et.json b/assets/translations/et.json index 7f4a8127..27f2c524 100644 --- a/assets/translations/et.json +++ b/assets/translations/et.json @@ -352,7 +352,7 @@ "select_provider_payment_text_do": "Krediitkaardid, Google Pay, PayPal", "select_provider_email_notice": "E-posti majutust uutele klientidele ei pakuta. Siiski saab selle lukust avada niipea, kui teete oma esimese makse.", "select_provider_site_button": "Külasta saiti", - "connect_to_server_provider": "Logi sisse ", + "connect_to_server_provider": "Logi sisse {provider}", "provider_bad_key_error": "Pakkuja API võti on kehtetu", "could_not_connect": "Ühendust pakkuja juurde ei saanud.", "choose_location_type": "Kust soovite tellida oma serveri?", diff --git a/assets/translations/he.json b/assets/translations/he.json index 50e37385..0613c73f 100644 --- a/assets/translations/he.json +++ b/assets/translations/he.json @@ -385,7 +385,7 @@ "select_provider_price_title": "מחיר ממוצע", "select_provider_price_free": "חינם", "select_provider_site_button": "ביקור באתר", - "connect_to_server_provider": "כעת יש להיכנס דרך ", + "connect_to_server_provider": "כעת יש להיכנס דרך {provider}", "choose_location_type_text": "מקומות שונים מציעים הגדרות, מחירים ומהירויות חיבור שונות לשרת.", "locations_not_found_text": "אין שרתים זמינים להשכרה", "back_to_locations": "נא לבחור משהו אחר", diff --git a/assets/translations/ja.json b/assets/translations/ja.json index 2f9aa654..da7dc8e3 100644 --- a/assets/translations/ja.json +++ b/assets/translations/ja.json @@ -448,7 +448,7 @@ "select_provider_payment_text_hetzner": "クレジットカード、国際送金（SWIFT、SEPA）、PayPal", "select_provider_payment_text_do": "クレジットカード、Google Pay、PayPal", "select_provider_email_notice": "新規のクライアントは電子メールのホスティングを利用できません。最初の支払いが完了次第、利用可能となります。", - "connect_to_server_provider": "にログイン ", + "connect_to_server_provider": "にログイン {provider}", "how": "APIトークンを取得する方法について", "provider_bad_key_error": "サービス提供者のAPI鍵が不正です", "could_not_connect": "サービス提供者に接続できませんでした。", diff --git a/assets/translations/kk.json b/assets/translations/kk.json index 3f45a621..44e89959 100644 --- a/assets/translations/kk.json +++ b/assets/translations/kk.json @@ -374,7 +374,7 @@ "select_provider_payment_title": "Провайдер төлемін таңдау атауы", "select_provider_payment_text_hetzner": "Hetzner төлемі туралы мәтін", "select_provider_payment_text_do": "DigitalOcean төлемі туралы мәтін", - "connect_to_server_provider": "Сервер провайдеріне қосылу ", + "connect_to_server_provider": "Сервер провайдеріне қосылу {provider}", "connect_to_server_provider_text": "Сервер провайдеріне қосылу мәтіні", "choose_server_type_payment_per_month": "Айына төлем", "choose_server_type_payment_storage": "Сақтау төлемі", diff --git a/assets/translations/pl.json b/assets/translations/pl.json index 1f8e9e49..9c9670f8 100644 --- a/assets/translations/pl.json +++ b/assets/translations/pl.json @@ -302,7 +302,7 @@ "select_provider_price_text_do": "$17 miesięcznie za stosunkowo mały serwer i 50GB miejsca na dysku", "select_provider_payment_title": "Metody płatności", "select_provider_payment_text_hetzner": "Karty kredytowe, SWIFT, SEPA, PayPal", - "connect_to_server_provider": "Teraz zaloguj się przez ", + "connect_to_server_provider": "Teraz zaloguj się przez {provider}", "no_locations_found": "Nie znaleziono lokalizacji, upewnij się, że Twoje konto jest dostępne", "choose_server_type": "Jaki typ serwera powinienem wybrać?", "choose_server_type_ram": "{} GB pamięci RAM", diff --git a/assets/translations/ru.json b/assets/translations/ru.json index b5a21b9e..cbd4e085 100644 --- a/assets/translations/ru.json +++ b/assets/translations/ru.json @@ -446,7 +446,7 @@ "select_provider_payment_text_do": "Банковские карты, Google Pay, PayPal", "select_provider_email_notice": "Хостинг электронной почты недоступен для новых клиентов. Разблокировать можно будет после первой оплаты.", "select_provider_site_button": "Посетить сайт", - "connect_to_server_provider": "Авторизоваться в ", + "connect_to_server_provider": "Авторизоваться в {provider}", "connect_to_server_provider_text": "С помощью API токена приложение SelfPrivacy сможет от вашего имени заказать и настроить сервер", "how": "Как получить API Token", "provider_bad_key_error": "API ключ провайдера неверен", @@ -537,8 +537,8 @@ "modal_confirmation_description": "Подключение к неправильному серверу может привести к деструктивным последствиям.", "modal_confirmation_dns_valid": "Обратный DNS корректен", "modal_confirmation_dns_invalid": "Обратный DNS указывает на другой домен", - "modal_confirmation_ip_valid": "IP совпадает с указанным в DNS записи", - "modal_confirmation_ip_invalid": "IP не совпадает с указанным в DNS записи", + "modal_confirmation_ip_valid": "IP адрес совпадает с указанным в DNS записи", + "modal_confirmation_ip_invalid": "IP адрес не совпадает с указанным в DNS записи", "provider_connected": "Подключение к вашему {}", "provider_connected_description": "Связь установлена. Введите свой токен с доступом к {}:", "provider_connected_placeholder": "{} Токен", diff --git a/assets/translations/sk.json b/assets/translations/sk.json index c08d220b..98971c17 100644 --- a/assets/translations/sk.json +++ b/assets/translations/sk.json @@ -267,7 +267,7 @@ "select_provider_payment_text_hetzner": "Bankové karty, SWIFT, SEPA, PayPal", "select_provider_payment_text_do": "Bankové karty, Google Pay, PayPal", "select_provider_site_button": "Navštíviť stránku", - "connect_to_server_provider": "Prihlásiť sa v ", + "connect_to_server_provider": "Prihlásiť sa v {provider}", "connect_to_server_provider_text": "S API tokenom si SelfPrivacy bude môcť prenajať stroj a nastaviť na ňom váš server", "how": "Ako získať token API", "provider_bad_key_error": "Kľúč API poskytovateľa je neplatný", diff --git a/assets/translations/th.json b/assets/translations/th.json index 7e52431c..099cff69 100644 --- a/assets/translations/th.json +++ b/assets/translations/th.json @@ -225,7 +225,7 @@ "select_provider_payment_text_hetzner": "บัตรเครดิต, SWIFT, SEPA, PayPal", "select_provider_payment_text_do": "บัตรเครดิต, Google Pay PayPal", "select_provider_site_button": "เยี่ยมชมเว็บไซต์", - "connect_to_server_provider": "เข้าสู่ระบบใน ", + "connect_to_server_provider": "เข้าสู่ระบบใน {provider}", "connect_to_server_provider_text": "ด้วยโทเค็น API SelfPrivacy จะสามารถเช่าเครื่องและตั้งค่าเซิร์ฟเวอร์ของคุณได้", "how": "วิธีรับโทเค็น API", "provider_bad_key_error": "คีย์ API ของผู้ให้บริการไม่ถูกต้อง" diff --git a/assets/translations/uk.json b/assets/translations/uk.json index 6afe5c0d..a92373f8 100644 --- a/assets/translations/uk.json +++ b/assets/translations/uk.json @@ -126,7 +126,7 @@ "select_provider_payment_text_hetzner": "Картка, SWIFT, SEPA, PayPal", "select_provider_payment_text_do": "Картка, Google Pay, PayPal", "select_provider_site_button": "Відвідати сайт", - "connect_to_server_provider": "Авторизуйтеся зараз ", + "connect_to_server_provider": "Авторизуйтеся зараз {provider}", "locations_not_found_text": "Немає доступних серверів для оренди", "connect_to_server_provider_text": "З токеном API SelfPrivacy зможе орендувати техніку і налаштувати на неї ваш сервер", "how": "Як отримати токен API", diff --git a/assets/translations/zh-Hans.json b/assets/translations/zh-Hans.json index 1343e9e1..ecd86fb6 100644 --- a/assets/translations/zh-Hans.json +++ b/assets/translations/zh-Hans.json @@ -198,7 +198,7 @@ "select_provider_payment_text_hetzner": "信用卡、SWIFT、SEPA、PayPal", "select_provider_payment_text_do": "信用卡、Google Pay、PayPal", "select_provider_site_button": "访问网站", - "connect_to_server_provider": "现在登录 ", + "connect_to_server_provider": "现在登录 {provider}", "connect_to_server_provider_text": "使用 API 令牌，SelfPrivacy 将能够租用一台机器并在其上设置您的服务器", "how": "如何获取 API 令牌", "provider_bad_key_error": "提供商 API 密钥无效", diff --git a/lib/ui/pages/setup/initializing/initializing.dart b/lib/ui/pages/setup/initializing/initializing.dart index 83d37d1e..c841a3e5 100644 --- a/lib/ui/pages/setup/initializing/initializing.dart +++ b/lib/ui/pages/setup/initializing/initializing.dart @@ -272,7 +272,11 @@ class InitializingPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - '${'initializing.connect_to_server_provider'.tr()}Backblaze', + 'initializing.connect_to_server_provider'.tr( + namedArgs: { + 'provider': 'Backblaze', + }, + ), style: Theme.of(context).textTheme.headlineSmall, ), ], diff --git a/lib/ui/pages/setup/initializing/server_provider_picker.dart b/lib/ui/pages/setup/initializing/server_provider_picker.dart index e7ff49e1..8a3095b0 100644 --- a/lib/ui/pages/setup/initializing/server_provider_picker.dart +++ b/lib/ui/pages/setup/initializing/server_provider_picker.dart @@ -102,7 +102,9 @@ class ProviderInputDataPage extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "${'initializing.connect_to_server_provider'.tr()}${providerInfo.providerType.displayName}", + 'initializing.connect_to_server_provider'.tr( + namedArgs: {'provider': providerInfo.providerType.displayName}, + ), style: Theme.of(context).textTheme.headlineSmall, ), const SizedBox(height: 16),