From 0b3f1ec62a08ab2aad2b7c1ab8f88bdac5e8a3c6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 1 Oct 2017 10:52:39 +0200
Subject: Reorganize preferences page (#5161)

---
 config/locales/de.yml             | 1 -
 config/locales/devise.de.yml      | 4 ++--
 config/locales/en.yml             | 6 ++++++
 config/locales/ja.yml             | 2 +-
 config/locales/oc.yml             | 2 +-
 config/locales/pl.yml             | 2 +-
 config/locales/simple_form.en.yml | 5 +++--
 7 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'config/locales')

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 06a535ba6..1192a7b10 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -388,7 +388,6 @@ de:
       private_long: Nur für Folgende sichtbar
       public: Öffentlich
       public_long: Für alle sichtbar
-      unlisted: Nicht gelistet
       unlisted: Für alle sichtbar, aber nicht in öffentlichen Zeitleisten aufgelistet
   stream_entries:
     click_to_show: Klicken, um zu zeigen
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index b1e26f1e5..0db946b9f 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -8,10 +8,10 @@ de:
     failure:
       already_authenticated: Du bist bereits angemeldet.
       inactive: Dein Konto wurde noch nicht aktiviert.
-      invalid: '%{authentication_keys} oder Passwort ungültig.'
+      invalid: "%{authentication_keys} oder Passwort ungültig."
       last_attempt: Du hast noch einen Versuch, bevor dein Konto gesperrt wird.
       locked: Dein Konto ist gesperrt.
-      not_found_in_database: '%{authentication_keys} oder Passwort ungültig.'
+      not_found_in_database: "%{authentication_keys} oder Passwort ungültig."
       timeout: Deine Sitzung ist abgelaufen. Bitte melde dich erneut an.
       unauthenticated: Du musst dich anmelden oder registrieren, bevor du fortfahren kannst.
       unconfirmed: Du musst deine E-Mail-Adresse bestätigen, bevor du fortfahren kannst.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f87d8532c..3049e0365 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -393,6 +393,12 @@ en:
     next: Next
     prev: Prev
     truncate: "&hellip;"
+  preferences:
+    languages: Languages
+    notifications: Notifications
+    other: Other
+    publishing: Publishing
+    web: Web
   push_notifications:
     favourite:
       title: "%{name} favourited your status"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2ccc827da..364bfcfd6 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -247,7 +247,7 @@ ja:
     salutation: "%{name} さん"
     settings: 'メール設定の変更: %{link}'
     signature: Mastodon %{instance} インスタンスからの通知
-    view: 'リンク'
+    view: リンク
   applications:
     created: アプリが作成されました
     destroyed: アプリが削除されました
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 406de36f0..3100e6265 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -93,8 +93,8 @@ oc:
       reset_password: Reïnicializar lo senhal
       resubscribe: Se tornar abonar
       salmon_url: URL Salmon
-      shared_inbox_url: URL de recepcion partejada
       search: Cercar
+      shared_inbox_url: URL de recepcion partejada
       show:
         created_reports: Rapòrts creat per aqueste compte
         report: rapòrt
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 9bf57e38b..f52883123 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -62,7 +62,7 @@ pl:
       followers: Śledzący
       followers_url: Adres śledzących
       follows: Śledzeni
-      inbox: Adres skrzynki
+      inbox_url: Adres skrzynki
       ip: Adres IP
       location:
         all: Wszystkie
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 6f8b88898..86c80290c 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -4,6 +4,7 @@ en:
     hints:
       defaults:
         avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
+        digest: Sent after a long period of inactivity with a summary of mentions you've received in your absence
         display_name:
           one: <span class="name-counter">1</span> character left
           other: <span class="name-counter">%{count}</span> characters left
@@ -19,7 +20,7 @@ en:
       sessions:
         otp: Enter the Two-factor code from your phone or use one of your recovery codes.
       user:
-        filtered_languages: Selected languages will be removed from your public timelines.
+        filtered_languages: Checked languages will be filtered from public timelines for you
     labels:
       defaults:
         avatar: Avatar
@@ -44,7 +45,7 @@ en:
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_noindex: Opt-out of search engine indexing
         setting_system_font_ui: Use system's default font
-        setting_theme: Site theme 
+        setting_theme: Site theme
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
         severity: Severity
         type: Import type
-- 
cgit