From 65c10c0bc829bb97ad86436e0715d17e82d53c2f Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sat, 24 Mar 2018 09:04:02 +0900 Subject: Weblate translations (2018-03-23) (#6874) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * bundle exec i18n-tasks normalize && yarn manage:translations --- config/locales/ar.yml | 5 ++++- config/locales/ca.yml | 9 +++++++++ config/locales/fr.yml | 8 ++++++++ config/locales/gl.yml | 9 +++++++++ config/locales/ja.yml | 9 +++++++++ config/locales/nl.yml | 9 +++++++++ config/locales/pl.yml | 2 ++ config/locales/pt-BR.yml | 9 +++++++++ config/locales/simple_form.sk.yml | 2 +- config/locales/sk.yml | 8 ++++---- 10 files changed, 64 insertions(+), 6 deletions(-) (limited to 'config/locales') diff --git a/config/locales/ar.yml b/config/locales/ar.yml index e6447cab3..25ca302d6 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -273,6 +273,7 @@ ar: your_token: رمز نفاذك auth: agreement_html: بقبولك التسجيل فإنك تُصرِّح قبول قواعد مثيل الخادوم و شروط الخدمة التي نوفرها لك. + change_password: الكلمة السرية confirm_email: تأكيد عنوان البريد الإلكتروني delete_account: حذف حساب delete_account_html: إن كنت ترغب في حذف حسابك يُمكنك المواصلة هنا. سوف يُطلَبُ منك التأكيد قبل الحذف. @@ -290,7 +291,7 @@ ar: resend_confirmation: إعادة إرسال تعليمات التأكيد reset_password: إعادة تعيين كلمة المرور security: الهوية - set_new_password: تعيين كلمة مرور جديدة + set_new_password: إدخال كلمة مرور جديدة authorize_follow: error: يا للأسف، وقع هناك خطأ إثر عملية البحث عن الحساب عن بعد follow: إتبع @@ -493,6 +494,7 @@ ar: windows: ويندوز windows_mobile: ويندوز موبايل windows_phone: ويندوز فون + revoke_success: تم إبطال الجلسة بنجاح title: الجلسات settings: authorized_apps: التطبيقات المرخص لها @@ -557,3 +559,4 @@ ar: users: invalid_email: عنوان البريد الإلكتروني غير صالح invalid_otp_token: الرمز الثنائي غير صالح + seamless_external_login: لقد قمت بتسجيل الدخول عبر خدمة خارجية، إنّ إعدادات الكلمة السرية و البريد الإلكتروني غير متوفرة. diff --git a/config/locales/ca.yml b/config/locales/ca.yml index c4008c998..7727bad37 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -634,6 +634,15 @@ ca: two_factor_authentication: Autenticació de dos factors your_apps: Les teves aplicacions statuses: + attached: + description: 'Adjunt: %{attached}' + image: + one: "%{count} imatge" + other: "%{count} imatges" + video: + one: "%{count} vídeo" + other: "%{count} vídeos" + content_warning: 'Avís de contingut: %{warning}' open_in_web: Obre en la web over_character_limit: Límit de caràcters de %{max} superat pin_errors: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 57ed05f40..6137e1bd4 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -634,6 +634,14 @@ fr: two_factor_authentication: Identification à deux facteurs your_apps: Vos applications statuses: + attached: + description: 'Attaché : %{attached}' + image: + one: "%{count} image" + other: "%{count} images" + video: + one: "%{count} vidéo" + other: "%{count} vidéos" open_in_web: Ouvrir sur le web over_character_limit: limite de caractères dépassée de %{max} caractères pin_errors: diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 30b68d7d6..bddc1b789 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -634,6 +634,15 @@ gl: two_factor_authentication: Validar Doble Factor your_apps: Os seus aplicativos statuses: + attached: + description: 'Axenado: %{attached}' + image: + one: "%{count} imaxe" + other: "%{count} imaxes" + video: + one: "%{count} vídeo" + other: "%{count} vídeos" + content_warning: 'Aviso sobre o contido: %{warning}' open_in_web: Abrir na web over_character_limit: Excedeu o límite de caracteres %{max} pin_errors: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 887eb016d..3b1990214 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -634,6 +634,15 @@ ja: two_factor_authentication: 二段階認証 your_apps: アプリ statuses: + attached: + description: '添付: %{attached}' + image: + one: "%{count} 枚の画像" + other: "%{count} 枚の画像" + video: + one: "%{count} 枚の動画" + other: "%{count} 枚の動画" + content_warning: '閲覧注意: %{warning}' open_in_web: Webで開く over_character_limit: 上限は %{max}文字までです pin_errors: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 66057e606..f3488f708 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -634,6 +634,15 @@ nl: two_factor_authentication: Tweestapsverificatie your_apps: Jouw toepassingen statuses: + attached: + description: 'Bijlagen: %{attached}' + image: + one: "%{count} afbeelding" + other: "%{count} afbeeldingen" + video: + one: "%{count} video" + other: "%{count} video's" + content_warning: 'Tekstwaarschuwing: %{warning}' open_in_web: In de webapp openen over_character_limit: Limiet van %{max} tekens overschreden pin_errors: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 78ca41102..de43ca9a9 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -641,6 +641,8 @@ pl: two_factor_authentication: Uwierzytelnianie dwuetapowe your_apps: Twoje aplikacje statuses: + attached: + description: 'Przytwierdzony: %{attached}' open_in_web: Otwórz w przeglądarce over_character_limit: limit %{max} znaków przekroczony pin_errors: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 88d4e92ff..589f44fa1 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -634,6 +634,15 @@ pt-BR: two_factor_authentication: Autenticação em dois passos your_apps: Seus aplicativos statuses: + attached: + description: 'Anexado: %{attached}' + image: + one: "%{count} imagem" + other: "%{count} imagens" + video: + one: "%{count} vídeo" + other: "%{count} vídeos" + content_warning: 'Aviso de conteúdo: %{warning}' open_in_web: Abrir na web over_character_limit: limite de caracteres de %{max} excedido pin_errors: diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index dd3651ee3..7d4241bac 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -46,7 +46,7 @@ sk: setting_default_sensitive: Označiť každý obrázok/video/súbor ako chúlostivý setting_delete_modal: Zobrazovať potvrdzovacie okno pred zmazaním toot-u setting_display_sensitive_media: Vždy zobrazovať médiá označované ako senzitívne - setting_noindex: Nezaradzovať vaše príspevky do indexácie pre vyhľadávanie + setting_noindex: Nezaraďuj príspevky do indexu pre vyhľadávče setting_reduce_motion: Redukovať pohyb v animáciách setting_system_font_ui: Použiť základné systémové písmo setting_theme: Vzhľad diff --git a/config/locales/sk.yml b/config/locales/sk.yml index e391974c6..a0e1a597c 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -414,10 +414,10 @@ sk: warning_title: Dostupnosť distribuovaného obsahu errors: '403': Nemáte dostatočné povolenie na zobrazenie tejto stránky. - '404': Stránka ktorú ste hľadali neexistuje. - '410': Stránka ktorú tu hľadáte už viac neexistuje. + '404': Stránka ktorú si hľadal/a sa tu nenachádza. + '410': Stránka ktorú tu hľadáš už viac neexistuje. '422': - content: Bezpečtnostné overenie zlyhalo. Blokujete cookies? + content: Bezpečtnostné overenie zlyhalo. Blokuješ cookies? title: Bezpečtnostné overenie zlyhalo '429': Zamlčané '500': @@ -602,7 +602,7 @@ sk: import: Importovať migrate: Presunúť účet notifications: Oznámenia - preferences: Možnosti + preferences: Voľby settings: Nastavenia two_factor_authentication: Dvoj-faktorové overenie your_apps: Tvoje aplikácie -- cgit From 580835ab698fb116adf26fe4c9c465b2218d124b Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sat, 24 Mar 2018 12:50:14 +0100 Subject: Invites: Add '1 week' as expire option (#6872) * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Update en.yml --- app/views/invites/_form.html.haml | 2 +- config/locales/en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'config/locales') diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml index a01cf5946..3f0871f47 100644 --- a/app/views/invites/_form.html.haml +++ b/app/views/invites/_form.html.haml @@ -3,7 +3,7 @@ .fields-group = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt') - = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') + = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') .actions = f.button :button, t('invites.generate'), type: :submit diff --git a/config/locales/en.yml b/config/locales/en.yml index 735a3490f..995cbdaa0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -474,6 +474,7 @@ en: '21600': 6 hours '3600': 1 hour '43200': 12 hours + '604800': 1 week '86400': 1 day expires_in_prompt: Never generate: Generate -- cgit From fa310695fa0b5fe76739232dd6acee81da6cd401 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sat, 24 Mar 2018 20:50:41 +0900 Subject: Note if the user is already following the target when authorizing follow (#6325) --- app/views/authorize_follows/_post_follow_actions.html.haml | 4 ++++ app/views/authorize_follows/show.html.haml | 8 +++++++- app/views/authorize_follows/success.html.haml | 5 +---- config/locales/en.yml | 1 + config/locales/ja.yml | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 app/views/authorize_follows/_post_follow_actions.html.haml (limited to 'config/locales') diff --git a/app/views/authorize_follows/_post_follow_actions.html.haml b/app/views/authorize_follows/_post_follow_actions.html.haml new file mode 100644 index 000000000..2a9c062e9 --- /dev/null +++ b/app/views/authorize_follows/_post_follow_actions.html.haml @@ -0,0 +1,4 @@ +.post-follow-actions + %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block' + %div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block' + %div= t('authorize_follow.post_follow.close') diff --git a/app/views/authorize_follows/show.html.haml b/app/views/authorize_follows/show.html.haml index f7a8f72d2..a1fd01dd6 100644 --- a/app/views/authorize_follows/show.html.haml +++ b/app/views/authorize_follows/show.html.haml @@ -5,7 +5,13 @@ .follow-prompt = render 'card', account: @account - - unless current_account.following?(@account) + - if current_account.following?(@account) + .flash-message + %strong + = t('authorize_follow.already_following') + = render 'post_follow_actions' + + - else = form_tag authorize_follow_path, method: :post, class: 'simple_form' do = hidden_field_tag :acct, @account.acct = button_tag t('authorize_follow.follow'), type: :submit diff --git a/app/views/authorize_follows/success.html.haml b/app/views/authorize_follows/success.html.haml index 63ff3bcf1..fa59b24b8 100644 --- a/app/views/authorize_follows/success.html.haml +++ b/app/views/authorize_follows/success.html.haml @@ -10,7 +10,4 @@ = render 'card', account: @account - .post-follow-actions - %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block' - %div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block' - %div= t('authorize_follow.post_follow.close') + = render 'post_follow_actions' diff --git a/config/locales/en.yml b/config/locales/en.yml index 995cbdaa0..e3d76971b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -382,6 +382,7 @@ en: security: Security set_new_password: Set new password authorize_follow: + already_following: You are already following this account error: Unfortunately, there was an error looking up the remote account follow: Follow follow_request: 'You have sent a follow request to:' diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 3b1990214..1ff309782 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -382,6 +382,7 @@ ja: security: セキュリティ set_new_password: 新しいパスワード authorize_follow: + already_following: あなたは既にこのアカウントをフォローしています error: 残念ながら、リモートアカウント情報の取得中にエラーが発生しました follow: フォロー follow_request: 'あなたは以下のアカウントにフォローリクエストを送信しました:' -- cgit From 85a395fab6d7077a252bfe6f96673931ea3aa5ee Mon Sep 17 00:00:00 2001 From: Marcin Mikołajczak Date: Sun, 25 Mar 2018 16:33:07 +0200 Subject: i18n: Update Polish translation (#6903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- app/javascript/mastodon/locales/defaultMessages.json | 2 +- app/javascript/mastodon/locales/pl.json | 4 ++-- config/locales/pl.yml | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) (limited to 'config/locales') diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index eee60c57f..76b302f3a 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -1748,4 +1748,4 @@ ], "path": "app/javascript/mastodon/middleware/errors.json" } -] +] \ No newline at end of file diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 0b6f178f8..7262ce76b 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -28,8 +28,8 @@ "account.unmute": "Cofnij wyciszenie @{name}", "account.unmute_notifications": "Cofnij wyciszenie powiadomień od @{name}", "account.view_full_profile": "Wyświetl pełny profil", - "alert.unexpected.message": "An unexpected error occurred.", - "alert.unexpected.title": "Oops!", + "alert.unexpected.message": "Wystąpił nieoczekiwany błąd.", + "alert.unexpected.title": "O nie!", "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem", "bundle_column_error.body": "Coś poszło nie tak podczas ładowania tego składnika.", "bundle_column_error.retry": "Spróbuj ponownie", diff --git a/config/locales/pl.yml b/config/locales/pl.yml index de43ca9a9..e92742ef4 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -383,6 +383,7 @@ pl: security: Bezpieczeństwo set_new_password: Ustaw nowe hasło authorize_follow: + already_following: Już śledzisz to konto error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd follow: Śledź follow_request: 'Wysłano prośbę o pozwolenie na śledzenie:' @@ -475,6 +476,7 @@ pl: '21600': 6 godzinach '3600': godzinie '43200': 12 godzinach + '604800': 1 tygodniu '86400': dobie expires_in_prompt: Nigdy generate: Wygeneruj @@ -643,6 +645,17 @@ pl: statuses: attached: description: 'Przytwierdzony: %{attached}' + image: + few: "%{count} obrazy" + many: "%{count} obrazów" + one: "%{count} obraz" + other: "%{count} obrazów" + video: + few: "%{count} filmy" + many: "%{count} filmów" + one: "%{count} film" + other: "%{count} filmów" + content_warning: 'Ostrzeżenie o zawartości: %{warning}' open_in_web: Otwórz w przeglądarce over_character_limit: limit %{max} znaków przekroczony pin_errors: -- cgit