Update translations using temporary workaround for Transifex bugs

config/locales/client.ar.yml

@@ -345,8 +345,6 @@ ar:
     undo: "تراجع"
     revert: "عكس"
     failed: "فشل"
-    switch_to_anon: "وضع التخفي"
-    switch_from_anon: "اخرج من وضع التخفي"
     banner:
       close: "تعطيل البانر"
       edit: "تحرير هذا البانر"
@@ -468,18 +466,18 @@ ar:
           title: "مكتوم"
           description: "لن يتم إشعارك بأي جديد يخص هذا الموضوع ولن يظهرهذا الموضوع في قائمة المواضيع المنشورة مؤخراً."
     user_action_groups:
-      '1': "الإعجابات المعطاة"
+      "1": "الإعجابات المعطاة"
-      '2': "الإعجابات المستلمة"
+      "2": "الإعجابات المستلمة"
-      '3': "المفضلة"
+      "3": "المفضلة"
-      '4': "مواضيع"
+      "4": "مواضيع"
-      '5': "الردود"
+      "5": "الردود"
-      '6': "ردود"
+      "6": "ردود"
-      '7': "إشارات"
+      "7": "إشارات"
-      '9': "إقتباسات"
+      "9": "إقتباسات"
-      '11': "التعديلات"
+      "11": "التعديلات"
-      '12': "العناصر المرسلة"
+      "12": "العناصر المرسلة"
-      '13': "البريد الوارد"
+      "13": "البريد الوارد"
-      '14': "قيد الانتظار"
+      "14": "قيد الانتظار"
     categories:
       all: "جميع التصنيفات"
       all_subcategories: "جميع"
@@ -560,10 +558,10 @@ ar:
         disable: "إيقاف الإشعارات "
         enable: "تفعيل الإشعارات"
         each_browser_note: "ملاحظة : يجب انت تقوم بتغيير هذا الإعداد عند كل مرة تستخدم فيها متصفح جديد ."
-      dismiss_notifications: "جعل الجميع مقروء"
       dismiss_notifications_tooltip: "جعل جميع اشعارات غيرمقروء الى مقروء"
       disable_jump_reply: "لاتذهب إلى مشاركتي بعد الرد"
       dynamic_favicon: "إعرض عدد المواضيع الجديدة والمحدثة في أيقونة المتصفح"
+      edit_history_public: "جعل المستخدمين الاخرين يطلعون على تعديلاتي"
       external_links_in_new_tab: "إفتح كل الروابط الخارجية في صفحة جديدة"
       enable_quoting: "فعل خاصية إقتباس النصوص المظللة"
       change: "تغيير"
@@ -576,7 +574,6 @@ ar:
       suspended_reason: "سبب"
       github_profile: "Github"
       watched_categories: "مراقبة"
-      watched_categories_instructions: "ستتم مراقبة جميع المواضيع الجديدة في هذه التصانيف. سيتم اشعارك بجميع المشاركات والمواضيع الجديدة، بالاضافة الى  عدد المشاركات الجديدة الذي سيظهر بجانب الموضوع."
       tracked_categories: "متابعة"
       tracked_categories_instructions: "ستتم متابعة جميع المواضيع الجديدة في هذه التصانيف. عدد المشاركات الجديدة سيظهر بجانب الموضوع."
       muted_categories: "كتم"
@@ -1268,20 +1265,20 @@ ar:
         position: "المشاركة %{current} من أصل %{total}"
       notifications:
         reasons:
-          '3_6': 'سيصلك إشعارات لأنك اخترت أن تتابع هذا التصنيف'
+          "3_6": 'سيصلك إشعارات لأنك اخترت أن تتابع هذا التصنيف'
-          '3_5': 'سيصلك إشعارات لأنك اخترت أن تتابع هذا الموضوع بشكل تلقائي.'
+          "3_5": 'سيصلك إشعارات لأنك اخترت أن تتابع هذا الموضوع بشكل تلقائي.'
-          '3_2': 'سيصلك إشعارات لأنك اخترت أن تتابع هذا الموضوع.'
+          "3_2": 'سيصلك إشعارات لأنك اخترت أن تتابع هذا الموضوع.'
-          '3_1': 'سيصلك إشعارات لأنك أنت من أنشأ هذا الموضوع.'
+          "3_1": 'سيصلك إشعارات لأنك أنت من أنشأ هذا الموضوع.'
-          '3': 'سيصلك إشعارات لأنك اخترت أن تتابع هذا الموضوع.'
+          "3": 'سيصلك إشعارات لأنك اخترت أن تتابع هذا الموضوع.'
-          '2_8': 'سيصلك إشعارات لأنك اخترت تتبع هذا التصنيف'
+          "2_8": 'سيصلك إشعارات لأنك اخترت تتبع هذا التصنيف'
-          '2_4': 'سيصلك إشعارات لأنك أضفت مشاركة لهذا الموضوع.'
+          "2_4": 'سيصلك إشعارات لأنك أضفت مشاركة لهذا الموضوع.'
-          '2_2': 'سيصلك إشعارات لأنك اخترت متابعة الموضوع'
+          "2_2": 'سيصلك إشعارات لأنك اخترت متابعة الموضوع'
-          '2': 'سيصلك إشعار لأنك  <a href="/users/{{username}}/preferences">قرأت هذا الموضوع</a>.'
+          "2": 'سيصلك إشعار لأنك  <a href="/users/{{username}}/preferences">قرأت هذا الموضوع</a>.'
-          '1_2': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك'
+          "1_2": '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك'
-          '1': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك'
+          "1": '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك'
-          '0_7': 'لن يصلك أي إشعار يخص هذا التصنيف بناء على طلبك.'
+          "0_7": 'لن يصلك أي إشعار يخص هذا التصنيف بناء على طلبك.'
-          '0_2': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
+          "0_2": 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
-          '0': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
+          "0": 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.'
         watching_pm:
           title: "تحت المتابعة"
           description: "سيتم إشعارك بأية رد على هذه الرسالة، وبعدد الردود الجديدة التي ستظهر ."
@@ -1892,10 +1889,10 @@ ar:
     posts_long: "هناك {{number}} مشاركات في هذا الموضوع"
     posts_likes_MF: |
       هذا الموضوع له {count, plural, one {1 reply} other {# replies}} {ratio, select,
-        low {with a high like to post ratio}
+      low {with a high like to post ratio}
-        med {with a very high like to post ratio}
+      med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
+      high {with an extremely high like to post ratio}
-        other {}}
+      other {}}
     original_post: "المشاركة الاصلية"
     views: "مشاهدات"
     views_lowercase:

config/locales/client.bs_BA.yml

@@ -234,7 +234,6 @@ bs_BA:
     undo: "Nazad"
     revert: "Vrati"
     failed: "Neuspješno"
-    switch_to_anon: "Anonimni mod"
     banner:
       close: "Dismiss this banner."
       edit: "Uredite ovaj baner >>"
@@ -337,18 +336,18 @@ bs_BA:
           title: "Utišano"
           description: "Nećete biti obaviješteni zbog nove teme unutar ove grupe."
     user_action_groups:
-      '1': "Dati Lajkovi"
+      "1": "Dati Lajkovi"
-      '2': "Dobijeni Lajkovi"
+      "2": "Dobijeni Lajkovi"
-      '3': "Sačuvano"
+      "3": "Sačuvano"
-      '4': "Teme"
+      "4": "Teme"
-      '5': "Postovi"
+      "5": "Postovi"
-      '6': "Odgovori"
+      "6": "Odgovori"
-      '7': "Spemenute"
+      "7": "Spemenute"
-      '9': "Citirane"
+      "9": "Citirane"
-      '11': "Izmjenjene"
+      "11": "Izmjenjene"
-      '12': "Poslato"
+      "12": "Poslato"
-      '13': "Inbox"
+      "13": "Inbox"
-      '14': "Na čekanju."
+      "14": "Na čekanju."
     categories:
       all: "Sve kategorije"
       all_subcategories: "sve"
@@ -414,10 +413,10 @@ bs_BA:
         disable: "Isključi notifikacije"
         enable: "Uključi notifikacije"
         each_browser_note: "Napomena: Ovu opciju morate promjeniti na svakom pregledniku."
-      dismiss_notifications: "Markiraj sve kao Pročitano"
       dismiss_notifications_tooltip: "Markiraj sve nepročitane notifikacije kao pročitane"
       disable_jump_reply: "Don't jump to your new post after replying"
       dynamic_favicon: "Show incoming message notifications on favicon (experimental)"
+      edit_history_public: "Let other users view my post revisions"
       external_links_in_new_tab: "Open all external links in a new tab"
       enable_quoting: "Enable quote reply for highlighted text"
       change: "promjeni"
@@ -430,7 +429,6 @@ bs_BA:
       suspended_reason: "Reason: "
       github_profile: "Github"
       watched_categories: "Watched"
-      watched_categories_instructions: "Automatski ćete da pratite sve nove objave u ovom kategorijama. Bićete notifikovani o svim novim objavama i temama i broj novih objava će se pojaviti pored naziva teme."
       tracked_categories: "Tracked"
       tracked_categories_instructions: "Automatski ćete da pratite sve nove objave u ovom kategorijama. Broj novih objava će se pojaviti pored naziva teme."
       muted_categories: "Muted"
@@ -843,7 +841,6 @@ bs_BA:
       invited_to_private_message: "<i title='privatna poruka' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='prihvatio pozivnicu' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='pomjerio post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      linked: "<i title='linkovo post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='bedž dobijen' class='fa fa-certificate'></i><p>Zaslužen '{{description}}'</p>"
       alt:
         mentioned: "Spomenut od"
@@ -964,20 +961,20 @@ bs_BA:
         position: "post %{current} od %{total}"
       notifications:
         reasons:
-          '3_6': 'Dobijat ćete notifikacije zato što motrite ovu temu.'
+          "3_6": 'Dobijat ćete notifikacije zato što motrite ovu temu.'
-          '3_5': 'Dobijat ćete notifikacije zato što motrite temu automatski.'
+          "3_5": 'Dobijat ćete notifikacije zato što motrite temu automatski.'
-          '3_2': 'Dobijat ćete notifikacije zato što pratite ovu temu.'
+          "3_2": 'Dobijat ćete notifikacije zato što pratite ovu temu.'
-          '3_1': 'Dobijat ćete notifikacije zato što ste kreirali ovu temu.'
+          "3_1": 'Dobijat ćete notifikacije zato što ste kreirali ovu temu.'
-          '3': 'Dobijat ćete notifikacije zato što motrite ovu temu.'
+          "3": 'Dobijat ćete notifikacije zato što motrite ovu temu.'
-          '2_8': 'Dobijat ćete notifikacije zato što motrite ovu temu.'
+          "2_8": 'Dobijat ćete notifikacije zato što motrite ovu temu.'
-          '2_4': 'Dobijat ćete notifikacije zato što ste ostavili odgovor na ovoj temi.'
+          "2_4": 'Dobijat ćete notifikacije zato što ste ostavili odgovor na ovoj temi.'
-          '2_2': 'Dobijat ćete notifikacije zato što pratite ovu temu.'
+          "2_2": 'Dobijat ćete notifikacije zato što pratite ovu temu.'
-          '2': 'Dobijat ćete notifikacije zato što <a href="/users/{{username}}/preferences">pročitao ovu temu</a>.'
+          "2": 'Dobijat ćete notifikacije zato što <a href="/users/{{username}}/preferences">pročitao ovu temu</a>.'
-          '1_2': 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
+          "1_2": 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
-          '1': 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
+          "1": 'Dobiti ćete notifikaciju kada neko spomene tvoje @name ili odgovori na tvoj post.'
-          '0_7': 'Ignorišete sve notifikacije u ovoj kategoriji.'
+          "0_7": 'Ignorišete sve notifikacije u ovoj kategoriji.'
-          '0_2': 'Ignorišete sve notifikacije u ovoj temi.'
+          "0_2": 'Ignorišete sve notifikacije u ovoj temi.'
-          '0': 'Ignorišete sve notifikacije u ovoj temi.'
+          "0": 'Ignorišete sve notifikacije u ovoj temi.'
         watching_pm:
           title: "Motrenje"
         watching:
@@ -1030,8 +1027,6 @@ bs_BA:
       feature_topic:
         title: "Istakni ovu temu."
       inviting: "Inviting..."
-      automatically_add_to_groups_optional: "This invite also includes access to these groups: (optional, admin only)"
-      automatically_add_to_groups_required: "This invite also includes access to these groups: (<b>Required</b>, admin only)"
       invite_private:
         title: 'Invite to Private Message'
         email_or_username: "Invitee's Email or Username"
@@ -1275,10 +1270,10 @@ bs_BA:
     posts_long: "postoji {{number}} odgovora u ovoj temi"
     posts_likes_MF: |
       This topic has {count, plural, one {1 post} other {# posts}} {ratio, select,
-        low {with a high like to post ratio}
+      low {with a high like to post ratio}
-        med {with a very high like to post ratio}
+      med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
+      high {with an extremely high like to post ratio}
-        other {}}
+      other {}}
     original_post: "Originalni Odgovor"
     views: "Pregleda"
     replies: "Odgovora"
@@ -1905,64 +1900,3 @@ bs_BA:
             with_post: <span class="username">%{username}</span> for post in %{link}
             with_post_time: <span class="username">%{username}</span> for post in %{link} at <span class="time">%{time}</span>
             with_time: <span class="username">%{username}</span> at <span class="time">%{time}</span>
-    lightbox:
-      download: "skini"
-    keyboard_shortcuts_help:
-      title: 'Prečice na Tastaturi'
-      jump_to:
-        title: 'Skoči na'
-        home: '<b>g</b>, <b>h</b> Home (Najnovije)'
-        latest: '<b>g</b>, <b>l</b> Najnovije'
-        new: '<b>g</b>, <b>n</b> Nove Teme'
-        unread: '<b>g</b>, <b>u</b> Nepročitane'
-        categories: '<b>g</b>, <b>c</b> Kategorije'
-        top: '<b>g</b>, <b>t</b> Popularne'
-      navigation:
-        title: 'Navigacija'
-        jump: '<b>#</b> Idi na post #'
-        back: '<b>u</b> Nazad'
-        up_down: '<b>k</b>/<b>j</b> Move selection &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Open selected topic'
-        next_prev: '<b>shift j</b>/<b>shift k</b> Next/previous section'
-      application:
-        title: 'Aplikacija'
-        create: '<b>c</b> Započni novu temu'
-        notifications: '<b>n</b> Otvori notifikacije'
-        user_profile_menu: '<b>p</b> Otvori meni korisnika'
-        show_incoming_updated_topics: '<b>.</b> Pročitaj promjenje teme'
-        search: '<b>/</b> Tragaj'
-        help: '<b>?</b> Otvori pomoć za tastaturu'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
-        dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
-      actions:
-        title: 'Akcije'
-        share_topic: '<b>shift s</b> Sheruj temu'
-        share_post: '<b>s</b> Sheruj post'
-        reply_as_new_topic: '<b>t</b> Odgovori kroz novu temu'
-        reply_topic: '<b>shift r</b> Odgovori na Temu'
-        reply_post: '<b>r</b> Odgovori na post'
-        quote_post: '<b>q</b> Citiraj odgovor'
-        like: '<b>l</b> Lajkuj post'
-        flag: '<b>!</b> Opomeni post'
-        bookmark: '<b>b</b> Bookmark post'
-        edit: '<b>e</b> Izmjeni post'
-        delete: '<b>d</b> Obriši post'
-        mark_muted: '<b>m</b>, <b>m</b> Mutiraj temu'
-        mark_regular: '<b>m</b>, <b>r</b> Regularna tema'
-        mark_tracking: '<b>m</b>, <b>t</b> Prati temu'
-        mark_watching: '<b>m</b>, <b>w</b> Motri temu'
-    badges:
-      title: Bedževi
-      select_badge_for_title: Izaveri bedž za svoj naslov
-      none: "<nijedna>"
-      badge_grouping:
-        getting_started:
-          name: Da započnete
-        community:
-          name: Zajednica
-        trust_level:
-          name: Nivo Povjerenja
-        other:
-          name: Drugi
-        posting:
-          name: Postiranje

config/locales/client.cs.yml

@@ -27,18 +27,20 @@ cs:
         thousands: "{{number}}k"
         millions: "{{number}}M"
     dates:
-      time: "h:mm a"
+      time: "H:mm"
-      long_no_year: "MMM D h:mm a"
+      timeline_date: "MMM YYYY"
-      long_no_year_no_time: "MMM D"
+      long_no_year: "D. MMMM H:mm"
-      full_no_year_no_time: "MMMM Do"
+      long_no_year_no_time: "D. MMMM"
-      long_with_year: "MMM D, YYYY h:mm a"
+      full_no_year_no_time: "D. MMMM"
-      long_with_year_no_time: "MMM D, YYYY"
+      long_with_year: "D. M. YYYY, H:mm"
-      full_with_year_no_time: "MMMM Do, YYYY"
+      long_with_year_no_time: "D. M. YYYY"
-      long_date_with_year: "MMM D, 'YY LT"
+      full_with_year_no_time: "D. MMMM YYYY"
-      long_date_without_year: "MMM D, LT"
+      long_date_with_year: "D. M. YYYY, H:mm"
-      long_date_with_year_without_time: "MMM D, 'YY"
+      long_date_without_year: "D. MMMM, H:mm"
-      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_without_time: "D. M. YYYY"
-      long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      long_date_without_year_with_linebreak: "D. MMMM <br/>H:mm"
+      long_date_with_year_with_linebreak: "D. M. YYYY <br/>H:mm"
+      wrap_ago: "před %{date}"
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
@@ -77,8 +79,8 @@ cs:
           one: "1r"
           few: "%{count}r"
           other: "%{count}let"
-        date_month: "MMM D"
+        date_month: "D. MMMM"
-        date_year: "MMM 'YY"
+        date_year: "MMMM YYYY"
       medium:
         x_minutes:
           one: "1 minuta"
@@ -92,7 +94,7 @@ cs:
           one: "1 den"
           few: "%{count} dny"
           other: "%{count} dní"
-        date_year: "MMM D, 'YY"
+        date_year: "D. M. YYYY"
       medium_with_ago:
         x_minutes:
           one: "před 1 minutou"
@@ -119,6 +121,8 @@ cs:
           one: "za 1 rok"
           few: "za %{count} roků"
           other: "za %{count} let"
+      previous_month: 'Předchozí měsíc'
+      next_month: 'Další měsíc'
     share:
       topic: 'sdílet odkaz na toto téma'
       post: 'příspěvek #%{postNumber}'
@@ -128,7 +132,13 @@ cs:
       google+: 'sdílet odkaz na Google+'
       email: 'odeslat odkaz emailem'
     action_codes:
+      public_topic: "Téma zveřejněno %{when}"
+      private_topic: "Téma změněno na soukromé %{when}"
       split_topic: "rozděl toto téma %{when}"
+      invited_user: "%{who} pozván %{when}"
+      invited_group: "%{who} pozvána %{when}"
+      removed_user: "%{who} smazán %{when}"
+      removed_group: "%{who} smazána %{when}"
       autoclosed:
         enabled: 'uzavřeno %{when}'
         disabled: 'otevřeno %{when}'
@@ -149,6 +159,17 @@ cs:
         disabled: 'neuvedeno %{when}'
     topic_admin_menu: "akce administrátora tématu"
     emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány."
+    bootstrap_mode_enabled: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile počet registrovaných uživatelů překročí %{min_users}."
+    bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách."
+    s3:
+      regions:
+        us_east_1: "Východ USA (S. Virginie)"
+        us_west_1: "Západ USA (S. Kalifornie)"
+        us_west_2: "Západ USA (Oregon)"
+        us_gov_west_1: "AWS GovCloud (USA)"
+        eu_west_1: "EU (Irsko)"
+        eu_central_1: "EU (Frankfurt)"
+        sa_east_1: "Jižní Amerika (Sao Paulo)"
     edit: 'upravit název a kategorii příspěvku'
     not_implemented: "Tato funkce ještě nebyla naprogramována, omlouváme se."
     no_value: "Ne"
@@ -182,6 +203,8 @@ cs:
     more: "Více"
     less: "Méně"
     never: "nikdy"
+    every_30_minutes: "každých 30 minut"
+    every_hour: "každou hodinu"
     daily: "denně"
     weekly: "týdně"
     every_two_weeks: "jednou za 14 dní"
@@ -194,6 +217,7 @@ cs:
       other: "{{count}} znaků"
     suggested_topics:
       title: "Doporučená témata"
+      pm_title: "Doporučené zprávy"
     about:
       simple_title: "O fóru"
       title: "O %{title}"
@@ -251,8 +275,8 @@ cs:
     undo: "Zpět"
     revert: "Vrátit"
     failed: "Selhání"
-    switch_to_anon: "Anonymní mód"
+    switch_to_anon: "Vstoupit do anonymního módu"
-    switch_from_anon: "Opustit Anonymní"
+    switch_from_anon: "Opustit anonymní mód"
     banner:
       close: "Odmítnout tento banner."
       edit: "Editujte tento banner >>"
@@ -276,6 +300,7 @@ cs:
         few: "Toto téma má <b>{{count}}</b> příspěvky, které čekají na schválení."
         other: "Toto téma má <b>{{count}}</b> příspěvků, které čekají na schválení."
       confirm: "Uložit změny"
+      delete_prompt: "Jste si jistí, že chcete smazat uživatele <b>%{username}</b>? Tímto smažete všechny jejich příspěvky a zablokujete jejich emailovou a IP addresu."
       approval:
         title: "Příspěvek potřebuje schválení"
         description: "Obdrželi jsme váš příspěvek, ale musí být před zveřejněním schválen moderátorem. Buďte trpěliví."
@@ -303,6 +328,8 @@ cs:
       title: "Uživatelé"
       likes_given: "Rozdáno"
       likes_received: "Obdrženo"
+      topics_entered: "Zobrazeno"
+      topics_entered_long: "Zobrazeno témat"
       time_read: "Čas strávený čtením"
       topic_count: "Témata"
       topic_count_long: "Témat vytvořeno"
@@ -318,6 +345,12 @@ cs:
         few: "%{count} uživatelé"
         other: "%{count} uživatelů"
     groups:
+      empty:
+        posts: "V této skupině není od žádného člena ani jeden příspěvek."
+        members: "V této skupině není žádny uživatel."
+        mentions: "Tato skupina nebyla ještě @zmíněna."
+        messages: "Pro tuto skupinu není žádná zpráva."
+        topics: "V této skupině není od žádného člena ani jedno téma."
       add: "Přidat"
       selector_placeholder: "Přidat členy"
       owner: "Vlastník"
@@ -327,7 +360,10 @@ cs:
         few: "skupiny"
         other: "skupiny"
       members: "Členové"
+      topics: "Témata"
       posts: "Odpovědi"
+      mentions: "Zmínění"
+      messages: "Zprávy"
       alias_levels:
         title: "Kdo může do této skupiny psát zprávy a @zmiňovat ji?"
         nobody: "Nikdo"
@@ -338,24 +374,41 @@ cs:
       trust_levels:
         title: "Automaticky přidělená úroveň důvěryhodnosti členům když jsou přidáni: "
         none: "Žádná"
+      notifications:
+        watching:
+          title: "Hlídané"
+          description: "Budete informováni o každém novém příspěvku v každné zprávě a také se vám zobrazí počet nepřečtených příspěvků."
+        watching_first_post:
+          title: "Hlídané první příspěvky"
+          description: "Budete informováni o prvním novém příspěvku v každém novém tématu vytvořeném v této skupině."
+        tracking:
+          title: "Sledování"
+          description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek a zobrazí se vám počet nových odpovědí."
+        regular:
+          title: "Normalní"
+          description: "Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek."
+        muted:
+          title: "Ztišený"
+          description: "Nikdy nedostanete oznámení o nových tématech v této skupině."
     user_action_groups:
-      '1': "Rozdaných 'líbí se'"
+      "1": "Rozdaných 'líbí se'"
-      '2': "Obdržených 'líbí se'"
+      "2": "Obdržených 'líbí se'"
-      '3': "Záložky"
+      "3": "Záložky"
-      '4': "Témata"
+      "4": "Témata"
-      '5': "Odpovědi"
+      "5": "Odpovědi"
-      '6': "Odezva"
+      "6": "Odezva"
-      '7': "Zmínění"
+      "7": "Zmínění"
-      '9': "Citace"
+      "9": "Citace"
-      '11': "Editace"
+      "11": "Editace"
-      '12': "Odeslané zprávy"
+      "12": "Odeslané zprávy"
-      '13': "Přijaté zprávy"
+      "13": "Přijaté zprávy"
-      '14': "Čeká na schválení"
+      "14": "Čeká na schválení"
     categories:
       all: "všechny kategorie"
       all_subcategories: "vše"
       no_subcategory: "žádné"
       category: "Kategorie"
+      category_list: "Zobrazit seznam kategorií"
       reorder:
         title: "Přeřadit kategorie"
         title_long: "Přeorganizovat seznam kategorií"
@@ -414,18 +467,21 @@ cs:
       invited_by: "Pozvánka od"
       trust_level: "Důvěryhodnost"
       notifications: "Oznámení"
+      statistics: "Statistiky"
       desktop_notifications:
         label: "Upozornění na desktopu"
         not_supported: "Tento prohlížeč nepodporuje upozornění. Omlouváme se."
         perm_default: "Vypnout upozornění."
         perm_denied_btn: "Povolení zamítnuto"
+        perm_denied_expl: "Máte zakázané upozornění. Povolte upozornění v nastavení vašeho prohlížeče."
         disable: "Vypnout upozornění"
         enable: "Povolit upozornění"
         each_browser_note: "Poznámka: Musíš změnit tuto volbu v každém prohlížeči, který používáš."
-      dismiss_notifications: "Označ vše jako přečtené"
+      dismiss_notifications: "Odbýt vše"
       dismiss_notifications_tooltip: "Označit všechny nepřečtené notifikace jako přečtené"
       disable_jump_reply: "Po odpovědi nepřeskakovat na nový příspěvek"
       dynamic_favicon: "Zobrazit počet nových témat v ikoně prohlížeče"
+      edit_history_public: "Povolit ostatním zobrazení všech verzí mého příspěvku"
       external_links_in_new_tab: "Otevírat všechny externí odkazy do nové záložky"
       enable_quoting: "Povolit odpověď s citací z označeného textu"
       change: "změnit"
@@ -437,10 +493,30 @@ cs:
       suspended_notice: "Uživatel je suspendován do {{date}}."
       suspended_reason: "Důvod: "
       github_profile: "Github"
+      email_activity_summary: "Souhrn aktivit"
+      mailing_list_mode:
+        label: "Režim elektronická pošta"
+        enabled: "Zapnout režim elektronická pošta"
+        instructions: |
+          Toto nastavení deaktivuje souhrn aktivit.<br/>
+          Ztlumená témata a kategorie nejsou zahrnuté v těchto emailech.
+        daily: "Denně posílat aktuality"
+        individual: "Upozornit emailem na každý nový příspěvek"
+        many_per_day: "Upozornit emailem na každý nový příspěvek (asi {{dailyEmailEstimate}} každý den)"
+        few_per_day: "Upozornit emailem na každý nový příspěvek (asi 2 každý den)"
+      tag_settings: "Štítky"
+      watched_tags: "Hlídané"
+      watched_tags_instructions: "Budete automaticky hlídat všechna nová témata s těmito štítky. Na všechny nové příspěvky a témata budete upozorněni. Počet nových příspěvků se zobrazí vedle tématu."
+      tracked_tags: "Sledované"
+      tracked_tags_instructions: "Všechna nová témata s těmito štítky budou automaticky sledovaná. Počet nových příspěvků se zobrazí vedle tématu."
+      muted_tags: "Ztišené"
+      muted_tags_instructions: "Nikdy nebudete dostávat upozornění na nová témata s těmito štítky a neobjeví se v aktuálních."
       watched_categories: "Hlídané"
-      watched_categories_instructions: "Budete automaticky sledovat všechna nová témata v těchto kategoriích. Na všechny nové příspěvky a témata budete upozorněni. Počet nových příspěvků se zobrazí vedle tématu."
+      watched_categories_instructions: "Budete automaticky sledovat všechna nová témata v těchto kategoriích. Na všechny nové příspěvky budete upozorněni. Počet nových příspěvků se zobrazí vedle tématu."
       tracked_categories: "Sledované"
       tracked_categories_instructions: "Všechna nová témata v této kategorii budou automaticky hlídaná. Počet nových příspěvků se zobrazí vedle tématu."
+      watched_first_post_categories: "Hlídané první příspěvky"
+      watched_first_post_categories_instructions: "Budete informováni o prvním novém příspěvku v každém novém tématu vytvořeném v těchto kategoriích."
       muted_categories: "Ztišené"
       muted_categories_instructions: "Budeš přijímat upornění na nová témata v těchto kategoriích a ty se neobjeví v aktuálních."
       delete_account: "Smazat můj účet"
@@ -453,6 +529,8 @@ cs:
       muted_users: "Ztišení"
       muted_users_instructions: "Umlčet všechny notifikace od těchto uživatelů."
       muted_topics_link: "Ukázat utlumená témata"
+      watched_topics_link: "Ukázat hlídaná témata"
+      automatically_unpin_topics: "Atomaticky odepni téma jakmile se dostanu na konec."
       staff_counters:
         flags_given: "užitečná nahlášení"
         flagged_posts: "nahlášených příspěvků"
@@ -461,7 +539,15 @@ cs:
         warnings_received: "varování"
       messages:
         all: "Všechny"
+        inbox: "Doručené"
+        sent: "Odeslané"
+        archive: "Archív"
         groups: "Moje skupiny"
+        bulk_select: "Vybrat zprávy"
+        move_to_inbox: "Přesunout do doručených"
+        move_to_archive: "Archivovat"
+        failed_to_move: "Nepodařilo se přesunout vybrané zprávy (možná vám spadlo připojení)"
+        select_all: "Vybrat vše"
       change_password:
         success: "(email odeslán)"
         in_progress: "(odesílám)"
@@ -470,8 +556,10 @@ cs:
         set_password: "Nastavit heslo"
       change_about:
         title: "Změna o mně"
+        error: "Došlo k chybě při pokusu změnit tuto hodnotu."
       change_username:
         title: "Změnit uživatelské jméno"
+        confirm: "Pokud si změníte vaše uživatelské jméno, všechny přechozí citace vašich příspěvků a zmínky vašeho @jména budou rozbité. Jste si absolutně jistý, že chcete potvrdit toto operaci?"
         taken: "Toto uživatelské jméno je již zabrané."
         error: "Nastala chyba při změně uživatelského jména."
         invalid: "Uživatelské jméno je neplatné. Musí obsahovat pouze písmena a číslice."
@@ -544,11 +632,27 @@ cs:
         title: "User Card Badge"
       website: "Webová stránka"
       email_settings: "Emailová upozornění"
+      like_notification_frequency:
+        title: "Upozornit mě na \"to se mi líbí\""
+        always: "Vždy"
+        first_time_and_daily: "Po prvé a pak každý den"
+        first_time: "Po prvé"
+        never: "Nikdy"
+      email_previous_replies:
+        title: "Zahrnout předchozí reakce na konci emailů"
+        unless_emailed: "pokud nebyli dříve odeslány"
+        always: "vždy"
+        never: "nikdy"
       email_digests:
+        title: "Pokud tady dlouho nebudu, chci zasílat souhrnné emaily s populárními tématy a reakcemi"
+        every_30_minutes: "každých 30 minut"
+        every_hour: "každou hodinu"
         daily: "denně"
         every_three_days: "každé tři dny"
         weekly: "týdně"
         every_two_weeks: "každé dva týdny"
+      include_tl0_in_digests: "Zahrnout obsah nových uživatelů v souhrnných emailech"
+      email_in_reply_to: "Zahrnout v emailech úryvek příspěvku, na který je reagováno"
       email_direct: "Zašli mi email, pokud mě někde cituje, odpoví na můj příspěvek, zmíní mé @jméno nebo mě pozve do tématu."
       email_private_messages: "Zašli mi email, pokud mi někdo pošle zprávu."
       email_always: "Zašli mi upozornění emailem i když jsem aktivní na fóru"
@@ -596,7 +700,9 @@ cs:
         rescind: "Smazat"
         rescinded: "Pozvánka odstraněna"
         reinvite: "Znovu poslat pozvánku"
+        reinvite_all: "Znovu poslat všechny pozvánky"
         reinvited: "Pozvánka byla opětovně odeslána."
+        reinvited_all: "Všechny pozvánky byly opětovně odeslány!"
         time_read: "Čas čtení"
         days_visited: "Přítomen dnů"
         account_age_days: "Stáří účtu ve dnech"
@@ -617,6 +723,53 @@ cs:
         same_as_email: "Vaše heslo je stejné jako váš e-mail."
         ok: "Vaše heslo je v pořádku."
         instructions: "Alespo %{count} znaků."
+      summary:
+        title: "Souhrn"
+        stats: "Statistiky"
+        time_read: "načteno"
+        topic_count:
+          one: "téma vytvořeno"
+          few: "témata vytvořena"
+          other: "témat vytvořeno"
+        post_count:
+          one: "příspěvek vytvořen"
+          few: "příspěvky vytvořeny"
+          other: "příspěvků vytvořeno"
+        likes_given:
+          one: "<i class='fa fa-heart'></i> dán"
+          few: "<i class='fa fa-heart'></i> dány"
+          other: "<i class='fa fa-heart'></i> dáno"
+        likes_received:
+          one: "<i class='fa fa-heart'></i> obdržen"
+          few: "<i class='fa fa-heart'></i> obdrženy"
+          other: "<i class='fa fa-heart'></i> obdrženo"
+        days_visited:
+          one: "den navštíven"
+          few: "dny navštíveno"
+          other: "dní navštíveno"
+        posts_read:
+          one: "přečten příspěvek"
+          few: "přečteny příspěvky"
+          other: "přečteno příspěvků"
+        bookmark_count:
+          one: "záložka"
+          few: "záložky"
+          other: "záložek"
+        top_replies: "Nejnovější příspěvky"
+        no_replies: "Zatím žádné odpovědi."
+        more_replies: "Více odpovědí"
+        top_topics: "Nejnovější témata"
+        no_topics: "Zatím žádné témata."
+        more_topics: "Více témat"
+        top_badges: "Nejnovější odznaky"
+        no_badges: "Zatím žádné odznaky."
+        more_badges: "Více odznaků"
+        top_links: "Nejnovější odkazy"
+        no_links: "Zatím žádné odkazy."
+        most_liked_by: "Nejvíce \"to se mi líbí\" od uživatele"
+        most_liked_users: "Nejvíce \"to se mi líbí\""
+        most_replied_to_users: "Nejvíce odpovědí"
+        no_likes: "Zatím žádné \"to se mi líbí\""
       associated_accounts: "Přihlášení"
       ip_address:
         title: "Poslední IP adresa"
@@ -659,7 +812,9 @@ cs:
     logout: "Byli jste odhlášeni."
     refresh: "Obnovit"
     read_only_mode:
-      login_disabled: "Přihlášení je zakázáno jelikož fórum je v režimu jen pro čtení."
+      enabled: "Tato stránka je v režimu jen pro čtení. Prosim pokračujte v prohlížení, ale odpovídání a ostatní operace jsou momentálně vypnuté."
+      login_disabled: "Přihlášení je zakázáno jelikož je stránka v režimu jen pro čtení."
+      logout_disabled: "Odhlášení je zakázáno zatímco je stránka v režimu jen pro čtení."
     learn_more: "více informací..."
     year: 'rok'
     year_desc: 'témata za posledních 365 dní'
@@ -697,6 +852,7 @@ cs:
       title: "Zpráva"
       invite: "pozvat účastníka"
       remove_allowed_user: "Určitě chcete odstranit {{name}} z této zprávy?"
+      remove_allowed_group: "Opravdu chcete odstranit {{name}} z této zprávy?"
     email: 'Email'
     username: 'Uživatelské jméno'
     last_seen: 'Naposledy viděn'
@@ -744,22 +900,25 @@ cs:
       forgot: "Nevybavuju si podrobnosti svého účtu"
       google:
         title: "přes Google"
-        message: "Autorizuji přes Google (ujistěte se, že nemáte zablokovaná popup okna)"
+        message: "Autentizuji přes Google (ujistěte se, že nemáte zablokovaná popup okna)"
       google_oauth2:
         title: "přes Google"
         message: "Přihlašování přes Google (ujistěte se že nemáte zaplé blokování pop up oken)"
       twitter:
         title: "přes Twitter"
-        message: "Autorizuji přes Twitter (ujistěte se, že nemáte zablokovaná popup okna)"
+        message: "Autentizuji přes Twitter (ujistěte se, že nemáte zablokovaná popup okna)"
+      instagram:
+        title: "s Instagramem"
+        message: "Autentizuji pres Instagram (ujistěte se, že nemáte zablokovaná popup okna)"
       facebook:
         title: "přes Facebook"
-        message: "Autorizuji přes Facebook (ujistěte se, že nemáte zablokovaná popup okna)"
+        message: "Autentizuji přes Facebook (ujistěte se, že nemáte zablokovaná popup okna)"
       yahoo:
         title: "přes Yahoo"
-        message: "Autorizuji přes Yahoo (ujistěte se, že nemáte zablokovaná popup okna)"
+        message: "Autentizuji přes Yahoo (ujistěte se, že nemáte zablokovaná popup okna)"
       github:
         title: "přes GitHub"
-        message: "Autorizuji přes GitHub (ujistěte se, že nemáte zablokovaná popup okna)"
+        message: "Autentizuji přes GitHub (ujistěte se, že nemáte zablokovaná popup okna)"
     apple_international: "Apple/Mezinárodní"
     google: "Google"
     twitter: "Twitter"
@@ -769,6 +928,7 @@ cs:
       ctrl: 'Ctrl'
       alt: 'Alt'
     composer:
+      emoji: "Smajlíky :)"
       more_emoji: "více..."
       options: "Možnosti"
       whisper: "šeptat"
@@ -780,7 +940,6 @@ cs:
       saved_local_draft_tip: "uloženo lokálně"
       similar_topics: "Podobná témata"
       drafts_offline: "koncepty offline"
-      group_mentioned: "Použitím {{group}} upozorníš <a href='{{group_link}}'>{{count}} lidí</a>."
       error:
         title_missing: "Název musí být vyplněn"
         title_too_short: "Název musí být dlouhý alespoň {{min}} znaků"
@@ -818,10 +977,12 @@ cs:
       link_description: "sem vložte popis odkazu"
       link_dialog_title: "Vložit odkaz"
       link_optional_text: "volitelný popis"
+      link_url_placeholder: "http://example.com"
       quote_title: "Bloková citace"
       quote_text: "Bloková citace"
       code_title: "Ukázka kódu"
       code_text: "odsadit předformátovaný text o 4 mezery"
+      paste_code_text: "napište nebo vložte kód tady"
       upload_title: "Obrázek"
       upload_description: "sem vložek popis obrázku"
       olist_title: "Číslovaný seznam"
@@ -848,6 +1009,7 @@ cs:
     notifications:
       title: "oznámení o zmínkách pomocí @name, odpovědi na vaše příspěvky a témata, zprávy, atd."
       none: "Notifikace nebylo možné načíst."
+      empty: "Žádné upozornění nenalezeny."
       more: "zobrazit starší oznámení"
       total_flagged: "celkem nahlášeno příspěvků"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -861,7 +1023,6 @@ cs:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> přijal vaši pozvánku</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> přesunul {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Získáno '{{description}}'</p>"
       alt:
         mentioned: "Zmíněno"
@@ -877,8 +1038,10 @@ cs:
         moved_post: "Tvůj příspěvek přesunul"
         linked: "Odkaz na tvůj příspěvek"
         granted_badge: "Odznak přidělen"
+        group_message_summary: "Zprávy ve skupinové schránce"
       popup:
         mentioned: '{{username}} vás zmínil v "{{topic}}" - {{site_title}}'
+        group_mentioned: 'Uživatel {{username}} vás zmínil v "{{topic}}" - {{site_title}}'
         quoted: '{{username}} vás citoval v "{{topic}}" - {{site_title}}'
         replied: '{{username}} vám odpověděl v "{{topic}}" - {{site_title}}'
         posted: '{{username}} přispěl do "{{topic}}" - {{site_title}}'
@@ -918,6 +1081,7 @@ cs:
       post_format: "#{{post_number}} od {{username}}"
       context:
         user: "Vyhledat příspěvky od @{{username}}"
+        category: "Hledat v kategorii #{{category}}"
         topic: "Vyhledat v tomto tématu"
         private_messages: "Hledat ve zprávách"
     hamburger_menu: "jít na jiný seznam témat nebo kategorii"
@@ -947,6 +1111,9 @@ cs:
           one: "Vybrali jste <b>1</b> téma."
           few: "Vybrali jste <b>{{count}}</b> témata."
           other: "Vybrali jste <b>{{count}}</b> témat."
+        change_tags: "Změnit štítky"
+        choose_new_tags: "Zvolte nové tagy pro témata:"
+        changed_tags: "Tagy témat byly změněny."
       none:
         unread: "Nemáte žádná nepřečtená témata."
         new: "Nemáte žádná nová témata ke čtení."
@@ -977,6 +1144,12 @@ cs:
       create: 'Nové téma'
       create_long: 'Vytvořit nové téma'
       private_message: 'Vytvořit zprávu'
+      archive_message:
+        help: 'Přesunout zprávy do archívu'
+        title: 'Archív'
+      move_to_inbox:
+        title: 'Přesunout do Přijaté'
+        help: 'Přesunout zprávu zpět do Přijaté'
       list: 'Témata'
       new: 'nové téma'
       unread: 'nepřečtený'
@@ -1032,6 +1205,9 @@ cs:
       auto_close_title: 'Nastavení automatického zavření'
       auto_close_save: "Uložit"
       auto_close_remove: "Nezavírat téma automaticky"
+      timeline:
+        back: "Zpět"
+        back_description: "Přejít na poslední nepřečtený příspěvek"
       progress:
         title: pozice v tématu
         go_top: "nahoru"
@@ -1044,20 +1220,20 @@ cs:
         position: "příspěvek %{current} z %{total}"
       notifications:
         reasons:
-          '3_6': 'Budete dostávat oznámení, protože hlídáte tuhle kategorii.'
+          "3_6": 'Budete dostávat oznámení, protože hlídáte tuhle kategorii.'
-          '3_5': 'Budete dostávat oznámení, protože jste tohle téma automaticky začali hlídat.'
+          "3_5": 'Budete dostávat oznámení, protože jste tohle téma automaticky začali hlídat.'
-          '3_2': 'Budete dostávat oznámení, protože hlídáte toto téma.'
+          "3_2": 'Budete dostávat oznámení, protože hlídáte toto téma.'
-          '3_1': 'Budete dostávat oznámení, protože jste autorem totoho tématu.'
+          "3_1": 'Budete dostávat oznámení, protože jste autorem totoho tématu.'
-          '3': 'Budete dostávat oznámení, protože hlídáte toto téma.'
+          "3": 'Budete dostávat oznámení, protože hlídáte toto téma.'
-          '2_8': 'Budete dostávat upozornění, protože sledujete tuto kategorii.'
+          "2_8": 'Budete dostávat upozornění, protože sledujete tuto kategorii.'
-          '2_4': 'Budete dostávat oznámení, protože jste zaslal odpověď do tohoto tématu.'
+          "2_4": 'Budete dostávat oznámení, protože jste zaslal odpověď do tohoto tématu.'
-          '2_2': 'Budete dostávat oznámení, protože sledujete toto téma.'
+          "2_2": 'Budete dostávat oznámení, protože sledujete toto téma.'
-          '2': 'Budete dostávat oznámení, protože <a href="/users/{{username}}/preferences">jste četli toto téma</a>.'
+          "2": 'Budete dostávat oznámení, protože <a href="/users/{{username}}/preferences">jste četli toto téma</a>.'
-          '1_2': 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
+          "1_2": 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
-          '1': 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
+          "1": 'Budete informováni pokud někdo zmíní vaše @jméno nebo odpoví na váš příspěvek.'
-          '0_7': 'Ignorujete všechna oznámení v této kategorii.'
+          "0_7": 'Ignorujete všechna oznámení v této kategorii.'
-          '0_2': 'Ignorujete všechna oznámení z tohoto tématu.'
+          "0_2": 'Ignorujete všechna oznámení z tohoto tématu.'
-          '0': 'Ignorujete všechna oznámení z tohoto tématu.'
+          "0": 'Ignorujete všechna oznámení z tohoto tématu.'
         watching_pm:
           title: "Hlídání"
           description: "Budete informováni o každém novém příspěvku v této zprávě. Vedle názvu tématu se objeví počet nepřečtených příspěvků."
@@ -1096,6 +1272,8 @@ cs:
         invisible: "Zneviditelnit"
         visible: "Zviditelnit"
         reset_read: "Vynulovat počet čtení"
+        make_public: "Vytvořit Veřejné Téma"
+        make_private: "Vytvořit Soukromou zprávu"
       feature:
         pin: "Připevnit téma"
         unpin: "Odstranit připevnění"
@@ -1140,8 +1318,6 @@ cs:
         no_banner_exists: "Žádné téma není jako banner."
         banner_exists: "V současnosti <strong class='badge badge-notification unread'>je</strong> zde téma jako banner."
       inviting: "Odesílám pozvánku..."
-      automatically_add_to_groups_optional: "Tato pozvánka obsahuje také přístup do této skupiny: (volitelné, pouze administrátor)"
-      automatically_add_to_groups_required: "Tato pozvánka obsahuje také přístup do těchto skupin: (<b>Vyžadováno</b>, pouze administrátor)"
       invite_private:
         title: 'Pozvat do konverzace'
         email_or_username: "Email nebo uživatelské jméno pozvaného"
@@ -1552,10 +1728,10 @@ cs:
     posts_long: "v tomto tématu je {{number}} příspěvků"
     posts_likes_MF: |
       Toto téma má {count, plural, one {1 příspěvek} other {# příspěvků}} {ratio, select,
-        low {s velkým poměrem líbí se na příspěvek}
+      low {s velkým poměrem líbí se na příspěvek}
-        med {s velmi velkým poměrem líbí se na příspěvek}
+      med {s velmi velkým poměrem líbí se na příspěvek}
-        high {s extrémně velkým poměrem líbí se na příspěvek}
+      high {s extrémně velkým poměrem líbí se na příspěvek}
-        other {}}
+      other {}}
     original_post: "Původní příspěvek"
     views: "Zobrazení"
     views_lowercase:
@@ -2016,6 +2192,26 @@ cs:
         last_seen_user: "Uživatel byl naposled přítomen:"
         reply_key: "Klíč pro odpověď"
         skipped_reason: "Důvod přeskočení"
+        incoming_emails:
+          from_address: "Od koho"
+          to_addresses: "Komu"
+          cc_addresses: "Kopie"
+          subject: "Předmět"
+          error: "Chyba"
+          none: "Žádné příchozí emaily nenalezeny."
+          modal:
+            title: "Detaily příchozích emailů"
+            error: "Chyba"
+            headers: "Hlavičky"
+            subject: "Předmět"
+            body: "Obsah"
+            rejection_message: "Email o nepřijetí"
+          filters:
+            from_placeholder: "odkoho@example.com"
+            to_placeholder: "komu@example.com"
+            cc_placeholder: "kopie@example.com"
+            subject_placeholder: "Předmět..."
+            error_placeholder: "Chyba"
         logs:
           none: "Žádné záznamy nalezeny."
           filters:
@@ -2310,6 +2506,9 @@ cs:
           title: "Zveřejnit na uživatelském profilu?"
           enabled: "zveřejněno na profilu"
           disabled: "nezveřejněno na profilu"
+        show_on_user_card:
+          title: "Zobrazit na kartě uživatele?"
+          enabled: "zobrazeno na kartě uživatele"
         field_types:
           text: 'Text Field'
           confirm: 'Potvrzení'
@@ -2332,6 +2531,7 @@ cs:
         no_results: "Nenalezeny žádné výsledky."
         clear_filter: "Zrušit"
         add_url: "přidat URL"
+        add_host: "přidat hostitele"
         categories:
           all_results: 'Všechny'
           required: 'Nezbytnosti'
@@ -2354,6 +2554,7 @@ cs:
           login: "Login"
           plugins: "Pluginy"
           user_preferences: "Uživatelká nastavení"
+          tags: "Tagy"
       badges:
         title: Odznaky
         new_badge: Nový odznak
@@ -2362,6 +2563,7 @@ cs:
         badge: Odznak
         display_name: Zobrazované jméno
         description: Popis
+        long_description: Dlouhý Popis
         badge_type: Typ odznaku
         badge_grouping: Skupina
         badge_groupings:
@@ -2456,85 +2658,3 @@ cs:
           label: "Nové:"
           add: "Přidat"
           filter: "Hledat (URL nebo externí URL)"
-    lightbox:
-      download: "download"
-    search_help:
-      title: 'Vyhledat v nápovědě'
-    keyboard_shortcuts_help:
-      title: 'Klávesové zkratky'
-      jump_to:
-        title: 'Jump To'
-        home: '<b>g</b>, <b>h</b> Domů'
-        latest: '<b>g</b>, <b>l</b> Poslední'
-        new: '<b>g</b>, <b>n</b> Nový'
-        unread: '<b>g</b>, <b>u</b> Nepřečtěné'
-        categories: '<b>g</b>, <b>c</b> Kategorie'
-        top: '<b>g</b>, <b>t</b> Nahoru'
-        bookmarks: '<b>g</b>, <b>b</b> Záložky'
-        profile: '<b>g</b>, <b>p</b> Profil'
-        messages: '<b>g</b>, <b>m</b> Zprávy'
-      navigation:
-        title: 'Navigation'
-        jump: '<b>#</b> Jdi na příspěvek #'
-        back: '<b>u</b> Back'
-        up_down: '<b>k</b>/<b>j</b> Move selection &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Open selected topic'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Následující/předchozí výběr'
-      application:
-        title: 'Application'
-        create: '<b>c</b> Create a new topic'
-        notifications: '<b>n</b> Open notifications'
-        hamburger_menu: '<b>=</b> Otevře hamburgerové menu'
-        user_profile_menu: '<b>p</b> Otevře uživatelské menu'
-        show_incoming_updated_topics: '<b>.</b> Ukáže aktualizovaná témata'
-        search: '<b>/</b> Search'
-        help: '<b>?</b> Otevře seznam klávesových zkratek'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
-        dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Odhlásit se'
-      actions:
-        title: 'Actions'
-        bookmark_topic: '<b>f</b> Toggle bookmark topic'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Připnout/Odepnout téma'
-        share_topic: '<b>shift</b>+<b>s</b> Sdílet téma'
-        share_post: '<b>s</b> Share post'
-        reply_as_new_topic: '<b>t</b> Odpovědět v propojeném tématu'
-        reply_topic: '<b>shift</b>+<b>r</b> Odpovědět na téma'
-        reply_post: '<b>r</b> Odpovědět na příspěvek'
-        quote_post: '<b>q</b> Citovat příspěvek'
-        like: '<b>l</b> Like post'
-        flag: '<b>!</b> Flag post'
-        bookmark: '<b>b</b> Bookmark post'
-        edit: '<b>e</b> Edit post'
-        delete: '<b>d</b> Delete post'
-        mark_muted: '<b>m</b>, <b>m</b> Mute topic'
-        mark_regular: '<b>m</b>, <b>r</b> Regular (default) topic'
-        mark_tracking: '<b>m</b>, <b>t</b> Track topic'
-        mark_watching: '<b>m</b>, <b>w</b> Watch topic'
-    badges:
-      title: Odznaky
-      badge_count:
-        one: "1 odznak"
-        few: "%{count} odznaky"
-        other: "%{count} odznaků"
-      more_badges:
-        one: "+1 další"
-        few: "+%{count} další"
-        other: "+%{count} dalších"
-      granted:
-        one: "1 udělen"
-        few: "1 udělen"
-        other: "%{count} uděleno"
-      select_badge_for_title: Vyberte odznak, který chcete použít jako svůj titul
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Jak začít?
-        community:
-          name: Komunita
-        trust_level:
-          name: Věrohodnost
-        other:
-          name: Ostatní
-        posting:
-          name: Přispívání

config/locales/client.da.yml

@@ -235,8 +235,6 @@ da:
     undo: "Fortryd"
     revert: "Gendan"
     failed: "Fejlet"
-    switch_to_anon: "Anonym tilstand"
-    switch_from_anon: "Afbryd anonym tilstand"
     banner:
       close: "Afvis denne banner."
       edit: "Rediger dette banner >>"
@@ -344,18 +342,18 @@ da:
           title: "Tavs"
           description: "Du får aldrig beskeder om nye emner i denne gruppe."
     user_action_groups:
-      '1': "Likes givet"
+      "1": "Likes givet"
-      '2': "Likes modtaget"
+      "2": "Likes modtaget"
-      '3': "Bogmærker"
+      "3": "Bogmærker"
-      '4': "Emner"
+      "4": "Emner"
-      '5': "Svar"
+      "5": "Svar"
-      '6': "Svar"
+      "6": "Svar"
-      '7': "Referencer"
+      "7": "Referencer"
-      '9': "Citater"
+      "9": "Citater"
-      '11': "Ændringer"
+      "11": "Ændringer"
-      '12': "Sendte indlæg"
+      "12": "Sendte indlæg"
-      '13': "Indbakke"
+      "13": "Indbakke"
-      '14': "Afventer"
+      "14": "Afventer"
     categories:
       all: "alle kategorier"
       all_subcategories: "Alle"
@@ -428,10 +426,10 @@ da:
         disable: "Deaktiver notifikationer"
         enable: "Aktiver notifikationer"
         each_browser_note: "Bemærk: Du skal ændre indstillingen i alle dine browsere."
-      dismiss_notifications: "Marker alle som læst"
       dismiss_notifications_tooltip: "Marker alle ulæste notifikationer som læst"
       disable_jump_reply: "Ikke hop til mit indlæg efter jeg svarer"
       dynamic_favicon: "Vis nyt / opdateret emnetal på browserikon"
+      edit_history_public: "Lad andre brugere se mine tidligere revisioner"
       external_links_in_new_tab: "Åbn alle eksterne links i en ny fane"
       enable_quoting: "Tillad citering af markeret tekst"
       change: "skift"
@@ -444,7 +442,6 @@ da:
       suspended_reason: "Begrundelse: "
       github_profile: "Github"
       watched_categories: "Overvåget"
-      watched_categories_instructions: "Du overvåger automatisk alle emner i disse kategorier. Du vil få en notifikation ved alle nye indlæg og emner, og antallet af ulæste og nye indlæg vil også stå ved siden af emnet."
       tracked_categories: "Fulgt"
       tracked_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategorier. En optælling af nye indlæg vises ved emnet."
       muted_categories: "Ignoreret"
@@ -700,9 +697,6 @@ da:
     too_few_topics_and_posts_notice: "Lad os <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få startet denne diskussion!</a> Der er i øjeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner og <strong>%{currentPosts} / %{requiredPosts}</strong> indlæg. Nye besøgende har brug for samtaler at læse og svare på."
     too_few_topics_notice: "Lad os <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få startet denne diskussion !</a> Der er i øjeblikket <strong>%{currentTopics} / %{requiredTopics}</strong> emner. Nye besøgende har brug for samtaler at læse og svare på."
     too_few_posts_notice: "Lad os <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få startet denne diskussion !</a> Der er i øjeblikket <strong>%{currentPosts} / %{requiredPosts}</strong> indlæg. Nye besøgende har brug for samtaler at læse og svare på."
-    logs_error_rate_notice:
-      reached: "%{timestamp}: Aktuelle mængde på <a href='%{url}' target='_blank'>%{rate}</a> har nået websitets begrænsning på %{siteSettingRate}."
-      exceeded: "%{timestamp}: Aktuelle mængde på <a href='%{url}' target='_blank'>%{rate}</a> har overskredet websitets begrænsning på %{siteSettingRate}."
     learn_more: "Læs mere…"
     year: 'år'
     year_desc: 'Indlæg oprettet i de seneste 365 dage'
@@ -828,7 +822,6 @@ da:
       saved_local_draft_tip: "gemt lokalt"
       similar_topics: "Dit emne minder om…"
       drafts_offline: "kladder offline"
-      group_mentioned: "Ved at bruge {{group}} informerer du <a href='{{group_link}}'>{{count}} personer</a>."
       error:
         title_missing: "Titlen er påkrævet"
         title_too_short: "Titlen skal være på mindst {{min}} tegn"
@@ -911,7 +904,6 @@ da:
       invited_to_topic: "<i title='inviteret til emne' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepterede din invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='indlæg flyttet' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      linked: "<i title='indlæg linket' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge givet' class='fa fa-certificate'></i><p>Du blev tildelt '{{description}}'</p>"
       group_message_summary:
         one: "<i title='beskeder i din gruppes indbakke' class='fa fa-group'></i><p> {{count}} besked i din {{group_name}} inbox</p>"
@@ -1099,20 +1091,20 @@ da:
         position: "indlæg %{current} af %{total}"
       notifications:
         reasons:
-          '3_6': 'Du får notifikationer fordi du overvåger denne kategori.'
+          "3_6": 'Du får notifikationer fordi du overvåger denne kategori.'
-          '3_5': 'Du får notifikationer fordi du overvåger dette emne automatisk.'
+          "3_5": 'Du får notifikationer fordi du overvåger dette emne automatisk.'
-          '3_2': 'Du får notifikationer fordi du overvåger dette emne.'
+          "3_2": 'Du får notifikationer fordi du overvåger dette emne.'
-          '3_1': 'Du får notifikationer fordi du oprettede dette emne.'
+          "3_1": 'Du får notifikationer fordi du oprettede dette emne.'
-          '3': 'Du får notifikationer fordi du overvåger dette emne.'
+          "3": 'Du får notifikationer fordi du overvåger dette emne.'
-          '2_8': 'Du får notifikationer fordi du følger dette kategori.'
+          "2_8": 'Du får notifikationer fordi du følger dette kategori.'
-          '2_4': 'Du får notifikationer fordi du har besvaret dette emne.'
+          "2_4": 'Du får notifikationer fordi du har besvaret dette emne.'
-          '2_2': 'Du får notifikationer fordi du følger dette emne.'
+          "2_2": 'Du får notifikationer fordi du følger dette emne.'
-          '2': 'Du får notifikationer fordi du <a href="/users/{{username}}/preferences">har læst dette emne</a>.'
+          "2": 'Du får notifikationer fordi du <a href="/users/{{username}}/preferences">har læst dette emne</a>.'
-          '1_2': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
+          "1_2": 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
-          '1': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
+          "1": 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.'
-          '0_7': 'Du ignorerer alle notifikationer i denne kategori.'
+          "0_7": 'Du ignorerer alle notifikationer i denne kategori.'
-          '0_2': 'Du får ingen notifikationer for dette emne.'
+          "0_2": 'Du får ingen notifikationer for dette emne.'
-          '0': 'Du får ingen notifikationer for dette emne.'
+          "0": 'Du får ingen notifikationer for dette emne.'
         watching_pm:
           title: "Følger"
           description: "Du vil modtage en notifikation for hvert nyt svar i denne besked, og en optælling af nye svar vil blive vist."
@@ -1197,8 +1189,6 @@ da:
         no_banner_exists: "Der er ikke noget banner-emne."
         banner_exists: "Der <strong class='badge badge-notification unread'>er</strong> aktuelt et banner-emne."
       inviting: "Inviterer…"
-      automatically_add_to_groups_optional: "Denne invitation giver også adgang til disse grupper: (valgfrit, kun for administrator)"
-      automatically_add_to_groups_required: "Denne invitation giver også adgang til disse grupper: (<b>Påkrævet</b>, kun for administrator)"
       invite_private:
         title: 'Inviter til besked'
         email_or_username: "Inviteret brugers e-mail eller brugernavn"
@@ -1594,10 +1584,10 @@ da:
     posts_long: "{{number}} indlæg i dette emne"
     posts_likes_MF: |
       Dette emne har {count, plural, one {1 svar} other {# svar}} {ratio, select,
-        low {med et højt like pr. indlæg forhold}
+      low {med et højt like pr. indlæg forhold}
-        med {med et meget højt like pr. indlæg forhold}
+      med {med et meget højt like pr. indlæg forhold}
-        high {med et ekstremt højt like pr. indlæg forhold}
+      high {med et ekstremt højt like pr. indlæg forhold}
-        other {}}
+      other {}}
     original_post: "Oprindeligt indlæg"
     views: "Visninger"
     views_lowercase:
@@ -2528,98 +2518,3 @@ da:
           label: "Ny:"
           add: "Tilføj"
           filter: "Søg (URL eller ekstern URL)"
-    lightbox:
-      download: "download"
-    search_help:
-      title: 'Hjælp til søgning'
-    keyboard_shortcuts_help:
-      title: 'Tastatur genveje'
-      jump_to:
-        title: 'Hop til'
-        home: '<b>g</b>, <b>h</b> Hjem'
-        latest: '<b>g</b>, <b>l</b> Seneste'
-        new: '<b>g</b>, <b>n</b> Nye'
-        unread: '<b>g</b>, <b>u</b> Ulæste'
-        categories: '<b>g</b>, <b>c</b> Kategorier'
-        top: '<b>g</b>, <b>t</b> Top'
-        bookmarks: '<b>g</b>, <b>b</b> Bogmærker'
-        profile: '<b>g</b>, <b>p</b> Profil'
-        messages: '<b>g</b>, <b>m</b> Beskeder'
-      navigation:
-        title: 'Navigation'
-        jump: '<b>#</b> Gå til indlæg #'
-        back: '<b>u</b> Tilbage'
-        up_down: '<b>k</b>/<b>j</b> Flyt valgte &uarr; &darr;'
-        open: '<b>o</b> eller <b>Enter</b> Åbn det valgte emne'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Næste/forrige sektion'
-      application:
-        title: 'Applikation'
-        create: '<b>c</b> Opret et nyt emne'
-        notifications: '<b>n</b> Åbn notifikationer'
-        hamburger_menu: '<b>=</b> Åbn i hamburgermenu'
-        user_profile_menu: '<b>p</b> Åben bruger menu'
-        show_incoming_updated_topics: '<b>.</b> Vis opdaterede emner'
-        search: '<b>/</b> Søg'
-        help: '<b>?</b> Åben keyboard hjælp'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Afvis alle Nye/Indlæg'
-        dismiss_topics: '<b>x</b>, <b>t</b> Afvis emner'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Log ud'
-      actions:
-        title: 'Handlinger'
-        bookmark_topic: '<b>f</b> Sæt bogmærke i emne'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Fastgør / Frigør emne'
-        share_topic: '<b>shift</b>+<b>s</b> Del emne'
-        share_post: '<b>s</b> Del opslag'
-        reply_as_new_topic: '<b>t</b> Svar med et linket emne'
-        reply_topic: '<b>shift</b>+<b>r</b> Besvar emne'
-        reply_post: '<b>r</b> Svar på kommentaren'
-        quote_post: '<b>q</b> Citer emne'
-        like: '<b>l</b> Like indlæg'
-        flag: '<b>!</b> Flag indlæg'
-        bookmark: '<b>b</b> Bogmærk indlæg'
-        edit: '<b>e</b> Redigér indlæg'
-        delete: '<b>d</b> Slet indlæg'
-        mark_muted: '<b>m</b>, <b>m</b> Lydløst emne'
-        mark_regular: '<b>m</b>, <b>r</b> Almindelig (stardard) emne'
-        mark_tracking: '<b>m</b>, <b>t</b> Følg emne'
-        mark_watching: '<b>m</b>, <b>w</b> Iagtag emne'
-    badges:
-      earned_n_times:
-        one: "Fortjente dette badge 1 gang"
-        other: "Fortjente dette badge %{count} gange."
-      granted_on: "Tildelt %{date}"
-      others_count: "Andre med dette badge (%{count})"
-      title: Badges
-      allow_title: "tilgængelig titel"
-      multiple_grant: "tildelt flere gange"
-      badge_count:
-        one: "1 Badge"
-        other: "%{count} Badges"
-      more_badges:
-        one: "+1 Mere"
-        other: "+%{count} Mere"
-      granted:
-        one: "1 givet"
-        other: "%{count} givet"
-      select_badge_for_title: Vælg en badge, du vil bruge som din titel
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Kom igang
-        community:
-          name: Fælleskab
-        trust_level:
-          name: Tillidsniveau
-        other:
-          name: Andre
-        posting:
-          name: Indlæg
-    google_search: |
-      <h3>Søg med Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>

config/locales/client.de.yml

@@ -117,7 +117,9 @@ de:
       private_topic: "hat das Thema %{when} privat gemacht"
       split_topic: "Thema aufgeteilt, %{when}"
       invited_user: "%{who} eingeladen, %{when}"
+      invited_group: "%{who} eingeladen, %{when}"
       removed_user: "%{who} entfernt, %{when}"
+      removed_group: "%{who} entfernt, %{when}"
       autoclosed:
         enabled: 'geschlossen, %{when}'
         disabled: 'geöffnet, %{when}'
@@ -253,7 +255,7 @@ de:
     undo: "Rückgängig machen"
     revert: "Verwerfen"
     failed: "Fehlgeschlagen"
-    switch_to_anon: "Anonymer Modus"
+    switch_to_anon: "Anonymen Modus beginnen"
     switch_from_anon: "Anonymen Modus beenden"
     banner:
       close: "Diesen Banner ausblenden."
@@ -352,6 +354,9 @@ de:
         watching:
           title: "Beobachten"
           description: "Du wirst über jeden neuen Beitrag in jeder Nachricht benachrichtigt und die Anzahl neuer Antworten wird angezeigt."
+        watching_first_post:
+          title: "Ersten Beitrag beobachten"
+          description: "Du erhältst nur eine Benachrichtigung für den ersten Beitrag in jedem neuen Thema in dieser Gruppe."
         tracking:
           title: "Verfolgen"
           description: "Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet, und die Anzahl neuer Antworten wird angezeigt."
@@ -362,18 +367,18 @@ de:
           title: "Stummgeschaltet"
           description: "Du erhältst keine Benachrichtigungen über neue Themen in dieser Gruppe."
     user_action_groups:
-      '1': "Abgegebene Likes"
+      "1": "Abgegebene Likes"
-      '2': "Erhaltene Likes"
+      "2": "Erhaltene Likes"
-      '3': "Lesezeichen"
+      "3": "Lesezeichen"
-      '4': "Themen"
+      "4": "Themen"
-      '5': "Beiträge"
+      "5": "Beiträge"
-      '6': "Antworten"
+      "6": "Antworten"
-      '7': "Erwähnungen"
+      "7": "Erwähnungen"
-      '9': "Zitate"
+      "9": "Zitate"
-      '11': "Änderungen"
+      "11": "Änderungen"
-      '12': "Gesendete Objekte"
+      "12": "Gesendete Objekte"
-      '13': "Posteingang"
+      "13": "Posteingang"
-      '14': "Ausstehend"
+      "14": "Ausstehend"
     categories:
       all: "Alle Kategorien"
       all_subcategories: "alle"
@@ -446,10 +451,11 @@ de:
         disable: "Benachrichtigungen deaktivieren"
         enable: "Benachrichtigungen aktivieren"
         each_browser_note: "Hinweis: Du musst diese Einstellung in jedem von dir verwendeten Browser ändern."
-      dismiss_notifications: "Alle als gelesen markieren"
+      dismiss_notifications: "Alles ausblenden"
       dismiss_notifications_tooltip: "Alle ungelesenen Benachrichtigungen als gelesen markieren"
       disable_jump_reply: "Springe nicht zu meinem Beitrag, nachdem ich geantwortet habe"
       dynamic_favicon: "Zeige die Anzahl der neuen und geänderten Themen im Browser-Symbol an"
+      edit_history_public: "Andere Benutzer dürfen in Beiträgen meine Überarbeitungen sehen."
       external_links_in_new_tab: "Öffne alle externen Links in einem neuen Tab"
       enable_quoting: "Aktiviere Zitatantwort mit dem hervorgehobenen Text"
       change: "ändern"
@@ -470,12 +476,21 @@ de:
           Stummgeschaltete Themen und Kategorien werden in diesen E-Mails nicht eingeschlossen.
         daily: "Aktualisierungen täglich senden"
         individual: "Für jeden Beitrag eine E-Mail senden"
-        many_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa {{dailyEmailEstimate}} pro Tag)."
+        many_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa {{dailyEmailEstimate}} pro Tag)"
-        few_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (weniger als 2 pro Tag)."
+        few_per_day: "Sende mir für jeden neuen Beitrag eine E-Mail (etwa 2 pro Tag)"
+      tag_settings: "Schlagwörter"
+      watched_tags: "Beobachtet"
+      watched_tags_instructions: "Du wirst automatisch alle neuen Themen imit diesen Schlagwörtern beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt und die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
+      tracked_tags: "Verfolgt"
+      tracked_tags_instructions: "Du wirst automatisch allen neuen Themen mit diesen Schlagwörtern folgen. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
+      muted_tags: "Stummgeschaltet"
+      muted_tags_instructions: "Du erhältst keine Benachrichtigungen über neue Themen mit diesen Schlagwörtern und die Themen werden auch nicht in der Liste der aktuellen Themen erscheinen."
       watched_categories: "Beobachtet"
-      watched_categories_instructions: "Du wirst automatisch alle neuen Themen in diesen Kategorien beobachten und über alle neuen Beiträge und Themen benachrichtigt werden. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
+      watched_categories_instructions: "Du wirst automatisch alle neuen Themen in diesen Kategorien beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt und die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
       tracked_categories: "Verfolgt"
       tracked_categories_instructions: "Du wirst automatisch allen neuen Themen in diesen Kategorien folgen. Die Anzahl der neuen Antworten wird bei den betroffenen Themen angezeigt."
+      watched_first_post_categories: "Ersten Beitrag beobachten"
+      watched_first_post_categories_instructions: "Du erhältst eine Benachrichtigung für den ersten Beitrag in jedem neuen Thema in diesen Kategorien."
       muted_categories: "Stummgeschaltet"
       muted_categories_instructions: "Du erhältst keine Benachrichtigungen über neue Themen in dieser Kategorie und die Themen werden auch nicht in der Liste der aktuellen Themen erscheinen."
       delete_account: "Lösche mein Benutzerkonto"
@@ -488,6 +503,7 @@ de:
       muted_users: "Stummgeschaltet"
       muted_users_instructions: "Alle Benachrichtigungen von diesem Benutzer unterdrücken."
       muted_topics_link: "Zeige stummgeschaltete Themen"
+      watched_topics_link: "Zeige beobachtete Themen"
       automatically_unpin_topics: "Angeheftete Themen automatisch loslösen, wenn ich deren letzten Beitrag gelesen habe."
       staff_counters:
         flags_given: "hilfreiche Meldungen"
@@ -517,7 +533,7 @@ de:
         error: "Beim Ändern dieses Wertes ist ein Fehler aufgetreten."
       change_username:
         title: "Benutzernamen ändern"
-        confirm: "Wenn du deinen Benutzername änderst, werden alle vorherigen Zitate deiner Beiträge und @name Erwähnungen nicht mehr funktionieren, und deine Beitragshistorie wird unterbruchen. Bist du dir ganz sicher, dass du das machen möchtest?"
+        confirm: "Wenn du deinen Benutzernamen änderst, werden alle vorherigen Zitate deiner Beiträge und Erwähnungen deines vorherigen @Namens nicht mehr funktonieren. Bist du dir ganz sicher, dass du das tun möchtest?"
         taken: "Der Benutzername ist bereits vergeben."
         error: "Bei der Änderung deines Benutzernamens ist ein Fehler aufgetreten."
         invalid: "Der Benutzernamen ist nicht zulässig. Er darf nur Zahlen und Buchstaben enthalten."
@@ -601,7 +617,7 @@ de:
         always: "immer"
         never: "nie"
       email_digests:
-        title: "Wenn ich nicht vorbeischaue, sende mir eine E-Mail-Zusammenfassung beliebter Themen und Antworten an:"
+        title: "Sende mir eine E-Mail-Zusammenfassung mit beliebten Themen und Antworten, wenn ich länger nicht hier war:"
         every_30_minutes: "alle 30 Minuten"
         every_hour: "stündlich"
         daily: "täglich"
@@ -811,6 +827,7 @@ de:
       title: "Nachricht"
       invite: "Andere einladen..."
       remove_allowed_user: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
+      remove_allowed_group: "Willst du {{name}} wirklich aus dieser Unterhaltung entfernen?"
     email: 'E-Mail-Adresse'
     username: 'Benutzername'
     last_seen: 'Zuletzt gesehen'
@@ -942,6 +959,7 @@ de:
       quote_text: "Zitat"
       code_title: "Vorformatierter Text"
       code_text: "vorformatierten Text mit 4 Leerzeichen einrücken"
+      paste_code_text: "Tippe oder füge den Code hier ein"
       upload_title: "Upload"
       upload_description: "gib hier eine Beschreibung des Uploads ein"
       olist_title: "Nummerierte Liste"
@@ -968,6 +986,7 @@ de:
     notifications:
       title: "Benachrichtigung über @Name-Erwähnungen, Antworten auf deine Beiträge und Themen, Nachrichten, usw."
       none: "Die Benachrichtigungen können derzeit nicht geladen werden."
+      empty: "Keine Benachrichtigungen gefunden."
       more: "ältere Benachrichtigungen anzeigen"
       total_flagged: "Anzahl der gemeldeten Beiträge"
       mentioned: "<i title='erwähnt' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -988,6 +1007,7 @@ de:
       moved_post: "<i title='Beitrag verschoben' class='fa fa-sign-out'></i><p><span>{{username}}</span> hat {{description}} verschoben</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='Abzeichen verliehen' class='fa fa-certificate'></i><p>Abzeichen '{{description}}' erhalten</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Neues Thema</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> Eine Nachricht in deinem {{group_name}} Postfach</p>"
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} Nachrichten in deinem {{group_name}} Postfach</p>"
@@ -1188,20 +1208,21 @@ de:
         title: Ändere wie häufig du zu diesem Thema benachrichtigt wirst
         reasons:
           mailing_list_mode: "Du hast den Mailinglisten-Modus aktiviert, daher wirst du über Antworten zu diesem Thema per E-Mail benachrichtigt"
-          '3_6': 'Du wirst Benachrichtigungen erhalten, weil du diese Kategorie beobachtest.'
+          "3_10": 'Du wirst Benachrichtigungen erhalten, weil du ein Schlagwort an diesem Thema beobachtest.'
-          '3_5': 'Du wirst Benachrichtigungen erhalten, weil dieses Thema automatisch von dir beobachtet wird.'
+          "3_6": 'Du wirst Benachrichtigungen erhalten, weil du diese Kategorie beobachtest.'
-          '3_2': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
+          "3_5": 'Du wirst Benachrichtigungen erhalten, weil dieses Thema automatisch von dir beobachtet wird.'
-          '3_1': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema erstellt hast.'
+          "3_2": 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
-          '3': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
+          "3_1": 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema erstellt hast.'
-          '2_8': 'Du wirst Benachrichtigungen erhalten, da du diese Kategorie verfolgst.'
+          "3": 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema beobachtest.'
-          '2_4': 'Du wirst Benachrichtigungen erhalten, weil du eine Antwort zu diesem Thema verfasst hast.'
+          "2_8": 'Du wirst Benachrichtigungen erhalten, da du diese Kategorie verfolgst.'
-          '2_2': 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema verfolgst.'
+          "2_4": 'Du wirst Benachrichtigungen erhalten, weil du eine Antwort zu diesem Thema verfasst hast.'
-          '2': 'Du wirst Benachrichtigungen erhalten, weil du <a href="/users/{{username}}/preferences">dieses Thema gelesen hast</a>.'
+          "2_2": 'Du wirst Benachrichtigungen erhalten, weil du dieses Thema verfolgst.'
-          '1_2': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
+          "2": 'Du wirst Benachrichtigungen erhalten, weil du <a href="/users/{{username}}/preferences">dieses Thema gelesen hast</a>.'
-          '1': 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
+          "1_2": 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
-          '0_7': 'Du ignorierst alle Benachrichtigungen dieser Kategorie.'
+          "1": 'Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet.'
-          '0_2': 'Du ignorierst alle Benachrichtigungen dieses Themas.'
+          "0_7": 'Du ignorierst alle Benachrichtigungen dieser Kategorie.'
-          '0': 'Du ignorierst alle Benachrichtigungen dieses Themas.'
+          "0_2": 'Du ignorierst alle Benachrichtigungen dieses Themas.'
+          "0": 'Du ignorierst alle Benachrichtigungen dieses Themas.'
         watching_pm:
           title: "Beobachten"
           description: "Du wirst über jeden neuen Beitrag in dieser Unterhaltung benachrichtigt und die Anzahl der neuen Beiträge wird angezeigt."
@@ -1295,6 +1316,7 @@ de:
         email_or_username_placeholder: "E-Mail-Adresse oder Benutzername"
         action: "Einladen"
         success: "Wir haben den Benutzer gebeten, sich an dieser Unterhaltung zu beteiligen."
+        success_group: "Wir haben die Gruppe eingeladen, an dieser Nachricht mitzuwirken."
         error: "Entschuldige, es gab einen Fehler beim Einladen des Benutzers."
         group_name: "Gruppenname"
       controls: "Weitere Aktionen"
@@ -1620,6 +1642,9 @@ de:
         watching:
           title: "Beobachten"
           description: "Du wirst automatisch alle neuen Themen in diesen Kategorien beobachten. Du wirst über jeden neuen Beitrag in jedem Thema benachrichtigt und die Anzahl neuer Antworten wird angezeigt."
+        watching_first_post:
+          title: "Ersten Beitrag beobachten"
+          description: "Du erhältst eine Benachrichtigung fnur ür den ersten Beitrag in jedem neuen Thema in diesen Kategorien."
         tracking:
           title: "Verfolgen"
           description: "Du wirst automatisch allen neuen Themen in diesen Kategorien folgen. Du wirst benachrichtigt, wenn jemand deinen @Namen erwähnt oder auf deinen Beitrag antwortet, und die Anzahl neuer Antworten wird angezeigt."
@@ -1891,11 +1916,11 @@ de:
     google_search: |
       <h3>Mit Google suchen</h3>
       <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
+      <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
+      <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
+      <button class="btn btn-primary">Google</button>
-        </form>
+      </form>
       </p>
     tagging:
       all_tags: "Alle Schlagwörter"
@@ -1919,6 +1944,9 @@ de:
         watching:
           title: "Beobachten"
           description: "Du wirst automatisch alle neuen Themen mit diesem Schlagwort beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt werden. Außerdem wird die Anzahl der ungelesenen und neuen Beiträge neben dem Thema erscheinen."
+        watching_first_post:
+          title: "Ersten Beitrag beobachten"
+          description: "Du erhältst nur eine Benachrichtigung für den ersten Beitrag in jedem neuen Thema mit diesem Schlagwort."
         tracking:
           title: "Verfolgen"
           description: "Du wirst automatisch alle neuen Themen mit diesem Schlagwort folgen. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema erscheinen."

config/locales/client.es.yml

@@ -117,7 +117,9 @@ es:
       private_topic: "hizo este tema privado %{when}"
       split_topic: "separó este tema %{when}"
       invited_user: "invitó a %{who} %{when}"
+      invited_group: "invitó a %{who} %{when}"
       removed_user: "eliminó a %{who} %{when}"
+      removed_group: "eliminó a %{who} %{when}"
       autoclosed:
         enabled: 'cerrado %{when}'
         disabled: 'abierto %{when}'
@@ -253,7 +255,7 @@ es:
     undo: "Deshacer"
     revert: "Revertir"
     failed: "Falló"
-    switch_to_anon: "Modo Anónimo"
+    switch_to_anon: "Entrar al Modo Anónimo"
     switch_from_anon: "Salir del Modo Anónimo"
     banner:
       close: "Descartar este banner."
@@ -352,6 +354,9 @@ es:
         watching:
           title: "Vigilando"
           description: "e te notificará de cada nuevo post en este mensaje y se mostrará un contador de nuevos posts."
+        watching_first_post:
+          title: "Vigilar Primer Post"
+          description: "Sólo se te notificará del primer post en cada nuevo tema en este grupo."
         tracking:
           title: "Siguiendo"
           description: "Se te notificará si alguien menciona tu @nombre o te responde, y un contador de nuevos mensajes será mostrado."
@@ -362,18 +367,18 @@ es:
           title: "Silenciado"
           description: "Nunca se te notificará de nada sobre temas en este grupo."
     user_action_groups:
-      '1': "'Me gusta' Dados"
+      "1": "'Me gusta' Dados"
-      '2': "'Me gusta' Recibidos"
+      "2": "'Me gusta' Recibidos"
-      '3': "Marcadores"
+      "3": "Marcadores"
-      '4': "Temas"
+      "4": "Temas"
-      '5': "Posts"
+      "5": "Posts"
-      '6': "Respuestas"
+      "6": "Respuestas"
-      '7': "Menciones"
+      "7": "Menciones"
-      '9': "Citas"
+      "9": "Citas"
-      '11': "Ediciones"
+      "11": "Ediciones"
-      '12': "Elementos Enviados"
+      "12": "Elementos Enviados"
-      '13': "Bandeja de entrada"
+      "13": "Bandeja de entrada"
-      '14': "Pendiente"
+      "14": "Pendiente"
     categories:
       all: "Categorías"
       all_subcategories: "todas"
@@ -446,10 +451,11 @@ es:
         disable: "Desactivar notificaciones"
         enable: "Activar notificaciones"
         each_browser_note: "Nota: Tendrás que cambiar esta opción para cada navegador que uses."
-      dismiss_notifications: "Marcador todos como leídos"
+      dismiss_notifications: "Descartar todos"
       dismiss_notifications_tooltip: "Marcar todas las notificaciones no leídas como leídas"
       disable_jump_reply: "No dirigirme a mi post cuando responda"
       dynamic_favicon: "Mostrar contador de temas nuevos/actualizados en el favicon"
+      edit_history_public: "Dejar que otros usuarios puedan ver las revisiones de mis posts"
       external_links_in_new_tab: "Abrir todos los enlaces externos en una nueva pestaña"
       enable_quoting: "Activar respuesta citando el texto resaltado"
       change: "cambio"
@@ -470,12 +476,21 @@ es:
           Los temas y categorías silenciadas no se incluyen en estos emails.
         daily: "Enviar actualizaciones diariamente"
         individual: "Enviar un email por cada nuevo post"
-        many_per_day: "Enviarme un correo por cada nuevo post  (en torno a {{dailyEmailEstimate}} por día)."
+        many_per_day: "Enviarme un email por cada nuevo post (unos {{dailyEmailEstimate}} por día)"
-        few_per_day: "Enviarme un correo por cada nuevo post (menos de 2 por día)."
+        few_per_day: "Enviarme un email por cada nuevo post (unos 2 por día)"
+      tag_settings: "Etiquetas"
+      watched_tags: "Vigiladas"
+      watched_tags_instructions: "Vigilarás automáticamente todos los temas con estas etiquetas. Se te notificará de todos los nuevos posts y temas y aparecerá un contador de nuevos posts al lado del tema."
+      tracked_tags: "Siguiendo"
+      tracked_tags_instructions: "Seguirás automáticamente todos los nuevos temas con estas etiquetas. Aparecerá un contador de nuevos posts al lado del tema."
+      muted_tags: "Silenciadas"
+      muted_tags_instructions: "No serás notificado de ningún tema con estas etiquetas y no aparecerán en la pestaña Recientes."
       watched_categories: "Vigiladas"
-      watched_categories_instructions: "Seguirás automáticamente todos los nuevos temas en estas categorías. Se te notificará de cada nuevo post y tema, y además, se añadirá un contador de posts nuevos y sin leer al lado del tema."
+      watched_categories_instructions: "Vigilarás automáticamente todos los temas en estas categorías. Se te notificará de todos los nuevos posts y temas, y aparecerá un contador de nuevos posts al lado del tema."
       tracked_categories: "Siguiendo"
       tracked_categories_instructions: "Seguirás automáticamente todos los nuevos temas en estas categorías. Se añadirá un contador de posts nuevos y sin leer al lado del tema."
+      watched_first_post_categories: "Vigilar Primer Post"
+      watched_first_post_categories_instructions: "Se te notificará del primer post de cada nuevo tema en estas categorías."
       muted_categories: "Silenciado"
       muted_categories_instructions: "No serás notificado de ningún tema en estas categorías, y no aparecerán en la página de mensajes recientes."
       delete_account: "Borrar Mi Cuenta"
@@ -488,6 +503,7 @@ es:
       muted_users: "Silenciados"
       muted_users_instructions: "Omite todas las notificaciones de estos usuarios."
       muted_topics_link: "Mostrar temas silenciados"
+      watched_topics_link: "Mostrar temas vigilados"
       automatically_unpin_topics: "Dejar de destacar temas automáticamente cuando los leo por completo."
       staff_counters:
         flags_given: "reportes útiles"
@@ -517,7 +533,7 @@ es:
         error: "Hubo un error al cambiar este valor."
       change_username:
         title: "Cambiar Nombre de Usuario"
-        confirm: "Si cambias tu nombre de usuario, todas las citas de tus posts y @menciones se romperán, y tu parte de tu historial será interrumpido. ¿Seguro que quieres cambiarlo?"
+        confirm: "Si cambias tu nombre de usuario, todas las citas anteriores a tus posts y menciones a tu @nombre se romperán. ¿Seguro que quieres hacerlo?"
         taken: "Lo sentimos, ese nombre de usuario ya está siendo usado."
         error: "Ha ocurrido un error al cambiar tu nombre de usuario."
         invalid: "Este nombre de usuario no es válido. Debe incluir sólo números y letras"
@@ -601,7 +617,7 @@ es:
         always: "siempre"
         never: "nunca"
       email_digests:
-        title: "Cuando no visite el sitio, envíame un resumen por email de los temas populares y las respuestas a:"
+        title: "Cuando no visite el sitio, envíame un email con un resumen de los temas y respuestas populares"
         every_30_minutes: "cada 30 minutos"
         every_hour: "cada hora"
         daily: "diariamente"
@@ -811,6 +827,7 @@ es:
       title: "Mensaje"
       invite: "Invitar a Otros..."
       remove_allowed_user: "¿Seguro que quieres eliminar a {{name}} de este mensaje?"
+      remove_allowed_group: "¿Seguro que quieres eliminar a {{name}} de este mensaje?"
     email: 'E-mail'
     username: 'Nombre de usuario'
     last_seen: 'Visto por última vez'
@@ -942,6 +959,7 @@ es:
       quote_text: "Cita"
       code_title: "Texto preformateado"
       code_text: "texto preformateado precedido por 4 espacios"
+      paste_code_text: "escribe o pega el código aquí"
       upload_title: "Subir"
       upload_description: "introduce una descripción de la imagen aquí"
       olist_title: "Lista numerada"
@@ -968,6 +986,7 @@ es:
     notifications:
       title: "notificaciones por menciones a tu @nombre, respuestas a tus posts y temas, mensajes, etc"
       none: "No se han podido cargar las notificaciones."
+      empty: "No se han encontrado notificaciones."
       more: "ver notificaciones antiguas"
       total_flagged: "total de posts reportados"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -988,6 +1007,7 @@ es:
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> movió {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Se te ha concedido '{{description}}'</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Nuevo Tema</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='mensaje en tu bandeja de grupo' class='fa fa-group'></i><p> {{count}} mensaje en la bandeja del grupo {{group_name}}</p>"
         other: "<i title='mensajes en tu bandeja de grupo' class='fa fa-group'></i><p> {{count}} mensajes en la bandeja del grupo {{group_name}}</p>"
@@ -1188,20 +1208,21 @@ es:
         title: cambiar con qué frecuencia se te notifica de este tema
         reasons:
           mailing_list_mode: "El modo lista de correo se encuentra activado, por lo que se te notificará de las respuestas a este tema vía email."
-          '3_6': 'Recibirás notificaciones porque estás vigilando esta categoría.'
+          "3_10": 'Recibirás notificaciones porque estás vigilando una etiqueta de este tema.'
-          '3_5': 'Recibirás notificaciones porque has empezado a vigilar este tema automáticamente.'
+          "3_6": 'Recibirás notificaciones porque estás vigilando esta categoría.'
-          '3_2': 'Recibirás notificaciones porque estás vigilando este tema.'
+          "3_5": 'Recibirás notificaciones porque has empezado a vigilar este tema automáticamente.'
-          '3_1': 'Recibirás notificaciones porque creaste este tema.'
+          "3_2": 'Recibirás notificaciones porque estás vigilando este tema.'
-          '3': 'Recibirás notificaciones porque estás vigilando este tema.'
+          "3_1": 'Recibirás notificaciones porque creaste este tema.'
-          '2_8': 'Recibirás notificaciones porque estás siguiendo esta categoría.'
+          "3": 'Recibirás notificaciones porque estás vigilando este tema.'
-          '2_4': 'Recibirás notificaciones porque has publicado una respuesta en este tema.'
+          "2_8": 'Recibirás notificaciones porque estás siguiendo esta categoría.'
-          '2_2': 'Recibirás notificaciones porque estás siguiendo este tema.'
+          "2_4": 'Recibirás notificaciones porque has publicado una respuesta en este tema.'
-          '2': 'Recibirás notificaciones porque <a href="/users/{{username}}/preferences">has leído este tema</a>.'
+          "2_2": 'Recibirás notificaciones porque estás siguiendo este tema.'
-          '1_2': 'Se te notificará solo si alguien menciona tu @nombre o te responde a un post.'
+          "2": 'Recibirás notificaciones porque <a href="/users/{{username}}/preferences">has leído este tema</a>.'
-          '1': 'Se te notificará si alguien menciona tu @nombre o te responde a un post.'
+          "1_2": 'Se te notificará solo si alguien menciona tu @nombre o te responde a un post.'
-          '0_7': 'Estás ignorando todas las notificaciones en esta categoría.'
+          "1": 'Se te notificará si alguien menciona tu @nombre o te responde a un post.'
-          '0_2': 'Estás ignorando todas las notificaciones en este tema.'
+          "0_7": 'Estás ignorando todas las notificaciones en esta categoría.'
-          '0': 'Estás ignorando todas las notificaciones en este tema.'
+          "0_2": 'Estás ignorando todas las notificaciones en este tema.'
+          "0": 'Estás ignorando todas las notificaciones en este tema.'
         watching_pm:
           title: "Vigilar"
           description: "Se te notificará de cada nuevo post en este mensaje y se mostrará un contador de nuevos posts."
@@ -1295,6 +1316,7 @@ es:
         email_or_username_placeholder: "dirección de email o nombre de usuario"
         action: "Invitar"
         success: "Hemos invitado a ese usuario a participar en este hilo de mensajes."
+        success_group: "Hemos invitado a ese grupo a participar en este mensaje."
         error: "Lo sentimos, hubo un error al invitar a ese usuario."
         group_name: "nombre del grupo"
       controls: "Controles del tema"
@@ -1620,6 +1642,9 @@ es:
         watching:
           title: "Vigilar"
           description: "Vigilarás automáticamente todos los nuevos temas en estas categorías. Serás notificado por cada nuevo mensaje en cada tema, y verás una cuenta de las nuevas respuestas."
+        watching_first_post:
+          title: "Vigilar Primer Post"
+          description: "Se te notificará del primer post de cada nuevo tema en estas categorías."
         tracking:
           title: "Seguir"
           description: "Seguirás automáticamente todos los nuevos temas en estas categorías. Serás notificado si alguien menciona tu @nombre o te responde, y verás una cuenta de las nuevas respuestas."
@@ -1698,10 +1723,10 @@ es:
     posts_long: "{{number}} posts en este tema"
     posts_likes_MF: |
       Este tema tiene {count, plural, one {1 respuesta} other {# respuestas}} {ratio, select,
-        low {con una ratio de me gusta por post elevada}
+      low {con una ratio de me gusta por post elevada}
-        med {con una ratio de me gusta por post bastante elevada}
+      med {con una ratio de me gusta por post bastante elevada}
-        high {con una ratio de me gusta por post elevadísima}
+      high {con una ratio de me gusta por post elevadísima}
-        other {}}
+      other {}}
     original_post: "Post Original"
     views: "Visitas"
     views_lowercase:
@@ -1895,11 +1920,11 @@ es:
     google_search: |
       <h3>Buscar con Google</h3>
       <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
+      <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
+      <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
+      <button class="btn btn-primary">Google</button>
-        </form>
+      </form>
       </p>
     tagging:
       all_tags: "Etiquetas"
@@ -1923,6 +1948,9 @@ es:
         watching:
           title: "Vigilar"
           description: "Vigilarás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema y además, se te notificará de cada nuevo tema y post."
+        watching_first_post:
+          title: "Vigilar Primer Post"
+          description: "Se te notificará del primer post de cada nuevo tema en esta etiqueta."
         tracking:
           title: "Seguir"
           description: "Seguirás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema."
@@ -2835,148 +2863,3 @@ es:
           label: "Nuevo:"
           add: "Añadir"
           filter: "Buscar (URL o URL externa)"
-    lightbox:
-      download: "descargar"
-    search_help:
-      title: 'Ayuda para búsquedas'
-    keyboard_shortcuts_help:
-      title: 'Atajos de teclado'
-      jump_to:
-        title: 'Saltar a'
-        home: '<b>g</b>, <b>h</b> Inicio'
-        latest: '<b>g</b>, <b>l</b> Recientes'
-        new: '<b>g</b>, <b>n</b> Nuevos'
-        unread: '<b>g</b>, <b>u</b> No leídos'
-        categories: '<b>g</b>, <b>c</b> Categorías'
-        top: '<b>g</b>, <b>t</b> Arriba'
-        bookmarks: '<b>g</b>, <b>b</b> Marcadores'
-        profile: '<b>g</b>, <b>p</b> Perfil'
-        messages: '<b>g</b>, <b>m</b> Mensajes'
-      navigation:
-        title: 'Navegación'
-        jump: '<b>#</b> Ir al post #'
-        back: '<b>u</b> Atrás'
-        up_down: '<b>k</b>/<b>j</b> Desplazar selección &uarr; &darr;'
-        open: '<b>o</b> or <b>Entrar</b> Abrir tema seleccionado'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Siguiente/anterior sección'
-      application:
-        title: 'Aplicación'
-        create: '<b>c</b> Crear un tema nuevo'
-        notifications: '<b>n</b> Abrir notificaciones'
-        hamburger_menu: '<b>=</b> Abrir Menú'
-        user_profile_menu: '<b>p</b> Abrir menú de usuario'
-        show_incoming_updated_topics: '<b>.</b> Mostrar temas actualizados'
-        search: '<b>/</b> Buscar'
-        help: '<b>?</b> Abrir la guía de atajos de teclado'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Descartar Nuevo/Posts'
-        dismiss_topics: '<b>x</b>, <b>t</b> Descartar Temas'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Cerrar sesión'
-      actions:
-        title: 'Acciones'
-        bookmark_topic: '<b>f</b> Guardar/Quitar el tema de marcadores'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Seleccionar/Deseleccionar como destacado'
-        share_topic: '<b>shift</b>+<b>s</b> Compartir tema'
-        share_post: '<b>s</b> Compartir post'
-        reply_as_new_topic: '<b>t</b> Responder como un tema enlazado.'
-        reply_topic: '<b>shift</b>+<b>r</b> Responder al tema'
-        reply_post: '<b>r</b> Responder al post'
-        quote_post: '<b>q</b> Citar post'
-        like: '<b>l</b> Me gusta el post'
-        flag: '<b>!</b> Reportar post'
-        bookmark: '<b>b</b> Marcar post'
-        edit: '<b>e</b> Editar post'
-        delete: '<b>d</b> Borrar post'
-        mark_muted: '<b>m</b>, <b>m</b> Silenciar tema'
-        mark_regular: '<b>m</b>, <b>r</b> Marcar este tema como normal (por defecto)'
-        mark_tracking: '<b>m</b>, <b>t</b> Seguir tema'
-        mark_watching: '<b>m</b>, <b>w</b> Vigilar Tema'
-    badges:
-      earned_n_times:
-        one: "Ganó este distintivo 1 vez"
-        other: "Ganó este distintivo %{count} veces"
-      granted_on: "Concedido el %{date}"
-      others_count: "Otras personas con este distintivo (%{count})"
-      title: Distintivos
-      allow_title: "título disponible"
-      multiple_grant: "puede ser concedido varias veces"
-      badge_count:
-        one: "1 distintivo"
-        other: "%{count} distintivos"
-      more_badges:
-        one: "+1 más"
-        other: "+%{count} Más"
-      granted:
-        one: "1 concedido"
-        other: "%{count} concedido"
-      select_badge_for_title: Seleccionar un distintivo para utilizar como tu título
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Primeros pasos
-        community:
-          name: Comunidad
-        trust_level:
-          name: Nivel de confianza
-        other:
-          name: Miscelánea
-        posting:
-          name: Escritura
-    google_search: |
-      <h3>Buscar con Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>
-    tagging:
-      all_tags: "Etiquetas"
-      selector_all_tags: "etiquetas"
-      changed: "etiquetas cambiadas:"
-      tags: "Etiquetas"
-      choose_for_topic: "elegir etiquetas para este tema (opcional)"
-      delete_tag: "Eliminar etiqueta"
-      delete_confirm: "¿Seguro que quieres eliminar esa etiqueta?"
-      rename_tag: "Renombrar etiqueta"
-      rename_instructions: "Elige un nuevo nombre para la etiqueta:"
-      sort_by: "Ordenar por:"
-      sort_by_count: "contador"
-      sort_by_name: "nombre"
-      filters:
-        without_category: "%{filter} %{tag} temas"
-        with_category: "%{filter} %{tag} temas en %{category}"
-      notifications:
-        watching:
-          title: "Vigilar"
-          description: "Vigilarás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema y además, se te notificará de cada nuevo tema y post."
-        tracking:
-          title: "Seguir"
-          description: "Seguirás automáticamente todos los nuevos temas con esta etiqueta. Se añadirá un contador de posts nuevos y sin leer al lado del tema."
-        regular:
-          title: "Normal"
-          description: "Se te notificará solo si alguien te menciona con tu @usuario o responde a algún post tuyo."
-        muted:
-          title: "Silenciar"
-          description: "No se te notificará de nuevos temas con esta etiqueta, ni aparecerán en tu pestaña de temas no leídos."
-      topics:
-        none:
-          unread: "No tienes temas sin leer."
-          new: "No tienes nuevos temas."
-          read: "Aún no has leído ningún tema."
-          posted: "Aún no has publicado ningún tema."
-          latest: "No hay temas recientes."
-          hot: "No hay temas populares."
-          bookmarks: "No hay temas guardados en marcadores aún."
-          top: "No hay temas top."
-          search: "No hay resultados de búsqueda."
-        bottom:
-          latest: "No hay más temas recientes."
-          hot: "No hay más temas populares."
-          posted: "No hay más temas publicados."
-          read: "No hay más temas leídos."
-          new: "No hay más temas nuevos."
-          unread: "No hay más temas sin leer."
-          top: "No hay más temas top."
-          bookmarks: "No hay más temas guardados en marcadores."
-          search: "No hay más resultados de búsqueda."

config/locales/client.et.yml

@@ -247,8 +247,6 @@ et:
     undo: "Ennista"
     revert: "Võta tagasi"
     failed: "Ebaõnnestus"
-    switch_to_anon: "Anonüümne režiim"
-    switch_from_anon: "Välju anonüümsest režiimist"
     banner:
       close: "Sulge see bänner."
       edit: "Muuda seda bännerit >>"
@@ -354,18 +352,18 @@ et:
           title: "Vaigistatud"
           description: "Sind ei teavitata ühestki uuest teemast selles grupis."
     user_action_groups:
-      '1': "Meeldimisi antud"
+      "1": "Meeldimisi antud"
-      '2': "Meeldimisi saadud"
+      "2": "Meeldimisi saadud"
-      '3': "Järjehoidjat"
+      "3": "Järjehoidjat"
-      '4': "Teemat"
+      "4": "Teemat"
-      '5': "Vastust"
+      "5": "Vastust"
-      '6': "Reaktsioone"
+      "6": "Reaktsioone"
-      '7': "Mainimisi"
+      "7": "Mainimisi"
-      '9': "Tsitaate"
+      "9": "Tsitaate"
-      '11': "Redaktsioone"
+      "11": "Redaktsioone"
-      '12': "Saatmisi"
+      "12": "Saatmisi"
-      '13': "Postkast"
+      "13": "Postkast"
-      '14': "Ootel"
+      "14": "Ootel"
     categories:
       all: "kõik liigid"
       all_subcategories: "kõik"
@@ -438,10 +436,10 @@ et:
         disable: "Keela teavitused"
         enable: "Luba teavitused"
         each_browser_note: "Märkus: see säte tuleb muuta igas kasutusel olevas brauseris."
-      dismiss_notifications: "Märgi kõik loetuks"
       dismiss_notifications_tooltip: "Märgi kõik lugemata teavitused loetuks"
       disable_jump_reply: "Ära hüppa minu postitusse peale vastamist"
       dynamic_favicon: "Kuva uute / muudetud teemade arvu brauseri ikoonil"
+      edit_history_public: "Näita minu postituse redaktsioone teistele kasutajatele"
       external_links_in_new_tab: "Ava kõik välisviited uuel sakil"
       enable_quoting: "Luba esiletõstetud tekstile tsitaadiga vastata"
       change: "muuda"
@@ -454,7 +452,6 @@ et:
       suspended_reason: "Põhjus:"
       github_profile: "Github"
       watched_categories: "Vaadeldav"
-      watched_categories_instructions: "Sa vaatled nendes liikides kõiki uusi teemasid automaatselt. Sind teavitatakse kõigist uutest postitustest ja teemadest, koos uute postituste arvuga teema pealkirja kõrval."
       tracked_categories: "Jälgitud"
       tracked_categories_instructions: "Sa jälgid nendes liikides kõiki uusi teemasid. Uute postituste arv on näha teema pealkirja kõrval."
       muted_categories: "Vaigistatud"
@@ -498,7 +495,6 @@ et:
         error: "Välja muutmisel tekkis viga."
       change_username:
         title: "Muuda kasutajanime"
-        confirm: "Muutes oma kasutajanime katkevad kõik varasemad sinu postituste tsitaadid ja @name mainimised. Oled täiesti kindel, et soovid seda?"
         taken: "Vabandust, see kasutajanimi on võetud."
         error: "Kasutajanime muutmisel tekkis tõrge."
         invalid: "Selline kasutajanimi ei ole lubatud. Kasutada tohib ainult numbreid ja tähti"
@@ -582,23 +578,18 @@ et:
         always: "alati"
         never: "mitte kunagi"
       email_digests:
-        title: "Kui ma siin ei käi, saada mulle meil uudiste kokkuvõttega:"
         every_30_minutes: "iga pooltund"
         every_hour: "iga tund"
         daily: "igapäevaselt"
         every_three_days: "iga kolme päeva tagant"
         weekly: "iga nädal"
         every_two_weeks: "iga kahe nädala tagant"
-      include_tl0_in_digests: "Lisa uute kasutajate postitused koond e-posti"
       email_in_reply_to: "Lisa e-kirjale katkend eelmisest vastusest"
       email_direct: "Teavita mind, kui keegi tsiteerib minu postitust, vastab minu postitusele, mainib minu @kasutajanime või kutsub mind teemaga liituma"
       email_private_messages: "Saada meilile teavitus, kui minuga kontakteerutakse sõnumi teel"
       email_always: "Saada mulle teavitused meilile, isegi kui ma olen siin aktiivne kasutaja"
       other_settings: "Muu"
       categories_settings: "Liigid"
-      enable_mailing_list:
-        one: "Oled Sa kindel, et soovid meili iga uue postituse kohta?"
-        other: "Oled Sa kindel, et soovid meili iga uue postituse kohta?<br><br>See tekitaks umbes <b>{{count}} meili</b> päevas."
       new_topic_duration:
         label: "Loe teemad uuteks, kui"
         not_viewed: "Ma ei ole neid veel vaadanud"
@@ -735,8 +726,6 @@ et:
     too_few_topics_notice: "Tõmbame <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>selle vestluse käima!</a> Hetkel on tehtud <strong>%{currentTopics} / %{requiredTopics}</strong> teemat. Uued külastajad vajavad vestlusi, milles osaleda."
     too_few_posts_notice: "Tõmbame <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>selle vestluse käima!</a> Hetkel on tehtud <strong>%{currentPosts} / %{requiredPosts}</strong> postitust. Uued külastajad vajavad vestlusi, milles osaleda."
     logs_error_rate_notice:
-      reached: "%{timestamp}: Current rate of <a href='%{url}' target='_blank'>%{rate}</a> has reached site settings's limit of %{siteSettingRate}."
-      exceeded: "%{timestamp}: Hetke sagedus <a href='%{url}' target='_blank'>%{rate}</a> ületab saidi sätetes kehtestatud limiidi %{siteSettingRate}."
       rate:
         one: "1 viga/%{duration}"
         other: "%{count} viga/%{duration}"
@@ -865,7 +854,6 @@ et:
       saved_local_draft_tip: "salvestatud lokaalselt"
       similar_topics: "Sinu teema sarnaneb..."
       drafts_offline: "mustandid vallasrežiimis"
-      group_mentioned: "Kasutades gruppi {{group}}, oled teavitamas <a href='{{group_link}}'>{{count}} inimest</a>."
       error:
         title_missing: "Pealkiri on kohustuslik"
         title_too_short: "Pealkiri peab olema vähemalt {{min}} sümbolit pikk"
@@ -952,7 +940,6 @@ et:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> võttis Sinu kutse vastu</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> liigutas {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Teenisid '{{description}}'</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} sõnum Sinu {{group_name}} postkastis</p>"
@@ -1143,20 +1130,20 @@ et:
         position: "postitus %{current} koguarvust %{total}"
       notifications:
         reasons:
-          '3_6': 'Sulle saabuvad teavitused, kuna vaatled seda liiki.'
+          "3_6": 'Sulle saabuvad teavitused, kuna vaatled seda liiki.'
-          '3_5': 'Sulle saabuvad teavitused kuna hakkasid seda teemat automaatselt jälgima.'
+          "3_5": 'Sulle saabuvad teavitused kuna hakkasid seda teemat automaatselt jälgima.'
-          '3_2': 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
+          "3_2": 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
-          '3_1': 'Sulle saabuvad teavitused kuna lõid selle teema.'
+          "3_1": 'Sulle saabuvad teavitused kuna lõid selle teema.'
-          '3': 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
+          "3": 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
-          '2_8': 'Sulle saabuvad teavitused, kuna jälgid seda liiki.'
+          "2_8": 'Sulle saabuvad teavitused, kuna jälgid seda liiki.'
-          '2_4': 'Sulle saabuvad teavitused kuna postitasid siia teemasse vastuse.'
+          "2_4": 'Sulle saabuvad teavitused kuna postitasid siia teemasse vastuse.'
-          '2_2': 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
+          "2_2": 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
-          '2': 'Sulle saabuvad teavitused kuna <a href="/users/{{username}}/preferences">luges seda teemat</a>.'
+          "2": 'Sulle saabuvad teavitused kuna <a href="/users/{{username}}/preferences">luges seda teemat</a>.'
-          '1_2': 'Sind teavitatakse, kui keegi Teie @name mainib või Teile vastab.'
+          "1_2": 'Sind teavitatakse, kui keegi Teie @name mainib või Teile vastab.'
-          '1': 'Sind teavitatakse, kui keegi Sinu @name mainib või Sulle vastab.'
+          "1": 'Sind teavitatakse, kui keegi Sinu @name mainib või Sulle vastab.'
-          '0_7': 'Eirad kõiki teavitusi selles liigis.'
+          "0_7": 'Eirad kõiki teavitusi selles liigis.'
-          '0_2': 'Eirad kõiki teavitusi selle teema kohta.'
+          "0_2": 'Eirad kõiki teavitusi selle teema kohta.'
-          '0': 'Eirad kõiki teavitusi selles liigis.'
+          "0": 'Eirad kõiki teavitusi selles liigis.'
         watching_pm:
           title: "Vaatleb"
           description: "Saad teavituse iga uue vastuse kohta sellele sõnumile koos uute vastuste koguarvu näitamisega."
@@ -1241,8 +1228,6 @@ et:
         no_banner_exists: "Bänner-teemat ei ole."
         banner_exists: "Hetkel <strong class='badge badge-notification unread'>on</strong> üks bänner-teema."
       inviting: "Kutsun..."
-      automatically_add_to_groups_optional: "See kutse annab juurdepääsu ka gruppidele: (vabatahtlik, ainult adminidele)"
-      automatically_add_to_groups_required: "See kutse annab juurdepääsu ka gruppidele: (<b>Nõutud</b>, ainult adminidele)"
       invite_private:
         title: 'Kutsu sõnumisse'
         email_or_username: "Kutsutava meiliaadress või kasutajanimi"
@@ -1638,10 +1623,10 @@ et:
     posts_long: "selles teemas on {{number}} postitust"
     posts_likes_MF: |
       Selles teemas on {count, plural, one {1 vastus} other {# vastust}} {ratio, select,
-        low {kõrge meeldimiste / postituste suhtega}
+      low {kõrge meeldimiste / postituste suhtega}
-        med {väga kõrge meeldimiste / postituste suhtega}
+      med {väga kõrge meeldimiste / postituste suhtega}
-        high {eriti kõrge meeldimiste / postituste suhtega}
+      high {eriti kõrge meeldimiste / postituste suhtega}
-        other {}}
+      other {}}
     original_post: "Algne postitus"
     views: "Vaatamisi"
     views_lowercase:
@@ -2593,105 +2578,3 @@ et:
           label: "Uus"
           add: "Lisa"
           filter: "Otsi (URL või väline URL)"
-    lightbox:
-      download: "Lae alla"
-    search_help:
-      title: 'Otsingu spikker'
-    keyboard_shortcuts_help:
-      title: 'Klaviatuuri kiirvalikud'
-      jump_to:
-        title: 'Hüppa'
-        home: '<b>g</b>, <b>h</b> Avaleht'
-        latest: '<b>g</b>, <b>l</b> Viimased'
-        new: '<b>g</b>, <b>n</b> Uus'
-        unread: '<b>g</b>, <b>u</b> Lugemata'
-        categories: '<b>g</b>, <b>c</b> Liigid'
-        top: '<b>g</b>, <b>t</b> Üles'
-        bookmarks: '<b>g</b>, <b>b</b> Järjehoidjad'
-        profile: '<b>g</b>, <b>p</b> Profiil'
-        messages: '<b>g</b>, <b>m</b> Sõnumid'
-      navigation:
-        title: 'Navigatsioon'
-        jump: '<b>#</b> Mine postitusse #'
-        back: '<b>u</b> Tagasi'
-        up_down: '<b>k</b>/<b>j</b> Liiguta valitut &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Ava valitud teema'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Järgmine/eelmine sektsioon'
-      application:
-        title: 'Rakendus'
-        create: '<b>c</b> Loo uus teema'
-        notifications: '<b>n</b> Ava teavitused'
-        hamburger_menu: '<b>=</b> Ava rippmenüü'
-        user_profile_menu: '<b>p</b> Ava kasutajamenüü'
-        show_incoming_updated_topics: '<b>.</b> Näita uuendatud teemasid'
-        search: '<b>/</b> Otsi'
-        help: '<b>?</b> Ava klaviatuuri abimenüü'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Lükka Uued/Postitused tagasi'
-        dismiss_topics: '<b>x</b>, <b>t</b> Lükka teemad tagasi'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Logi välja'
-      actions:
-        title: 'Tegevused'
-        bookmark_topic: '<b>f</b> Lülita postituse järjehoidja sisse/välja
-
-           '
-        pin_unpin_topic: '<b>shift</b>+<b>p</b>  Kinnita/Vabasta teema'
-        share_topic: '<b>shift</b>+<b>s</b> Jaga teemat'
-        share_post: '<b>s</b> Jaga postitust'
-        reply_as_new_topic: '<b>t</b> Vasta viidates teemale'
-        reply_topic: '<b>shift</b>+<b>r</b> Vasta teemale'
-        reply_post: '<b>r</b> Vasta postitusele'
-        quote_post: '<b>q</b> Tsiteeri postitust'
-        like: '<b>l</b> Märgi postitus meeldivaks'
-        flag: '<b>!</b> Tähista postitus'
-        bookmark: '<b>b</b> Pane postitusele järjehoidja'
-        edit: '<b>e</b> Muuda postitust'
-        delete: '<b>d</b> Kustuta postitus'
-        mark_muted: '<b>m</b>, <b>m</b> Vaigista teema'
-        mark_regular: '<b>m</b>, <b>r</b> Tavaline teema'
-        mark_tracking: '<b>m</b>, <b>t</b> Jälgi teemat'
-        mark_watching: 'Vaatle teemat'
-    badges:
-      earned_n_times:
-        one: "Teenis selle märgise 1 kord"
-        other: "Teenis selle märgise %{count} korda"
-      granted_on: "Märgistatud %{date}"
-      others_count: "Teised selle märgisega (%{count})"
-      title: Märgiseid
-      allow_title: "saadaval tiitel"
-      multiple_grant: "määratud mitmeid kordi"
-      badge_count:
-        one: "1 märgis"
-        other: "%{count} märgist"
-      more_badges:
-        one: "+1 veel"
-        other: "+%{count} veel"
-      granted:
-        one: "1 lubatud"
-        other: "%{count} lubatud"
-      select_badge_for_title: Vali märgis, mida kasutada oma tiitlina
-      none: "<pole ühtegi>"
-      badge_grouping:
-        getting_started:
-          name: Alustamine
-        community:
-          name: Kogukond
-        trust_level:
-          name: Usaldustase
-        other:
-          name: Muu
-        posting:
-          name: Postitan
-    google_search: |
-      <h3>Otsi Google abil</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>
-    tagging:
-      sort_by_name: "nimi"
-      topics:
-        bottom:
-          unread: "Lugemata teemasid rohkem ei ole"

config/locales/client.fa_IR.yml

@@ -207,8 +207,6 @@ fa_IR:
     undo: "برگردانی"
     revert: "برگشت"
     failed: "ناموفق"
-    switch_to_anon: "حالت ناشناس "
-    switch_from_anon: "از حالت ناشناس خارج شدن"
     banner:
       close: "این سردر را رد بده."
       edit: "این بنر را ویرایش کنید >>"
@@ -306,18 +304,18 @@ fa_IR:
           title: "بی صدا شد"
           description: "با ارسال شدن موضوعات جدید در این گروه شما اعلانی دریافت نمی‌کنید."
     user_action_groups:
-      '1': "پسندهای داده شده"
+      "1": "پسندهای داده شده"
-      '2': "پسندهای دریافت شده"
+      "2": "پسندهای دریافت شده"
-      '3': "نشانک‌ها"
+      "3": "نشانک‌ها"
-      '4': "موضوعات"
+      "4": "موضوعات"
-      '5': "پاسخ ها"
+      "5": "پاسخ ها"
-      '6': "واکنش"
+      "6": "واکنش"
-      '7': "اشاره‌ها"
+      "7": "اشاره‌ها"
-      '9': "نقل‌قول‌ها"
+      "9": "نقل‌قول‌ها"
-      '11': "ویرایش‌ها"
+      "11": "ویرایش‌ها"
-      '12': "ارسال موارد"
+      "12": "ارسال موارد"
-      '13': "صندوق دریافت"
+      "13": "صندوق دریافت"
-      '14': "در انتظار"
+      "14": "در انتظار"
     categories:
       all: "همهٔ دسته‌بندی ها"
       all_subcategories: "همه"
@@ -387,10 +385,10 @@ fa_IR:
         disable: "غیرفعال کردن اعلانات"
         enable: "فعال کردن اعلانات"
         each_browser_note: "نکته: شما باید این تنظیمات را در هر مرورگری که استفاده میکنید تغییر دهید."
-      dismiss_notifications: "علامت گذاری همه به عنوان خوانده شده"
       dismiss_notifications_tooltip: "علامت گذاری همه اطلاعیه های خوانده نشده به عنوان خوانده شده"
       disable_jump_reply: "بعد از پاسخ من به پست من پرش نکن"
       dynamic_favicon: " تعداد موضوعات جدید یا بروز شده را روی آیکون مرورگر نمایش بده"
+      edit_history_public: "اجازه بده کاربران دیگر اصلاحات نوشته مرا ببینند"
       external_links_in_new_tab: "همهٔ پیوندهای برون‌رو را در یک تب جدید باز کن"
       enable_quoting: "فعال کردن نقل قول گرفتن از متن انتخاب شده"
       change: "تغییر"
@@ -403,7 +401,6 @@ fa_IR:
       suspended_reason: "دلیل: "
       github_profile: "Github"
       watched_categories: "تماشا شده"
-      watched_categories_instructions: "شما به صورت خودکار تمام نوشته‌های این دسته را مشاهده‌ خواهید کرد. به شما تمام عناوین و نوشته‌‌های جدید اطلاع رسانی خواهد شد، و تعداد نوشته‌های جدید هر عنوان در کنار آن نمایش داده می‌شود."
       tracked_categories: "پی‌گیری شده"
       tracked_categories_instructions: "شما به صورت خودکار تمام عناوین جدید در این دسته را پیگیری خواهید کرد. تعداد نوشته های جدید در کنار عنواین نمایش داده می‌شود."
       muted_categories: "بی صدا شد"
@@ -749,7 +746,6 @@ fa_IR:
       saved_local_draft_tip: "ذخیره سازی به صورت محلی"
       similar_topics: "موضوع شما شبیه است به..."
       drafts_offline: "پیش نویس آنلاین"
-      group_mentioned: "با استفاده از {{group}}, شما اگاه میکنید <a href='{{group_link}}'>{{count}} اشخاص</a>."
       error:
         title_missing: "سرنویس الزامی است"
         title_too_short: "سرنویس دست‌کم باید {{min}} نویسه باشد"
@@ -830,7 +826,6 @@ fa_IR:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Earned '{{description}}'</p>"
       alt:
         mentioned: "اشاره شده توسط"
@@ -1000,20 +995,20 @@ fa_IR:
         position: "نوشته %{current} از %{total}"
       notifications:
         reasons:
-          '3_6': 'شما آگاه‌سازی‌ها را دریافت خواهید کرد، زیرا شما در حال مشاهده ی این  دسته بندی هستید.'
+          "3_6": 'شما آگاه‌سازی‌ها را دریافت خواهید کرد، زیرا شما در حال مشاهده ی این  دسته بندی هستید.'
-          '3_5': 'شما آگاه‌سازی‌ها را دریافت خواهید کرد، زیرا تماشای خودکار این موضوع را آغاز کرده‌اید.'
+          "3_5": 'شما آگاه‌سازی‌ها را دریافت خواهید کرد، زیرا تماشای خودکار این موضوع را آغاز کرده‌اید.'
-          '3_2': 'شما آگاه سازی دریافت می کنید زیرا در حال مشاهده این جستار هستید.'
+          "3_2": 'شما آگاه سازی دریافت می کنید زیرا در حال مشاهده این جستار هستید.'
-          '3_1': 'از آنجا که این موضوع را ساخته‌اید، از رویدادهای آن آگاه خواهید شد.'
+          "3_1": 'از آنجا که این موضوع را ساخته‌اید، از رویدادهای آن آگاه خواهید شد.'
-          '3': 'از آنجا که این موضوع را تماشا می‌کنید، از رویدادهای آن آگاه خواهید شد.'
+          "3": 'از آنجا که این موضوع را تماشا می‌کنید، از رویدادهای آن آگاه خواهید شد.'
-          '2_8': 'شما آگاه سازی دریافت خواهید کرد چرا که شما این دسته بندی را پی گیری می کنید.'
+          "2_8": 'شما آگاه سازی دریافت خواهید کرد چرا که شما این دسته بندی را پی گیری می کنید.'
-          '2_4': 'از آنجا که به این جستار پاسخ فرستادید، از رویدادهای آن آگاه خواهید شد.'
+          "2_4": 'از آنجا که به این جستار پاسخ فرستادید، از رویدادهای آن آگاه خواهید شد.'
-          '2_2': 'از آنجا که این موضوع را دنبال می‌کنید، از رویدادهای آن آگاه خواهید شد.'
+          "2_2": 'از آنجا که این موضوع را دنبال می‌کنید، از رویدادهای آن آگاه خواهید شد.'
-          '2': 'شما اطلاعیه ای دریافت خواهید کرد چون  <a href="/users/{{username}}/preferences">این موضوع را مطالعه می نمایید</a>.'
+          "2": 'شما اطلاعیه ای دریافت خواهید کرد چون  <a href="/users/{{username}}/preferences">این موضوع را مطالعه می نمایید</a>.'
-          '1_2': 'در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد.'
+          "1_2": 'در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد.'
-          '1': 'در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد.'
+          "1": 'در صورتی که فردی با @name به شما اشاره کند یا به شما پاسخی دهد به شما اطلاع داده خواهد شد.'
-          '0_7': 'شما تمام آگاه سازی های این دسته بندی را نادیده گرفته اید'
+          "0_7": 'شما تمام آگاه سازی های این دسته بندی را نادیده گرفته اید'
-          '0_2': 'شما کل آگاه سازی های این جستار را نادیده گرفته اید'
+          "0_2": 'شما کل آگاه سازی های این جستار را نادیده گرفته اید'
-          '0': 'شما تمام آگاه سازی های این جستار را نادیده گرفته اید'
+          "0": 'شما تمام آگاه سازی های این جستار را نادیده گرفته اید'
         watching_pm:
           title: "در حال مشاهده"
           description: "هر پاسخ جدید به این پیام به اطلاع شما خواهد رسید، و تعداد پاسخ‌های جدید نیز نمایش داده خواهد شد."
@@ -1096,8 +1091,6 @@ fa_IR:
         no_banner_exists: "هیچ مبحث سرصفحه ای وجود ندارد."
         banner_exists: "یک مبحث سرصفحه ای <strong class='badge badge-notification unread'> هست </strong> در حال حاضر."
       inviting: "فراخوانی..."
-      automatically_add_to_groups_optional: "این دعوتنامه دارای دسترسی به این گروه ها است : (اختیاری٬ فقط ادمین)"
-      automatically_add_to_groups_required: "این دعوتنامه دارای دسترسی به این گروه ها است : (<b>Required</b>, admin only)"
       invite_private:
         title: 'دعوت به پیام خصوصی'
         email_or_username: "دعوتنامه ی ایمیل یا نام کاربر"
@@ -1448,10 +1441,10 @@ fa_IR:
     posts_long: "این موضوع {{number}} نوشته دارد"
     posts_likes_MF: |
       این موضوع است {count, plural, one {1 reply} other {# replies}} {ratio, select,
-        low {with a high like to post ratio}
+      low {with a high like to post ratio}
-        med {with a very high like to post ratio}
+      med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
+      high {with an extremely high like to post ratio}
-        other {}}
+      other {}}
     original_post: "نوشته اصلی"
     views: "نمایش‌ها"
     views_lowercase:
@@ -2330,95 +2323,3 @@ fa_IR:
           label: "جدید:"
           add: "افزودن"
           filter: "جستجو (آدرس یا آدرس خارجی)"
-    lightbox:
-      download: "دریافت"
-    search_help:
-      title: 'کمک جستجو'
-    keyboard_shortcuts_help:
-      title: 'میانبر‌های صفحه کلید'
-      jump_to:
-        title: 'بپر به'
-        home: '<b>g</b>, <b>h</b> خانه'
-        latest: '<b>g</b>, <b>l</b>آخرین'
-        new: '<b>g</b>, <b>n</b> جدید'
-        unread: '<b>g</b>, <b>u</b> خوانده نشده'
-        categories: '<b>g</b>, <b>c</b> دسته بندی ها'
-        top: '<b>g</b>, <b>t</b> بالا ترین'
-        bookmarks: '<b>g</b>, <b>h</b> نشانک‌ها'
-        profile: '<b>g</b>, <b>p</b> پروفایل'
-        messages: '<b>g</b>, <b>m</b> پیام ها'
-      navigation:
-        title: 'راهبری'
-        jump: '<b>#</b> رفتن به نوشته #'
-        back: 'برگشت'
-        up_down: '<b>k</b>/<b>j</b> انتقال انتخاب شده &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> باز کردن موضوع انتخاب شده'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> بخش قبلی/بعدی'
-      application:
-        title: 'نرم‌افزار'
-        create: '<b>c</b> ساختن یک موضوع جدید'
-        notifications: '<b>n</b> باز کردن آگاه‌سازی‌ها'
-        hamburger_menu: '<b>=</b> باز کردن منوی همبرگری'
-        user_profile_menu: '<b>p</b> باز کردن منوی کاربران'
-        show_incoming_updated_topics: '<b>.</b> نمایش موضوعات بروز شده'
-        search: '<b>/</b> جستجو'
-        help: '<b>?</b> باز کردن راهنمای کیبورد'
-        dismiss_new_posts: '<b>x</b>, <b>r</b>بستن جدید/نوشته ها '
-        dismiss_topics: '<b>x</b>, <b>t</b> بستن موضوعات'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> خروج'
-      actions:
-        title: 'اقدامات'
-        bookmark_topic: '<b>f</b> تعویض نشانک موضوع'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> سنجاق /لغو سنجاق موضوع'
-        share_topic: '<b>shift</b>+<b>s</b> اشتراک گذاری نوشته'
-        share_post: 'به اشتراک‌گذاری نوشته'
-        reply_as_new_topic: '<b>t</b> پاسخگویی به عنوان یک موضوع لینک شده'
-        reply_topic: '<b>shift</b>+<b>r</b> پاسخ به موضوع'
-        reply_post: '<b>r</b> پاسخ به نوشته'
-        quote_post: 'نقل‌قول نوشته'
-        like: '<b>l</b> پسندیدن نوشته'
-        flag: '<b>!</b> پرچم‌گذاری نوشته'
-        bookmark: '<b>b</b> نشانک‌گذاری نوشته'
-        edit: '<b>e</b> ویرایش نوشته'
-        delete: '<b>d</b> پاک کردن نوشته'
-        mark_muted: '<b>m</b>, <b>m</b> بی صدا کردن موضوع'
-        mark_regular: '<b>m</b>, <b>r</b> تنظیم ( پیش فرض) موضوع'
-        mark_tracking: 'b>m</b>, <b>t</b> پیگری جستار'
-        mark_watching: '<b>m</b>, <b>w</b> مشاهده موضوع'
-    badges:
-      title: مدال‌ها
-      badge_count:
-        other: "%{count} مدال"
-      more_badges:
-        other: "+%{count} بیش‌تر"
-      granted:
-        other: "%{count} اعطا شد"
-      select_badge_for_title: انتخاب یک مدال برای استفاده در عنوان خود
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: شروع
-        community:
-          name: انجمن
-        trust_level:
-          name: سطح اعتماد
-        other:
-          name: دیگر
-        posting:
-          name: در حال نوشتن
-    google_search: |
-      <h3>جستجو با گوگل</h3>
-
-      <p>
-
-      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-
-      <input type="text" id='user-query' value="">
-
-      <input type='hidden' id='google-query' name="q">
-
-      <button class="btn btn-primary">گوگل</button>
-
-      </form>
-
-      </p>

config/locales/client.fi.yml

@@ -69,7 +69,7 @@ fi:
         almost_x_years:
           one: "1 v"
           other: "%{count} v"
-        date_month: "D. MMMM[ta]"
+        date_month: "D. MMM"
         date_year: "MMM -YY"
       medium:
         x_minutes:
@@ -117,7 +117,9 @@ fi:
       private_topic: "teki ketjusta yksityisen %{when}"
       split_topic: "pilkkoi tämän ketjun %{when}"
       invited_user: "kutsui käyttäjän %{who} %{when}"
+      invited_group: "kutsui käyttäjän %{who} %{when}"
       removed_user: "poisti käyttäjän %{who} %{when}"
+      removed_group: "poisti käyttäjän %{who} %{when}"
       autoclosed:
         enabled: 'sulki %{when}'
         disabled: 'avasi %{when}'
@@ -253,7 +255,7 @@ fi:
     undo: "Peru"
     revert: "Palauta"
     failed: "Epäonnistui"
-    switch_to_anon: "Anonyymi tila"
+    switch_to_anon: "Siirry anonyymitilaan"
     switch_from_anon: "Poistu anonyymitilasta"
     banner:
       close: "Sulje tämä banneri."
@@ -280,7 +282,7 @@ fi:
       delete_prompt: "Haluatko todella poistaa käyttäjän <b>%{username}</b>? Kaikki hänen kirjoittamansa viestit poistetaan. Lisäksi hänen sähköposti- ja IP-osoitteillensa laitetaan esto."
       approval:
         title: "Viesti odottaa hyväksyntää"
-        description: "Olemme vastaanottaneet viestisi, mutta se täytyy vielä hyväksyä ennen, kuin se näytetään sivustolla. Ole kärsivällinen."
+        description: "Viestisi saapui perille, mutta valvojan on vielä hyväksyttävä se, jotta se näkyy sivustolla. Ole kärsivällinen."
         pending_posts:
           one: "Sinulla on <strong>1</strong> odottava viesti."
           other: "Sinulla on <strong>{{count}}</strong> odottavaa viestiä."
@@ -352,6 +354,9 @@ fi:
         watching:
           title: "Tarkkaillut"
           description: "Saat ilmoituksen uusista viesteistä jokaisessa viestiketjussa, ja uusien vastausten lukumäärä näytetään."
+        watching_first_post:
+          title: "Tarkkaillaan uusia ketjuja"
+          description: "Saat ilmoituksen vain ketjujen ensimmäisistä viesteistä tässä ryhmässä."
         tracking:
           title: "Seurannassa"
           description: "Saat ilmoituksen, jos joku mainitsee @nimesi tai vastaa sinulle, ja uusien vastausten lukumäärä näytetään."
@@ -362,18 +367,18 @@ fi:
           title: "Vaimennetut"
           description: "Et saa ilmoituksia uusista ketjuista tässä ryhmässä."
     user_action_groups:
-      '1': "Annetut tykkäykset"
+      "1": "Annetut tykkäykset"
-      '2': "Saadut tykkäykset"
+      "2": "Saadut tykkäykset"
-      '3': "Kirjanmerkit"
+      "3": "Kirjanmerkit"
-      '4': "Ketjut"
+      "4": "Ketjut"
-      '5': "Vastauksia"
+      "5": "Vastauksia"
-      '6': "Vastaukset"
+      "6": "Vastaukset"
-      '7': "Viittaukset"
+      "7": "Viittaukset"
-      '9': "Lainaukset"
+      "9": "Lainaukset"
-      '11': "Muokkaukset"
+      "11": "Muokkaukset"
-      '12': "Lähetetyt"
+      "12": "Lähetetyt"
-      '13': "Postilaatikko"
+      "13": "Postilaatikko"
-      '14': "Odottaa"
+      "14": "Odottaa"
     categories:
       all: "kaikki alueet"
       all_subcategories: "kaikki"
@@ -446,10 +451,11 @@ fi:
         disable: "Poista ilmoitukset käytöstä"
         enable: "Näytä ilmoituksia"
         each_browser_note: "Huom: Sinun täytyy vaihtaa tämä asetus kaikissa selaimista, joita käytät."
-      dismiss_notifications: "Merkitse kaikki luetuiksi"
+      dismiss_notifications: "Unohda kaikki"
       dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi"
       disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen"
       dynamic_favicon: "Näytä uusien / päivittyneiden ketjujen määrä selaimen ikonissa"
+      edit_history_public: "Anna muiden nähdä viestieni revisiot"
       external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä"
       enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla"
       change: "vaihda"
@@ -465,18 +471,26 @@ fi:
       mailing_list_mode:
         label: "Postituslistatila"
         enabled: "Ota käyttöön postituslistatila"
-        instructions: |+
+        instructions: |
           Asetus syrjäyttää koosteet tapahtumista.<br />
           Vaimennettujen ketjujen ja alueiden viestejä ei sisällytetä sähköposteihin.
-
         daily: "Lähetä päivittäin"
         individual: "Lähetä sähköpostia jokaisesta uudesta viestistä"
-        many_per_day: "Lähetä sähköpostia jokaisesta uudesta viestistä (noin {{dailyEmailEstimate}} päivässä)."
+        many_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin {{dailyEmailEstimate}} päivässä)"
-        few_per_day: "Lähetä sähköpostia jokaisesta uudesta viestistä (alle 2 päivässä)."
+        few_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin 2 päivässä)"
+      tag_settings: "Tunnisteet"
+      watched_tags: "Tarkkailtavat"
+      watched_tags_instructions: "Ketjut joilla on joku näistä tunnisteista asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
+      tracked_tags: "Seurattavat"
+      tracked_tags_instructions: "Ketjut joilla on joku näistä tunnisteista asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
+      muted_tags: "Vaimennettavat"
+      muted_tags_instructions: "Et saa ilmoituksia ketjuista, joilla on joku näistä tunnisteista, eivätkä ne näy tuoreimmissa."
       watched_categories: "Tarkkaillut"
-      watched_categories_instructions: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
+      watched_categories_instructions: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien viestien lukumäärä näytetään ketjun otsikon vieressä. "
       tracked_categories: "Seuratut"
       tracked_categories_instructions: "Näiden alueiden kaikki uudet ketjut asetetaan automaattisesti seurantaan. Uusien viestien lukumäärä näytetään ketjun otsikon vieressä."
+      watched_first_post_categories: "Tarkkaillaan uusia ketjuja"
+      watched_first_post_categories_instructions: "Saat ilmoituksen näiden alueiden ketjujen ensimmäisistä viesteistä."
       muted_categories: "Vaimennetut"
       muted_categories_instructions: "Et saa imoituksia uusista viesteistä näillä alueilla, eivätkä ne näy tuoreimmissa."
       delete_account: "Poista tilini"
@@ -489,6 +503,7 @@ fi:
       muted_users: "Vaimennetut"
       muted_users_instructions: "Älä näytä ilmoituksia näiltä käyttäjiltä"
       muted_topics_link: "Näytä vaimennetut ketjut"
+      watched_topics_link: "Näytä tarkkaillut ketjut"
       automatically_unpin_topics: "Poista kiinnitetyn ketjun kiinnitys automaattisesti, kun olen selannut sen loppuun."
       staff_counters:
         flags_given: "hyödyllistä liputusta"
@@ -518,7 +533,7 @@ fi:
         error: "Arvon muuttamisessa tapahtui virhe."
       change_username:
         title: "Vaihda käyttäjätunnus"
-        confirm: "Jos vaihdat käyttäjätunnustasi, kaikki tähän astiset lainaukset viesteistäsi ja @nimen maininnat menevät rikki. Oletko ehdottoman varma, että haluat tehdä näin?"
+        confirm: "Jos vaihdat käyttäjätunnustasi, kaikki aiemmat lainaukset viesteistäsi ja @nimen maininnat menevät rikki. Oletko ehdottoman varma, että haluat tehdä näin?"
         taken: "Pahoittelut, tuo nimi on jo käytössä."
         error: "Käyttäjätunnuksen vaihdossa tapahtui virhe."
         invalid: "Käyttäjätunnus ei kelpaa. Siinä saa olla ainoastaan numeroita ja kirjaimia."
@@ -602,7 +617,7 @@ fi:
         always: "aina"
         never: "ei koskaan"
       email_digests:
-        title: "Jos en käy sivustolla, lähetä minulle kooste suosituista ketjuista ja vastauksista osoitteeseen:"
+        title: "Jos en käy sivustolla, lähetä minulle kooste suosituista ketjuista ja vastauksista"
         every_30_minutes: "puolen tunnin välein"
         every_hour: "tunneittain"
         daily: "päivittäin"
@@ -686,7 +701,7 @@ fi:
         time_read: "lukenut palstaa"
         topic_count:
           one: "avattu ketju"
-          other: "avattua ketjua"
+          other: "luotua ketjua"
         post_count:
           one: "kirjoitettu viesti"
           other: "kirjoitettua viestiä"
@@ -765,9 +780,9 @@ fi:
       enabled: "Sivusto on vain luku -tilassa. Voit jatkaa selailua, mutta vastaaminen, tykkääminen ja muita toimintoja on toistaiseksi poissa käytöstä."
       login_disabled: "Et voi kirjautua sisään, kun sivusto on vain luku -tilassa."
       logout_disabled: "Et voi kirjautua ulos, kun sivusto on vain luku -tilassa."
-    too_few_topics_and_posts_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics} / %{requiredTopics}</strong> ketjua ja <strong>%{currentPosts} / %{requiredPosts}</strong> viestiä. Uudet kävijät tarvitsevat keskusteluita, joita lukea ja joihin vastata."
+    too_few_topics_and_posts_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics} / %{requiredTopics}</strong> ketjua ja <strong>%{currentPosts} / %{requiredPosts}</strong> viestiä. Uusia kävijöitä varten tarvitaan keskusteluita, joita voivat lukea ja joihin vastata."
-    too_few_topics_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics} / %{requiredTopics}</strong> ketjua. Uudet kävijät tarvitsevat keskusteluita, joita lukea ja joihin vastata."
+    too_few_topics_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics} / %{requiredTopics}</strong> ketjua. Uusia kävijöitä varten tarvitaan keskusteluita, joita voivat lukea ja joihin vastata."
-    too_few_posts_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentPosts} / %{requiredPosts}</strong> viestiä. Uudet kävijät tarvitsevat keskusteluita, joita lukea ja joihin vastata."
+    too_few_posts_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentPosts} / %{requiredPosts}</strong> viestiä. Uusia kävijöitä varten tarvitaan keskusteluita, joita voivat lukea ja joihin vastata."
     logs_error_rate_notice:
       reached: "<b>[%{relativeAge}]</b> Virheiden määrä <a href='%{url}' target='_blank'>%{rate}</a> on saavuttanut sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
       exceeded: "<b>[%{relativeAge}]</b> Virheiden määrä <a href='%{url}' target='_blank'>%{rate}</a> on ylittänyt sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
@@ -812,6 +827,7 @@ fi:
       title: "Viesti"
       invite: "Kutsu muita..."
       remove_allowed_user: "Haluatko varmasti poistaa käyttäjän {{name}} tästä keskustelusta?"
+      remove_allowed_group: "Haluatko varmasti poistaa käyttäjän {{name}} tästä viestiketjusta?"
     email: 'Sähköposti'
     username: 'Käyttäjätunnus'
     last_seen: 'Nähty'
@@ -943,6 +959,7 @@ fi:
       quote_text: "Lainaus"
       code_title: "Teksti ilman muotoiluja"
       code_text: "Sisennä teksti neljällä välilyönnillä poistaaksesi automaattisen muotoilun"
+      paste_code_text: "kirjoita tai liitä koodia tähän"
       upload_title: "Liitä"
       upload_description: "kirjoita ladatun tiedoston kuvaus tähän"
       olist_title: "Numeroitu lista"
@@ -969,6 +986,7 @@ fi:
     notifications:
       title: "ilmoitukset @nimeen viittauksista, vastauksista omiin viesteihin ja ketjuihin, viesteistä ym."
       none: "Ilmoitusten lataaminen ei onnistunut."
+      empty: "Ilmoituksia ei löydetty."
       more: "vanhat ilmoitukset"
       total_flagged: "yhteensä liputettuja viestejä"
       mentioned: "<i title='viittasi' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -989,6 +1007,7 @@ fi:
       moved_post: "<i title='siirsi viestin' class='fa fa-sign-out'></i><p><span>{{username}}</span> siirsi {{description}}</p>"
       linked: "<i title='linkkasi viestiin' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='arvomerkki myönnetty' class='fa fa-certificate'></i><p>Ansaitsit '{{description}}'</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Uusi ketju</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} viesti ryhmän {{group_name}} saapuneissa</p>"
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} viestiä ryhmän {{group_name}} saapuneissa</p>"
@@ -1155,7 +1174,7 @@ fi:
       options: "Ketjun asetukset"
       show_links: "näytä tämän ketjun linkit"
       toggle_information: "näytä/kätke ketjun tiedot"
-      read_more_in_category: "Haluatko lukea lisää? Selaile muita ketjuja alueella {{catLink}} tai katsella {{latestLink}}."
+      read_more_in_category: "Haluatko lukea lisää? Selaile muita alueen {{catLink}} ketjuja tai {{latestLink}}."
       read_more: "Haluatko lukea lisää? Selaa aluetta {{catLink}} tai katsele {{latestLink}}."
       read_more_MF: "Sinulla on { UNREAD, plural, =0 {} one { <a href='/unread'>1 ketju</a>, jossa on viestejä } other { <a href='/unread'># ketjua</a>, joissa on viestejä }} { NEW, plural, =0 {} one { {BOTH, select, true{ja } false { } other{}} <a href='/new'>1 uusi</a> ketju} other { {BOTH, select, true{ja } false { } other{}} <a href='/new'># uutta ketjua</a>} } lukematta. Tai {CATEGORY, select, true {selaile aluetta {catLink}} false {katsele {latestLink}.} other {}}"
       browse_all_categories: Selaa keskustelualueita
@@ -1189,20 +1208,21 @@ fi:
         title: muuta sitä, kuinka usein saat muistutuksia tästä ketjusta
         reasons:
           mailing_list_mode: "Olet postituslistatilassa, joten saat sähköpostia tähän ketjuun lähetyistä vastauksista."
-          '3_6': 'Saat ilmoituksia, koska olet asettanut tämän alueen tarkkailuun.'
+          "3_10": 'Saat ilmoituksia, koska tarkkailet tähän ketjuun liittyvää tunnistetta.'
-          '3_5': 'Saat ilmoituksia, koska ketju on asetettu tarkkailuun automaattisesti.'
+          "3_6": 'Saat ilmoituksia, koska olet asettanut tämän alueen tarkkailuun.'
-          '3_2': 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
+          "3_5": 'Saat ilmoituksia, koska ketju on asetettu tarkkailuun automaattisesti.'
-          '3_1': 'Saat ilmoituksia, koska loit tämän ketjun.'
+          "3_2": 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
-          '3': 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
+          "3_1": 'Saat ilmoituksia, koska loit tämän ketjun.'
-          '2_8': 'Saat ilmoituksia, koska olet asettanut tämän alueen seurantaan.'
+          "3": 'Saat ilmoituksia, koska olet asettanut ketjun tarkkailuun.'
-          '2_4': 'Saat ilmoituksia, koska olet kirjoittanut ketjuun.'
+          "2_8": 'Saat ilmoituksia, koska olet asettanut tämän alueen seurantaan.'
-          '2_2': 'Saat ilmoituksia, koska olet asettanut ketjun seurantaan.'
+          "2_4": 'Saat ilmoituksia, koska olet kirjoittanut ketjuun.'
-          '2': 'Saat ilmoituksia, koska <a href="/users/{{username}}/preferences">luet tätä ketjua</a>.'
+          "2_2": 'Saat ilmoituksia, koska olet asettanut ketjun seurantaan.'
-          '1_2': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
+          "2": 'Saat ilmoituksia, koska <a href="/users/{{username}}/preferences">luit ketjua aiemmin</a>.'
-          '1': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
+          "1_2": 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
-          '0_7': 'Et saa mitään ilmoituksia tältä alueelta.'
+          "1": 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.'
-          '0_2': 'Et saa mitään ilmoituksia tästä ketjusta.'
+          "0_7": 'Et saa mitään ilmoituksia tältä alueelta.'
-          '0': 'Et saa mitään ilmoituksia tästä ketjusta.'
+          "0_2": 'Et saa mitään ilmoituksia tästä ketjusta.'
+          "0": 'Et saa mitään ilmoituksia tästä ketjusta.'
         watching_pm:
           title: "Tarkkaile"
           description: "Saat ilmoituksen kaikista uusista vastauksista tässä viestiketjussa ja uusien vastausten lukumäärä näytetään."
@@ -1296,6 +1316,7 @@ fi:
         email_or_username_placeholder: "sähköpostiosoite tai käyttäjänimi"
         action: "Kutsu"
         success: "Käyttäjä on kutsuttu osallistumaan tähän yksityiseen keskusteluun."
+        success_group: "Ryhmä on kutsuttu osallistumaan tähän yksityiseen keskusteluun."
         error: "Pahoittelut, kutsuttaessa tapahtui virhe."
         group_name: "ryhmän nimi"
       controls: "Ketjun hallinta"
@@ -1383,7 +1404,7 @@ fi:
         one: "näytä 1 piilotettu vastaus"
         other: "näytä {{count}} piilotettua vastausta"
       more_links: "{{count}} lisää..."
-      unread: "Viesti on lukematon"
+      unread: "Viesti on lukematta"
       has_replies:
         one: "{{count}} vastaus"
         other: "{{count}} vastausta"
@@ -1621,6 +1642,9 @@ fi:
         watching:
           title: "Tarkkaile"
           description: "Tarkkailet automaattisesti kaikkia uusia ketjuja näillä alueilla. Saat ilmoituksen jokaisesta uudesta viestistä jokaisessa ketjussa ja uusien vastausten lukumäärä näytetään. "
+        watching_first_post:
+          title: "Tarkkaillaan uusia ketjuja"
+          description: "Saat ilmoituksen näille alueille luoduista ketjuista."
         tracking:
           title: "Seuraa"
           description: "Seuraat automaattisesti kaikkia uusia ketjuja näillä alueilla. Saat ilmoituksen, jos joku mainitsee @nimesi tai vastaa sinulle ja uusien vastauksien lukumäärä näytetään."
@@ -1923,7 +1947,10 @@ fi:
       notifications:
         watching:
           title: "Tarkkaile"
-          description: "Tämän tunnisteen ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja uusien ja lukemattomien viestien lukumäärä näytetään ketjujen yhteydessä. "
+          description: "Ketjut joilla on tämä tunniste asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien ja lukemattomien viestien lukumäärä näytetään ketjujen yhteydessä. "
+        watching_first_post:
+          title: "Tarkkaillaan uusia ketjuja"
+          description: "Saat ilmoituksen luoduista ketjuista, joilla on joku näistä tunnisteista."
         tracking:
           title: "Seuraa"
           description: "Tämän tunnisteen ketjut asetetaan automaattisesti seurantaan. Uusien ja lukemattomien viestien lukumäärä näytetään ketjun yhteydessä."
@@ -2098,7 +2125,7 @@ fi:
         refresh: "Lataa uudelleen"
         new: "Uusi"
         selector_placeholder: "syötä käyttäjätunnus"
-        name_placeholder: "Ryhmän nimi, ei välilyöntejä, samt säännöt kuin käyttäjänimillä"
+        name_placeholder: "Ryhmän nimi, ei välilyöntejä, samat säännöt kuin käyttäjänimillä"
         about: "Muokkaa ryhmien jäsenyyksiä ja nimiä täällä"
         group_members: "Ryhmään kuuluvat"
         delete: "Poista"
@@ -2571,7 +2598,7 @@ fi:
         delete_posts_forbidden_because_staff: "Ylläpitäjien ja valvojien kaikkia viestejä ei voi poistaa."
         delete_forbidden:
           one: "Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivä ei voi poistaa)"
-          other: "Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivää ei voi poistaa)"
+          other: "Käyttäjää ei voi poistaa jos hänellä on kirjoitettuja viestejä. Poista viestit ennen käyttäjätilin poistamista. (Yli %{count} päivää vanhoja viestejä ei voi poistaa.)"
         cant_delete_all_posts:
           one: "Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivän vanhoja. (Asetus delete_user_max_post_age)"
           other: "Kaikkia viestejä ei voi poistaa. Jotkin viestit ovat enemmän kuin %{count} päivää vanhoja. (Asetus delete_user_max_post_age)"

config/locales/client.fr.yml

@@ -117,7 +117,9 @@ fr:
       private_topic: "rendre ce sujet privé %{when}"
       split_topic: "a scindé ce sujet %{when}"
       invited_user: "a invité %{who} %{when}"
+      invited_group: "a invité %{who} %{when}"
       removed_user: "a retiré %{who} %{when}"
+      removed_group: "a retiré %{who} %{when}"
       autoclosed:
         enabled: 'fermé %{when}'
         disabled: 'ouvert %{when}'
@@ -200,8 +202,8 @@ fr:
       title: "Sujets similaires"
       pm_title: "Messages Proposés"
     about:
-      simple_title: "A propos"
+      simple_title: "À propos"
-      title: "A propos de %{title}"
+      title: "À propos de %{title}"
       stats: "Statistiques du site"
       our_admins: "Nos administrateurs"
       our_moderators: "Nos modérateurs"
@@ -252,9 +254,8 @@ fr:
     disable: "Désactiver"
     undo: "Annuler"
     revert: "Rétablir"
-    failed: "Echec"
+    failed: "Échec"
-    switch_to_anon: "Mode anonyme"
+    switch_to_anon: "Quitter le mode anonyme"
-    switch_from_anon: "Quitter le mode anonyme"
     banner:
       close: "Ignorer cette bannière."
       edit: "Éditer cette bannière >>"
@@ -352,6 +353,8 @@ fr:
         watching:
           title: "Surveiller"
           description: "Vous serez notifié de chaque nouvelle réponse dans chaque message, et le nombre de nouvelles réponses sera affiché."
+        watching_first_post:
+          description: "Vous serez uniquement notifié du premier message de chaque sujet de ce groupe"
         tracking:
           title: "Suivre"
           description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond, et le nombre de nouvelles réponses sera affiché."
@@ -362,18 +365,18 @@ fr:
           title: "Silencieux"
           description: "Nous ne serez jamais notifié de quoi que ce soit à propos des nouveaux sujets dans ce groupe."
     user_action_groups:
-      '1': "J'aime donnés"
+      "1": "J'aime donnés"
-      '2': "J'aime reçus"
+      "2": "J'aime reçus"
-      '3': "Signets"
+      "3": "Signets"
-      '4': "Sujets"
+      "4": "Sujets"
-      '5': "Réponses"
+      "5": "Réponses"
-      '6': "Réponses"
+      "6": "Réponses"
-      '7': "Mentions"
+      "7": "Mentions"
-      '9': "Citations"
+      "9": "Citations"
-      '11': "Editions"
+      "11": "Éditions"
-      '12': "Eléments envoyés"
+      "12": "Eléments envoyés"
-      '13': "Boîte de réception"
+      "13": "Boîte de réception"
-      '14': "En attente"
+      "14": "En attente"
     categories:
       all: "toutes les catégories"
       all_subcategories: "toutes"
@@ -446,10 +449,10 @@ fr:
         disable: "Désactiver les notifications"
         enable: "Activer les notifications"
         each_browser_note: "Note : Vous devez changer ce paramètre sur chaque navigateur que vous utilisez."
-      dismiss_notifications: "Marquer tout comme lu"
       dismiss_notifications_tooltip: "Marquer comme lues toutes les notifications non lues"
       disable_jump_reply: "Ne pas se déplacer à mon nouveau message après avoir répondu"
       dynamic_favicon: "Faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur"
+      edit_history_public: "Autoriser les autres utilisateurs à consulter les modifications de mes messages."
       external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet"
       enable_quoting: "Proposer la citation du texte surligné"
       change: "modifier"
@@ -470,10 +473,8 @@ fr:
           Les sujets et catégories passés en silencieux ne sont pas cités dans ces courriels.
         daily: "Envoyer des informations quotidiennes"
         individual: "Envoyer un courriel pour chaque nouveau message."
-        many_per_day: "M'en voyer un courriel pour chaque nouveau message (environ {{dailyEmailEstimate}} par jour)."
+      tag_settings: "Tags"
-        few_per_day: "M'envoyer un courriel pour chaque nouveau sujet (moins de 2 par jour)."
       watched_categories: "Surveillés"
-      watched_categories_instructions: "Vous surveillerez automatiquement les nouveaux sujets de ces catégories. Vous serez averti de tous les nouveaux messages et sujets. De plus, le nombre de messages non lus apparaîtra en regard de la liste des sujets."
       tracked_categories: "Suivies"
       tracked_categories_instructions: "Vous allez suivre automatiquement tous les nouveaux sujets dans ces catégories. Le nombre de nouveaux messages apparaîtra à côté du sujet."
       muted_categories: "Désactivés"
@@ -517,7 +518,6 @@ fr:
         error: "Il y avait une erreur lors de la modification de cette valeur."
       change_username:
         title: "Modifier le pseudo"
-        confirm: "Si vous modifiez votre pseudo, toutes les citations de vos messages et toutes les mentions de votre @pseudo seront invalides, et votre historique sera interrompu. Etes-vous vraiment sûr de vouloir continuer ?"
         taken: "Désolé, ce pseudo est déjà pris."
         error: "Il y a eu une erreur lors du changement de votre pseudo."
         invalid: "Ce pseudo est invalide. Il ne doit être composé que de lettres et de chiffres."
@@ -601,7 +601,6 @@ fr:
         always: "toujours"
         never: "jamais"
       email_digests:
-        title: "Lorsque je ne visite pas le site, m'envoyer un résumé des sujets tendances et les \"répondre à\" me concernant à :"
         every_30_minutes: "toutes les 30 minutes"
         every_hour: "toutes les heures"
         daily: "quotidien"
@@ -941,6 +940,7 @@ fr:
       quote_text: "Citation"
       code_title: "Texte préformaté"
       code_text: "texte préformaté indenté par 4 espaces"
+      paste_code_text: "saisir ou coller le code ici"
       upload_title: "Envois de fichier"
       upload_description: "saisir ici la description de votre fichier"
       olist_title: "Liste numérotée"
@@ -1154,7 +1154,7 @@ fr:
       show_links: "afficher les liens dans ce sujet"
       toggle_information: "afficher les détails de ce sujet"
       read_more_in_category: "Vous voulez en lire plus ? Afficher d'autres sujets dans {{catLink}} ou {{latestLink}}."
-      read_more: "Vous voulez en lire plus? {{catLink}} or {{latestLink}}."
+      read_more: "Vous voulez en lire plus ? {{catLink}} or {{latestLink}}."
       read_more_MF: "Il y { UNREAD, plural, =0 {} one { <a href='/unread'>a 1 sujet non lu</a> } other { <a href='/unread'>a # sujets non lus</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{et } false {a } other{}} <a href='/new'>1 nouveau</a> sujet} other { {BOTH, select, true{et } false {a } other{}} <a href='/new'># nouveaux</a> sujets} } restant, ou {CATEGORY, select, true {consulter les autres sujets dans {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Voir toutes les catégories
       view_latest_topics: voir les derniers sujets
@@ -1187,20 +1187,20 @@ fr:
         title: Modifier la fréquence de vos notifications concernant ce sujet
         reasons:
           mailing_list_mode: "Vous avez activé le mode mailing list, vous serez donc notifié des réponses à ce sujet par courriel."
-          '3_6': 'Vous recevrez des notifications parce que vous surveillez cette catégorie.'
+          "3_6": 'Vous recevrez des notifications parce que vous surveillez cette catégorie.'
-          '3_5': 'Vous recevrez des notifications parce que vous avez commencé à surveiller ce sujet automatiquement.'
+          "3_5": 'Vous recevrez des notifications parce que vous avez commencé à surveiller ce sujet automatiquement.'
-          '3_2': 'Vous recevrez des notifications car vous surveillez ce sujet.'
+          "3_2": 'Vous recevrez des notifications car vous surveillez ce sujet.'
-          '3_1': 'Vous recevrez des notifications car vous avez créé ce sujet.'
+          "3_1": 'Vous recevrez des notifications car vous avez créé ce sujet.'
-          '3': 'Vous recevrez des notifications car vous surveillez ce sujet.'
+          "3": 'Vous recevrez des notifications car vous surveillez ce sujet.'
-          '2_8': 'Vous recevrez des notifications parce que vous suivez cette catégorie.'
+          "2_8": 'Vous recevrez des notifications parce que vous suivez cette catégorie.'
-          '2_4': 'Vous recevrez des notifications car vous avez écrit une réponse dans ce sujet.'
+          "2_4": 'Vous recevrez des notifications car vous avez écrit une réponse dans ce sujet.'
-          '2_2': 'Vous recevrez des notifications car vous suivez ce sujet.'
+          "2_2": 'Vous recevrez des notifications car vous suivez ce sujet.'
-          '2': 'Vous recevrez des notifications car vous <a href="/users/{{username}}/preferences">avez lu ce sujet</a>.'
+          "2": 'Vous recevrez des notifications car vous <a href="/users/{{username}}/preferences">avez lu ce sujet</a>.'
-          '1_2': 'Vous serez averti si quelqu''un mentionne votre @pseudo ou vous répond.'
+          "1_2": 'Vous serez averti si quelqu''un mentionne votre @pseudo ou vous répond.'
-          '1': 'Vous serez averti si quelqu''un mentionne votre @pseudo ou vous répond.'
+          "1": 'Vous serez averti si quelqu''un mentionne votre @pseudo ou vous répond.'
-          '0_7': 'Vous ignorez toutes les notifications de cette catégorie.'
+          "0_7": 'Vous ignorez toutes les notifications de cette catégorie.'
-          '0_2': 'Vous ignorez toutes les notifications de ce sujet.'
+          "0_2": 'Vous ignorez toutes les notifications de ce sujet.'
-          '0': 'Vous ignorez toutes les notifications de ce sujet.'
+          "0": 'Vous ignorez toutes les notifications de ce sujet.'
         watching_pm:
           title: "Suivre attentivement"
           description: "Vous serez notifié de chaque nouvelle réponse dans ce message, et le nombre de nouvelles réponses apparaîtra."
@@ -1294,6 +1294,7 @@ fr:
         email_or_username_placeholder: "adresse de courriel ou @pseudo"
         action: "Inviter"
         success: "Nous avons invité cet utilisateur à participer à cette discussion."
+        success_group: "Nous avons invité ce groupe à participer à cette discussion."
         error: "Désolé, il y a eu une erreur lors de l'invitation de cet utilisateur."
         group_name: "nom du groupe"
       controls: "Actions sur le sujet"
@@ -1736,7 +1737,7 @@ fr:
         help: "sujets avec des messages récents"
       hot:
         title: "Populaires"
-        help: "un selection de sujets populaires"
+        help: "une sélection de sujets populaires"
       read:
         title: "Lus"
         help: "sujets que vous avez lus, dans l'ordre de dernière lecture"
@@ -1865,7 +1866,7 @@ fr:
         one: "A reçu ce badge 1 fois"
         other: "A reçu ce badge %{count} fois"
       granted_on: "Accordé le %{date}"
-      others_count: "Autres yant ce badge (%{count})"
+      others_count: "Autres utilisateurs avec ce badge (%{count})"
       title: Badges
       allow_title: "titre disponible"
       multiple_grant: "donné plusieurs fois"
@@ -1894,11 +1895,11 @@ fr:
     google_search: |
       <h3>Rechercher avec Google</h3>
       <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
+      <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
+      <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
+      <button class="btn btn-primary">Google</button>
-        </form>
+      </form>
       </p>
     tagging:
       all_tags: "Tous les tags"
@@ -1924,7 +1925,12 @@ fr:
           description: "Vous serez automatiquement abonné à l'ensemble des nouvaux sujets avec ce tag. Vous serez notifié des nouveaux sujets et messages, et le compteur des sujets non-lus apparaîtra à coté des sujets."
         tracking:
           title: "Suivi"
+          description: "Vous allez suivre automatiquement tous les nouveaux sujets dans ce tag. Le nombre de messages nouveaux et non lus apparaîtra à côté du sujet."
+        regular:
+          title: "Habitué"
+          description: "Vous serez notifié si un utilisateur mentionne votre @pseudo ou réponds à votre message."
         muted:
+          title: "Silencieux"
           description: "Vous ne recevrez aucune notification sur des nouveaux sujets dans ce tag, et ils n'apparaitront pas sur mon onglet non-lus."
       groups:
         about: "Ajout des tags aux groupes pour les gérer plus facilement."
@@ -1932,6 +1938,8 @@ fr:
         tags_label: "Tags dans ce groupe :"
         parent_tag_label: "Tag parent :"
         parent_tag_placeholder: "Facultatif"
+        save: "Sauvegarder"
+        delete: "Supprimer"
       topics:
         none:
           unread: "Vous n'avez aucun sujet non lu."
@@ -1939,8 +1947,24 @@ fr:
           read: "Vous n'avez lu aucun sujet pour le moment."
           posted: "Vous n'avez écrit aucun message pour le moment."
           latest: "Il n'y a pas de sujets récents."
+          hot: "Il n'y a pas de sujets populaires."
+          bookmarks: "Vous n'avez pas encore ajouté de sujet à vos signets"
+          top: "Il n'y a pas de meilleurs sujets."
+          search: "Il n'y a pas de résultats de recherche."
+        bottom:
+          latest: "Il n'y a plus de sujets récents."
+          hot: "Il n'y a plus de sujets populaires."
+          posted: "Il n'y a plus de sujets publiés."
+          read: "Il n'y a plus de sujets lus."
+          new: "Il n'y a plus de nouveaux sujets."
+          unread: "Il n'y a plus de sujets non lus."
+          top: "Il n'y a plus de meilleurs sujets."
+          bookmarks: "Il n'y a plus de sujets dans vos signets."
+          search: "Il n'y a plus de résultats de recherche."
     invite:
       custom_message: "Rendez votre invitation plus personnelle en écrivant un"
+      custom_message_link: "message personnalisé"
+      custom_message_placeholder: "Entrez votre message personnalisé"
   admin_js:
     type_to_filter: "Commencez à taper pour filtrer..."
     admin:

config/locales/client.gl.yml

@@ -247,8 +247,6 @@ gl:
     undo: "Desfacer"
     revert: "Reverter"
     failed: "Fallou"
-    switch_to_anon: "Modo anónimo"
-    switch_from_anon: "Saír do Modo anónimo"
     banner:
       close: "Desbotar este báner."
       edit: "Editar este báner »"
@@ -354,18 +352,18 @@ gl:
           title: "Silenciado"
           description: "Non recibirás notificacións de nada relacionado con novos temas neste grupo."
     user_action_groups:
-      '1': "Gústames dados"
+      "1": "Gústames dados"
-      '2': "Gústames recibidos"
+      "2": "Gústames recibidos"
-      '3': "Marcadores"
+      "3": "Marcadores"
-      '4': "Temas"
+      "4": "Temas"
-      '5': "Respostas"
+      "5": "Respostas"
-      '6': "Respostas"
+      "6": "Respostas"
-      '7': "Mencións"
+      "7": "Mencións"
-      '9': "CItas"
+      "9": "CItas"
-      '11': "Edicións"
+      "11": "Edicións"
-      '12': "Enviar elementos"
+      "12": "Enviar elementos"
-      '13': "Caixa de entrada"
+      "13": "Caixa de entrada"
-      '14': "Pendente"
+      "14": "Pendente"
     categories:
       all: "todas as categorías"
       all_subcategories: "todo"
@@ -438,10 +436,10 @@ gl:
         disable: "Desactivar as notificacións"
         enable: "Activar as notificacións"
         each_browser_note: "Nota: Tes que cambiar este axuste en cadanseu navegador que utilices."
-      dismiss_notifications: "Marcar todas como lidas"
       dismiss_notifications_tooltip: "Marcar todas notificacións sen ler como lidas"
       disable_jump_reply: "Non saltar á miña publicación despois de que responda"
       dynamic_favicon: "Amosar o número de temas novos / actualizados na icona do navegador"
+      edit_history_public: "Permitirlles a outros usuarios ver as revisións das miñas publicacións"
       external_links_in_new_tab: "Abrir todas as ligazóns externas nunha nova lapela"
       enable_quoting: "Activar as comiñas de resposta para o texto realzado"
       change: "cambiar"
@@ -454,7 +452,6 @@ gl:
       suspended_reason: "Razón:"
       github_profile: "Github"
       watched_categories: "Visto"
-      watched_categories_instructions: "Verás automaticamente todos os temas novos nestas categorías. Notificaránseche todas as novas publicacións e temas, e o número de novas publicacións aparecerá tamén preto do tema."
       tracked_categories: "Seguido"
       tracked_categories_instructions: "Seguirás automaticamente todos os temas novos nestas categorías. Un número de novas publicacións aparecerá preto do tema."
       muted_categories: "Silenciado"
@@ -836,7 +833,6 @@ gl:
       saved_local_draft_tip: "gardado localmente"
       similar_topics: "O teu tema é semellante a..."
       drafts_offline: "borradores sen conexión"
-      group_mentioned: "Usando {{group}}, vas enviar a notificación a <a href='{{group_link}}'>{{count}} persoas</a>."
       error:
         title_missing: "O título é obrigatorio"
         title_too_short: "O título debe ter alomenos {{min}} caracteres"
@@ -922,7 +918,6 @@ gl:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> aceptou o teu convite</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moveu {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Obtiveches «{{description}}»</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensaxe na caixa do correo de {{group_name}} </p>"
@@ -1113,20 +1108,20 @@ gl:
         position: "publicación %{current} de %{total}"
       notifications:
         reasons:
-          '3_6': 'Recibirás notificacións porque estás vendo esta categoría.'
+          "3_6": 'Recibirás notificacións porque estás vendo esta categoría.'
-          '3_5': 'Recibirás notificacións porque comezaches a ver este tema automaticamente.'
+          "3_5": 'Recibirás notificacións porque comezaches a ver este tema automaticamente.'
-          '3_2': 'Recibirás notificacións porque estás vendo este tema.'
+          "3_2": 'Recibirás notificacións porque estás vendo este tema.'
-          '3_1': 'Recibirás notificacións por ser o creador deste tema.'
+          "3_1": 'Recibirás notificacións por ser o creador deste tema.'
-          '3': 'Recibirás notificacións porque estás vendo este tema.'
+          "3": 'Recibirás notificacións porque estás vendo este tema.'
-          '2_8': 'Recibirás notificacións porque segues esta categoría.'
+          "2_8": 'Recibirás notificacións porque segues esta categoría.'
-          '2_4': 'Recibirás notificacións porque publicaches unha resposta neste tema.'
+          "2_4": 'Recibirás notificacións porque publicaches unha resposta neste tema.'
-          '2_2': 'Recibirás notificacións porque segues este tema.'
+          "2_2": 'Recibirás notificacións porque segues este tema.'
-          '2': 'Recibirás notificacións porque <a href="/users/{{username}}/preferences">liches este tema</a>.'
+          "2": 'Recibirás notificacións porque <a href="/users/{{username}}/preferences">liches este tema</a>.'
-          '1_2': 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
+          "1_2": 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
-          '1': 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
+          "1": 'Notificarémosche se alguén menciona o teu @nome ou che responde.'
-          '0_7': 'Estás ignorando todas as notificacións desta categoría.'
+          "0_7": 'Estás ignorando todas as notificacións desta categoría.'
-          '0_2': 'Estás ignorando todas as notificacións deste tema.'
+          "0_2": 'Estás ignorando todas as notificacións deste tema.'
-          '0': 'Estás ignorando todas as notificacións deste tema.'
+          "0": 'Estás ignorando todas as notificacións deste tema.'
         watching_pm:
           title: "Ver"
           description: "Recibirás notificacións de cada resposta a esta mensaxe e aparecerá o número de novas respostas."
@@ -1211,8 +1206,6 @@ gl:
         no_banner_exists: "Non hai tema para o báner."
         banner_exists: "<strong class='badge badge-notification unread'>Hai</strong> actualmente un tema para o báner."
       inviting: "Convidando..."
-      automatically_add_to_groups_optional: "Este convite tamén inclúe o acceso a estes grupos: (opcional, só administradores)"
-      automatically_add_to_groups_required: "Este convite tamén inclúe o acceso a estes grupos: (<b>Obrigatorio</b>, só administradores)"
       invite_private:
         title: 'Convidar á mensaxe'
         email_or_username: "Nome do usuario ou correo-e do convidado"
@@ -1607,10 +1600,10 @@ gl:
     posts_long: "hai {{number}} publicacións neste tema"
     posts_likes_MF: |
       Este tema ten {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
-        low {cun alto índice de gústames}
+      low {cun alto índice de gústames}
-        med {cun moi alto índice de gústames}
+      med {cun moi alto índice de gústames}
-        high {cun extremadamente alto índice de gústames}
+      high {cun extremadamente alto índice de gústames}
-        other {}}
+      other {}}
     original_post: "Publicación orixinal"
     views: "Vistas"
     views_lowercase:
@@ -2547,94 +2540,3 @@ gl:
           label: "Novo:"
           add: "Engadir"
           filter: "Buscar (URLou URL externa)"
-    lightbox:
-      download: "descargar"
-    search_help:
-      title: 'Buscar axuda'
-    keyboard_shortcuts_help:
-      title: 'Atallos do teclado'
-      jump_to:
-        title: 'Ir a'
-        home: '<b>g</b>, <b>h</b> Inicio'
-        latest: '<b>g</b>, <b>l</b> Último'
-        new: '<b>g</b>, <b>n</b> Novo'
-        unread: '<b>g</b>, <b>u</b> Sen ler'
-        categories: '<b>g</b>, <b>c</b> Categorías'
-        top: '<b>g</b>, <b>t</b> Arriba'
-        bookmarks: '<b>g</b>, <b>b</b> Marcadores'
-        profile: '<b>g</b>, <b>p</b> Perfil'
-        messages: '<b>g</b>, <b>m</b> Mensaxes'
-      navigation:
-        title: 'Navegación'
-        jump: '<b>#</b> Ir á publicación #'
-        back: '<b>u</b> Volver'
-        up_down: '<b>k</b>/<b>j</b> Mover selección &uarr; &darr;'
-        open: '<b>o</b> ou <b>Intro</b> Abrir tema seleccionado'
-        next_prev: '<b>maiús.</b>+<b>j</b>/<b>maiús.</b>+<b>k</b> Sección Seguinte/Anterior'
-      application:
-        title: 'Aplicativo'
-        create: '<b>c</b> Crear un novo tema'
-        notifications: '<b>n</b> Abrir notificacións'
-        hamburger_menu: '<b>=</b> Abrir o menú hamburguesa'
-        user_profile_menu: '<b>p</b> Abrir o menú do usuario'
-        show_incoming_updated_topics: '<b>.</b> Amosar temas actualizados'
-        search: '<b>/</b> Buscar'
-        help: '<b>?</b> Abrir a axuda do teclado'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Desbotar Novas/Publicacións'
-        dismiss_topics: '<b>x</b>, <b>t</b> Desbotar temas'
-        log_out: '<b>maiús.</b>+<b>z</b> <b>maiús.</b>+<b>z</b> Saír da sesión'
-      actions:
-        title: 'Accións'
-        bookmark_topic: '<b>f</b> Cambiar marcar tema'
-        pin_unpin_topic: '<b>Maiús</b>+<b>p</b> Pegar/Despegar tema'
-        share_topic: '<b>maiús.</b>+<b>s</b> Compartir tema'
-        share_post: '<b>s</b> Compartir publicación'
-        reply_as_new_topic: '<b>t</b> Responder como tema ligado'
-        reply_topic: '<b>maiús.</b>+<b>r</b> Responder o tema'
-        reply_post: '<b>r</b> Responder a publicación'
-        quote_post: '<b>q</b> Citar publicación'
-        like: '<b>l</b> Gústame a publicación'
-        flag: '<b>!</b> Denunciar publicación'
-        bookmark: '<b>b</b> Marcar publicación'
-        edit: '<b>e</b> Editar publicación'
-        delete: '<b>d</b> Eliminar publicación'
-        mark_muted: '<b>m</b>, <b>m</b> Silenciar tema'
-        mark_regular: '<b>m</b>, <b>r</b> Tema normal (predeterminado)'
-        mark_tracking: '<b>m</b>, <b>t</b> Seguir tema'
-        mark_watching: '<b>m</b>, <b>w</b> Ver tema'
-    badges:
-      earned_n_times:
-        one: "Conseguiu esta insignia unha vez"
-        other: "Conseguiu esta insignia %{count} veces"
-      title: Insignias
-      badge_count:
-        one: "1 insignia"
-        other: "%{count} insignias"
-      more_badges:
-        one: "1 máis"
-        other: "%{count} máis"
-      granted:
-        one: "1 concedido"
-        other: "%{count} concedidos"
-      select_badge_for_title: Selecciona insignia para usar como o teu título
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Comezar
-        community:
-          name: Comunidade
-        trust_level:
-          name: Nivel de confianza
-        other:
-          name: Outro
-        posting:
-          name: Publicación
-    google_search: |
-      <h3>Buscar no Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>

config/locales/client.he.yml

@@ -241,8 +241,6 @@ he:
     undo: "ביטול (Undo)"
     revert: "לחזור"
     failed: "נכשל"
-    switch_to_anon: "מצב אנונימי"
-    switch_from_anon: "צא ממצב אנונימי"
     banner:
       close: "שחרור באנר זה."
       edit: "ערוך את הבאנר"
@@ -337,18 +335,18 @@ he:
         tracking:
           title: "במעקב"
     user_action_groups:
-      '1': "לייקים שניתנו"
+      "1": "לייקים שניתנו"
-      '2': "לייקים שהתקבלו"
+      "2": "לייקים שהתקבלו"
-      '3': "מועדפים"
+      "3": "מועדפים"
-      '4': "פוסטים"
+      "4": "פוסטים"
-      '5': "תשובות"
+      "5": "תשובות"
-      '6': "תגובות"
+      "6": "תגובות"
-      '7': "אזכורים"
+      "7": "אזכורים"
-      '9': "ציטוטים"
+      "9": "ציטוטים"
-      '11': "עריכות"
+      "11": "עריכות"
-      '12': "פריטים שנשלחו"
+      "12": "פריטים שנשלחו"
-      '13': "דואר נכנס"
+      "13": "דואר נכנס"
-      '14': "ממתין"
+      "14": "ממתין"
     categories:
       all: "כל הקטגוריות"
       all_subcategories: "הכל"
@@ -418,10 +416,10 @@ he:
         disable: "כבה התראות"
         enable: "אפשר התראות"
         each_browser_note: "הערה: עליך לשנות הגדרה זו עבור כל דפדפן בנפרד."
-      dismiss_notifications: "סימון הכל כנקרא"
       dismiss_notifications_tooltip: "סימון כל ההתראות שלא נקראו כהתראות שנקראו"
       disable_jump_reply: "אל תקפצו לפרסומים שלי לאחר שאני משיב/ה"
       dynamic_favicon: "הצג את מספר פוסטים חדשים/מעודכנים על האייקון של הדפדפן"
+      edit_history_public: "אפשרו למשתמשים אחרים לראות את תיקוני הפרסומים שלי"
       external_links_in_new_tab: "פתח את כל הקישורים החיצוניים בעמוד חדש"
       enable_quoting: "אפשרו תגובת ציטוט לטקסט מסומן"
       change: "שנה"
@@ -434,7 +432,6 @@ he:
       suspended_reason: "הסיבה: "
       github_profile: "גיטהאב"
       watched_categories: "עוקב"
-      watched_categories_instructions: "תעקבו באופן אוטומטי אחרי כל הפוסטים החדשים בקטגוריות אלה. תקבלו התראה על כל פרסום ופוסט חדש."
       tracked_categories: "רגיל+"
       tracked_categories_instructions: "בקטגוריות אלה סך הפרסומים החדשים שלא נקראו יופיע לצד שם הפוסט."
       muted_categories: "מושתק"
@@ -849,7 +846,6 @@ he:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> אישר/ה את הזמנתך</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> הזיז/ה {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>הרוויח/ה '{{description}}'</p>"
       alt:
         mentioned: "הוזכר על ידי"
@@ -1023,20 +1019,20 @@ he:
         position: "הודעה %{current} מתוך %{total}"
       notifications:
         reasons:
-          '3_6': 'תקבלו התראות כיוון שאת/ה עוקב אחרי קטגוריה זו.'
+          "3_6": 'תקבלו התראות כיוון שאת/ה עוקב אחרי קטגוריה זו.'
-          '3_5': 'תקבל/י התראות כיוון שהתחלת לעקוב אחרי הפוסט הזה אוטומטית.'
+          "3_5": 'תקבל/י התראות כיוון שהתחלת לעקוב אחרי הפוסט הזה אוטומטית.'
-          '3_2': 'תקבל/י התראות כיוון שאת/ה עוקב אחרי הפוסט הזה.'
+          "3_2": 'תקבל/י התראות כיוון שאת/ה עוקב אחרי הפוסט הזה.'
-          '3_1': 'תקבל/י התראות כיוון שאת/ה יצרת את הפוסט הזה.'
+          "3_1": 'תקבל/י התראות כיוון שאת/ה יצרת את הפוסט הזה.'
-          '3': 'תקבל/י התראות כיוון שאת/ה עוקב אחרי פוסט זה.'
+          "3": 'תקבל/י התראות כיוון שאת/ה עוקב אחרי פוסט זה.'
-          '2_8': 'תקבלו התראות כיוון שאת/ה צופה בקטגוריה הזו.'
+          "2_8": 'תקבלו התראות כיוון שאת/ה צופה בקטגוריה הזו.'
-          '2_4': 'תקבל/י התראות כיוון שפרסמת תגובה לפוסט הזה.'
+          "2_4": 'תקבל/י התראות כיוון שפרסמת תגובה לפוסט הזה.'
-          '2_2': 'תקבל/י התראות כיוון שאת/ה צופה אחרי הפוסט הזה.'
+          "2_2": 'תקבל/י התראות כיוון שאת/ה צופה אחרי הפוסט הזה.'
-          '2': 'תקבל/י התראות כיוון ש<a href="/users/{{username}}/preferences">קראת את הפוסט הזה</a>.'
+          "2": 'תקבל/י התראות כיוון ש<a href="/users/{{username}}/preferences">קראת את הפוסט הזה</a>.'
-          '1_2': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך.'
+          "1_2": 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך.'
-          '1': 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך.'
+          "1": 'תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך.'
-          '0_7': 'את/ה מתעלם/מתעלמת מכל ההתראות בקטגוריה זו.'
+          "0_7": 'את/ה מתעלם/מתעלמת מכל ההתראות בקטגוריה זו.'
-          '0_2': 'אתה מתעלם מכל ההתראות בפוסט זה.'
+          "0_2": 'אתה מתעלם מכל ההתראות בפוסט זה.'
-          '0': 'אתה מתעלם מכל ההתראות בפוסט זה.'
+          "0": 'אתה מתעלם מכל ההתראות בפוסט זה.'
         watching_pm:
           title: "עוקב"
           description: "תקבל/י התראה על כל תגובה חדשה בהודעה זו. בנוסף מספר התגובות שלא נקראו יופיעו ליד ההודעה. "
@@ -1110,8 +1106,6 @@ he:
         remove_banner: "הסרת הבאנר שמופיע בראש כל העמודים."
         banner_note: "משתמשים יכולים לבטל את הבאנר על ידי סגירתו. רק פוסט אחד יכול לשמש כבאנר בזמן נתון."
       inviting: "מזמין..."
-      automatically_add_to_groups_optional: "הזמנה זו כוללת גישה לקבוצות הללו: (אופציונלי, רק מנהל/ת)"
-      automatically_add_to_groups_required: "הזמנה זו כוללת גישה לקבוצות הללו: (<b>חובה</b>, רק מנהל/ת)"
       invite_private:
         title: 'הזמן להודעה'
         email_or_username: "כתובת דואר אלקטרוני או שם משתמש של המוזמן"
@@ -2360,91 +2354,3 @@ he:
           label: "חדש:"
           add: "הוסף"
           filter: "חפש (כתובת או כתובת חיצונית)"
-    lightbox:
-      download: "הורד"
-    search_help:
-      title: 'חיפוש בעזרה'
-    keyboard_shortcuts_help:
-      title: 'קיצורי מקלדת'
-      jump_to:
-        title: 'קפוץ ל'
-        home: '<b>g</b>, <b>h</b> בית'
-        latest: '<b>g</b>, <b>l</b> Latest'
-        new: '<b>g</b>, <b>n</b> New'
-        unread: '<b>g</b>, <b>u</b> Unread'
-        categories: '<b>g</b>, <b>c</b> Categories'
-        top: '<b>g</b>, <b>t</b> Top'
-        bookmarks: 'סימניות <b>g</b>, <b>b</b>'
-        profile: '<b>g</b>, <b>p</b> פרופיל'
-        messages: '<b>g</b>, <b>m</b> הודעות'
-      navigation:
-        title: 'ניווט'
-        jump: '<b>#</b> מעבר לפרסום #'
-        back: '<b>u</b> חזרה'
-        up_down: '<b>k</b>/<b>j</b> Move selection &uarr; &darr;'
-        open: '<b>o</b> או <b>Enter</b> פתח פוסט נבחר'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b>לחלק הבא/קודם'
-      application:
-        title: 'יישום'
-        create: '<b>c</b> צור פוסט חדש'
-        notifications: '<b>n</b> פתח התראות'
-        hamburger_menu: '<b>=</b>  פתח תפריט המבורגר'
-        user_profile_menu: '<b>p</b>פתיחת תפריט משתמש/ת'
-        show_incoming_updated_topics: '<b>.</b> הצגת פוסטים שעודכנו'
-        search: '<b>/</b> חיפוש'
-        help: '<b>?</b> הצגת עזרת מקלדת'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> שחרור הודעות/חדשות'
-        dismiss_topics: '<b>x</b>, <b>t</b> שחרור פוסטים'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b>  התנתק'
-      actions:
-        title: 'פעולות'
-        bookmark_topic: '<b>f</b> החלפת פוסט סימניה'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b>קיבוע/שחרור פוסט'
-        share_topic: '<b>shift</b>+<b>s</b> שיתוף הפוסט'
-        share_post: '<b>s</b> שיתוף הודעה'
-        reply_as_new_topic: '<b>t</b> תגובה כפוסט מקושר'
-        reply_topic: '<b>shift</b>+<b>r</b> תשובה לפוסט'
-        reply_post: '<b>r</b> להגיב להודעה'
-        quote_post: '<b> q </b> ציטוט פוסט'
-        like: '<b>l</b> תן לייק להודעה'
-        flag: '<b>!</b> סימון הודעה'
-        bookmark: '<b>b</b> הוסף הודעה למועדפים'
-        edit: '<b>e</b> ערוך הודעה'
-        delete: '<b>d</b> מחק הודעה'
-        mark_muted: '<b>m</b>, <b>m</b> השתקת פוסט'
-        mark_regular: '<b>m</b>, <b>r</b> פוסט רגיל (ברירת מחדל)'
-        mark_tracking: '<b>m</b>, <b>t</b> מעקב פוסט'
-        mark_watching: '<b>m</b>, <b>w</b>צפייה בפוסט'
-    badges:
-      title: תגים
-      badge_count:
-        one: "תג אחד"
-        other: "%{count} תגים"
-      more_badges:
-        one: "עוד +1"
-        other: "עוד +%{count}"
-      granted:
-        one: "1 הוענק"
-        other: "%{count} הוענקו"
-      select_badge_for_title: בחר תג שיופיע בכותרת הפרופיל שלך
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: מתחילים
-        community:
-          name: קהילה
-        trust_level:
-          name: רמת אמון
-        other:
-          name: אחר
-        posting:
-          name: פרסום
-    google_search: |
-      <h3>חפש עם גוגל</h3>
-      <p>
-      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-      <input type="text" id='user-query' value="">
-      <input type='hidden' id='google-query' name="q">
-      <button class="btn btn-primary">Google</button>
-      </form>
-      </p>

config/locales/client.id.yml

@@ -229,8 +229,6 @@ id:
     undo: "Batalkan perintah"
     revert: "Kembali ke awal"
     failed: "Gagal"
-    switch_to_anon: "Mode Anonim"
-    switch_from_anon: "Keluar Anonim"
     banner:
       close: "Abaikan banner ini."
       edit: "Ubah banner ini >>"
@@ -332,18 +330,18 @@ id:
           title: "meredam"
           description: "Anda tidak akan pernah diberitahu apapun tentang topik baru pada kelompok ini."
     user_action_groups:
-      '1': "Likes Diberikan"
+      "1": "Likes Diberikan"
-      '2': "Likes Diterima"
+      "2": "Likes Diterima"
-      '3': "Markah"
+      "3": "Markah"
-      '4': "Topik"
+      "4": "Topik"
-      '5': "balasan"
+      "5": "balasan"
-      '6': "tanggapan"
+      "6": "tanggapan"
-      '7': "Disebutkan"
+      "7": "Disebutkan"
-      '9': "Kutipan"
+      "9": "Kutipan"
-      '11': "Edit"
+      "11": "Edit"
-      '12': "Item Terkirim"
+      "12": "Item Terkirim"
-      '13': "Kotak masuk"
+      "13": "Kotak masuk"
-      '14': "tertunda"
+      "14": "tertunda"
     categories:
       all: "Semua kategori"
       all_subcategories: "Semua"
@@ -414,10 +412,10 @@ id:
         disable: "Tidak membolehkan Notifikasi"
         enable: "Membolehkan Notifikasi"
         each_browser_note: "Catatan : Anda  harus mengubah pengaturan ini pada setiap browser yang Anda gunakan."
-      dismiss_notifications: "Tandai semua telah dibaca"
       dismiss_notifications_tooltip: "Tandai semua notifikasi belum dibaca telah dibaca"
       disable_jump_reply: "Jangan pindah ke kiriman saya setelah saya balas"
       dynamic_favicon: "Tampilkan jumlah topik baru / pembaharuan pada icon browser."
+      edit_history_public: "Biarkan pengguna lain melihat revisi pos saya"
       external_links_in_new_tab: "Buka semua link eksternal ke dalam tab baru"
       enable_quoting: "Aktifkan balasan kutipan untuk teks yang disorot"
       change: "ubah"
@@ -435,10 +433,7 @@ id:
         enabled: "Aktifkan mode milis"
         daily: "mengirim pembaharuan harian"
         individual: "Kirim email untuk setiap pesan baru"
-        many_per_day: "Kirimi saya email untuk setiap pesan baru (tentang {{PerkiraanEmailHarian}} per hari)."
-        few_per_day: "Kirimi saya email untuk setiap pesan baru (kurang dari 2 per hari)."
       watched_categories: "Dilihat"
-      watched_categories_instructions: "Anda secara otomatis akan melihat semua topik dalam kategori ini. Anda akan diberitahu dari semua posting baru dan topik, dan jumlah posting baru juga akan muncul di topik selanjutnya."
       tracked_categories: "Dilacak"
       tracked_categories_instructions: "Anda akan melacak semua topik dalam kategori ini secara otomatis. sejumlah pesan baru akan muncul di topik selanjutnya."
       muted_categories: "Diredam"
@@ -585,6 +580,7 @@ id:
         rescind: "Hapus"
         rescinded: "Undangan dihapus"
         reinvite: "Kirim Ulang Undangan"
+        reinvite_all: "Kirim ulang semua Undangan"
         reinvited: "Undangan sudah dikirim ulang"
         reinvited_all: "Semua Undangan sudah dikirim ulang"
         time_read: "Waktu Baca"
@@ -593,15 +589,18 @@ id:
         create: "Kirim Undangan"
         generate_link: "Salin Tautan Undangan"
         bulk_invite:
+          text: "Undangan Massal dari Berkas"
           uploading: "Mengunggah..."
       password:
-        title: "Password"
+        title: "Kata sandi"
         too_short: "Password kamu terlalu pendek."
         common: "Password terlalu umum"
         same_as_username: "Password dan nama pengguna kamu sama"
         same_as_email: "Password dan email kamu sama"
+        ok: "Kata sandi Anda terlihat baik."
       summary:
         title: "Ringkasan"
+        stats: "Statistik"
         days_visited:
           other: "hari berkunjung"
         top_replies: "Balasan Teratas"
@@ -824,37 +823,3 @@ id:
       badges:
         new_badge: Badge Baru
         new: Baru
-    lightbox:
-      download: "unduh"
-    keyboard_shortcuts_help:
-      navigation:
-        title: 'Navigasi'
-      application:
-        title: 'Aplikasi'
-        create: '<b>c</b> Buat topik baru'
-        notifications: '<b>n</b> Buka notifikasi'
-        search: '<b>/</b> Cari'
-      actions:
-        title: 'Aksi'
-    badges:
-      badge_grouping:
-        trust_level:
-          name: Tingkat Kepercayaan
-        other:
-          name: Lainnya
-    google_search: |
-      <h3>Cari dengan Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>
-    tagging:
-      sort_by_name: "nama"
-      topics:
-        none:
-          new: "Anda tidak memiliki topik baru."
-        bottom:
-          new: "Tidak ada topik baru lainnya."

config/locales/client.it.yml

@@ -253,8 +253,6 @@ it:
     undo: "Annulla"
     revert: "Ripristina"
     failed: "Fallito"
-    switch_to_anon: "Modalità Anonima"
-    switch_from_anon: "Abbandona Anonimato"
     banner:
       close: "Nascondi questo banner."
       edit: "Modifica questo annuncio >>"
@@ -362,18 +360,18 @@ it:
           title: "Silenziato"
           description: "Non verrai mai avvertito per i nuovi argomenti in questo gruppo."
     user_action_groups:
-      '1': "Mi piace - Assegnati"
+      "1": "Mi piace - Assegnati"
-      '2': "Mi piace - Ricevuti"
+      "2": "Mi piace - Ricevuti"
-      '3': "Segnalibri"
+      "3": "Segnalibri"
-      '4': "Argomenti"
+      "4": "Argomenti"
-      '5': "Risposte"
+      "5": "Risposte"
-      '6': "Risposte"
+      "6": "Risposte"
-      '7': "Menzioni"
+      "7": "Menzioni"
-      '9': "Citazioni"
+      "9": "Citazioni"
-      '11': "Modifiche"
+      "11": "Modifiche"
-      '12': "Inviati"
+      "12": "Inviati"
-      '13': "Posta in arrivo"
+      "13": "Posta in arrivo"
-      '14': "In Attesa"
+      "14": "In Attesa"
     categories:
       all: "tutte le categorie"
       all_subcategories: "tutte"
@@ -446,10 +444,10 @@ it:
         disable: "Disabilita Notifiche"
         enable: "Abilita Notifiche"
         each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
-      dismiss_notifications: "Imposta tutti come Letti"
       dismiss_notifications_tooltip: "Imposta tutte le notifiche non lette come lette "
       disable_jump_reply: "Non saltare al mio messaggio dopo la mia risposta"
       dynamic_favicon: "Visualizza il conteggio degli argomenti nuovi / aggiornati sull'icona del browser"
+      edit_history_public: "Consenti agli altri utenti di visualizzare le mie revisioni ai messaggi"
       external_links_in_new_tab: "Apri tutti i link esterni in nuove schede"
       enable_quoting: "Abilita \"rispondi quotando\" per il testo evidenziato"
       change: "cambia"
@@ -462,7 +460,6 @@ it:
       suspended_reason: "Motivo: "
       github_profile: "Github"
       watched_categories: "Osservate"
-      watched_categories_instructions: "Osserverai automaticamente tutti i nuovi argomenti in queste categorie. Riceverai notifiche su tutti i nuovi messaggi e argomenti e, accanto all'argomento, apparirà il conteggio dei nuovi messaggi."
       tracked_categories: "Seguite"
       tracked_categories_instructions: "Seguirai automaticamente tutti i nuovi argomenti appartenenti a queste categorie. Di fianco all'argomento comparirà il conteggio dei nuovi messaggi."
       muted_categories: "Silenziate"
@@ -1141,20 +1138,20 @@ it:
         position: "messaggio %{current} di %{total}"
       notifications:
         reasons:
-          '3_6': 'Riceverai notifiche perché stai osservando questa categoria.'
+          "3_6": 'Riceverai notifiche perché stai osservando questa categoria.'
-          '3_5': 'Riceverai notifiche poiché hai iniziato ad osservare questo argomento automaticamente.'
+          "3_5": 'Riceverai notifiche poiché hai iniziato ad osservare questo argomento automaticamente.'
-          '3_2': 'Riceverai notifiche perché stai osservando questo argomento.'
+          "3_2": 'Riceverai notifiche perché stai osservando questo argomento.'
-          '3_1': 'Riceverai notifiche perché hai creato questo argomento.'
+          "3_1": 'Riceverai notifiche perché hai creato questo argomento.'
-          '3': 'Riceverai notifiche perché stai osservando questo argomento.'
+          "3": 'Riceverai notifiche perché stai osservando questo argomento.'
-          '2_8': 'Riceverai notifiche perché stai seguendo questa categoria.'
+          "2_8": 'Riceverai notifiche perché stai seguendo questa categoria.'
-          '2_4': 'Riceverai notifiche perché hai pubblicato una risposta a questo argomento.'
+          "2_4": 'Riceverai notifiche perché hai pubblicato una risposta a questo argomento.'
-          '2_2': 'Riceverai notifiche perché stai seguendo questo argomento.'
+          "2_2": 'Riceverai notifiche perché stai seguendo questo argomento.'
-          '2': 'Riceverai notifiche perché <a href="/users/{{username}}/preferences">hai letto questo argomento</a>.'
+          "2": 'Riceverai notifiche perché <a href="/users/{{username}}/preferences">hai letto questo argomento</a>.'
-          '1_2': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
+          "1_2": 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
-          '1': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
+          "1": 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.'
-          '0_7': 'Stai ignorando tutte le notifiche di questa categoria.'
+          "0_7": 'Stai ignorando tutte le notifiche di questa categoria.'
-          '0_2': 'Stai ignorando tutte le notifiche di questo argomento.'
+          "0_2": 'Stai ignorando tutte le notifiche di questo argomento.'
-          '0': 'Stai ignorando tutte le notifiche di questo argomento.'
+          "0": 'Stai ignorando tutte le notifiche di questo argomento.'
         watching_pm:
           title: "In osservazione"
           description: "Riceverai una notifica per ogni nuova risposta a questo messaggio, e comparirà un conteggio delle nuove risposte."

config/locales/client.ja.yml

@@ -226,8 +226,6 @@ ja:
     undo: "取り消す"
     revert: "戻す"
     failed: "失敗"
-    switch_to_anon: "匿名モード"
-    switch_from_anon: "匿名モードをやめる"
     banner:
       close: "バナーを閉じる。"
       edit: "このバナーを編集 >>"
@@ -327,18 +325,18 @@ ja:
         muted:
           title: "ミュート"
     user_action_groups:
-      '1': "「いいね！」 "
+      "1": "「いいね！」 "
-      '2': "「いいね！」 された"
+      "2": "「いいね！」 された"
-      '3': "ブックマーク"
+      "3": "ブックマーク"
-      '4': "トピック"
+      "4": "トピック"
-      '5': "返信"
+      "5": "返信"
-      '6': "反応"
+      "6": "反応"
-      '7': "タグ付け"
+      "7": "タグ付け"
-      '9': "引用"
+      "9": "引用"
-      '11': "編集"
+      "11": "編集"
-      '12': "アイテム送信"
+      "12": "アイテム送信"
-      '13': "受信ボックス"
+      "13": "受信ボックス"
-      '14': "保留"
+      "14": "保留"
     categories:
       all: "すべてのカテゴリ"
       all_subcategories: "すべてのサブカテゴリ"
@@ -408,10 +406,10 @@ ja:
         disable: "通知を無効にする"
         enable: "通知を有効にする"
         each_browser_note: "注意: 利用するすべてのブラウザでこの設定を変更する必要があります"
-      dismiss_notifications: "全て既読にする"
       dismiss_notifications_tooltip: "全ての未読の通知を既読にします"
       disable_jump_reply: "返信した後に投稿へ移動しない"
       dynamic_favicon: "新規または更新されたトピックのカウントをブラウザアイコンに表示する"
+      edit_history_public: "投稿の編集履歴を公開する"
       external_links_in_new_tab: "外部リンクをすべて別のタブで開く"
       enable_quoting: "選択したテキストを引用して返信する"
       change: "変更"
@@ -433,7 +431,6 @@ ja:
         daily: "デイリーアップデートを送る"
         individual: "新しい投稿がある場合にメールで送る"
       watched_categories: "ウォッチ中"
-      watched_categories_instructions: "これらのカテゴリに新しく投稿されたトピックを自動的に参加します。これらのカテゴリに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。"
       tracked_categories: "追跡中"
       tracked_categories_instructions: "カテゴリの新しいトピックを自動的に追跡します。トピックに対して新しい投稿があった場合、トピック一覧に新しい投稿数がつきます。"
       muted_categories: "ミュート中"
@@ -890,7 +887,6 @@ ja:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p> '{{description}}' バッジをゲット！</p>"
       group_message_summary:
         other: "<i title='グループ宛にメッセージが届いています' class='fa fa-group'></i><p> {{count}}件のメッセージが{{group_name}}へ着ています</p>"
@@ -1057,20 +1053,20 @@ ja:
         position: "投稿: %{current}/%{total}"
       notifications:
         reasons:
-          '3_6': 'このカテゴリに参加中のため通知されます'
+          "3_6": 'このカテゴリに参加中のため通知されます'
-          '3_5': 'このトピックに参加中のため通知されます'
+          "3_5": 'このトピックに参加中のため通知されます'
-          '3_2': 'このトピックに参加中のため通知されます。'
+          "3_2": 'このトピックに参加中のため通知されます。'
-          '3_1': 'このトピックを作成したため通知されます。'
+          "3_1": 'このトピックを作成したため通知されます。'
-          '3': 'このトピックに参加中のため通知されます。'
+          "3": 'このトピックに参加中のため通知されます。'
-          '2_8': 'このカテゴリを追跡しているため通知されます。'
+          "2_8": 'このカテゴリを追跡しているため通知されます。'
-          '2_4': 'このトピックに返信したため通知されます。'
+          "2_4": 'このトピックに返信したため通知されます。'
-          '2_2': 'このトピックを追跡中のため通知されます。'
+          "2_2": 'このトピックを追跡中のため通知されます。'
-          '2': '<a href="/users/{{username}}/preferences">このトピックを閲覧した</a>ため通知されます。'
+          "2": '<a href="/users/{{username}}/preferences">このトピックを閲覧した</a>ため通知されます。'
-          '1_2': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。'
+          "1_2": '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。'
-          '1': '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。'
+          "1": '他のユーザからメンションされた場合、投稿へ返信された場合に通知します。'
-          '0_7': 'このカテゴリに関して一切通知を受け取りません。'
+          "0_7": 'このカテゴリに関して一切通知を受け取りません。'
-          '0_2': 'このトピックに関して一切通知を受け取りません。'
+          "0_2": 'このトピックに関して一切通知を受け取りません。'
-          '0': 'このトピックに関して一切通知を受け取りません。'
+          "0": 'このトピックに関して一切通知を受け取りません。'
         watching_pm:
           title: "ウォッチ中"
           description: "未読件数と新しい投稿がトピックの横に表示されます。このトピックに対して新しい投稿があった場合に通知されます。"
@@ -1148,8 +1144,6 @@ ja:
         remove_banner: "全てのページのバナーを削除します"
         banner_note: "ユーザはバナーを閉じることができます。常に１つのトピックだけがバナー表示されます"
       inviting: "招待中..."
-      automatically_add_to_groups_optional: "この招待によって、リストされたグループに参加することができます。"
-      automatically_add_to_groups_required: "この招待によって、リストされたグループに参加することができます。"
       invite_private:
         title: 'プライベートメッセージへ招待する'
         email_or_username: "招待するユーザのメールアドレスまたはユーザ名"
@@ -2053,7 +2047,7 @@ ja:
         not_found: "ユーザが見つかりませんでした。"
         id_not_found: "申し訳ありません。そのユーザIDはシステムに存在していません"
         active: "アクティブ"
-        show_emails: "メールアドレス参照"
+        show_emails: "メールアドレスを表示"
         nav:
           new: "新規"
           active: "アクティブ"
@@ -2069,7 +2063,7 @@ ja:
           other: "拒否ユーザ ({{count}})"
         titles:
           active: 'アクティブユーザ'
-          new: '新規ユーザ'
+          new: '新しいユーザ'
           pending: '保留中のユーザ'
           newuser: 'トラストレベル0のユーザ (新しいユーザ)'
           basic: 'トラストレベル1のユーザ (ベーシックユーザ)'
@@ -2366,89 +2360,3 @@ ja:
           label: "新規:"
           add: "追加"
           filter: "検索(URL または 外部URL)"
-    lightbox:
-      download: "ダウンロード"
-    search_help:
-      title: 'Search Help'
-    keyboard_shortcuts_help:
-      title: 'ショートカットキー'
-      jump_to:
-        title: 'ページ移動'
-        home: '<b>g</b>, <b>h</b> ホーム'
-        latest: '<b>g</b>, <b>l</b> 最新'
-        new: '<b>g</b>, <b>n</b> 新着'
-        unread: '<b>g</b>, <b>u</b> 未読'
-        categories: '<b>g</b>, <b>c</b> カテゴリ'
-        top: '<b>g</b>, <b>t</b> トップ'
-        bookmarks: '<b>g</b>, <b>b</b> ブックマーク'
-        profile: '<b>g</b>, <b>p</b> プロフィール'
-        messages: '<b>g</b>, <b>m</b> メッセージ'
-      navigation:
-        title: 'ナビゲーション'
-        jump: '<b>#</b> # 投稿へ'
-        back: '<b>u</b> 戻る'
-        up_down: '<b>k</b>/<b>j</b> トピック・投稿 &uarr; &darr;移動'
-        open: '<b>o</b> or <b>Enter</b> トピックへ'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> 次のセクション/前のセクション'
-      application:
-        title: 'アプリケーション'
-        create: '<b>c</b> 新しいトピックを作成'
-        notifications: '<b>n</b> お知らせを開く'
-        hamburger_menu: '<b>=</b> メニューを開く'
-        user_profile_menu: '<b>p</b> ユーザメニュを開く'
-        show_incoming_updated_topics: '<b>.</b> 更新されたトピックを表示する'
-        search: '<b>/</b> 検索'
-        help: '<b>?</b> キーボードヘルプを表示する'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> 新しい投稿を非表示にする'
-        dismiss_topics: 'Dismiss Topics'
-      actions:
-        title: '操作'
-        bookmark_topic: '<b>f</b> トピックのブックマークを切り替え'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b>トピックを ピン留め/ピン留め解除'
-        share_topic: '<b>shift</b>+<b>s</b> トピックをシェア'
-        share_post: '<b>s</b> 投稿をシェアする'
-        reply_as_new_topic: '<b>t</b> トピックへリンクして返信'
-        reply_topic: '<b>shift</b>+<b>r</b> トピックに返信'
-        reply_post: '<b>r</b> 投稿に返信'
-        quote_post: '<b>q</b> 投稿を引用する'
-        like: '<b>l</b> 投稿を「いいね！」する'
-        flag: '<b>!</b> 投稿を通報'
-        bookmark: '<b>b</b> 投稿をブックマークする'
-        edit: '<b>e</b> 投稿を編集'
-        delete: '<b>d</b> 投稿を削除する'
-        mark_muted: '<b>m</b>, <b>m</b> トピックをミュートする'
-        mark_regular: '<b>m</b>, <b>r</b> 通常トピックにする'
-        mark_tracking: '<b>m</b>, <b>t</b> トピックを追跡する'
-        mark_watching: '<b>m</b>, <b>w</b> トピックを参加中にする'
-    badges:
-      granted_on: "%{date} にゲット"
-      title: バッジ
-      allow_title: "プロフィールにつける"
-      multiple_grant: "何度も取得可能"
-      badge_count:
-        other: "%{count} バッジ"
-      more_badges:
-        other: "バッジを全て見る（全%{count}個）"
-      granted:
-        other: "%{count} つバッジを付与されました"
-      select_badge_for_title: プロフィールのタイトルに付けるバッジを選んでください
-      none: "<なし>"
-      badge_grouping:
-        getting_started:
-          name: はじめの一歩
-        community:
-          name: コミュニティ
-        trust_level:
-          name: トラストレベル
-        other:
-          name: その他
-        posting:
-          name: 投稿
-    tagging:
-      changed: "タグを変更しました:"
-      sort_by: "並べ替え:"
-      topics:
-        none:
-          search: "検索結果は何もありません。"
-        bottom:
-          search: "検索結果は以上です。"

config/locales/client.nb_NO.yml

@@ -231,8 +231,6 @@ nb_NO:
     undo: "Angre"
     revert: "Reverser"
     failed: "Mislykket"
-    switch_to_anon: "Anonym modus"
-    switch_from_anon: "Avslutt Anonym"
     banner:
       close: "Fjern denne banneren"
       edit: "Endre denne banneren >>"
@@ -331,18 +329,18 @@ nb_NO:
         muted:
           title: "Dempet"
     user_action_groups:
-      '1': "Liker tildelt"
+      "1": "Liker tildelt"
-      '2': "Liker mottatt"
+      "2": "Liker mottatt"
-      '3': "Bokmerker"
+      "3": "Bokmerker"
-      '4': "Emner"
+      "4": "Emner"
-      '5': "Svar"
+      "5": "Svar"
-      '6': "Svar"
+      "6": "Svar"
-      '7': "Omtalelser"
+      "7": "Omtalelser"
-      '9': "Sitater"
+      "9": "Sitater"
-      '11': "Redigeringer"
+      "11": "Redigeringer"
-      '12': "Sendte elementer"
+      "12": "Sendte elementer"
-      '13': "Innboks"
+      "13": "Innboks"
-      '14': "Venter"
+      "14": "Venter"
     categories:
       all: "Alle"
       all_subcategories: "alle"
@@ -405,10 +403,10 @@ nb_NO:
         disable: "Slå av varslinger"
         enable: "Slå på varslinger"
         each_browser_note: "Merk: Du må endre denne innstillinger for hver nettleser du bruker."
-      dismiss_notifications: "Merk alle som lest"
       dismiss_notifications_tooltip: "Merk alle uleste varslinger som lest"
       disable_jump_reply: "Ikke hopp til ditt nye innlegg etter svar"
       dynamic_favicon: "Vis antall nye / oppdaterte emner på nettleser ikonet"
+      edit_history_public: "La andre brukere se mine innleggsrevisjoner"
       external_links_in_new_tab: "Åpne alle eksterne lenker i ny fane"
       enable_quoting: "Aktiver svar med sitat for uthevet tekst"
       change: "Endre"
@@ -421,7 +419,6 @@ nb_NO:
       suspended_reason: "Begrunnelse:"
       github_profile: "Github"
       watched_categories: "Følger"
-      watched_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner. Antallet uleste og nye emner vil også vises."
       tracked_categories: "Sporet"
       tracked_categories_instructions: "Du vil automatisk spore alle nye emner i disse kategoriene. Antallet uleste og nye innlegg vil vises ved emnets oppføring."
       muted_categories: "Dempet"
@@ -458,7 +455,6 @@ nb_NO:
         title: "Rediger om meg"
       change_username:
         title: "Endre brukernavn"
-        confirm: "Hvis du endrer brukernavn vil alle siteringer av dine innlegg og nevning ved ditt @navn gå i stykker. Er du sikker på at du vil gjøre det?"
         taken: "Beklager, det brukernavnet er tatt."
         error: "Det skjedde en feil ved endring av ditt brukernavn."
         invalid: "Det brukernavnet er ugyldig. Det kan bare inneholde nummer og bokstaver."
@@ -535,7 +531,6 @@ nb_NO:
         always: "alltid"
         never: "aldri"
       email_digests:
-        title: "Send meg sammendrag av hva som er nytt på e-post når jeg ikke er ofte innom:"
         every_30_minutes: "hvert 30 minutt"
         every_hour: "hver time"
         daily: "daglig"
@@ -841,7 +836,6 @@ nb_NO:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Ble tildelt '{{description}}'</p>"
       alt:
         mentioned: "Nevnt av"
@@ -1002,20 +996,20 @@ nb_NO:
         position: "innlegg %{current} av %{total}"
       notifications:
         reasons:
-          '3_6': 'Du vil motta varsler fordi du følger denne kategorien'
+          "3_6": 'Du vil motta varsler fordi du følger denne kategorien'
-          '3_5': 'Du vil motta varsler fordi du startet å følge dette emnet automatisk.'
+          "3_5": 'Du vil motta varsler fordi du startet å følge dette emnet automatisk.'
-          '3_2': 'Du vil motta varsler fordi du følger dette emnet.'
+          "3_2": 'Du vil motta varsler fordi du følger dette emnet.'
-          '3_1': 'Du vil motta varsler fordi du opprettet dette emnet.'
+          "3_1": 'Du vil motta varsler fordi du opprettet dette emnet.'
-          '3': 'Du vil motta varsler fordi du følger dette emnet.'
+          "3": 'Du vil motta varsler fordi du følger dette emnet.'
-          '2_8': 'Du vil motta varsler fordi du følger denne kategorien.'
+          "2_8": 'Du vil motta varsler fordi du følger denne kategorien.'
-          '2_4': 'Du vil motta varsler fordi du svarte på dette emnet.'
+          "2_4": 'Du vil motta varsler fordi du svarte på dette emnet.'
-          '2_2': 'Du vil motta varsler fordi du følger dette emnet.'
+          "2_2": 'Du vil motta varsler fordi du følger dette emnet.'
-          '2': 'Du vil motta varsler fordi du <a href="/users/{{username}}/preferences">read this topic</a>.'
+          "2": 'Du vil motta varsler fordi du <a href="/users/{{username}}/preferences">read this topic</a>.'
-          '1_2': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
+          "1_2": 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
-          '1': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
+          "1": 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.'
-          '0_7': 'Du ignorerer alle varsler i denne kategorien.'
+          "0_7": 'Du ignorerer alle varsler i denne kategorien.'
-          '0_2': 'Du ignorerer alle varsler på dette emnet.'
+          "0_2": 'Du ignorerer alle varsler på dette emnet.'
-          '0': 'Du ignorerer alle varsler på dette emnet.'
+          "0": 'Du ignorerer alle varsler på dette emnet.'
         watching_pm:
           title: "Følger"
           description: "Du vil bli varslet om hvert nye innlegg i denne meldingen. Antall nye tilbakemeldinger vil også bli vist. "
@@ -1084,8 +1078,6 @@ nb_NO:
         remove_banner: "Fjern banneret som dukker opp på toppen av alle sider. "
         banner_note: "Brukere kan fjerne banneret ved å lukke det. Kun et emne kan være banner på en og samme tid. "
       inviting: "Inviterer..."
-      automatically_add_to_groups_optional: "Denne invitasjonen inkluderer også tilgang på disse gruppene: (valgfritt, kun for admin)"
-      automatically_add_to_groups_required: "Denne invitasjonen inkluderer også tilgang til disse gruppene: (<b>påkrevet</a>, kun for admin)"
       invite_private:
         title: 'Inviter til samtale'
         email_or_username: "Invitertes e-post eller brukernavn."
@@ -1457,10 +1449,10 @@ nb_NO:
     posts_long: "{{number}} innlegg i dette emnet"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-        low {with a high like to post ratio}
+      low {with a high like to post ratio}
-        med {with a very high like to post ratio}
+      med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
+      high {with an extremely high like to post ratio}
-        other {}}
+      other {}}
     original_post: "Originalt Innlegg"
     views: "Visninger"
     views_lowercase:
@@ -2315,86 +2307,3 @@ nb_NO:
           label: "Ny:"
           add: "Legg til"
           filter: "Søk (URL eller ekstern URL)"
-    lightbox:
-      download: "last ned"
-    search_help:
-      title: 'Søke hjelp'
-    keyboard_shortcuts_help:
-      title: 'Tastatursnarveier'
-      jump_to:
-        title: 'Hopp til'
-        home: '<b>g</b>, <b>h</b> Hjem'
-        latest: '<b>g</b>, <b>l</b> Siste'
-        new: '<b>g</b>, <b>n</b> Nye'
-        unread: '<b>g</b>, <b>u</b> Ules'
-        categories: '<b>g</b>, <b>c</b> Kategorier'
-        top: '<b>g</b>, <b>t</b> Topp'
-        bookmarks: '<b>g</b>, <b>b</b> Bokmerker'
-      navigation:
-        title: 'Navigasjon'
-        jump: '<b>#</b> Gå til innlegg #'
-        back: '<b>u</b> Tilbake'
-        up_down: '<b>k</b>/<b>j</b> Flytt markering &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Åpne valgt emne'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Neste/Forrige'
-      application:
-        title: 'Applikasjon'
-        create: '<b>c</b> Opprett nytt emne'
-        notifications: '<b>n</b> Åpne varsler'
-        user_profile_menu: '<b>p</b> Åpne brukermenyen'
-        show_incoming_updated_topics: '<b>.</b> Vis oppdaterte emner'
-        search: '<b>/</b> Søk'
-        help: '<b>?</b> Åpne tastaturhjelp'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Avvis Nye/Innlegg'
-        dismiss_topics: '<b>x</b>, <b>t</b> Avvis Emner'
-      actions:
-        title: 'Handlinger'
-        bookmark_topic: '<b>f</b> Bokmerk emne / Fjern bokmerke'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Pin/fjern pin fra emne'
-        share_topic: '<b>shift</b>+<b>s</b> Del emne'
-        share_post: '<b>s</b> Del innlegg'
-        reply_as_new_topic: '<b>t</b> Svar med lenket emne'
-        reply_topic: '<b>shift</b>+<b>r</b> Svar på emne'
-        reply_post: '<b>r</b> Svar på innlegg'
-        quote_post: '<b>q</b> Siter innlegg'
-        like: '<b>l</b> Lik innlegg'
-        flag: '<b>!</b> Rapporter innlegg'
-        bookmark: '<b>b</b> Bokmerk innlegg'
-        edit: '<b>e</b> Rediger innlegg'
-        delete: '<b>d</b> Slett innlegg'
-        mark_muted: '<b>m</b>, <b>m</b> Demp emne'
-        mark_regular: '<b>m</b>, <b>r</b> Vanlig (standard) emne'
-        mark_tracking: '<b>m</b>, <b>t</b> Spor emne'
-        mark_watching: '<b>m</b>, <b>w</b> Følg emne'
-    badges:
-      title: Merker
-      badge_count:
-        one: "1 Merke"
-        other: "%{count} Merker"
-      more_badges:
-        one: "+1 Til"
-        other: "+%{count} Til"
-      granted:
-        one: "1 tildelt"
-        other: "%{count} tildelt"
-      select_badge_for_title: Velg et merke å bruke som din tittel
-      none: "<ingen>"
-      badge_grouping:
-        getting_started:
-          name: Kom i gang
-        community:
-          name: Nettsamfunn
-        trust_level:
-          name: Tillitsnivå
-        other:
-          name: Annet
-        posting:
-          name: Posting
-    tagging:
-      sort_by: "Sorter etter:"
-      notifications:
-        muted:
-          title: "Dempet"
-      topics:
-        none:
-          unread: "Du har ingen uleste emner"

config/locales/client.pl_PL.yml

@@ -270,8 +270,6 @@ pl_PL:
     disable: "Wyłącz"
     undo: "Cofnij"
     failed: "Niepowodzenie"
-    switch_to_anon: "Tryb anonimowy"
-    switch_from_anon: "Zakończ tryb anonimowy"
     banner:
       close: "Zamknij ten baner."
       edit: "Edytuj ten baner >>"
@@ -378,18 +376,18 @@ pl_PL:
           title: "Wyciszony"
           description: "Nie otrzymasz powiadomień o nowych tematach w tej grupie."
     user_action_groups:
-      '1': "Przyznane lajki"
+      "1": "Przyznane lajki"
-      '2': "Otrzymane lajki"
+      "2": "Otrzymane lajki"
-      '3': "Zakładki"
+      "3": "Zakładki"
-      '4': "Tematy"
+      "4": "Tematy"
-      '5': "Odpowiedzi"
+      "5": "Odpowiedzi"
-      '6': "Odpowiedzi"
+      "6": "Odpowiedzi"
-      '7': "Wzmianki"
+      "7": "Wzmianki"
-      '9': "Cytaty"
+      "9": "Cytaty"
-      '11': "Edycje"
+      "11": "Edycje"
-      '12': "Wysłane"
+      "12": "Wysłane"
-      '13': "Skrzynka odbiorcza"
+      "13": "Skrzynka odbiorcza"
-      '14': "Oczekujące"
+      "14": "Oczekujące"
     categories:
       all: "wszystkie kategorie"
       all_subcategories: "wszystkie"
@@ -463,10 +461,10 @@ pl_PL:
         disable: "Wyłącz powiadomienia"
         enable: "Włącz powiadomienia"
         each_browser_note: "Uwaga: to ustawienie musisz zmienić w każdej przeglądarce której używasz."
-      dismiss_notifications: "Oznacz jako przeczytane"
       dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane"
       disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu"
       dynamic_favicon: "Pokazuj licznik powiadomień na karcie jako dynamiczny favicon"
+      edit_history_public: "Pozwól innym oglądać historię edycji moich wpisów"
       external_links_in_new_tab: "Otwieraj wszystkie zewnętrzne odnośniki w nowej karcie"
       enable_quoting: "Włącz cytowanie zaznaczonego tekstu"
       change: "zmień"
@@ -479,7 +477,6 @@ pl_PL:
       suspended_reason: "Powód: "
       github_profile: "Github"
       watched_categories: "Obserwowane"
-      watched_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Będziesz otrzymywać powiadomienie o każdym nowym wpisie i temacie, a liczba nieprzeczytanych i nowych wpisów będzie wyświetlana obok tytułów na liście tematów. "
       tracked_categories: "Śledzone"
       tracked_categories_instructions: "Będziesz automatycznie śledzić wszystkie nowe tematy w tych kategoriach. Licznik nowych wpisów pojawi się obok tytułu na liście tematów."
       muted_categories: "Wyciszone"
@@ -1138,20 +1135,20 @@ pl_PL:
         position: "wpis %{current} z %{total}"
       notifications:
         reasons:
-          '3_6': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, ponieważ obserwujesz tę kategorię.'
+          "3_6": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, ponieważ obserwujesz tę kategorię.'
-          '3_5': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ włączono automatyczne obserwowanie tego tematu.'
+          "3_5": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ włączono automatyczne obserwowanie tego tematu.'
-          '3_2': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
+          "3_2": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
-          '3_1': 'Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem tego tematu.'
+          "3_1": 'Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem tego tematu.'
-          '3': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
+          "3": 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie, ponieważ obserwujesz ten temat.'
-          '2_8': 'Będziesz otrzymywać powiadomienia, ponieważ śledzisz tę kategorię.'
+          "2_8": 'Będziesz otrzymywać powiadomienia, ponieważ śledzisz tę kategorię.'
-          '2_4': 'Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem odpowiedzi w tym temacie.'
+          "2_4": 'Będziesz otrzymywać powiadomienia, ponieważ jesteś autorem odpowiedzi w tym temacie.'
-          '2_2': 'Będziesz otrzymywać powiadomienia, ponieważ śledzisz ten temat.'
+          "2_2": 'Będziesz otrzymywać powiadomienia, ponieważ śledzisz ten temat.'
-          '2': 'Będziesz otrzymywać powiadomienia, ponieważ <a href="/users/{{username}}/preferences">ten temat został uznany za przeczytany</a>.'
+          "2": 'Będziesz otrzymywać powiadomienia, ponieważ <a href="/users/{{username}}/preferences">ten temat został uznany za przeczytany</a>.'
-          '1_2': 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
+          "1_2": 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
-          '1': 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
+          "1": 'Dostaniesz powiadomienie jedynie, gdy ktoś wspomni twoją @nazwę lub odpowie na twój wpis.'
-          '0_7': 'Ignorujesz wszystkie powiadomienia z tej kategorii.'
+          "0_7": 'Ignorujesz wszystkie powiadomienia z tej kategorii.'
-          '0_2': 'Ignorujesz wszystkie powiadomienia w tym temacie.'
+          "0_2": 'Ignorujesz wszystkie powiadomienia w tym temacie.'
-          '0': 'Ignorujesz wszystkie powiadomienia w tym temacie.'
+          "0": 'Ignorujesz wszystkie powiadomienia w tym temacie.'
         watching_pm:
           title: "Obserwuj wszystko"
           description: "Dostaniesz powiadomienie o każdym nowym wpisie w tej dyskusji. Liczba nowych wpisów pojawi się obok jej tytułu na liście wiadomości."

config/locales/client.pt.yml

@@ -251,8 +251,6 @@ pt:
     undo: "Desfazer"
     revert: "Reverter"
     failed: "Falhou"
-    switch_to_anon: "Modo Anónimo"
-    switch_from_anon: "Sair de Anónimo"
     banner:
       close: "Destituir esta faixa."
       edit: "Editar esta faixa >>"
@@ -358,18 +356,18 @@ pt:
           title: "Mudo"
           description: "Não será notificado de nada relacionado com novos tópicos neste grupo."
     user_action_groups:
-      '1': "Gostos Dados"
+      "1": "Gostos Dados"
-      '2': "Gostos Recebidos"
+      "2": "Gostos Recebidos"
-      '3': "Marcadores"
+      "3": "Marcadores"
-      '4': "Tópicos"
+      "4": "Tópicos"
-      '5': "Respostas"
+      "5": "Respostas"
-      '6': "Respostas"
+      "6": "Respostas"
-      '7': "Menções"
+      "7": "Menções"
-      '9': "Citações"
+      "9": "Citações"
-      '11': "Edições"
+      "11": "Edições"
-      '12': "Itens Enviados"
+      "12": "Itens Enviados"
-      '13': "Caixa de Entrada"
+      "13": "Caixa de Entrada"
-      '14': "Pendente"
+      "14": "Pendente"
     categories:
       all: "todas as categorias"
       all_subcategories: "todas"
@@ -442,10 +440,10 @@ pt:
         disable: "Desativar Notificações"
         enable: "Ativar Notificações"
         each_browser_note: "Nota: Tem que alterar esta configuração em todos os navegadores de internet que utiliza."
-      dismiss_notifications: "Marcar tudo como lido"
       dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler"
       disable_jump_reply: "Não voltar para a minha mensagem após ter respondido"
       dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser."
+      edit_history_public: "Permitir que outros utilizadores vejam as minhas revisões de publicação"
       external_links_in_new_tab: "Abrir todas as hiperligações externas num novo separador"
       enable_quoting: "Ativar resposta usando citação de texto destacado"
       change: "alterar"
@@ -458,7 +456,6 @@ pt:
       suspended_reason: "Motivo: "
       github_profile: "Github"
       watched_categories: "Vigiado"
-      watched_categories_instructions: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Será notificado de todas as novas mensagens e tópicos, e uma contagem de novas mensagens irá aparecer junto ao tópico."
       tracked_categories: "Acompanhado"
       tracked_categories_instructions: "Irá acompanhar automaticamente todos os novos tópicos nestas categorias. Uma contagem de novas mensagens irá aparecer junto ao tópico."
       muted_categories: "Silenciado"
@@ -746,8 +743,6 @@ pt:
     too_few_topics_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentTopics} / %{requiredTopics}</strong> tópios. Novos visitantes precisam de algumas conversações para ler e responder a."
     too_few_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar esta discussão!</a> Atualmente existem <strong>%{currentPosts} / %{requiredPosts}</strong> mensagens. Novos visitantes precisam de algumas conversações para ler e responder a."
     logs_error_rate_notice:
-      reached: "%{timestamp}: Velocidade corrente de <a href='%{url}' target='_blank'>%{rate}</a> alcançou o limite definido nas configurações do site de %{siteSettingRate}."
-      exceeded: "%{timestamp}: Velocidade corrente de <a href='%{url}' target='_blank'>%{rate}</a> excedeu o limite definido nas configurações do site de %{siteSettingRate}."
       rate:
         one: "1 erro/%{duration}"
         other: "%{count} erros/%{duration}"
@@ -876,7 +871,6 @@ pt:
       saved_local_draft_tip: "guardado localmente"
       similar_topics: "O seu tópico é similar a..."
       drafts_offline: "rascunhos offline"
-      group_mentioned: "Ao usar {{group}}, estará a notificar <a href='{{group_link}}'>{{count}} pessoas</a>."
       error:
         title_missing: "O título é obrigatório"
         title_too_short: "O título tem que ter pelo menos {{min}} caracteres."
@@ -963,7 +957,6 @@ pt:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> aceitou o seu convite</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moveu {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Ganhou '{{description}}'</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagem na caixa de entrada do seu grupo {{group_name}}</p>"
@@ -1157,20 +1150,20 @@ pt:
         position: "mensagem %{current} de %{total}"
       notifications:
         reasons:
-          '3_6': 'Receberá notificações porque está a vigiar esta categoria.'
+          "3_6": 'Receberá notificações porque está a vigiar esta categoria.'
-          '3_5': 'Receberá notificações porque começou a vigiar automaticamente este tópico.'
+          "3_5": 'Receberá notificações porque começou a vigiar automaticamente este tópico.'
-          '3_2': 'Receberá notificações porque está a vigiar este tópico.'
+          "3_2": 'Receberá notificações porque está a vigiar este tópico.'
-          '3_1': 'Receberá notificações porque criou este tópico.'
+          "3_1": 'Receberá notificações porque criou este tópico.'
-          '3': 'Receberá notificações porque está a vigiar este tópico.'
+          "3": 'Receberá notificações porque está a vigiar este tópico.'
-          '2_8': 'Receberá notificações porque está a acompanhar esta categoria.'
+          "2_8": 'Receberá notificações porque está a acompanhar esta categoria.'
-          '2_4': 'Receberá notificações porque publicou uma resposta a este tópico.'
+          "2_4": 'Receberá notificações porque publicou uma resposta a este tópico.'
-          '2_2': 'Receberá notificações porque está a acompanhar este tópico.'
+          "2_2": 'Receberá notificações porque está a acompanhar este tópico.'
-          '2': 'Receberá notificações porque <a href="/users/{{username}}/preferences">leu este tópico</a>.'
+          "2": 'Receberá notificações porque <a href="/users/{{username}}/preferences">leu este tópico</a>.'
-          '1_2': 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.'
+          "1_2": 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.'
-          '1': 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.'
+          "1": 'Será notificado se alguém mencionar o seu @nome ou responder-lhe.'
-          '0_7': 'Está a ignorar todas as notificações nesta categoria.'
+          "0_7": 'Está a ignorar todas as notificações nesta categoria.'
-          '0_2': 'Está a ignorar todas as notificações para este tópico.'
+          "0_2": 'Está a ignorar todas as notificações para este tópico.'
-          '0': 'Está a ignorar todas as notificações para este tópico.'
+          "0": 'Está a ignorar todas as notificações para este tópico.'
         watching_pm:
           title: "A vigiar"
           description: "Será notificado de cada nova resposta nesta mensagem, e uma contagem de novas respostas será exibida."
@@ -1257,8 +1250,6 @@ pt:
         no_banner_exists: "Não existe tópico de faixa."
         banner_exists: "<strong class='badge badge-notification unread'>Existe</strong> atualmente um tópico de faixa."
       inviting: "A Convidar..."
-      automatically_add_to_groups_optional: "Este convite também inclui acesso a estes grupos: (opcional, apenas Administração)"
-      automatically_add_to_groups_required: "Esse convite também inclui acesso a estes grupos: (<b>Obrigatório<b>, apenas Administração)"
       invite_private:
         title: 'Convidar para Mensagem'
         email_or_username: "Email ou Nome de Utilizador do Convidado"
@@ -2618,148 +2609,3 @@ pt:
           label: "Novo:"
           add: "Adicionar"
           filter: "Pesquisar (URL ou URL Externo)"
-    lightbox:
-      download: "descarregar"
-    search_help:
-      title: 'Pesquisar Ajuda'
-    keyboard_shortcuts_help:
-      title: 'Atalhos de Teclado'
-      jump_to:
-        title: 'Ir Para'
-        home: '<b>g</b>, <b>h</b> Página Principal'
-        latest: '<b>g</b>, <b>l</b> Recentes'
-        new: '<b>g</b>, <b>n</b> Novo'
-        unread: '<b>g</b>, <b>u</b> Não lido'
-        categories: '<b>g</b>, <b>c</b> Categorias'
-        top: '<b>g</b>, <b>t</b> Os Melhores'
-        bookmarks: '<b>g</b>, <b>b</b> Marcadores'
-        profile: '<b>g</b>, <b>p</b> Perfil'
-        messages: '<b>g</b>, <b>m</b> Mensagens'
-      navigation:
-        title: 'Navegação'
-        jump: '<b>#</b> Ir para o post #'
-        back: '<b>u</b> Retroceder'
-        up_down: '<b>k</b>/<b>j</b> Mover seleção &uarr; &darr;'
-        open: '<b>o</b> ou <b>Enter</b> Abrir tópico selecionado'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Secção Seguinte/Anterior'
-      application:
-        title: 'Aplicação'
-        create: '<b>c</b> Criar um novo tópico'
-        notifications: '<b>n</b> Abrir notificações'
-        hamburger_menu: '<b>=</b> Abrir menu hamburger'
-        user_profile_menu: '<b>p</b> Abrir menu do utilizador'
-        show_incoming_updated_topics: '<b>.</b> Mostrar tópicos atualizados'
-        search: '<b>/</b> Pesquisar'
-        help: '<b>?</b> Abrir ajuda do teclado'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Destituir Novos/Mensagens'
-        dismiss_topics: '<b>x</b>, <b>t</b> Destituir Tópicos'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Terminar Sessão'
-      actions:
-        title: 'Ações'
-        bookmark_topic: '<b>f</b> Alternar marcador de tópico'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Tópico Fixado/Desafixado'
-        share_topic: '<b>shift</b>+<b>s</b> Partilhar tópico'
-        share_post: '<b>s</b> Partilhar mensagem'
-        reply_as_new_topic: '<b>t</b> Responder como tópico hiperligado'
-        reply_topic: '<b>shift</b>+<b>r</b> Responder ao tópico'
-        reply_post: '<b>r</b> Responder à mensagem'
-        quote_post: '<b>q</b> Citar mensagem'
-        like: '<b>l</b> Gostar da mensagem'
-        flag: '<b>!</b> Sinalizar mensagem'
-        bookmark: '<b>b</b> Adicionar mensagem aos marcadores'
-        edit: '<b>e</b> Editar mensagem'
-        delete: '<b>d</b> Eliminar mensagem'
-        mark_muted: '<b>m</b>, <b>m</b> Silenciar tópico'
-        mark_regular: '<b>m</b>, <b>r</b> Tópico Habitual (por defeito)'
-        mark_tracking: '<b>m</b>, <b>t</b> Acompanhar tópico'
-        mark_watching: '<b>m</b>, <b>w</b> Vigiar este tópico'
-    badges:
-      earned_n_times:
-        one: "Ganhou esta medalha 1 vez"
-        other: "Ganhou esta medalha %{count} vezes"
-      granted_on: "Ganho %{date}"
-      others_count: "Outras pessoas com esta medalha (%{count})"
-      title: Distintivos
-      allow_title: "título disponivel"
-      multiple_grant: "atribuido multiplas vezes"
-      badge_count:
-        one: "1 Distintivo"
-        other: "%{count} Distintivos"
-      more_badges:
-        one: "+1 Mais"
-        other: "+%{count} Mais"
-      granted:
-        one: "1 concedida"
-        other: "%{count} concedidas"
-      select_badge_for_title: Selecionar um distintivo para usar como título
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Dar Início
-        community:
-          name: Comunidade
-        trust_level:
-          name: Nível de Confiança
-        other:
-          name: Outro
-        posting:
-          name: A publicar
-    google_search: |
-      <h3>Pesquise com o Google</h3>
-      <p>
-      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-      <input type="text" id='user-query' value="">
-      <input type='hidden' id='google-query' name="q">
-      <button class="btn btn-primary">Google</button>
-      </form>
-      </p>
-    tagging:
-      all_tags: "Todas as Etiquetas"
-      selector_all_tags: "todas as etiquetas"
-      changed: "etiquetas modificadas:"
-      tags: "Etiquetas"
-      choose_for_topic: "escolha etiquetas opcionais para este tópico"
-      delete_tag: "Remover Etiqueta"
-      delete_confirm: "Tem a certeza que deseja remover esta etiqueta?"
-      rename_tag: "Renomear Etiqueta"
-      rename_instructions: "Escolha o novo nome para a etiqueta:"
-      sort_by: "Ordenar por:"
-      sort_by_count: "contagem"
-      sort_by_name: "nome"
-      filters:
-        without_category: "%{filter} %{tag} tópicos"
-        with_category: "%{filter} %{tag} tópicos em %{category}"
-      notifications:
-        watching:
-          title: "A vigiar"
-          description: "Vigiará automaticamente todos os tópicos novos nesta etiqueta. Será notificado acerca de todas as novas mensagens e tópicos,bem como lhe será apresentada a contagem de mensagens por ler e novas ao lado do tópico."
-        tracking:
-          title: "A seguir"
-          description: "Irá automaticamente seguir todos os novos tópicos nesta etiqueta. Uma contagem de mensagens não lidas e novas aparecerá ao lado to tópico."
-        regular:
-          title: "Regular"
-          description: "Será notificado quando alguém mencione o seu @nome ou responda à sua mensagem."
-        muted:
-          title: "Silenciado"
-          description: "Não será notificado acerca de novos tópicos sob esta etiqueta, não aparecendo eles no seu separador de não lidos."
-      topics:
-        none:
-          unread: "Não tem tópicos por ler."
-          new: "Não tem nenhum tópico novo."
-          read: "Ainda não leu quaisquer tópicos."
-          posted: "Ainda não publicou nada em um tópico qualquer."
-          latest: "Não há tópicos recentes."
-          hot: "Não há tópicos quentes."
-          bookmarks: "Não marcou qualquer tópico ainda."
-          top: "Não há quaisquer tópicos de topo."
-          search: "Não há resultados para a procura."
-        bottom:
-          latest: "Não há mais tópicos recentes."
-          hot: "Não há mais tópicos quentes."
-          posted: "Não existem mais tópicos publicados."
-          read: "Não existem mais tópicos lidos."
-          new: "Não existem mais tópicos novos."
-          unread: "Não existem mais tópicos por ler."
-          top: "Não existem mais tópicos de topo."
-          bookmarks: "Não existem mais tópicos marcados."
-          search: "Não existem mais resultados de pesquisa."

config/locales/client.pt_BR.yml

@@ -27,6 +27,7 @@ pt_BR:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      timeline_date: "MMM AAAA"
       long_no_year: "MMM D h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -249,8 +250,6 @@ pt_BR:
     undo: "Desfazer"
     revert: "Reverter"
     failed: "Falhou"
-    switch_to_anon: "Modo Anônimo"
-    switch_from_anon: "Sair do Modo Anônimo"
     banner:
       close: "Ignorar este banner."
       edit: "Editar este banner >>"
@@ -358,18 +357,18 @@ pt_BR:
           title: "Mudo"
           description: "Você será notificado sobre qualquer coisa sobre novos tópicos neste grupo."
     user_action_groups:
-      '1': "Curtidas dadas"
+      "1": "Curtidas dadas"
-      '2': "Curtidas recebidas"
+      "2": "Curtidas recebidas"
-      '3': "Favoritos"
+      "3": "Favoritos"
-      '4': "Tópicos"
+      "4": "Tópicos"
-      '5': "Respostas"
+      "5": "Respostas"
-      '6': "Respostas"
+      "6": "Respostas"
-      '7': "Menções"
+      "7": "Menções"
-      '9': "Citações"
+      "9": "Citações"
-      '11': "Edições"
+      "11": "Edições"
-      '12': "Itens enviados"
+      "12": "Itens enviados"
-      '13': "Caixa de Entrada"
+      "13": "Caixa de Entrada"
-      '14': "Pendente"
+      "14": "Pendente"
     categories:
       all: "todas as categorias"
       all_subcategories: "todos"
@@ -442,10 +441,10 @@ pt_BR:
         disable: "Desativar Notificações"
         enable: "Ativar Notificações"
         each_browser_note: "Nota: Você deve modificar essa configuração em todos navegadores que você usa."
-      dismiss_notifications: "Marcar todas como lidas"
       dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidos"
       disable_jump_reply: "Não pular para o meu tópico depois que eu respondo"
       dynamic_favicon: "Exibir ícone no navegador de tópicos novos / atualizados."
+      edit_history_public: "Deixar que os outros usuários visualizem minhas revisões na resposta"
       external_links_in_new_tab: "Abrir todos os links externos em uma nova aba"
       enable_quoting: "Ativar resposta citando o texto destacado"
       change: "alterar"
@@ -461,7 +460,6 @@ pt_BR:
       mailing_list_mode:
         daily: "Enviar atualizações diárias"
       watched_categories: "Acompanhados"
-      watched_categories_instructions: "Você vai acompanhar automaticamente todos os novos tópicos dessas categorias. Você será notificado de todas as novas mensagens e tópicos.  Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado do tópico."
       tracked_categories: "Monitorado"
       tracked_categories_instructions: "Automaticamente monitora todos novos tópicos nestas categorias. Uma contagem de posts não lidos e novos aparecerá próximo ao tópico."
       muted_categories: "Silenciado"
@@ -866,7 +864,6 @@ pt_BR:
       saved_local_draft_tip: "salvo localmente"
       similar_topics: "Seu tópico é parecido com..."
       drafts_offline: "rascunhos offline"
-      group_mentioned: "Ao usar {{group}}, você irá notificar <a href='{{group_link}}'>{{count}} pessoas.</a>."
       error:
         title_missing: "Título é obrigatório"
         title_too_short: "O título tem que ter no mínimo {{min}} caracteres"
@@ -953,7 +950,6 @@ pt_BR:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Adquirido '{{description}}'</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagem na caixa de entrada de {{group_name}}</p>"
@@ -1149,20 +1145,20 @@ pt_BR:
         position: "mensagem %{current} de %{total}"
       notifications:
         reasons:
-          '3_6': 'Você receberá notificações porque você está acompanhando esta categoria.'
+          "3_6": 'Você receberá notificações porque você está acompanhando esta categoria.'
-          '3_5': 'Você receberá notificações porque começou a acompanhar este tópico automaticamente.'
+          "3_5": 'Você receberá notificações porque começou a acompanhar este tópico automaticamente.'
-          '3_2': 'Você receberá notificações porque está observando este tópico.'
+          "3_2": 'Você receberá notificações porque está observando este tópico.'
-          '3_1': 'Você receberá notificações porque criou este tópico.'
+          "3_1": 'Você receberá notificações porque criou este tópico.'
-          '3': 'Você receberá notificações porque você está observando este tópico.'
+          "3": 'Você receberá notificações porque você está observando este tópico.'
-          '2_8': 'Você receberá notificações porque você está monitorando essa categoria.'
+          "2_8": 'Você receberá notificações porque você está monitorando essa categoria.'
-          '2_4': 'Você receberá notificações porque postou uma resposta neste tópico.'
+          "2_4": 'Você receberá notificações porque postou uma resposta neste tópico.'
-          '2_2': 'Você receberá notificações porque está monitorando este tópico.'
+          "2_2": 'Você receberá notificações porque está monitorando este tópico.'
-          '2': 'Você receberá notificações porque você <a href="/users/{{username}}/preferences">leu este tópico</a>.'
+          "2": 'Você receberá notificações porque você <a href="/users/{{username}}/preferences">leu este tópico</a>.'
-          '1_2': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
+          "1_2": 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
-          '1': 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
+          "1": 'Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem.'
-          '0_7': 'Você está ignorando todas as notificações nessa categoria.'
+          "0_7": 'Você está ignorando todas as notificações nessa categoria.'
-          '0_2': 'Você está ignorando todas as notificações deste tópico.'
+          "0_2": 'Você está ignorando todas as notificações deste tópico.'
-          '0': 'Você está ignorando todas as notificações deste tópico.'
+          "0": 'Você está ignorando todas as notificações deste tópico.'
         watching_pm:
           title: "Acompanhando"
           description: "Você será notificado de cada mensagem nova neste tópico. Um contador de mensagens novas e não lidas também aparecerá próximo ao tópico."
@@ -2538,92 +2534,3 @@ pt_BR:
           label: "Novo:"
           add: "Adicionar"
           filter: "Busca (URL ou URL Externa)"
-    lightbox:
-      download: "download"
-    search_help:
-      title: 'Procurar na Ajuda'
-    keyboard_shortcuts_help:
-      title: 'Atalhos de teclado'
-      jump_to:
-        title: 'Ir Para'
-        home: '<b>g</b>, <b>h</b> Home'
-        latest: '<b>g</b>, <b>l</b> Últimos'
-        new: '<b>g</b>, <b>n</b> Novo'
-        unread: '<b>g</b>, <b>u</b> Não Lidos'
-        categories: '<b>g</b>, <b>c</b> Categorias'
-        top: '<b>g</b>, <b>t</b> Topo'
-        bookmarks: '<b>g</b>, <b>b</b> Favoritos'
-        profile: '<b>g</b>, <b>p</b> Perfil'
-        messages: '<b>g</b>, <b>m</b> Mensagens'
-      navigation:
-        title: 'Navegação'
-        jump: '<b>#</b> Ir para a resposta #'
-        back: '<b>u</b> Voltar'
-        up_down: '<b>k</b>/<b>j</b> Move seleção &uarr; &darr;'
-        open: '<b>o</b> ou <b>Enter</b> Abre tópico selecionado'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Pŕoxima seção/seção anterior'
-      application:
-        title: 'Aplicação'
-        create: '<b>c</b> Criar um tópico novo'
-        notifications: '<b>n</b> Abre notificações'
-        hamburger_menu: '<b>=</b> Abrir menu hamburger'
-        user_profile_menu: '<b>p</b> Abrir menu do usuário'
-        show_incoming_updated_topics: '<b>.</b> Exibir tópicos atualizados'
-        search: '<b>/</b> Pesquisa'
-        help: '<b>?</b> Abrir ajuda de teclado'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Descartar Novas Postagens'
-        dismiss_topics: '<b>x</b>, <b>t</b> Descartar Tópicos'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Deslogar'
-      actions:
-        title: 'Ações'
-        bookmark_topic: '<b>f</b> Adicionar tópico aos favoritos'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Fixar/Desfixar tópico'
-        share_topic: '<b>shift</b>+<b>s</b> Compartilhar tópico'
-        share_post: '<b>s</b> Compartilhar mensagem'
-        reply_as_new_topic: '<b>t</b> Responder como tópico linkado'
-        reply_topic: '<b>shift</b>+<b>r</b> Responder ao tópico'
-        reply_post: '<b>r</b> Responder a mensagem'
-        quote_post: '<b>q</b> Citar resposta'
-        like: '<b>l</b> Curtir a mensagem'
-        flag: '<b>!</b> Sinalizar mensagem'
-        bookmark: '<b>b</b> Marcar mensagem'
-        edit: '<b>e</b> Editar mensagem'
-        delete: '<b>d</b> Excluir mensagem'
-        mark_muted: '<b>m</b>, <b>m</b> Silenciar tópico'
-        mark_regular: '<b>m</b>, <b>r</b> Tópico (default) normal'
-        mark_tracking: '<b>m</b>, <b>t</b> Monitorar tópico'
-        mark_watching: '<b>m</b>, <b>w</b> Acompanhar tópico'
-    badges:
-      title: Emblemas
-      allow_title: "título disponível"
-      badge_count:
-        one: "1 Emblema"
-        other: "%{count} Emblemas"
-      more_badges:
-        one: "+1 Mais"
-        other: "+%{count} Mais"
-      granted:
-        one: "1 emblema concedido"
-        other: "%{count} emblemas concedidos"
-      select_badge_for_title: Selecione um emblema para usar como título
-      none: "<nenhum>"
-      badge_grouping:
-        getting_started:
-          name: Começando
-        community:
-          name: Comunidade
-        trust_level:
-          name: Nível de confiança
-        other:
-          name: Outro
-        posting:
-          name: Postando
-    google_search: |
-      <h3>Buscar com o Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>

config/locales/client.ro.yml

@@ -167,7 +167,7 @@ ro:
     edit: 'editează titlul și categoria acestui subiect'
     not_implemented: "Această caracteristică nu a fost implementată încă, ne pare rău!"
     no_value: "Nu"
-    yes_value: "Acceptă"
+    yes_value: "Da"
     generic_error: "Ne pare rău, a avut loc o eroare."
     generic_error_with_reason: "A avut loc o eroare: %{error}"
     sign_up: "Înregistrare"
@@ -269,8 +269,6 @@ ro:
     undo: "Anulează acțiunea precedentă"
     revert: "Refacere"
     failed: "Eșuat"
-    switch_to_anon: "Mod anonim"
-    switch_from_anon: "Ieșire din mod anonim"
     banner:
       close: "Ignoră acest banner."
       edit: "Editează acest banner >>"
@@ -374,18 +372,18 @@ ro:
         muted:
           title: "Mut"
     user_action_groups:
-      '1': "Aprecieri Date"
+      "1": "Aprecieri Date"
-      '2': "Aprecieri Primite"
+      "2": "Aprecieri Primite"
-      '3': "Semne de carte"
+      "3": "Semne de carte"
-      '4': "Discuții"
+      "4": "Discuții"
-      '5': "Răspunsuri"
+      "5": "Răspunsuri"
-      '6': "Răspunsuri"
+      "6": "Răspunsuri"
-      '7': "Mențiuni"
+      "7": "Mențiuni"
-      '9': "Citate"
+      "9": "Citate"
-      '11': "Editări"
+      "11": "Editări"
-      '12': "Obiecte Trimise"
+      "12": "Obiecte Trimise"
-      '13': "Primite"
+      "13": "Primite"
-      '14': "În așteptare"
+      "14": "În așteptare"
     categories:
       all: "toate categoriile"
       all_subcategories: "toate"
@@ -458,10 +456,10 @@ ro:
         disable: "Dezactiveaza notificarile"
         enable: "Activeaza Notificarile"
         each_browser_note: "Notati: Setarile vor fi modificate pe orice alt browser."
-      dismiss_notifications: "Marchează toate ca citite"
       dismiss_notifications_tooltip: "Marchează cu citit toate notificările necitite"
       disable_jump_reply: "Nu sări la postarea mea după ce răspund"
       dynamic_favicon: "Arată subiectele noi/actualizate în iconiţă browserului."
+      edit_history_public: "Permite altor utilizatori să vizualizeze reviziile postului meu"
       external_links_in_new_tab: "Deschide toate adresele externe într-un tab nou"
       enable_quoting: "Activează răspunsuri-citat pentru textul selectat"
       change: "schimbă"
@@ -478,8 +476,6 @@ ro:
         label: " "
         daily: "Trimite actualizări zilnice"
         individual: "Trimite un email pentru fiecare postare nouă"
-        many_per_day: "Trimite-mi un email pentru fiecare postare nouă (aproximativ {{dailyEmailEstimate}}/zi)"
-        few_per_day: "Trimite-mi un email pentru fiecare postare nouă (mai puțin de 2/zi)"
       watched_categories: "Văzut"
       tracked_categories: "Tracked"
       muted_categories: "Muted"
@@ -666,6 +662,34 @@ ro:
         title: "Sumar"
         stats: "Statistici"
         time_read: "timp de citit"
+        topic_count:
+          one: "subiect creat"
+          few: "subiecte create"
+          other: "de subiecte create"
+        post_count:
+          one: "postare creată"
+          few: "postări create"
+          other: "de postări create"
+        likes_given:
+          one: "<i class='fa fa-heart'></i> dat"
+          few: "<i class='fa fa-heart'></i> date"
+          other: "de <i class='fa fa-heart'></i> date"
+        likes_received:
+          one: "<i class='fa fa-heart'></i> primit"
+          few: "<i class='fa fa-heart'></i> primite"
+          other: "de <i class='fa fa-heart'></i> primite"
+        days_visited:
+          one: "zi vizitată"
+          few: "vizite zilnice"
+          other: "de zile vizitate"
+        posts_read:
+          one: "postare citită"
+          few: "postări citite"
+          other: "de postări citite"
+        bookmark_count:
+          one: "semn de carte"
+          few: "semne de carte"
+          other: "de semne de carte"
         top_replies: "Top răspunsuri"
         no_replies: "Nici un răspuns încă."
         more_replies: "Mai multe răspunsuri"
@@ -928,7 +952,6 @@ ro:
       invited_to_topic: "<i title='a invitat la discuţie' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='a acceptat invitația ta' class='fa fa-user'></i><p><span>{{username}}</span> a acceptat invitația ta</p>"
       moved_post: "<i title='postare mutată' class='fa fa-sign-out'></i><p><span>{{username}}</span> mutată {{description}}</p>"
-      linked: "<i title='adresă de postare' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='insignă acordată' class='fa fa-certificate'></i><p> Ţi s-a acordat {{description}}</p>"
       alt:
         mentioned: "Mentionat de"
@@ -1099,20 +1122,20 @@ ro:
         position: "postarea %{current} din %{total}"
       notifications:
         reasons:
-          '3_6': 'Vei primi notificări deoarece urmărești activ această categorie.'
+          "3_6": 'Vei primi notificări deoarece urmărești activ această categorie.'
-          '3_5': 'Vei primi notificări deoarece ai început să urmărești activ această discuție automat.'
+          "3_5": 'Vei primi notificări deoarece ai început să urmărești activ această discuție automat.'
-          '3_2': 'Vei primi notificări deoarece urmărești activ această discuție.'
+          "3_2": 'Vei primi notificări deoarece urmărești activ această discuție.'
-          '3_1': 'Vei primi notificări deoarece ați creat această discuție.'
+          "3_1": 'Vei primi notificări deoarece ați creat această discuție.'
-          '3': 'Vei primi notificări deoarece urmărești activ această discuție.'
+          "3": 'Vei primi notificări deoarece urmărești activ această discuție.'
-          '2_8': 'Vei primi notificări deoarece urmărești această categorie.'
+          "2_8": 'Vei primi notificări deoarece urmărești această categorie.'
-          '2_4': 'Vei primi notificări deoarece ai postat un răspuns în această discuție.'
+          "2_4": 'Vei primi notificări deoarece ai postat un răspuns în această discuție.'
-          '2_2': 'Vei primi notificări fiindcă urmărești această discuție.'
+          "2_2": 'Vei primi notificări fiindcă urmărești această discuție.'
-          '2': 'Vei primi notificări fiindcă citești <a href="/users/{{username}}/preferences">această discuție</a>.'
+          "2": 'Vei primi notificări fiindcă citești <a href="/users/{{username}}/preferences">această discuție</a>.'
-          '1_2': 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
+          "1_2": 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
-          '1': 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
+          "1": 'Vei fi notificat dacă cineva îți menționează @numele sau îți scrie un răspuns.'
-          '0_7': 'Ignori toate notificările din această categorie.'
+          "0_7": 'Ignori toate notificările din această categorie.'
-          '0_2': 'Ignori toate notificările din această discuție.'
+          "0_2": 'Ignori toate notificările din această discuție.'
-          '0': 'Ignori toate notificările din această discuție.'
+          "0": 'Ignori toate notificările din această discuție.'
         watching_pm:
           title: "Urmărit Activ"
           description: "Numărul postărilor noi va fi arătat pentru acest mesaj și vei fi notificat pentru orice răspuns scris."
@@ -1185,8 +1208,6 @@ ro:
         remove_banner: "Îndepărtaţi mesajul banner care apare în partea de sus a fiecărei pagini."
         banner_note: "Utilizatorii pot îndepărta baner-ul închizându-l. Doar un singur mesaj poate fi folosit că baner într-un moment dat."
       inviting: "Invită..."
-      automatically_add_to_groups_optional: "Aceasta invitație include și accesul la grupurile: (opțional, doar admin)"
-      automatically_add_to_groups_required: "Aceasta invitație include și accesul la grupurile: (<b>Neapărat</b>, doar admin)"
       invite_private:
         title: 'Invită la mesaj privat'
         email_or_username: "adresa de Email sau numele de utilizator al invitatului"
@@ -1563,12 +1584,6 @@ ro:
         one: "1 click"
         few: "%{count} click-uri"
         other: "%{count} click-uri"
-    post_links:
-      about: "Extinde link-urile pentru acest post"
-      title:
-        one: "Un link"
-        few: "%{count} link-uri"
-        other: "%{count} de link-uri"
     topic_statuses:
       warning:
         help: "Aceasta este o avertizare oficială."
@@ -1946,8 +1961,8 @@ ro:
         override_default: "Nu include foaia de stil standard"
         enabled: "Activat?"
         preview: "previzualizează"
-        undo_preview: "înlaturș previzualizarea"
+        undo_preview: "șterge previzualizarea"
-        rescue_preview: "stilul predefinit"
+        rescue_preview: "stil predefinit"
         explain_preview: "Vizualizează site-ul cu foaia de stil predefinită"
         explain_undo_preview: "Înapoi la foaia de stil preferentială activată momentan"
         explain_rescue_preview: "Vizualizeaza site-ul cu foaia de stil predefinită"
@@ -2190,7 +2205,7 @@ ro:
           regular: 'Utilizatori la nivel de încredere 3 (Utilizator activ)'
           leader: 'Utilizatori la nivel de încredere 4 (Lider)'
           staff: "Personalul"
-          admins: 'Utilizatori admin'
+          admins: 'Administratori'
           moderators: 'Moderatori'
           blocked: 'Utilizatori blocați'
           suspended: 'Utilizatori suspendați'
@@ -2495,93 +2510,3 @@ ro:
           label: "Nou:"
           add: "Adăugați"
           filter: "Căutare (URL sau URL extern)"
-    lightbox:
-      download: "descarcă"
-    search_help:
-      title: 'Ajutor căutare'
-    keyboard_shortcuts_help:
-      title: 'Scurtături de tastatură'
-      jump_to:
-        title: 'Sari la'
-        home: '<b>g</b>, <b>h</b> Acasă'
-        latest: '<b>g</b> apoi <b>l</b> ultimele'
-        new: '<b>g</b> apoi <b>n</b> noi'
-        unread: '<b>g</b> apoi <b>u</b> Necitite'
-        categories: '<b>g</b> apoi <b>c</b> Categorii'
-        top: '<b>g</b>, <b>t</b> Top'
-        bookmarks: '<b>g</b>, <b>b</b> Semne de carte'
-        messages: '<b>g</b>, <b>m</b> Mesaje'
-      navigation:
-        title: 'Navigare'
-        jump: '<b>#</b> Mergi la mesajul #'
-        back: '<b>u</b> Înapoi'
-        up_down: '<b>k</b>/<b>j</b> Muta selecția sus/jos'
-        open: '<b>o</b> sau <b>Introdu</b> Deschide discutia selectată'
-        next_prev: '<b>`</b>/<b>~</b> selecția Urmatoare/Precedentă'
-      application:
-        title: 'Applicația'
-        create: '<b>c</b> Creează discuție nouă'
-        notifications: '<b>n</b> Deschide notificare'
-        hamburger_menu: '<b>=</b> Deschide meniul hamburger'
-        user_profile_menu: '<b>p</b> Deschide meniu utilizator'
-        show_incoming_updated_topics: '<b>.</b> Arată discuţiile actualizate'
-        search: '<b>/</b> Caută'
-        help: '<b>?</b> Vezi comenzi rapide disponibile'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Respinge Nou/Mesaje'
-        dismiss_topics: '<b>x</b>, <b>t</b> Respinge discuţiile'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Ieșire din cont'
-      actions:
-        title: 'Acțiuni'
-        bookmark_topic: '<b>f</b> Comută semnul de carte pentru discuţie'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Promovează discuția'
-        share_topic: '<b>shift s</b> distribuie discuție'
-        share_post: '<b>s</b> Distribuie mesajul'
-        reply_as_new_topic: '<b>t</b> Răspunde că discuţie conexă'
-        reply_topic: '<b>shift r</b> Raspunde la discuție'
-        reply_post: '<b>r</b> Răspunde la postare'
-        quote_post: '<b>q</b> Citează mesajul'
-        like: '<b>l</b> Apreciează mesajul'
-        flag: '<b>!</b> Reclamă mesajul'
-        bookmark: '<b>b</b> Salvează postarea'
-        edit: '<b>e</b> Editează mesaj'
-        delete: '<b>d</b> Șterge mesaj'
-        mark_muted: '<b>m</b> apoi <b>m</b> Treceți discuția în mod silențios'
-        mark_regular: '<b>m</b>, <b>r</b> Discuție normală (implicită)'
-        mark_tracking: '<b>m</b>, <b>t</b> Urmăriți discuția'
-        mark_watching: '<b>m</b>, <b>w</b> Urmăriți discuția îndeaproape'
-    badges:
-      title: Insigne
-      badge_count:
-        one: "1 Insignă"
-        few: "%{count} Insigne"
-        other: "%{count} Insigne"
-      more_badges:
-        one: "+1 Mai mult"
-        few: "+%{count} Mai mult"
-        other: "+%{count} Mai mult"
-      granted:
-        one: "1 acordat"
-        few: "2 acordate"
-        other: "%{count} acordate"
-      select_badge_for_title: Selectează o insignă pentru a o folosii ca titlu
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Cum începem
-        community:
-          name: Communitate
-        trust_level:
-          name: Nivel de încredere
-        other:
-          name: Altele
-        posting:
-          name: Postând
-    google_search: |
-      <h3>Căutați cu Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>

config/locales/client.ru.yml

@@ -174,6 +174,7 @@ ru:
         disabled: 'Исключил из списков %{when}'
     topic_admin_menu: "действия администратора над темой"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
+    bootstrap_mode_disabled: "Bootstrap режим будет отключен в течение 24 часов."
     s3:
       regions:
         us_east_1: "US East (N. Virginia)"
@@ -202,11 +203,7 @@ ru:
     show_more: "показать дальше"
     show_help: "Cправка"
     links: "Ссылки"
-    links_lowercase:
+    c4a0b77944e0de96f84647621e716a44_trfaq: "Вопрос-ответ"
-      one: "ссылка"
-      few: "ссылки"
-      other: "ссылок"
-    faq: "Вопрос-ответ"
     guidelines: "Руководство"
     privacy_policy: "Политика конфиденциальности"
     privacy: "Политика конфиденциальности"
@@ -296,8 +293,6 @@ ru:
     undo: "Отменить"
     revert: "Вернуть"
     failed: "Проблема"
-    switch_to_anon: "Анонимный режим"
-    switch_from_anon: "Выйти из анонимного режима"
     banner:
       close: "Больше не показывать это объявление."
       edit: "Редактировать это объявление >>"
@@ -412,18 +407,18 @@ ru:
           title: "Выключено"
           description: "Не уведомлять о новых темах в этой группе."
     user_action_groups:
-      '1': "Выразил симпатий"
+      "1": "Выразил симпатий"
-      '2': "Получил симпатий"
+      "2": "Получил симпатий"
-      '3': "Закладки"
+      "3": "Закладки"
-      '4': "Темы"
+      "4": "Темы"
-      '5': "Сообщения"
+      "5": "Сообщения"
-      '6': "Ответы"
+      "6": "Ответы"
-      '7': "Упоминания"
+      "7": "Упоминания"
-      '9': "Цитаты"
+      "9": "Цитаты"
-      '11': "Изменения"
+      "11": "Изменения"
-      '12': "Отправленные"
+      "12": "Отправленные"
-      '13': "Входящие"
+      "13": "Входящие"
-      '14': "Ожидает одобрения"
+      "14": "Ожидает одобрения"
     categories:
       all: "Все разделы"
       all_subcategories: "Все подкатегории"
@@ -500,10 +495,10 @@ ru:
         disable: "Отключить оповещения"
         enable: "Включить оповещения"
         each_browser_note: "Примечание: эта настройка устанавливается в каждом браузере индивидуально."
-      dismiss_notifications: "Пометить все прочитанными"
       dismiss_notifications_tooltip: "Пометить все непрочитанные уведомления прочитанными"
       disable_jump_reply: "Не переходить к вашему новому сообщению после ответа"
       dynamic_favicon: "Показывать колличество новых / обновленных тем на иконке сообщений"
+      edit_history_public: "Разрешить другим пользователям просматривать мои редакции сообщения"
       external_links_in_new_tab: "Открывать все внешние ссылки в новой вкладке"
       enable_quoting: "Позволить отвечать с цитированием выделенного текста"
       change: "изменить"
@@ -516,9 +511,9 @@ ru:
       suspended_reason: "Причина:"
       github_profile: "Github"
       mailing_list_mode:
+        daily: "Отправить ежедневные обновления"
         individual: "Отправлять письмо каждый раз, когда появляется новое сообщение."
       watched_categories: "Наблюдение"
-      watched_categories_instructions: "Вы будете автоматически отслеживать все новые темы в этих разделах. Вам будут приходить уведомления о новых сообщениях и темах, плюс рядом со списком тем будет отображено количество  новых сообщений."
       tracked_categories: "Отслеживаемые разделы"
       tracked_categories_instructions: "Автоматически следить за всеми новыми темами из следующих разделов. Счетчик новых и непрочитанных сообщений будет появляться рядом с названием темы."
       muted_categories: "Выключенные разделы"
@@ -562,7 +557,6 @@ ru:
         error: "При изменении значения произошла ошибка."
       change_username:
         title: "Изменить псевдоним"
-        confirm: "Если вы измените свой псевдоним, то все существующие цитаты ваших сообщений и упоминания вас по @псевдониму в чужих сообщениях перестанут ссылаться на вас. Вы точно хотите изменить псевадоним?"
         taken: "Этот псевдоним уже занят."
         error: "При изменении псевдонима произошла ошибка."
         invalid: "Псевдоним должен состоять только из цифр и латинских букв"
@@ -643,7 +637,6 @@ ru:
         always: "всегда"
         never: "никогда"
       email_digests:
-        title: "В случае моего отсутствия на сайте присылайте мне сводку новостей по почте:"
         every_30_minutes: "каждые 30 минут"
         every_hour: "каждый час"
         daily: "ежедневно"
@@ -655,11 +648,6 @@ ru:
       email_always: "Присылать почтовое уведомление, даже если я присутствую на сайте"
       other_settings: "Прочее"
       categories_settings: "Разделы"
-      enable_mailing_list:
-        one: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?"
-        few: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?<br><br>Это будет в среднем <b>{{count}} письма</b> в день, а иногда больше."
-        many: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?<br><br>Это будет в среднем <b>{{count}} писем</b> в день, а иногда больше."
-        other: "Вы уверены, что хотите получать письма буквально о каждом новом сообщении на форуме?<br><br>Это будет в среднем <b>{{count}} писем</b> в день, а иногда больше."
       new_topic_duration:
         label: "Считать темы новыми, если"
         not_viewed: "ещё не просмотрены"
@@ -826,11 +814,7 @@ ru:
     unmute: Включить
     last_post: Последнее сообщение
     last_reply_lowercase: последний ответ
-    replies_lowercase:
+    ed6f28c9ea3940524a3044a1ee58cb7c_trsignup_cta:
-      one: ответ
-      few: ответа
-      other: ответов
-    signup_cta:
       sign_up: "Зарегистрироваться"
       hide_session: "Напомнить мне завтра"
       hide_forever: "Нет, спасибо"
@@ -939,7 +923,6 @@ ru:
       saved_local_draft_tip: "Сохранено локально"
       similar_topics: "Ваша тема похожа на..."
       drafts_offline: "Черновики, сохраненные в офлайн"
-      group_mentioned: "При использовании {{group}}, <a href='{{group_link}}'>{{count}} людям</a> будут отправлены уведомления."
       error:
         title_missing: "Требуется название темы"
         title_too_short: "Название темы должно быть не короче {{min}} символов"
@@ -1025,7 +1008,6 @@ ru:
       invited_to_topic: "<i title='приглашен в тему' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> принял(а) ваше приглашение</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> переместил(а) {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Вы награждены: {{description}}</p>"
       alt:
         mentioned: "Упомянуто"
@@ -1227,20 +1209,20 @@ ru:
         position: "%{current} сообщение из %{total}"
       notifications:
         reasons:
-          '3_6': 'Вы будете получать уведомления, т.к. наблюдаете за этим разделом.'
+          "3_6": 'Вы будете получать уведомления, т.к. наблюдаете за этим разделом.'
-          '3_5': 'Вы будете получать уведомления, т.к. наблюдение темы началось автоматически.'
+          "3_5": 'Вы будете получать уведомления, т.к. наблюдение темы началось автоматически.'
-          '3_2': 'Вы будете получать уведомления, т.к. наблюдаете за этой темой.'
+          "3_2": 'Вы будете получать уведомления, т.к. наблюдаете за этой темой.'
-          '3_1': 'Вы будете получать уведомления, т.к. создали эту тему.'
+          "3_1": 'Вы будете получать уведомления, т.к. создали эту тему.'
-          '3': 'Вы будете получать уведомления, т.к. наблюдаете за темой.'
+          "3": 'Вы будете получать уведомления, т.к. наблюдаете за темой.'
-          '2_8': 'Вы будете получать уведомления, т.к. следите за этим разделом.'
+          "2_8": 'Вы будете получать уведомления, т.к. следите за этим разделом.'
-          '2_4': 'Вы будете получать уведомления, т.к. ответили в теме.'
+          "2_4": 'Вы будете получать уведомления, т.к. ответили в теме.'
-          '2_2': 'Вы будете получать уведомления, т.к. следите за этой темой.'
+          "2_2": 'Вы будете получать уведомления, т.к. следите за этой темой.'
-          '2': 'Вы будете получать уведомления, т.к. <a href="/users/{{username}}/preferences">читали эту тему</a>.'
+          "2": 'Вы будете получать уведомления, т.к. <a href="/users/{{username}}/preferences">читали эту тему</a>.'
-          '1_2': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
+          "1_2": 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
-          '1': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
+          "1": 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.'
-          '0_7': 'Не получать уведомлений из этого раздела.'
+          "0_7": 'Не получать уведомлений из этого раздела.'
-          '0_2': 'Не получать уведомлений по этой теме.'
+          "0_2": 'Не получать уведомлений по этой теме.'
-          '0': 'Не получать уведомлений по этой теме.'
+          "0": 'Не получать уведомлений по этой теме.'
         watching_pm:
           title: "Наблюдать"
           description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов."
@@ -1315,8 +1297,6 @@ ru:
         banner_note: "Пользователи могут отклонить объявление, закрыв его. Только одну тему можно сделать текущим объявлением."
         no_banner_exists: "Нет текущих объявлений."
       inviting: "Высылаю приглашение..."
-      automatically_add_to_groups_optional: "Это приглашение также включает в себя доступ к следующим группам: (опционально, только для администратора)"
-      automatically_add_to_groups_required: "Это приглашение также включает в себя доступ к следующим группам: (<b>Обязательно</b>, только для администратора)"
       invite_private:
         title: 'Пригласить в беседу'
         email_or_username: "Адрес электронной почты или псевдоним того, кого вы хотите пригласить"
@@ -1545,11 +1525,7 @@ ru:
             few: "Вы и еще {{count}} человека отметили это как требующее модерации"
             many: "Вы и еще {{count}} человек отметили это как требующее модерации"
             other: "Вы и еще {{count}} человек отметили это как требующее модерации"
-          notify_user:
+          fd4c41cd2bb5de71bae01080a4a74f59_trbookmark:
-            one: "Вы и еще 1 человек отправили сообщение этому пользователю"
-            few: "Вы и еще {{count}} человека отправили сообщение этому пользователю"
-            other: "Вы и еще {{count}} человек отправили сообщение этому пользователю"
-          bookmark:
             one: "Вы и еще {{count}} человек добавили это сообщение в закладки"
             few: "Вы и еще {{count}} человека добавили это сообщение в закладки"
             many: "Вы и еще {{count}} человек добавили это сообщение в закладки"
@@ -1585,11 +1561,7 @@ ru:
             few: "{{count}} человека отметили это как требующее модерации"
             many: "{{count}} человек отметили это как требующее модерации"
             other: "{{count}} человек отметили это как требующее модерации"
-          notify_user:
+          f191ee3aa9c07f352705b5ee977c74da_trbookmark:
-            one: "1 человек отправил сообщение этому пользователю"
-            few: "{{count}} человека отправили сообщение этому пользователю"
-            other: "{{count}} человек отправили сообщение этому пользователю"
-          bookmark:
             one: "{{count}} человек добавил это сообщение в закладки"
             few: "{{count}} человека добавили это сообщение в закладки"
             many: "{{count}} человек добавили это сообщение в закладки"
@@ -1766,25 +1738,13 @@ ru:
       other {}}
     original_post: "Начальное сообщение"
     views: "Просм."
-    views_lowercase:
+    4e6f81a5008f054376e322d0cad2e68e_trreplies: "Ответов"
-      one: "просмотр"
-      few: "просмотра"
-      other: "просмотров"
-    replies: "Ответов"
     views_long: "тема просмотрена {{number}} раз"
     activity: "Активность"
     likes: "Нрав."
-    likes_lowercase:
+    075de56487a16cc4a7500880a5a64219_trlikes_long: "{{number}} лайков в теме"
-      one: "лайк"
-      few: "лайка"
-      other: "лайков"
-    likes_long: "{{number}} лайков в теме"
     users: "Пользователи"
-    users_lowercase:
+    29473ef4a5376b201204fdbbe04e2c0f_trcategory_title: "Раздел"
-      one: "пользователь"
-      few: "пользователя"
-      other: "пользователей"
-    category_title: "Раздел"
     history: "История"
     changed_by: "автором {{author}}"
     raw_email:
@@ -2730,118 +2690,3 @@ ru:
           label: "Новая постоянная ссылка:"
           add: "Добавить"
           filter: "Поиск по ссылке или внешней ссылке (URL)"
-    lightbox:
-      download: "загрузить"
-    search_help:
-      title: 'Справка по поиску'
-    keyboard_shortcuts_help:
-      title: 'Сочетания клавиш'
-      jump_to:
-        title: 'Перейти к'
-        home: '<b>g</b>, <b>h</b> Домой'
-        latest: '<b>g</b>, <b>l</b> Последние'
-        new: '<b>g</b>, <b>n</b> Новые'
-        unread: '<b>g</b>, <b>u</b> Непрочитанные'
-        categories: '<b>g</b>, <b>c</b> Разделы'
-        top: '<b>g</b>, <b>t</b> Вверх'
-        bookmarks: '<b>g</b>, <b>b</b> Закладки'
-        profile: '<b>g</b>, <b>p</b> Профиль'
-        messages: '<b>g</b>, <b>m</b> Сообщения'
-      navigation:
-        title: 'Навигация'
-        jump: '<b>#</b> Перейти к сообщение №'
-        back: '<b>u</b> Назад'
-        up_down: '<b>k</b>/<b>j</b> Переместить выделение &uarr; &darr;'
-        open: '<b>o</b> или <b>Enter</b> Открыть выбранную тему'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Следующая/предыдущая секция'
-      application:
-        title: 'Приложение'
-        create: '<b>c</b> Создать новую тему'
-        notifications: '<b>n</b> Открыть уведомления'
-        hamburger_menu: '<b>=</b> Открыть меню'
-        user_profile_menu: '<b>p</b> Открыть меню моего профиля'
-        show_incoming_updated_topics: '<b>.</b> Показать обновленные темы'
-        search: '<b>/</b> Поиск'
-        help: '<b>?</b> Открыть помощь по горячим клавишам'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Отложить новые сообщения'
-        dismiss_topics: '<b>x</b>, <b>t</b> Отложить темы'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Выйти'
-      actions:
-        title: 'Действия'
-        bookmark_topic: '<b>f</b> Добавить в Избранное'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Закрепить/Открепить тему'
-        share_topic: '<b>shift</b>+<b>s</b> Поделиться темой'
-        share_post: '<b>s</b> Поделиться сообщением'
-        reply_as_new_topic: '<b>t</b> Ответить в новой связанной теме'
-        reply_topic: '<b>shiftr</b>+<b>r</b> Ответить на тему'
-        reply_post: '<b>r</b> Ответить на сообщение'
-        quote_post: '<b>q</b> Цитировать сообщение'
-        like: '<b>l</b> Лайкнуть сообщение'
-        flag: '<b>!</b> Пожаловаться на сообщение'
-        bookmark: '<b>b</b> Добавить сообщение в избранные'
-        edit: '<b>e</b> Изменить сообщение'
-        delete: '<b>d</b> Удалить сообщение'
-        mark_muted: '<b>m</b>, <b>m</b> Отключить уведомления в теме'
-        mark_regular: '<b>m</b>, <b>r</b> Включить уведомления в теме'
-        mark_tracking: '<b>m</b>, <b>t</b> Отслеживать тему'
-        mark_watching: '<b>m</b>, <b>w</b> Наблюдать за темой'
-    badges:
-      others_count: "Другие с этой наградой (%{count})"
-      title: Награды
-      multiple_grant: "Выдаётся многократно"
-      badge_count:
-        one: "1 награда"
-        few: "%{count} награды"
-        many: "%{count} наград"
-        other: "%{count} наград"
-      more_badges:
-        one: "+ еще 1"
-        few: "+ еще %{count}"
-        many: "+ еще %{count}"
-        other: "+ еще %{count}"
-      granted:
-        one: "выдан %{count}"
-        few: "выдано %{count}"
-        many: "выдано %{count}"
-        other: "выдано %{count}"
-      select_badge_for_title: Использовать награду в качестве вашего титула
-      none: "<отсутствует>"
-      badge_grouping:
-        getting_started:
-          name: Начало
-        community:
-          name: Сообщество
-        trust_level:
-          name: Уровень доверия
-        other:
-          name: Прочее
-        posting:
-          name: Темы и сообщения
-    google_search: |
-      <h3>Поиск через Google</h3>
-      <p>
-      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-      <input type="text" id='user-query' value="">
-      <input type='hidden' id='google-query' name="q">
-      <button class="btn btn-primary">Google</button>
-      </form>
-      </p>
-    tagging:
-      all_tags: "Все тэги"
-      selector_all_tags: "все тэги"
-      changed: "тэги изменились:"
-      tags: "Тэги"
-      delete_tag: "Удалить тэг"
-      delete_confirm: "Вы уверены, что хотите удалить этот тэг?"
-      rename_tag: "Переименовать тэг"
-      rename_instructions: "Выберите новое имя для тэга:"
-      sort_by: "Сортировать:"
-      sort_by_count: "количество"
-      sort_by_name: "имя"
-      notifications:
-        watching:
-          title: "Наблюдение"
-        tracking:
-          title: "Следить"
-        muted:
-          title: "Игнорируется"

config/locales/client.sk.yml

@@ -271,8 +271,6 @@ sk:
     undo: "Späť"
     revert: "Vrátiť zmeny"
     failed: "Nepodarilo sa"
-    switch_to_anon: "Anonymný mód"
-    switch_from_anon: "Opustiť anonymný mód"
     banner:
       close: "Zamietnuť tento banner."
       edit: "Upraviť tento banner >>"
@@ -379,18 +377,18 @@ sk:
           title: "Ignorovaný"
           description: "Nikdy nebudete upozornení na nič ohľadom nových tém v tejto skupine."
     user_action_groups:
-      '1': "Rozdaných 'páči sa mi'"
+      "1": "Rozdaných 'páči sa mi'"
-      '2': "Obdržaných 'páči sa mi'"
+      "2": "Obdržaných 'páči sa mi'"
-      '3': "Záložky"
+      "3": "Záložky"
-      '4': "Témy"
+      "4": "Témy"
-      '5': "Odpovede"
+      "5": "Odpovede"
-      '6': "Odozvy"
+      "6": "Odozvy"
-      '7': "Zmienky"
+      "7": "Zmienky"
-      '9': "Citácie"
+      "9": "Citácie"
-      '11': "Úpravy"
+      "11": "Úpravy"
-      '12': "Odoslané správy"
+      "12": "Odoslané správy"
-      '13': "Prijaté správy"
+      "13": "Prijaté správy"
-      '14': "Čakajúce správy"
+      "14": "Čakajúce správy"
     categories:
       all: "všetky kategórie"
       all_subcategories: "všetky"
@@ -465,10 +463,10 @@ sk:
         disable: "Zakázať upozornenia"
         enable: "Povoliť upozornenia"
         each_browser_note: "Poznámka: Toto nastavenie musíte zmeniť v každom používanom prehliadači."
-      dismiss_notifications: "Označiť všetky ako prečítané"
       dismiss_notifications_tooltip: "Označiť všetky neprečítané upozornenia ako prečítané"
       disable_jump_reply: "Neskočiť na môj príspevok po odpovedi"
       dynamic_favicon: "Zobraziť počet nových/upravených tém na ikone prehliadača"
+      edit_history_public: "Povoliť ostatným užívateľom zobrazenie všetkých verzií môjho príspevku"
       external_links_in_new_tab: "Otvoriť všekty externé odkazy v novej záložke"
       enable_quoting: "Umožniť odpoveď s citáciou z označeného textu"
       change: "zmeniť"
@@ -481,7 +479,6 @@ sk:
       suspended_reason: "Dôvod:"
       github_profile: "Github"
       watched_categories: "Sledované"
-      watched_categories_instructions: "Budete automaticky sledovať všetky nové témy v týchto kategóriách. Budete upozornený na všetky nové príspevky a témy, a zároveň bude vedľa témy zobrazený počet nových príspevkov."
       tracked_categories: "Sledované"
       tracked_categories_instructions: "Budete automaticky sledovať všetky nové témy v týchto kategóriách. Počet nových príspevkov sa bude zobraziť vedľa témy."
       muted_categories: "Ignorovaný"
@@ -858,7 +855,6 @@ sk:
       saved_local_draft_tip: "uložené lokálne"
       similar_topics: "Vaša téma je podobná..."
       drafts_offline: "offline koncepty"
-      group_mentioned: "Použitím tejto  {{group}} , upozorníte <a href='{{group_link}}'>{{count}} ľudí</a>."
       error:
         title_missing: "Názov je povinný"
         title_too_short: "Názov musí mať minimálne {{min}} znakov"
@@ -939,7 +935,6 @@ sk:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> prijal Vaše pozvanie</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> presunul {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Získal '{{description}}'</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} správa vo vašej {{group_name}} schránke</p>"
@@ -1136,20 +1131,20 @@ sk:
         position: "%{current}  príspevok z %{total}"
       notifications:
         reasons:
-          '3_6': 'Budete dostávať upozornenia, pretože sa pozeráte na túto kategóriu.'
+          "3_6": 'Budete dostávať upozornenia, pretože sa pozeráte na túto kategóriu.'
-          '3_5': 'Budete automaticky dostávať upozornenie pretože ste začali pozorovať túto tému.'
+          "3_5": 'Budete automaticky dostávať upozornenie pretože ste začali pozorovať túto tému.'
-          '3_2': 'Budete dostávať upozornenia, pretože sa pozeráte na túto tému.'
+          "3_2": 'Budete dostávať upozornenia, pretože sa pozeráte na túto tému.'
-          '3_1': 'Budete dostávať upozornenia, pretože ste vytvorili túto tému.'
+          "3_1": 'Budete dostávať upozornenia, pretože ste vytvorili túto tému.'
-          '3': 'Budete dostávať upozornenia, pretože sa pozeráte na túto tému.'
+          "3": 'Budete dostávať upozornenia, pretože sa pozeráte na túto tému.'
-          '2_8': 'Budete dostávať upozornenia, pretože sledujete túto kategóriu.'
+          "2_8": 'Budete dostávať upozornenia, pretože sledujete túto kategóriu.'
-          '2_4': 'Budete dostávať upozornenia, pretože ste zaslali odpoveď na túto tému.'
+          "2_4": 'Budete dostávať upozornenia, pretože ste zaslali odpoveď na túto tému.'
-          '2_2': 'Budete dostávať upozornenia, pretože sledujete túto tému.'
+          "2_2": 'Budete dostávať upozornenia, pretože sledujete túto tému.'
-          '2': 'Budete dostávať upozornenia, pretože ste <a href="/users/{{username}}/preferences">čítali túto tému</a>.'
+          "2": 'Budete dostávať upozornenia, pretože ste <a href="/users/{{username}}/preferences">čítali túto tému</a>.'
-          '1_2': 'Budete upozornený ak niekto spomenie Vaše @meno alebo Vám odpovie.'
+          "1_2": 'Budete upozornený ak niekto spomenie Vaše @meno alebo Vám odpovie.'
-          '1': 'Budete upozornený ak niekto spomenie Vaše @meno alebo Vám odpovie.'
+          "1": 'Budete upozornený ak niekto spomenie Vaše @meno alebo Vám odpovie.'
-          '0_7': 'Ignorujete všetky upozornenia v tejto kategórii.'
+          "0_7": 'Ignorujete všetky upozornenia v tejto kategórii.'
-          '0_2': 'Ignorujete všetky upozornenia k tejto téme.'
+          "0_2": 'Ignorujete všetky upozornenia k tejto téme.'
-          '0': 'Ignorujete všetky upozornenia k tejto téme.'
+          "0": 'Ignorujete všetky upozornenia k tejto téme.'
         watching_pm:
           title: "Pozerať"
           description: "Budete upozornený na každú novu dopoveť na túto správu, a zobrazí sa počet nových odpovedí"
@@ -1236,8 +1231,6 @@ sk:
         no_banner_exists: "Neexistuje žiadna banerová téma."
         banner_exists: "Banerová téma <strong class='badge badge-notification unread'>je</strong> aktuálne nastavená."
       inviting: "Pozývam..."
-      automatically_add_to_groups_optional: "Táto pozvánka obsahuje taktiež prístup do týchto skupín: ( nepovinné, iba správca) "
-      automatically_add_to_groups_required: "Táto pozvánka obsahuje taktiež prístup do týchto skupín: ( <b>Povinné</b>, iba správca) "
       invite_private:
         title: 'Pozvať do konverzácie'
         email_or_username: "Email, alebo užívateľské meno pozvaného"
@@ -1654,10 +1647,10 @@ sk:
     posts_long: "v tejto téme je {{number}} príspevkov"
     posts_likes_MF: |
       Táto téma obsahuje {count, plural, one {1 odpoveď} other {# odpovedí}} {ratio, select,
-        low {s vysokým pomerom "Páči sa" na príspevok}
+      low {s vysokým pomerom "Páči sa" na príspevok}
-        med {s veľmi vysokým pomerom "Páči sa" na príspevok}
+      med {s veľmi vysokým pomerom "Páči sa" na príspevok}
-        high {s extrémne vysokým pomerom "Páči sa" na príspevok}
+      high {s extrémne vysokým pomerom "Páči sa" na príspevok}
-        other {}}
+      other {}}
     original_post: "Pôvodný príspevok"
     views: "Zobrazenia"
     views_lowercase:
@@ -2609,98 +2602,3 @@ sk:
           label: "Nový:"
           add: "Pridať"
           filter: "Hľadať (URL alebo externá URL)"
-    lightbox:
-      download: "stiahnuť"
-    search_help:
-      title: 'Pomoc pri vyhľadávaní'
-    keyboard_shortcuts_help:
-      title: 'Klávesové skratky'
-      jump_to:
-        title: 'Preskočiť na'
-        home: '<b>g</b>, <b>h</b> Domov'
-        latest: '<b>g</b>, <b>l</b> Najnovšie'
-        new: '<b>g</b>, <b>n</b> Nové'
-        unread: '<b>g</b>, <b>u</b> Neprečítané'
-        categories: '<b>g</b>, <b>c</b> Kategórie'
-        top: '<b>g</b>, <b>t</b> Hore'
-        bookmarks: '<b>g</b>, <b>b</b> Záložky'
-        profile: '<b>g</b>, <b>p</b> Profil'
-        messages: '<b>g</b>, <b>m</b> Správy'
-      navigation:
-        title: 'Navigácia'
-        jump: '<b>#</b> Choď na príspevok #'
-        back: '<b>u</b> Späť'
-        up_down: '<b>k</b>/<b>j</b> Presuň označené &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b>Otvoriť zvolenú tému'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Nasledujúca/predchádzajúca sekcia'
-      application:
-        title: 'Aplikácia'
-        create: '<b>c</b> Vytvoriť novú tému'
-        notifications: '<b>n</b> Otvor upozornenia'
-        hamburger_menu: '<b>=</b> Otvoriť hamburger menu'
-        user_profile_menu: '<b>p</b> Otvor užívateľské menu'
-        show_incoming_updated_topics: '<b>.</b> Zobraz aktualizované témy'
-        search: '<b>/</b> Hľadať'
-        help: '<b>?</b> Pomoc s klávesovými skratkami'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Zahodiť Nové/Príspevky'
-        dismiss_topics: '<b>x</b>, <b>t</b> Zahodiť témy'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Odhlásiť sa'
-      actions:
-        title: 'Akcie'
-        bookmark_topic: '<b>f</b> Zmeniť tému záložky'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Pripnúť/Odopnúť tému'
-        share_topic: '<b>shift</b>+<b>s</b> Zdielať tému'
-        share_post: '<b>s</b> Zdielať príspevok'
-        reply_as_new_topic: '<b>t</b> Odpoveď ako súvisiaca téma'
-        reply_topic: '<b>shift</b>+<b>r</b> Odpovedať na tému'
-        reply_post: '<b>r</b> Odpovedať na príspevok'
-        quote_post: '<b>q</b> Citovať príspevok'
-        like: '<b>l</b> Označiť príspevok "Páči sa"'
-        flag: '<b>!</b> Označiť príspevok '
-        bookmark: '<b>b</b> Pridať príspevok do záložiek'
-        edit: '<b>e</b> Editovat príspevok'
-        delete: '<b>d</b> Zmazať príspevok'
-        mark_muted: '<b>m</b>, <b>m</b> Umlčať tému'
-        mark_regular: '<b>m</b>, <b>r</b> Obyčajná (preddefinovaná) téma'
-        mark_tracking: '<b>m</b>, <b>w</b> Sledovať tému'
-        mark_watching: '<b>m</b>, <b>w</b> Sledovať tému'
-    badges:
-      earned_n_times:
-        one: "Získal tento odkaz 1 krát"
-        few: "Získal tento odkaz %{count} krát"
-        other: "Získal tento odkaz %{count} krát"
-      title: Odznaky
-      badge_count:
-        one: "1 Odznak"
-        few: "%{count} Odznaky"
-        other: "%{count} Odznakov"
-      more_badges:
-        one: "+1 Viac"
-        few: "+%{count} Viac"
-        other: "+%{count} Viac"
-      granted:
-        one: "1 povolené"
-        few: "%{count} povolené"
-        other: "%{count} povolených"
-      select_badge_for_title: Vyberte odznak, ktorý chcete použiť ako Váš titul
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Začíname
-        community:
-          name: Komunita
-        trust_level:
-          name: Stupeň dôvery
-        other:
-          name: Ostatné
-        posting:
-          name: Prispievam
-    google_search: |
-      <h3>Vyhľadávať pomocou Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>

config/locales/client.sq.yml

@@ -249,8 +249,6 @@ sq:
     undo: "Çbëj"
     revert: "Rikthe"
     failed: "Dështoi"
-    switch_to_anon: "Mënyrë anonime"
-    switch_from_anon: "Shkëputu si anonim"
     banner:
       close: "Hiq këtë banderolë."
       edit: "Modifiko këtë banderolë >>"
@@ -356,18 +354,18 @@ sq:
           title: "Pa njoftime"
           description: "Ju nuk do të njoftoheni asnjëherë për asgjë mbi temat e reja të këtij grupi."
     user_action_groups:
-      '1': "Pëlqime të dhëna"
+      "1": "Pëlqime të dhëna"
-      '2': "Pëlqime të marra"
+      "2": "Pëlqime të marra"
-      '3': "Të preferuarat"
+      "3": "Të preferuarat"
-      '4': "Tema"
+      "4": "Tema"
-      '5': "Përgjigje"
+      "5": "Përgjigje"
-      '6': "Përgjigjet"
+      "6": "Përgjigjet"
-      '7': "Përmendje"
+      "7": "Përmendje"
-      '9': "Citime"
+      "9": "Citime"
-      '11': "Redaktime"
+      "11": "Redaktime"
-      '12': "Të dërguar"
+      "12": "Të dërguar"
-      '13': "Inbox"
+      "13": "Inbox"
-      '14': "Në pritje"
+      "14": "Në pritje"
     categories:
       all: "kategoritë"
       all_subcategories: "të gjitha"
@@ -440,10 +438,10 @@ sq:
         disable: "Çaktivizoni njoftimet"
         enable: "Aktivizoni njoftimet"
         each_browser_note: "Shënim: Duhet të ndryshoni këtë rregullim (setting) në çdo shfletues që përdorni. "
-      dismiss_notifications: "Shëno të gjitha si të lexuara"
       dismiss_notifications_tooltip: "Shëno njoftimet e palexuara si të lexuara"
       disable_jump_reply: "Don't jump to my post after I reply"
       dynamic_favicon: "Tregoni numrin e temave të reja e azhornuara në ikonën e shfletuesit"
+      edit_history_public: "Lejo anëtarët e tjerë të shikojnë redaktimet e mia"
       external_links_in_new_tab: "Hap të gjitha lidhjet e jashtme në një tab të ri"
       enable_quoting: "Aktivizo citimin në përgjigje për tekstin e përzgjedhur"
       change: "ndrysho"
@@ -456,7 +454,6 @@ sq:
       suspended_reason: "Arsyeja:"
       github_profile: "Github"
       watched_categories: "Shikuar"
-      watched_categories_instructions: "You will automatically watch all new topics in these categories. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic."
       tracked_categories: "Gjurmuar"
       tracked_categories_instructions: "You will automatically track all new topics in these categories. A count of new posts will appear next to the topic."
       muted_categories: "Pa njoftime"
@@ -744,8 +741,6 @@ sq:
     too_few_topics_notice: "Let's <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>get this discussion started!</a> There are currently <strong>%{currentTopics} / %{requiredTopics}</strong> topics. New visitors need some conversations to read and respond to."
     too_few_posts_notice: "Let's <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>get this discussion started!</a> There are currently <strong>%{currentPosts} / %{requiredPosts}</strong> posts. New visitors need some conversations to read and respond to."
     logs_error_rate_notice:
-      reached: "%{timestamp}: Current rate of <a href='%{url}' target='_blank'>%{rate}</a> has reached site settings's limit of %{siteSettingRate}."
-      exceeded: "%{timestamp}: Current rate of <a href='%{url}' target='_blank'>%{rate}</a> has exceeded site settings's limit of %{siteSettingRate}."
       rate:
         one: "1 gabim/%{duration}"
         other: "%{count} gabime/%{duration}"
@@ -874,7 +869,6 @@ sq:
       saved_local_draft_tip: "ruajtur lokalisht"
       similar_topics: "Tema juaj është e ngjashme me..."
       drafts_offline: "draftet offline"
-      group_mentioned: "Duke qënë se po përdorni {{group}}, jeni duke njoftuar <a href='{{group_link}}'>{{count}} anëtarë</a>."
       error:
         title_missing: "Titulli është i nevojshëm"
         title_too_short: "Titulli duhet të ketë të paktën {{min} shkronja."
@@ -961,7 +955,6 @@ sq:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> pranoi ftesën tuaj</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> transferoi {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Earned '{{description}}'</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} message in your {{group_name}} inbox</p>"
@@ -1155,20 +1148,20 @@ sq:
         position: "tema %{current} nga %{total}"
       notifications:
         reasons:
-          '3_6': 'Ju do të merrni njoftime sepse jeni duke vëzhguar këtë kategori. '
+          "3_6": 'Ju do të merrni njoftime sepse jeni duke vëzhguar këtë kategori. '
-          '3_5': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë automatikisht. '
+          "3_5": 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë automatikisht. '
-          '3_2': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
+          "3_2": 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
-          '3_1': 'Ju do të njoftoheni duke qënë se ju jeni autori i kësaj teme. '
+          "3_1": 'Ju do të njoftoheni duke qënë se ju jeni autori i kësaj teme. '
-          '3': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
+          "3": 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
-          '2_8': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë kategori. '
+          "2_8": 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë kategori. '
-          '2_4': 'Ju do të njoftoheni duke qënë se keni dërguar një përgjigje në këtë temë. '
+          "2_4": 'Ju do të njoftoheni duke qënë se keni dërguar një përgjigje në këtë temë. '
-          '2_2': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë. '
+          "2_2": 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë. '
-          '2': 'Ju do të merrni njoftime sepse e keni <a href="/users/{{username}}/preferences">lexuar këtë temë</a>.'
+          "2": 'Ju do të merrni njoftime sepse e keni <a href="/users/{{username}}/preferences">lexuar këtë temë</a>.'
-          '1_2': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
+          "1_2": 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
-          '1': 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
+          "1": 'Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose nëse dikush ju përgjigjet. '
-          '0_7': 'Ju nuk do të merrni asnjë njoftim për temat në këtë kategori. '
+          "0_7": 'Ju nuk do të merrni asnjë njoftim për temat në këtë kategori. '
-          '0_2': 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
+          "0_2": 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
-          '0': 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
+          "0": 'Ju nuk do të merrni asnjë njoftim për këtë temë. '
         watching_pm:
           title: "Në vëzhgim"
           description: "Ju do të njoftoheni për çdo përgjigje të re në këtë mesazh, dhe numri i përgjigjeve të reja do të shfaqet. "
@@ -1249,8 +1242,6 @@ sq:
         no_banner_exists: "There is no banner topic."
         banner_exists: "There <strong class='badge badge-notification unread'>is</strong> currently a banner topic."
       inviting: "Inviting..."
-      automatically_add_to_groups_optional: "Kjo ftesë përfshin edhe akses për këto grupe: (fakultative, vetëm për adminët)"
-      automatically_add_to_groups_required: "Kjo ftesë përfshin edhe akses për këto grupe: (<b>e detyrueshme</b>, vetëm për adminët)"
       invite_private:
         title: 'Ftoje në këtë mesazh'
         email_or_username: "Emaili ose emri i përdoruesit të të ftuarit"
@@ -1650,10 +1641,10 @@ sq:
     posts_long: "there are {{number}} posts in this topic"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-        low {with a high like to post ratio}
+      low {with a high like to post ratio}
-        med {with a very high like to post ratio}
+      med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
+      high {with an extremely high like to post ratio}
-        other {}}
+      other {}}
     original_post: "Postimi Origjinal"
     views: "Shikimet"
     views_lowercase:
@@ -2575,140 +2566,3 @@ sq:
           label: "New:"
           add: "Add"
           filter: "Search (URL or External URL)"
-    lightbox:
-      download: "shkarko"
-    search_help:
-      title: 'Ndihma'
-    keyboard_shortcuts_help:
-      title: 'Shkurtimet e Tastierës '
-      jump_to:
-        title: 'Kalo tek'
-        home: '<b>g</b>, <b>h</b> Home'
-        latest: '<b>g</b>, <b>l</b> Latest'
-        new: '<b>g</b>, <b>n</b> New'
-        unread: '<b>g</b>, <b>u</b> Unread'
-        categories: '<b>g</b>, <b>c</b> Kategoritë'
-        top: '<b>g</b>, <b>t</b> Top'
-        bookmarks: '<b>g</b>, <b>b</b> Bookmarks'
-        profile: '<b>g</b>, <b>p</b> Profili'
-        messages: '<b>g</b>, <b>m</b> Mesazhet'
-      navigation:
-        title: 'Shfletimi'
-        jump: '<b>#</b> Shko tek postimi #'
-        back: '<b>u</b> Mbrapa'
-        up_down: '<b>k</b>/<b>j</b> Move selection &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Open selected topic'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Next/previous section'
-      application:
-        title: 'Aplikacion'
-        create: '<b>c</b> Filloni një diskutim të ri'
-        notifications: '<b>n</b> Hap njoftimet'
-        hamburger_menu: '<b>=</b> Hap menunë hamburger'
-        user_profile_menu: '<b>p</b> Open user menu'
-        show_incoming_updated_topics: '<b>.</b> Show updated topics'
-        search: '<b>/</b> Kërko'
-        help: '<b>?</b> Open keyboard help'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
-        dismiss_topics: '<b>x</b>, <b>t</b> Dismiss Topics'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Shkëputu'
-      actions:
-        title: 'Actions'
-        bookmark_topic: '<b>f</b> Toggle bookmark topic'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Pin/Unpin topic'
-        share_topic: '<b>shift</b>+<b>s</b> Share topic'
-        share_post: '<b>s</b> Share post'
-        reply_as_new_topic: '<b>t</b> Përgjigju në një temë të re të ndërlidhur'
-        reply_topic: '<b>shift</b>+<b>r</b> Reply to topic'
-        reply_post: '<b>r</b> Reply to post'
-        quote_post: '<b>q</b> Quote post'
-        like: '<b>l</b> Like post'
-        flag: '<b>!</b> Sinjalizo postimin'
-        bookmark: '<b>b</b> Bookmark post'
-        edit: '<b>e</b> Edit post'
-        delete: '<b>d</b> Delete post'
-        mark_muted: '<b>m</b>, <b>m</b> Mute topic'
-        mark_regular: '<b>m</b>, <b>r</b> Regular (default) topic'
-        mark_tracking: '<b>m</b>, <b>t</b> Track topic'
-        mark_watching: '<b>m</b>, <b>w</b> Watch topic'
-    badges:
-      title: Badges
-      badge_count:
-        one: "1 Badge"
-        other: "%{count} Badges"
-      more_badges:
-        one: "+1 More"
-        other: "+%{count} More"
-      granted:
-        one: "1 granted"
-        other: "%{count} granted"
-      select_badge_for_title: Select a badge to use as your title
-      none: "<asnjë>"
-      badge_grouping:
-        getting_started:
-          name: Getting Started
-        community:
-          name: Komuniteti
-        trust_level:
-          name: Niveli i besimit
-        other:
-          name: Të tjerë
-        posting:
-          name: Posting
-    google_search: |
-      <h3>Kerko me Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>
-    tagging:
-      all_tags: "Të gjitha etiketat"
-      selector_all_tags: "të gjithat etiketat"
-      changed: "etiketat e ndryshuara:"
-      tags: "Etiketat"
-      choose_for_topic: "zgjidhni etiketat fakultative për këtë temë"
-      delete_tag: "Fshi etiketën"
-      delete_confirm: "Jeni të sigurtë që doni të fshini këtë etiketë?"
-      rename_tag: "Riemëro etiketën"
-      rename_instructions: "Zgjidhni një emër të ri për këtë etiketë"
-      sort_by: "Rendit sipas:"
-      sort_by_name: "emër"
-      filters:
-        without_category: "%{filter} %{tag} temat"
-        with_category: "%{filter} %{tag} temat në %{category}"
-      notifications:
-        watching:
-          title: "Në vëzhgim"
-          description: "Ju do të vëzhgoni automatikisht të gjitha temat e reja nën këtë etiketë. Do të njoftoheni për çdo postim e temë të re, dhe numri i postimeve të reja të palexuara do të afishohet ngjitur me titullin e temës përgjatë listave të faqes. "
-        tracking:
-          title: "Në gjurmim"
-          description: "Ju do të gjurmoni automatikisht çdo temë të re nën këtë etiketë. Numri i përgjigjeve të palexuara do të afishohet ngjitur me titullin e temës në listat e faqes. "
-        regular:
-          title: "Normal"
-          description: "Ju do të njoftoheni nëse dikush përmend @emrin tuaj ose i përgjigjet postimeve tuaja. "
-        muted:
-          title: "Pa njoftime"
-          description: "Ju nuk do të njoftoheni për asgjë nga temat e reja të kësaj etikete, dhe këto tema nuk do të afishohen në faqen \"Të palexuara\" për ju. "
-      topics:
-        none:
-          unread: "Nuk keni tema të palexuara."
-          new: "Nuk keni tema të palexuara."
-          read: "Nuk keni lexuar asnjë temë deri tani."
-          posted: "Nuk keni shkruar tek asnjë temë deri tani."
-          latest: "Nuk ka tema të reja."
-          hot: "Nuk ka tema të nxehta."
-          bookmarks: "Nuk keni ende tema të preferuara. "
-          top: "Nuk ka tema popullore."
-          search: "Kërkimi nuk ka asnjë rezultat."
-        bottom:
-          latest: "Nuk ka më tema të reja."
-          hot: "Nuk ka më tema të nxehta."
-          posted: "Nuk ka më tema të publikuara."
-          read: "Nuk ka më tema të lexuara."
-          new: "Nuk ka më tema të reja."
-          unread: "Nuk ka më tema të palexuara."
-          top: "Nuk ka më tema popullore."
-          bookmarks: "Nuk ka më tema të preferuara."
-          search: "Kërkimi nuk ka më rezultate."

config/locales/client.te.yml

@@ -226,15 +226,15 @@ te:
         members_mods_and_admins: "కేవలం గుంపు సభ్యులు, నిర్వాహకులు మరియు అధికారులు"
         everyone: "అందరూ"
     user_action_groups:
-      '1': "ఇచ్చిన ఇష్టాలు "
+      "1": "ఇచ్చిన ఇష్టాలు "
-      '2': "వచ్చిన ఇష్టాలు"
+      "2": "వచ్చిన ఇష్టాలు"
-      '3': "పేజీకలు"
+      "3": "పేజీకలు"
-      '4': "విషయాలు"
+      "4": "విషయాలు"
-      '7': "ప్రస్తావనలు"
+      "7": "ప్రస్తావనలు"
-      '9': "కోట్ లు"
+      "9": "కోట్ లు"
-      '11': "సవరణలు"
+      "11": "సవరణలు"
-      '12': "పంపిన అంశాలు"
+      "12": "పంపిన అంశాలు"
-      '13': "ఇన్ బాక్స్"
+      "13": "ఇన్ బాక్స్"
     categories:
       all: "అన్ని వర్గాలు"
       all_subcategories: "అన్నీ"
@@ -283,9 +283,9 @@ te:
       invited_by: "ఆహ్వానిచినవారు"
       trust_level: "నమ్మకపు స్థాయి"
       notifications: "ప్రకటనలు"
-      dismiss_notifications: "అన్నీ చదివినట్టు గుర్తించు"
       dismiss_notifications_tooltip: "అన్ని చదవని ప్రకటనలూ చదివినట్టు గుర్తించు"
       disable_jump_reply: "నేను జవాబిచ్చాక నా టపాకు వెళ్లవద్దు"
+      edit_history_public: "ఇతర సభ్యలను నా టపా దిద్దుబాట్లను చూడనివ్వు"
       external_links_in_new_tab: "అన్ని బాహ్య లంకెలనూ కొత్త ట్యాబులో తెరువు"
       enable_quoting: "హైలైట్ అయిన పాఠ్యానికి కోట్ జవాబు చేతనం చేయి"
       change: "మార్చు"
@@ -631,7 +631,6 @@ te:
       invited_to_private_message: "<i title='ప్రైవేటు సందేశం' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='మీ ఆహ్వానాన్ని మన్నించారు' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='టపా జరిపారు' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
-      linked: "<i title='టపాకు లంకె ఉంచారు' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='బ్యాడ్జ్ ప్రసాదించారు' class='fa fa-certificate'></i><p>Earned '{{description}}'</p>"
     upload_selector:
       title: "ఒక బొమ్మ కలుపు"
@@ -752,18 +751,18 @@ te:
         position: "%{total} లో %{current} టపా"
       notifications:
         reasons:
-          '3_6': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ వర్గాంపై కన్నేసారు'
+          "3_6": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ వర్గాంపై కన్నేసారు'
-          '3_5': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే ఈ విషయం స్వీయ కన్నేసారు. '
+          "3_5": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే ఈ విషయం స్వీయ కన్నేసారు. '
-          '3_2': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
+          "3_2": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
-          '3_1': 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయాన్ని సృష్టించారు.'
+          "3_1": 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయాన్ని సృష్టించారు.'
-          '3': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
+          "3": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ విషయంపై కన్నేసారు.'
-          '2_8': 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ వర్గాన్ని గమనిస్తున్నారు.'
+          "2_8": 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ వర్గాన్ని గమనిస్తున్నారు.'
-          '2_4': 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయానికి జవాబిచ్చారు.'
+          "2_4": 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయానికి జవాబిచ్చారు.'
-          '2_2': 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయాన్ని గమనిస్తున్నారు.'
+          "2_2": 'మీకు ప్రకటనలు వస్తాయి ఎందుకంటే మీరు ఈ విషయాన్ని గమనిస్తున్నారు.'
-          '2': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే <a href="/users/{{username}}/preferences">మీరు ఈ విషయాన్ని చదివారు</a>.'
+          "2": 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే <a href="/users/{{username}}/preferences">మీరు ఈ విషయాన్ని చదివారు</a>.'
-          '0_7': 'ఈ వర్గంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
+          "0_7": 'ఈ వర్గంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
-          '0_2': 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
+          "0_2": 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
-          '0': 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
+          "0": 'ఈ విషయంలోని అన్ని ప్రకటనలనూ మీరు విస్మరిస్తున్నారు.'
         watching_pm:
           title: "కన్నేసారు"
         watching:
@@ -800,8 +799,6 @@ te:
         help: 'ఈ విషయాన్ని ప్రైవేటుగా కేతనించు లేదా ప్రైవేటు ప్రకటన పంపు'
         success_message: 'ఈ విషయాన్ని మీరు కేతనించారు'
       inviting: "ఆహ్వానిస్తున్నామ్..."
-      automatically_add_to_groups_optional: "ఈ ఆహ్వానం ఈ గుంపులకు అనుమతిని కూడా కలిగి ఉంది:(ఐచ్చికం, అధికారులు మాత్రమే)"
-      automatically_add_to_groups_required: "ఈ ఆహ్వానం ఈ గుంపులకు అనుమతిని కూడా కలిగి ఉంది:(<b>తప్పనిసరి</b>, అధికారులు మాత్రమే)"
       invite_private:
         email_or_username: "ఆహ్వానితుని ఈమెయిల్ లేదా సభ్యనామం"
         email_or_username_placeholder: "ఈమెయిల్ చిరునామా లేదా సభ్యనామం"
@@ -1594,9 +1591,7 @@ te:
         reject_successful:
           one: "వినియోగదారులు విజయవంతంగా "
           other: "వినియోగదారులు విజయవంతంగా %{సంఖ్య} తిరస్కరింపబడ్డారు.."
-        reject_failures:
+        b08927041c772c6c244ae4cd21227ccc_trnot_verified: "ద్రువీకరించలేదు"
-          one: "వినియోగదారులు 1 ని తిరస్కరించుటలో వైఫల్యం."
-        not_verified: "ద్రువీకరించలేదు"
         check_email:
           title: "ఈ సభ్యుని ఈమెయిల్ చూపు"
           text: "చూపు"
@@ -1827,70 +1822,3 @@ te:
         name: "పేరు"
         image: "బొమ్మ"
         delete_confirm: "మీరు నిజంగా %{పేరు}: ఎమోజీ ని తొలగించాలనుకుంటున్నారా ?"
-    lightbox:
-      download: "దిగుమతించు"
-    search_help:
-      title: 'సహాయం వెతుకు'
-    keyboard_shortcuts_help:
-      title: 'కీబోర్డు షార్ట్ కట్లు'
-      jump_to:
-        title: 'వెళ్లు'
-        latest: '<b>g</b>, <b>l</b> తాజా'
-        new: '<b>g</b>, <b>n</b> కొత్త'
-        unread: '<b>g</b>, <b>u</b> చదవనవి'
-        categories: '<b>g</b>, <b>c</b> వర్గాలు'
-        top: '<b>g</b>, <b>t</b> పైన'
-      navigation:
-        title: 'నావిగేషను'
-        jump: '<b>#</b> టపాకు వెళ్లు #'
-        back: '<b>u</b> వెనుకకు'
-        open: '<b>o</b> or <b>ప్రవేశం</b> ఎంచుకున్న విషయం తెరువు'
-        next_prev: '<b>మార్పు</b>+<b>j</b>/<b>మార్పు</b>+<b>k</b> తర్వాతి/ముందరి విభాగం'
-      application:
-        title: 'అనువర్తనం'
-        create: '<b>c</b> కొత్త టపా సృష్టించు'
-        notifications: '<b>n</b> తెరచిన ప్రకటనలు'
-        user_profile_menu: '<b>p</b> యూజర్ మెనూ తెరువు'
-        show_incoming_updated_topics: '<b>.</b> నవీకరించిన విషయాలను చూపించండి'
-        search: '<b>/</b> వెతుకు'
-        help: '<b>?</b> కీ బోర్డ్ సహాయాన్ని తెరువు'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> తీసివేసిన కొత్త/టపాలు'
-        dismiss_topics: '<b>x</b>, <b>t</b> తీసివేసిన విషయాలు'
-      actions:
-        title: 'చర్యలు'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> విషయం చేర్చు/విడదీయు'
-        share_topic: '<b>shift</b>+<b>s</b> విషయం పంచు'
-        share_post: '<b>s</b> టపా పంచు'
-        reply_as_new_topic: '<b>t</b> లంకె విషయంగా సమాధానం'
-        reply_topic: '<b>shift</b>+<b>r</b> టపా కి సమాధానం'
-        reply_post: '<b>r</b> టపా కి సమాధానం'
-        like: '<b>l</b> టపా ని ఇష్టపడు'
-        flag: '<b>!</b> టపా కేతనం'
-        bookmark: '<b>b</b>టపా పేజీక'
-        edit: '<b>e</b> టపా సవరణ'
-        delete: '<b>d</b> టపా తొలగించు'
-        mark_muted: '<b>m</b>, <b>m</b> విషయాన్ని ఆపివేయండి'
-        mark_regular: '<b>m</b>, <b>r</b> నిత్య (అప్రమేయ) విషయం'
-        mark_tracking: '<b>m</b>, <b>t</b> విషయం వెతుకు'
-        mark_watching: '<b>m</b>, <b>w</b> చూసిన విషయం'
-    badges:
-      title: బ్యాడ్జీలు
-      more_badges:
-        one: "+%{count} కంటే"
-        other: "+%{count} ఇంకా"
-      granted:
-        one: "1 మంజూరు"
-        other: "%{లెక్క} మంజూరు"
-      select_badge_for_title: మీ శీర్షికగా ఉపయోగించడానికి ఒక చిహ్నాన్ని ఎంపిక చేయండి.
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: మొదలుపెట్టడం
-        community:
-          name: కమ్యునిటీ
-        trust_level:
-          name: నమ్మకపు స్థాయి
-        other:
-          name: ఇతర
-        posting:
-          name: రాస్తున్నారు

config/locales/client.tr_TR.yml

@@ -98,7 +98,9 @@ tr_TR:
       private_topic: "bu konuyu %{when} tarihinde özel yaptı"
       split_topic: "bu konuyu ayır %{when}"
       invited_user: "%{when} %{who} davet edildi"
+      invited_group: "%{who} %{when} devet edildi"
       removed_user: "%{when} %{who} silindi"
+      removed_group: "%{who} %{when} kaldırıldı"
       autoclosed:
         enabled: '%{when} kapatıldı'
         disabled: '%{when} açıldı'
@@ -119,6 +121,7 @@ tr_TR:
         disabled: '%{when} listelenmedi'
     topic_admin_menu: "konuyla alakalı yönetici işlemleri"
     emails_are_disabled: "Tüm giden e-postalar yönetici tarafından evrensel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
+    bootstrap_mode_enabled: "Yeni sitenizi kolayca çalıştırmak  için bootstrap modundasınız. Tüm yeni kullanıcılar 1. seviyeden başlar ve email uyarıcıları açıksa günlük mail alırlar. Bu özellik kullanıcı sayısı %{min_users}  rakamına ulaştığında otomatik kapatılacaktır."
     bootstrap_mode_disabled: "Bootstrap modu önümüzdeki 24 saat içinde devre dışı kalacaktır."
     s3:
       regions:
@@ -228,8 +231,8 @@ tr_TR:
     undo: "Geri Al"
     revert: "Eski Haline Getir"
     failed: "Başarısız oldu"
-    switch_to_anon: "Anonim Ol"
+    switch_to_anon: "Ziyaretçi moduna geç"
-    switch_from_anon: "Anonim Modundan Çık"
+    switch_from_anon: "Ziyaretçi modundan çıkış"
     banner:
       close: "Bu manşeti yoksay."
       edit: "Bu manşeti düzenle >>"
@@ -333,18 +336,18 @@ tr_TR:
           title: "Susturuldu"
           description: "Bu gruptan herhangi yeni konuyla ilgili asla bildirim almayacaksınız"
     user_action_groups:
-      '1': "Verilen Beğeniler"
+      "1": "Verilen Beğeniler"
-      '2': "Alınan Beğeniler"
+      "2": "Alınan Beğeniler"
-      '3': "İşaretlenenler"
+      "3": "İşaretlenenler"
-      '4': "Konular"
+      "4": "Konular"
-      '5': "Cevaplar"
+      "5": "Cevaplar"
-      '6': "Yanıtlar"
+      "6": "Yanıtlar"
-      '7': "Bahsedenler"
+      "7": "Bahsedenler"
-      '9': "Alıntılar"
+      "9": "Alıntılar"
-      '11': "Düzenlemeler"
+      "11": "Düzenlemeler"
-      '12': "Yollanmış ögeler"
+      "12": "Yollanmış ögeler"
-      '13': "Gelen Kutusu"
+      "13": "Gelen Kutusu"
-      '14': "Bekleyen"
+      "14": "Bekleyen"
     categories:
       all: "Tüm Kategoriler"
       all_subcategories: "hepsi"
@@ -415,10 +418,11 @@ tr_TR:
         disable: "Bildirimleri Devre Dışı Bırakın"
         enable: "Bildirimleri Etkinleştirin"
         each_browser_note: "Not: Bu ayarı kullandığınız her tarayıcıda değiştirmelisiniz."
-      dismiss_notifications: "Hepsini okunmuş olarak işaretle"
+      dismiss_notifications: "Tümünü kaldır"
       dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle"
       disable_jump_reply: "Cevapladıktan sonra gönderime atlama"
       dynamic_favicon: "Tarayıcı simgesinde yeni / güncellenen konu sayısını göster"
+      edit_history_public: "Gönderimde yaptığım revizyonları diğer kullanıcıların görmesine izin ver"
       external_links_in_new_tab: "Tüm dış bağlantıları yeni sekmede aç"
       enable_quoting: "Vurgulanan yazıyı alıntılayarak cevaplama özelliğini etkinleştir"
       change: "değiştir"
@@ -439,10 +443,9 @@ tr_TR:
           Sessize alınmış başlıklar ve kategoriler bu epostalarda yer almaz.
         daily: "Günlük güncellemeleri gönder"
         individual: "Her yazı için bir eposta gönder"
-        many_per_day: "Her yeni yazı için bir eposta gönder (yaklaşık günde {{dailyEmailEstimate}})."
+        many_per_day: " ({{dailyEmailEstimate}} konusu hakkında) tüm yeni gönderilerde bana mail gönder"
-        few_per_day: "Her yeni yazı hakkında bir eposta gönder (günde 2 den az)"
+      tag_settings: "Etiketler"
       watched_categories: "Gözlendi"
-      watched_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konular size bildirilecek. Ayrıca, okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek."
       tracked_categories: "Takip edildi"
       tracked_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek."
       muted_categories: "Susturuldu"
@@ -457,6 +460,7 @@ tr_TR:
       muted_users: "Susturuldu"
       muted_users_instructions: "Bu kullanıcılardan gelen tüm bildirileri kapa."
       muted_topics_link: "Sessize alınmış konuları göster"
+      watched_topics_link: "Takip edilen konuları göster"
       automatically_unpin_topics: "En alta ulaşınca otomatik olarak başlıkların tutturulmasını kaldır."
       staff_counters:
         flags_given: "yararlı bayraklar"
@@ -616,7 +620,9 @@ tr_TR:
         rescind: "Kaldır"
         rescinded: "Davet kaldırıldı"
         reinvite: "Davetiyeyi Tekrar Yolla"
+        reinvite_all: "Tüm davetleri tekrar gönder"
         reinvited: "Davetiye tekrar yollandı"
+        reinvited_all: "Tüm davetler tekrar gönderildi!"
         time_read: "Okunma Zamanı"
         days_visited: "Ziyaret Edilen Günler"
         account_age_days: "Gün içinde Hesap yaş"
@@ -661,7 +667,9 @@ tr_TR:
         no_badges: "Henüz rozet bulunmuyor."
         more_badges: "Diğer Rozetleri"
         top_links: "Önemli Bağlantılar"
+        no_links: "Henüz bir bağlantı bulunmuyor."
         most_liked_users: "Popüler Beğenmeler"
+        no_likes: "Henüz bir beğeni bulunmuyor."
       associated_accounts: "Girişler"
       ip_address:
         title: "Son IP Adresi"
@@ -733,7 +741,7 @@ tr_TR:
       hide_session: "Yarın bana hatırlat"
       hide_forever: "hayır teşekkürler"
       hidden_for_session: "Tamamdır, yarın tekrar soracağım. İstediğiniz zaman 'Giriş' yaparak da hesap oluşturabilirsiniz."
-      intro: "Nabersin! heart_eyes: Görüneşe göre tartışmaların keyfini çıkaryorsun, fakat henüz bir hesap almak için kayıt olmamışsın."
+      intro: "Nabersin! :heart_eyes: Görüneşe göre tartışmaların keyfini çıkaryorsun, fakat henüz bir hesap almak için kayıt olmamışsın."
       value_prop: "Bir hesap oluşturduğunuzda, tam olarak neyi okuyor olduğunuzu hatırlarız, böylece her zaman okumayı bırakmış olduğunuz yere geri gelirsiniz.  Ayrıca burada, yeni gönderiler yağıldığında email yoluyla bildirim alırsınız. Ve sevgiyi paylaşmak için gönderileri beğenebilirsiniz. :heartbeat:"
     summary:
       enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler"
@@ -750,6 +758,7 @@ tr_TR:
       title: "Mesaj"
       invite: "Diğerlerini Davet Et..."
       remove_allowed_user: "Bu mesajlaşmadan {{name}} isimli kullanıcıyı çıkarmak istediğinize emin misiniz?"
+      remove_allowed_group: "{{name}} bunu gerçekten mesajdan kaldırmak istiyor musunuz?"
     email: 'E-posta'
     username: 'Kullanıcı Adı'
     last_seen: 'Son Görülme'
@@ -879,6 +888,7 @@ tr_TR:
       quote_text: "Blok-alıntı"
       code_title: "Önceden biçimlendirilmiş yazı"
       code_text: "paragraf girintisi 4 boşluktan oluşan, önceden biçimlendirilen yazı"
+      paste_code_text: "kodu buraya gir veya yapıştır"
       upload_title: "Yükle"
       upload_description: "yükleme açıklamasını buraya girin"
       olist_title: "Numaralandırılmış Liste"
@@ -905,6 +915,7 @@ tr_TR:
     notifications:
       title: "@isim bahsedilişleri, gönderileriniz ve konularınıza verilen cevaplar, mesajlarla vb. ilgili bildiriler"
       none: "Şu an için bildirimler yüklenemiyor."
+      empty: "Bildirim Yok"
       more: "daha eski bildirimleri görüntüle"
       total_flagged: "tüm bayraklanan gönderiler"
       mentioned: "<i title='bahsetti' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -922,7 +933,9 @@ tr_TR:
       invited_to_topic: "<i title='konuya davet edildi' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='davetiyeni kabul etti' class='fa fa-user'></i><p><span>{{username}}</span> davetini kabul etti!</p>"
       moved_post: "<i title='gönderiyi taşıdı' class='fa fa-sign-out'></i><p><span>{{username}}</span> taşıdı {{description}}</p>"
+      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p><strong>{{description}}</strong> rozeti kazandınız!</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Yeni Konu</span> {{description}}</p>"
       group_message_summary:
         other: "<i title='grup gelen kutusundaki mesajlar' class='fa fa-group'></i><p> {{group_name}} isimli grubunuzun gelen kutusunda {{count}} adet mesaj var</p>"
       alt:
@@ -980,6 +993,7 @@ tr_TR:
       post_format: "{{username}} tarafından #{{post_number}}"
       context:
         user: "@{{username}} kullancısına ait gönderilerde ara"
+        category: "#{{category}} kategorisini ara"
         topic: "Bu konuda ara"
         private_messages: "Mesajlarda ara"
     hamburger_menu: "bir diğer konu ya da kategoriye git"
@@ -1019,6 +1033,9 @@ tr_TR:
         category: "{{category}} konusu yok."
         top: "Popüler bir konu yok."
         search: "Arama sonuçları yok."
+        educate:
+          new: '<p>Yeni konunuz burada görünecektir.</p><p>Varsayalına olarak son 2 gün içerisinde oluşturulmuş konular yeni olarak nitelendirilir ve  <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">yeni</span> ibaresiyle işeretli olarak gösterilir.</p><p> <a href="%{userPrefsUrl}">ayarlar</a> sayfanızı ziyaret ederek bunu değiştirebilirsiniz.</p>'
+          unread: '<p>Okunmamış konularınız burda görünecektir.</p><p>By default, topics are considered unread and will show unread counts <span class="badge new-posts badge-notification">1</span> if you:</p><ul><li>Created the topic</li><li>Replied to the topic</li><li>Read the topic for more than 4 minutes</li></ul><p>Or if you have explicitly set the topic to Tracked or Watched via the notification control at the bottom of each topic.</p><p>Visit your <a href="%{userPrefsUrl}">preferences</a> to change this.</p>'
       bottom:
         latest: "Daha fazla son konu yok."
         hot: "Daha fazla sıcak bir konu yok."
@@ -1089,6 +1106,9 @@ tr_TR:
       auto_close_save: "Kaydet"
       auto_close_remove: "Bu Konuyu Otomatik Olarak Kapatma"
       auto_close_immediate: "Son konudaki mesaj %{hours} saat olmuş, bu yüzden konu hemen kapanacak"
+      timeline:
+        back: "Geri"
+        replies: "%{current} / %{total} Cevap"
       progress:
         title: konu gidişatı
         go_top: "en üst"
@@ -1101,20 +1121,20 @@ tr_TR:
         position: "%{total} gönderi arasından %{current}."
       notifications:
         reasons:
-          '3_6': 'Bu kategoriyi gözlediğiniz için bildirimlerini alacaksınız.'
+          "3_6": 'Bu kategoriyi gözlediğiniz için bildirimlerini alacaksınız.'
-          '3_5': 'Bu konuyu otomatik olarak gözlemeye başladığınız için bildirimlerini alacaksınız.'
+          "3_5": 'Bu konuyu otomatik olarak gözlemeye başladığınız için bildirimlerini alacaksınız.'
-          '3_2': 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
+          "3_2": 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
-          '3_1': 'Bu konuyu siz oluşturduğunuz için bildirimlerini alacaksınız.'
+          "3_1": 'Bu konuyu siz oluşturduğunuz için bildirimlerini alacaksınız.'
-          '3': 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
+          "3": 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
-          '2_8': 'Be kategoriyi takip ettiğiniz için bildirimlerini alacaksınız.'
+          "2_8": 'Be kategoriyi takip ettiğiniz için bildirimlerini alacaksınız.'
-          '2_4': 'Bu konuya cevap yazdığınız için bildirimlerini alacaksınız.'
+          "2_4": 'Bu konuya cevap yazdığınız için bildirimlerini alacaksınız.'
-          '2_2': 'Bu konuyu takip ettiğiniz için bildirimlerini alacaksınız.'
+          "2_2": 'Bu konuyu takip ettiğiniz için bildirimlerini alacaksınız.'
-          '2': '<a href="/users/{{username}}/preferences">Bu konuyu okuduğunuz için</a> bildirimlerini alacaksınız.'
+          "2": '<a href="/users/{{username}}/preferences">Bu konuyu okuduğunuz için</a> bildirimlerini alacaksınız.'
-          '1_2': 'Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.'
+          "1_2": 'Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.'
-          '1': 'Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.'
+          "1": 'Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.'
-          '0_7': 'Bu kategoriye ait tüm bildirimleri görmezden geliyorsunuz.'
+          "0_7": 'Bu kategoriye ait tüm bildirimleri görmezden geliyorsunuz.'
-          '0_2': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
+          "0_2": 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
-          '0': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
+          "0": 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
         watching_pm:
           title: "Gözleniyor"
           description: "Bu mesajlaşmada ki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek."
@@ -1441,6 +1461,7 @@ tr_TR:
       general: 'Genel'
       settings: 'Ayarlar'
       topic_template: "Konu Şablonu"
+      tags: "Etiketler"
       delete: 'Kategoriyi Sil'
       create: 'Yeni Kategori'
       create_long: 'Yeni bir kategori oluştur'
@@ -1532,6 +1553,9 @@ tr_TR:
       links_shown: "tüm {{totalLinks}} bağlantıları göster..."
       clicks:
         other: "%{count} tıklama"
+    post_links:
+      title:
+        other: "%{count} daha"
     topic_statuses:
       warning:
         help: "Bu resmi bir uyarıdır."
@@ -1559,10 +1583,10 @@ tr_TR:
     posts_long: "bu konuda {{number}} gönderi var"
     posts_likes_MF: |
       Bu konuda {count, plural, one {1} other {#}} {ratio, select,
-        low {beğeni/gönderi oranı yüksek cevap}
+      low {beğeni/gönderi oranı yüksek cevap}
-        med {beğeni/gönderi oranı çok yüksek cevap}
+      med {beğeni/gönderi oranı çok yüksek cevap}
-        high {beğeni/gönderi oranı aşırı yüksek cevap}
+      high {beğeni/gönderi oranı aşırı yüksek cevap}
-        other {}} var
+      other {}} var
     original_post: "Orijinal Gönderi"
     views: "Gösterim"
     views_lowercase:
@@ -1658,6 +1682,153 @@ tr_TR:
       full: "Oluştur / Cevapla / Bak"
       create_post: "Cevapla / Bak"
       readonly: "Bak"
+    lightbox:
+      download: "indir"
+    search_help:
+      title: 'Arama yardım'
+    keyboard_shortcuts_help:
+      title: 'Klavye Kısayolları'
+      jump_to:
+        title: 'Şuraya git'
+        home: '<b>g</b>, <b>h</b> Anasayfa'
+        latest: '<b>g</b>, <b>l</b> Enson'
+        new: '<b>g</b>, <b>n</b> Yeni'
+        unread: '<b>g</b>, <b>u</b> Okunmamış'
+        categories: '<b>g</b>, <b>c</b> Kategoriler'
+        top: '<b>g</b>, <b>t</b> Enüst'
+        bookmarks: '<b>g</b>, <b>b</b> Yer imleri'
+        profile: '<b>g</b>, <b>p</b> Profil'
+        messages: '<b>g</b>, <b>m</b> Mesajlar'
+      navigation:
+        title: 'Navigasyon'
+        jump: '<b>#</b> Gönderiye git #'
+        back: '<b>u</b> Geri'
+        up_down: '<b>k</b>/<b>j</b> Seçileni taşı &uarr; &darr;'
+        open: '<b>o</b> or <b>Enter</b> Seçili konuyu aç'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Önceki/Sonraki bölüm'
+      application:
+        title: 'Uygulama'
+        create: '<b>c</b> Yeni konu oluştur'
+        notifications: '<b>n</b> Bildirimleri aç'
+        hamburger_menu: '<b>=</b> Hamburger menüyü aç'
+        user_profile_menu: '<b>p</b> Kullanıcı menüsünü aç'
+        show_incoming_updated_topics: '<b>.</b> Güncellenmiş konuları göster'
+        search: '<b>/</b> Ara'
+        help: '<b>?</b> Klavye yardım sayfasını aç'
+        dismiss_topics: '<b>x</b>, <b>t</b> Konuları anımsatma'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Çıkış'
+      actions:
+        title: 'Eylemler'
+        bookmark_topic: '<b>f</b> Konu yer imini değiştir'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Konuyu sabitle/bırak'
+        share_topic: '<b>shift</b>+<b>s</b> Konuyu paylaş'
+        share_post: '<b>s</b> Gönderiyi paylaş'
+        reply_as_new_topic: '<b>t</b> Bağlantılı konu olarak cevapla'
+        reply_topic: '<b>shift</b>+<b>r</b> Konuyu cevapla'
+        reply_post: '<b>r</b> Gönderiyi cevapla'
+        quote_post: '<b>q</b> Gönderiden alıntı yap'
+        like: '<b>l</b> Gönderiyi beğen'
+        flag: '<b>!</b> Gönderiyi şikayet et'
+        bookmark: '<b>b</b> Gönderiyi işaretle'
+        edit: '<b>e</b> Gönderiyi düzenle'
+        delete: '<b>d</b> Gönderiyi sil'
+        mark_muted: '<b>m</b>, <b>m</b> Konuyu sustur'
+        mark_regular: '<b>m</b>, <b>r</b> Varsayılan konu'
+        mark_watching: '<b>m</b>, <b>w</b> Konuyu Takip Et'
+    badges:
+      title: Rozetler
+      allow_title: "başlık girin"
+      multiple_grant: "birden fazla ödüllendirilmiş"
+      badge_count:
+        other: "%{count} Rozet"
+      more_badges:
+        other: "+%{count} Daha Fazla"
+      granted:
+        other: "%{count} İzin verildi"
+      select_badge_for_title: Başlık olarak kullanılacak bir rozet seçin
+      none: "<none>"
+      badge_grouping:
+        getting_started:
+          name: Başlangıç
+        community:
+          name: Topluluk
+        trust_level:
+          name: Güven Seviyesi
+        other:
+          name: Diğer
+        posting:
+          name: Gönderiliyor
+    tagging:
+      all_tags: "Tüm etiketler"
+      selector_all_tags: "tüm etiketler"
+      changed: "değişen etiketler:"
+      tags: "Etiketler"
+      choose_for_topic: "bu konu için etiket seçiniz"
+      delete_tag: "Etiketi sil"
+      delete_confirm: "Bu etiketi silmek istiyor musunuz?"
+      rename_tag: "Etiketi Yeniden Adlandır"
+      rename_instructions: "Bu etiket için yeni bir ad seçin:"
+      sort_by: "Sırala:"
+      sort_by_count: "say"
+      sort_by_name: "ad"
+      manage_groups: "Etiket Grubunu Yönet"
+      manage_groups_description: "Etiket gurubunu yönetmek için grup tanımla"
+      filters:
+        without_category: "%{filter} %{tag} konular"
+        with_category: "%{category} içerisinkeri konular%{filter} %{tag}"
+      notifications:
+        watching:
+          title: "İzleniyor"
+          description: "Bu etiketteki tüm yeni konuları takip ediyor olacaksınız. Bu etikete ait yeni tüm konularda ve gönderilerde  bildirim alacaksınız, ayrıca yeni gönderiler konuların yanında görünecektir"
+        watching_first_post:
+          title: "İlk gönderi izlemeniz"
+          description: "Bu etikette bulunan tüm konuların sadece ilk gönderilerinde bildirim alacaksınız."
+        tracking:
+          title: "İzleme"
+          description: "Bu etiketteki tüm konuları otomatik olarak takip ediyor olacaksınız. Okunmamış yeni gönderilerin bir kısmı konunun yanında görünecektir."
+        regular:
+          title: "Düzenli"
+          description: "Eğer bir kişi adınızın tagini kullanırsa (@isminiz gibi) veya oluşturduğunuz konuya cevap yazarsa bildirim alacaksınız."
+        muted:
+          title: "Susturuldu"
+      groups:
+        title: "Etiket Grupları"
+        about: "Konuları kolayca yönetmek için onlara etiket ekleyiniz."
+        new: "Yeni grup"
+        tags_label: "Bu gruptaki etiketler:"
+        parent_tag_label: "Üst etiket:"
+        parent_tag_placeholder: "İsteğe Bağlı"
+        one_per_topic_label: "Bu etiket grubundan her konu için bir etiket ile sınırla"
+        new_name: "Yeni Etiket Grubu"
+        save: "Kaydet"
+        delete: "Sil"
+        confirm_delete: "Bu etiket grubunu silmek istedinizden emin misiniz?"
+      topics:
+        none:
+          unread: "Okunmamış konunuz bulunmuyor."
+          new: "Yeni konunuz bulunmuyor"
+          read: "Henüz bir konu okumadınız."
+          posted: "Henüz bir konu oluşturmadınız."
+          latest: "Yeni eklenen konu bulunmuyor."
+          hot: "Hareketli konu bulunmuyor."
+          bookmarks: "Henüz yer imi eklenmiş bir konunuz bulunmuyor."
+          top: "Üst sırada bir konu bulunmuyor."
+          search: "Arama sonucu hiçbirşey bulunamadı."
+        bottom:
+          latest: "Daha fazla yeni eklenmiş konu bulunmuyor."
+          hot: "Daha fazla hareketli konu bulunmuyor."
+          posted: "Daha fazla oluşturulmuş konu bulunmuyor."
+          read: "Okunacak daha fazla konu bulunmuyor."
+          new: "Daha fazla yeni konu bulunmuyor."
+          unread: "Daha fazla okunmamış konu bulunmuyor."
+          top: "Daha falza üst sıralarda konu bulunmuyor."
+          bookmarks: "Daha fazla imlenmiş konu bulunmuyor."
+          search: "Daha fazla arama sonucu bulunmuyor."
+    invite:
+      custom_message_link: "kişiselleştirilmiş mesak"
+      custom_message_placeholder: "Kişiselleştirilmiş mesajınızı düzenleyin"
+      custom_message_template_forum: "Hey, bu foruma üye olsan iyi olur!"
+      custom_message_template_topic: "Hey, bu konu senin için eğleceli olabilir!"
   admin_js:
     type_to_filter: "filtre girin..."
     admin:
@@ -1705,6 +1876,7 @@ tr_TR:
           30_days_ago: "30 Gün Önce"
           all: "Hepsi"
           view_table: "tablo"
+          view_graph: "grafik"
           refresh_report: "Raporu Yenile"
           start_date: "Başlangıç tarihi"
           end_date: "Bitiş Tarihi"
@@ -1834,6 +2006,14 @@ tr_TR:
           backups: "Yedekler"
           logs: "Kayıtlar"
         none: "Yedek bulunmuyor."
+        read_only:
+          enable:
+            title: "Salt okuma modunu etkinleştir"
+            label: "Salt okumayı etkinleştir"
+            confirm: "Salt okuma modunu aktifleştirmek istediğinizden emin misiniz?"
+          disable:
+            title: "Salt okuma modunu engelle"
+            label: "Salt okumayı engelle"
         logs:
           none: "Henüz kayıt bulunmuyor..."
         columns:
@@ -2093,6 +2273,9 @@ tr_TR:
             grant_moderation: "moderasyon yetkisi ver"
             revoke_moderation: "moderasyon yetkisini kaldır"
             backup_operation: "yedek operasyonu"
+            deleted_tag: "silinmiş etiket"
+            renamed_tag: "yeniden adlandırılmış etiket"
+            revoke_email: "e-posta kaldır"
         screened_emails:
           title: "Taranmış E-postalar"
           description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir aksiyon alınacak."
@@ -2253,6 +2436,8 @@ tr_TR:
         block_failed: 'Kullanıcı engellenirken bir sorun yaşandı.'
         block_confirm: 'Bu kullanıcıyı bloklamak istediğinize emin misiniz? Bunu yaparsanız yeni başlık ya da gönderi oluşturamayacak.'
         block_accept: 'Evet, bu kullanıcıyı blokla'
+        reset_bounce_score:
+          label: "Yenile"
         deactivate_explanation: "Deaktive edilmiş bir kullanıcı e-postasını tekrar doğrulamalı."
         suspended_explanation: "Uzaklaştırılmış kullanıcılar sistemde oturum açamaz."
         block_explanation: "Engellenmiş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz."
@@ -2322,6 +2507,10 @@ tr_TR:
           title: "Herkese açık profilde göster?"
           enabled: "profilde gösteriliyor"
           disabled: "profilde gösterilmiyor"
+        show_on_user_card:
+          title: "Kullanıcı profilinde gösterilsin mi?"
+          enabled: "Kullanıcı profilinde göster"
+          disabled: "Kullanıcı profilinde gösterme"
         field_types:
           text: 'Yazı Alanı'
           confirm: 'Onay'
@@ -2367,6 +2556,7 @@ tr_TR:
           login: "Oturum Açma"
           plugins: "Eklentiler"
           user_preferences: "Kullanıcı Tercihleri"
+          tags: "Etiketler"
       badges:
         title: Rozetler
         new_badge: Yeni Rozet
@@ -2415,6 +2605,7 @@ tr_TR:
           post_revision: "Bir kullanıcı bir gönderiyi düzenlediğinde veya yeni bir gönderi oluşturduğunda"
           trust_level_change: "Bir kullanıcı güven seviyesini değiştirdiğinde"
           user_change: "Bir kullanıcı düzenlendiğinde veya oluşturduğunda"
+          post_processed: "Gönderi işlendikten sonra"
         preview:
           link_text: "Verilen rozetleri önizle"
           plan_text: "Sorgu planıyla önizle"
@@ -2460,6 +2651,7 @@ tr_TR:
         embed_truncate: "Gömülü gönderileri buda"
         embed_whitelist_selector: "Gömülüler içinde izin verilen elementler için CSS seçici"
         embed_blacklist_selector: "Gömülülerden kaldırılan elementler için CSS seçici"
+        embed_classname_whitelist: "CSS Sınıf isimlerine izin verildi"
         feed_polling_enabled: "Konuları RSS/ATOM aracılığıyla içe aktar"
         feed_polling_url: "İstila etmek için RSS/ATOM beslemesi URL'i"
         save: "Gömme Ayarlarını Kaydet"

config/locales/client.uk.yml

@@ -159,7 +159,6 @@ uk:
     undo: "Скасувати"
     revert: "Повернути"
     failed: "Помилка"
-    switch_to_anon: "Потайливий перегляд"
     banner:
       close: "Сховати"
     choose_topic:
@@ -218,16 +217,16 @@ uk:
         members_mods_and_admins: "Лише участики групи, модератори та адміністратори"
         everyone: "Усі"
     user_action_groups:
-      '1': "Вподобані"
+      "1": "Вподобані"
-      '2': "Отримані вподобання"
+      "2": "Отримані вподобання"
-      '3': "Закладки"
+      "3": "Закладки"
-      '4': "Теми"
+      "4": "Теми"
-      '5': "Відповіді"
+      "5": "Відповіді"
-      '7': "Згадки"
+      "7": "Згадки"
-      '9': "Цитати"
+      "9": "Цитати"
-      '11': "Редагування"
+      "11": "Редагування"
-      '12': "Надіслані"
+      "12": "Надіслані"
-      '13': "Вхідні"
+      "13": "Вхідні"
     categories:
       all: "всі категорії"
       all_subcategories: "все"
@@ -276,9 +275,9 @@ uk:
         perm_denied_btn: "Немає доступу"
         disable: "Вимкнути сповіщення"
         enable: "Увімкнути сповіщення"
-      dismiss_notifications: "Позначити все як прочитане"
       dismiss_notifications_tooltip: "Позначити всі сповіщення як прочитані"
       disable_jump_reply: "Не перескакувати до мого допису коли я відповім"
+      edit_history_public: "Дати іншим дивитися версії мого повідомлення"
       external_links_in_new_tab: "Відкривати всі зовнішні посилання у новій вкладці"
       enable_quoting: "Увімкнути відповіді на цитати для виділеного тексту"
       change: "змінити"
@@ -652,17 +651,17 @@ uk:
         position: "допис %{current} із %{total}"
       notifications:
         reasons:
-          '3_6': 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією категорією.'
+          "3_6": 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією категорією.'
-          '3_5': 'Ви будете отримувати сповіщення, бо Ви автоматично почали слідкувати за цією темою.'
+          "3_5": 'Ви будете отримувати сповіщення, бо Ви автоматично почали слідкувати за цією темою.'
-          '3_2': 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
+          "3_2": 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
-          '3_1': 'Ви будете отримувати сповіщення, бо Ви створили цю тему.'
+          "3_1": 'Ви будете отримувати сповіщення, бо Ви створили цю тему.'
-          '3': 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
+          "3": 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією темою.'
-          '2_4': 'Ви будете отримувати сповіщення, бо Ви залишили відповідь в цій темі.'
+          "2_4": 'Ви будете отримувати сповіщення, бо Ви залишили відповідь в цій темі.'
-          '2_2': 'Ви будете отримувати сповіщення, бо Ви стежите за цією темою.'
+          "2_2": 'Ви будете отримувати сповіщення, бо Ви стежите за цією темою.'
-          '2': 'Ви будете отримувати сповіщення, бо Ви <a href="/users/{{username}}/preferences">читаєте цю тему</a>.'
+          "2": 'Ви будете отримувати сповіщення, бо Ви <a href="/users/{{username}}/preferences">читаєте цю тему</a>.'
-          '0_7': 'Ви ігноруєте всі сповіщення у цій категорії.'
+          "0_7": 'Ви ігноруєте всі сповіщення у цій категорії.'
-          '0_2': 'Ви ігноруєте всі сповіщення з цієї теми.'
+          "0_2": 'Ви ігноруєте всі сповіщення з цієї теми.'
-          '0': 'Ви ігноруєте всі сповіщення з цієї теми.'
+          "0": 'Ви ігноруєте всі сповіщення з цієї теми.'
         watching_pm:
           title: "Слідкувати"
         watching:
@@ -1354,43 +1353,3 @@ uk:
         delete_confirm: Ви впевнені, що хочете видалити це постійне посилання?
         form:
           add: "Додати"
-    lightbox:
-      download: "звантажити"
-    keyboard_shortcuts_help:
-      title: 'Поєднання клавіш'
-      jump_to:
-        title: 'Перейти до'
-        categories: '<b>g</b>,  <b>c</b> Категорії'
-      navigation:
-        title: 'Навігація'
-        back: '<b>u</b> Назад'
-        open: '<b>o</b> або <b>Enter</b> Відкрити обрану тему'
-      application:
-        title: 'Застосунок'
-        create: '<b>c</b> Створити нову тему'
-        notifications: '<b>n</b> Відкрити сповіщення'
-        search: '<b>/</b> Пошук'
-      actions:
-        title: 'Дії'
-        share_post: '<b>s</b> Поширити допис'
-        reply_post: '<b>r</b> Відповісти на допис'
-        quote_post: '<b>q</b> Цитувати допис'
-        like: '<b>l</b> Вподобати допис'
-        flag: '<b>!</b> Поскаржитися на допис'
-        bookmark: '<b>b</b> Лишити закладку в дописі'
-        edit: '<b>e</b> Редагувати допис'
-        delete: '<b>d</b> Видалити допис'
-        mark_muted: '<b>m</b>, <b>m</b> Ігнорувати сповіщення з теми'
-        mark_tracking: '<b>m</b>, <b>t</b> Стежити за темою'
-    badges:
-      title: Значок
-      badge_count:
-        one: "Значок"
-        few: "Значків: %{count} "
-        other: "Значків %{count}"
-      select_badge_for_title: Оберіть значок, що буде вашим званням
-      badge_grouping:
-        community:
-          name: Спільнота
-        other:
-          name: Інше

config/locales/client.vi.yml

@@ -223,8 +223,6 @@ vi:
     undo: "Hoàn tác"
     revert: "Phục hồi"
     failed: "Thất bại"
-    switch_to_anon: "Chế độ Ẩn danh"
-    switch_from_anon: "Thoát ẩn danh"
     banner:
       close: "Xóa biểu ngữ này."
       edit: "Sửa banner này >>"
@@ -326,18 +324,18 @@ vi:
           title: "Im lặng"
           description: "Bạn sẽ không bao giờ được thông báo về bất cứ chủ đề mới nào trong nhóm này"
     user_action_groups:
-      '1': "Lần thích"
+      "1": "Lần thích"
-      '2': "Lần được thích"
+      "2": "Lần được thích"
-      '3': "Chỉ mục"
+      "3": "Chỉ mục"
-      '4': "Các chủ đề"
+      "4": "Các chủ đề"
-      '5': "Trả lời"
+      "5": "Trả lời"
-      '6': "Phản hồi"
+      "6": "Phản hồi"
-      '7': "Được nhắc đến"
+      "7": "Được nhắc đến"
-      '9': "Lời trích dẫn"
+      "9": "Lời trích dẫn"
-      '11': "Biên tập"
+      "11": "Biên tập"
-      '12': "Bài đã gửi"
+      "12": "Bài đã gửi"
-      '13': "Hộp thư"
+      "13": "Hộp thư"
-      '14': "Đang chờ xử lý"
+      "14": "Đang chờ xử lý"
     categories:
       all: "tất cả chuyên mục"
       all_subcategories: "Tất cả"
@@ -408,10 +406,10 @@ vi:
         disable: "Khóa Notification"
         enable: "Cho phép Notification"
         each_browser_note: "Lưu ý: Bạn phải thay đổi trong cấu hình mỗi trình duyệt bạn sử dụng."
-      dismiss_notifications: "Đánh dấu đã đọc cho tất cả"
       dismiss_notifications_tooltip: "Đánh dấu đã đọc cho tất cả các thông báo chưa đọc"
       disable_jump_reply: "Đừng tới bài viết của tôi sau khi tôi trả lời"
       dynamic_favicon: "Hiện số chủ đề mới / cập nhật vào biểu tượng trình duyệt"
+      edit_history_public: "Để thành viên khác xem những sửa chữa bài viết của bạn"
       external_links_in_new_tab: "Mở tất cả liên kết bên ngoài trong thẻ mới"
       enable_quoting: "Bật chế độ làm nổi bật chữ trong đoạn trích dẫn trả lời"
       change: "thay đổi"
@@ -424,7 +422,6 @@ vi:
       suspended_reason: "Lý do: "
       github_profile: "Github"
       watched_categories: "Xem"
-      watched_categories_instructions: "Bạn sẽ tự động xem tất cả các chủ đề mới trong các chuyên mục này. Bạn sẽ được thông báo về tất các các bài viết mới, và một số các bài viết mới cũng sẽ xuất hiện ở chủ đề kế tiếp."
       tracked_categories: "Theo dõi"
       tracked_categories_instructions: "Bạn sẽ tự động theo dõi tất cả các chủ đề trong các chuyên mục này. Một số bài viết mới sẽ xuất hiện ở chủ đề kế tiếp."
       muted_categories: "Im lặng"
@@ -693,8 +690,6 @@ vi:
     too_few_topics_notice: "Hãy <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bắt đầu thảo luận!</a> Hiện có <strong>%{currentTopics} / %{requiredTopics}</strong> chủ đề. Khách ghé thăm cần một số chủ đề để đọc và trả lời."
     too_few_posts_notice: "Hãy <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bắt đầu thảo luận!</a> Hiện có <strong>%{currentPosts} / %{requiredPosts}</strong> bài viết. Khách ghé thăm cần một số chủ đề để đọc và trả lời."
     logs_error_rate_notice:
-      reached: "%{timestamp}: Tỷ lệ hiện tại <a href='%{url}' target='_blank'>%{rate}</a> đã đạt tới giới hạn thiết lập %{siteSettingRate} của website."
-      exceeded: "%{timestamp}: Tỷ lệ hiện tại <a href='%{url}' target='_blank'>%{rate}</a> đã vượt quá giới hạn thiết lập %{siteSettingRate} của website."
       rate:
         other: "%{count} lỗi/%{duration}"
     learn_more: "tìm hiểu thêm..."
@@ -821,7 +816,6 @@ vi:
       saved_local_draft_tip: "Đã lưu locally"
       similar_topics: "Bài viết của bạn tương tự với "
       drafts_offline: "Nháp offline"
-      group_mentioned: "Bằng cách sử dụng {{group}}, bạn có thể thông báo tới <a href='{{group_link}}'>{{count}} người</a>."
       error:
         title_missing: "Tiêu đề là bắt buộc"
         title_too_short: "Tiêu để phải có ít nhất {{min}} ký tự"
@@ -907,7 +901,6 @@ vi:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> chấp nhận lời mời của bạn</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> chuyển {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Thu được '{{description}}'</p>"
       group_message_summary:
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} tin nhắn trong {{group_name}} của bạn</p>"
@@ -1089,20 +1082,20 @@ vi:
         position: "bài viết %{current} trong %{total}"
       notifications:
         reasons:
-          '3_6': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chuyên mục nàyotification'
+          "3_6": 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chuyên mục nàyotification'
-          '3_5': 'Bạn sẽ nhận được các thông báo bởi vì bạn đã bắt đầu xem chủ đề này một cách tự động'
+          "3_5": 'Bạn sẽ nhận được các thông báo bởi vì bạn đã bắt đầu xem chủ đề này một cách tự động'
-          '3_2': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
+          "3_2": 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
-          '3_1': 'Bạn sẽ được nhận thông báo bởi bạn đã tạo chủ để này.'
+          "3_1": 'Bạn sẽ được nhận thông báo bởi bạn đã tạo chủ để này.'
-          '3': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
+          "3": 'Bạn sẽ nhận được các thông báo bởi vì bạn đang xem chủ đề này'
-          '2_8': 'Bạn sẽ nhận được thông báo bởi vì bạn đang theo dõi chuyên mục này.'
+          "2_8": 'Bạn sẽ nhận được thông báo bởi vì bạn đang theo dõi chuyên mục này.'
-          '2_4': 'Bạn sẽ nhận được các thông báo bởi vì bạn đã đăng một trả lời vào chủ đề này'
+          "2_4": 'Bạn sẽ nhận được các thông báo bởi vì bạn đã đăng một trả lời vào chủ đề này'
-          '2_2': 'Bạn sẽ nhận được các thông báo bởi vì bạn đang theo dõi chủ đề này.'
+          "2_2": 'Bạn sẽ nhận được các thông báo bởi vì bạn đang theo dõi chủ đề này.'
-          '2': 'Bạn sẽ nhận được các thông báo bởi vì bạn <a href="/users/{{username}}/preferences"> đọc chủ đề này </a>'
+          "2": 'Bạn sẽ nhận được các thông báo bởi vì bạn <a href="/users/{{username}}/preferences"> đọc chủ đề này </a>'
-          '1_2': 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
+          "1_2": 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
-          '1': 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
+          "1": 'Bạn sẽ được thông báo nếu ai đó đề cập đến @tên bạn hoặc trả lời bạn'
-          '0_7': 'Bạn đang bỏ qua tất cả các thông báo trong chuyên mục này'
+          "0_7": 'Bạn đang bỏ qua tất cả các thông báo trong chuyên mục này'
-          '0_2': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
+          "0_2": 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
-          '0': 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
+          "0": 'Bạn đang bỏ qua tất cả các thông báo trong chủ đề này'
         watching_pm:
           title: "Đang xem"
           description: "Bạn sẽ được thông báo về từng trả lời mới trong tin nhắn này, và một số trả lời mới sẽ được hiển thị"
@@ -1185,8 +1178,6 @@ vi:
         no_banner_exists: "Không có chủ đề banner nào."
         banner_exists: "Có <strong class='badge badge-notification unread'>is</strong> đang là chủ đề banner."
       inviting: "Đang mời..."
-      automatically_add_to_groups_optional: "Lời mời này cũng bao gồm quyền truy cập vào các nhóm: (optional, admin only)"
-      automatically_add_to_groups_required: "Lời mời này cũng bao gồm quyền truy cập vào các nhóm: (<b>Required</b>, admin only)"
       invite_private:
         title: 'Mời thảo luận'
         email_or_username: "Email hoặc username người được mời"
@@ -1551,10 +1542,10 @@ vi:
     posts_long: "Có {{number}} bài đăng trong chủ đề này"
     posts_likes_MF: |
       Chủ đề này có {count, plural, one {1 reply} other {# replies}} {ratio, select,
-        low {with a high like to post ratio}
+      low {with a high like to post ratio}
-        med {with a very high like to post ratio}
+      med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
+      high {with an extremely high like to post ratio}
-        other {}}
+      other {}}
     original_post: "Bài viết gốc"
     views: "Lượt xem"
     views_lowercase:
@@ -2484,94 +2475,3 @@ vi:
           label: "Mới:"
           add: "Thêm"
           filter: "Tìm kiếm (URL hoặc External URL)"
-    lightbox:
-      download: "tải"
-    search_help:
-      title: 'Tìm giúp đỡ'
-    keyboard_shortcuts_help:
-      title: 'Phím tắt'
-      jump_to:
-        title: 'Chuyển đến'
-        home: '<b>g</b>, <b>h</b> Trang chủ'
-        latest: '<b>g</b>, <b>l</b> Cuối cùng'
-        new: '<b>g</b>, <b>n</b> Mới'
-        unread: '<b>g</b>, <b>u</b> Chưa đọc'
-        categories: '<b>g</b>, <b>c</b> Danh mục'
-        top: '<b>g</b>, <b>t</b> Trên'
-        bookmarks: '<b>g</b>, <b>b</b> Đánh dấu'
-        profile: '<b>g</b>, <b>p</b> Hồ sơ'
-        messages: '<b>g</b>, <b>m</b> Tin nhắn'
-      navigation:
-        title: 'Điều hướng'
-        jump: '<b>#</b> Đến bài viết #'
-        back: '<b>u</b> Quay lại'
-        up_down: '<b>k</b>/<b>j</b> Move selection &uarr; &darr;'
-        open: '<b>o</b> or <b>Enter</b> Mở chủ để đã chọn'
-        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Next/previous section'
-      application:
-        title: 'Ứng dụng'
-        create: '<b>c</b> Tạo mới chủ đề'
-        notifications: '<b>n</b> Mở thông báo'
-        hamburger_menu: '<b>=</b> Mở menu mobile'
-        user_profile_menu: '<b>p</b> Mở trình đơn thành viên'
-        show_incoming_updated_topics: '<b>.</b> Show updated topics'
-        search: '<b>/</b> Tìm kiếm'
-        help: '<b>?</b> Mở trợ giúp bàn phím'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> Dismiss New/Posts'
-        dismiss_topics: '<b>x</b>, <b>t</b> Bỏ qua bài viết'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Đăng xuất'
-      actions:
-        title: 'Hành động'
-        bookmark_topic: '<b>f</b> Chuyển chủ đề đánh dấu'
-        pin_unpin_topic: '<b>shift</b>+<b>p</b> Pin/Unpin bài viết'
-        share_topic: '<b>shift</b>+<b>s</b> Chia sẻ bài viết'
-        share_post: '<b>s</b> Chia sẻ bài viết'
-        reply_as_new_topic: '<b>t</b> Trả lời như là một liên kết đến bài viết'
-        reply_topic: '<b>shift</b>+<b>r</b> Trả lời bài viết'
-        reply_post: '<b>r</b> Trả lời bài viết'
-        quote_post: '<b>q</b> Trích dẫn bài viết'
-        like: '<b>l</b> Thích bài viết'
-        flag: '<b>!</b> Đánh dấu bài viết'
-        bookmark: '<b>b</b> Đánh dấu bài viết'
-        edit: '<b>e</b> Sửa bài viết'
-        delete: '<b>d</b> Xóa bài viết'
-        mark_muted: '<b>m</b>, <b>m</b> Mute topic'
-        mark_regular: '<b>m</b>, <b>r</b> Chủ đề thông thường (mặc định)'
-        mark_tracking: '<b>m</b>, <b>t</b> Theo dõi chủ đề'
-        mark_watching: '<b>m</b>, <b>w</b> theo dõi chủ đề'
-    badges:
-      earned_n_times:
-        other: "Đạt được huy hiệu này %{count} lần"
-      granted_on: "Cấp ngày %{date}"
-      others_count: "Người có huy hiệu này (%{count})"
-      title: Huy hiệu
-      allow_title: "tiêu đề có sẵn"
-      multiple_grant: "trao tặng nhiều lần"
-      badge_count:
-        other: "%{count} Huy hiệu"
-      more_badges:
-        other: "+%{count} Thêm"
-      granted:
-        other: "%{count} được cấp"
-      select_badge_for_title: Chọn huy hiệu để sử dụng như là tên
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: Bắt đầu
-        community:
-          name: Cộng đồng
-        trust_level:
-          name: Độ tin cậy
-        other:
-          name: Khác
-        posting:
-          name: Đang đăng bài
-    google_search: |
-      <h3>Tìm kiếm với Google</h3>
-      <p>
-        <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
-          <input type="text" id='user-query' value="">
-          <input type='hidden' id='google-query' name="q">
-          <button class="btn btn-primary">Google</button>
-        </form>
-      </p>

config/locales/client.zh_TW.yml

@@ -223,8 +223,6 @@ zh_TW:
     undo: "復原"
     revert: "回復"
     failed: "失敗"
-    switch_to_anon: "匿名模式"
-    switch_from_anon: "登出匿名模式"
     banner:
       close: "關閉此橫幅"
       edit: "編輯此橫幅 >>"
@@ -311,18 +309,18 @@ zh_TW:
         regular:
           title: "一般"
     user_action_groups:
-      '1': "已按讚"
+      "1": "已按讚"
-      '2': "已收到的讚"
+      "2": "已收到的讚"
-      '3': "書籤"
+      "3": "書籤"
-      '4': "討論話題"
+      "4": "討論話題"
-      '5': "回覆"
+      "5": "回覆"
-      '6': "回應"
+      "6": "回應"
-      '7': "提到"
+      "7": "提到"
-      '9': "引用"
+      "9": "引用"
-      '11': "編輯"
+      "11": "編輯"
-      '12': "送出的項目"
+      "12": "送出的項目"
-      '13': "收件匣"
+      "13": "收件匣"
-      '14': "等待中"
+      "14": "等待中"
     categories:
       all: "所有分類"
       all_subcategories: "所有"
@@ -388,10 +386,10 @@ zh_TW:
         perm_denied_btn: "權限被拒絕"
         disable: "停用通知"
         enable: "啟用通知"
-      dismiss_notifications: "全部標記為已讀"
       dismiss_notifications_tooltip: "標記所有未讀通知為已讀"
       disable_jump_reply: "不要在回覆之後直接跳到我的文章"
       dynamic_favicon: "在瀏覽器小圖示上顯示新主題/更新的主題數"
+      edit_history_public: "讓其他用戶檢視我的文章修訂紀錄"
       external_links_in_new_tab: "以新分頁開啟所有外部連結"
       enable_quoting: "允許引用已標註的文字"
       change: "修改"
@@ -791,7 +789,6 @@ zh_TW:
       invited_to_private_message: "<i title='private message' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span>已接受你的邀請</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> 移動了 {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>獲得徽章「{{description}}」</p>"
       alt:
         linked: "連結到你的討論"
@@ -919,18 +916,18 @@ zh_TW:
         position: "第 %{current}/%{total} 篇文章"
       notifications:
         reasons:
-          '3_6': '你將會收到通知，因為你正在關注此分類。'
+          "3_6": '你將會收到通知，因為你正在關注此分類。'
-          '3_5': '你將會收到通知，因為你在觀看此討論話題。'
+          "3_5": '你將會收到通知，因為你在觀看此討論話題。'
-          '3_2': '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
+          "3_2": '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
-          '3_1': '你將收到關於此討論話題的通知，因為你建立了此討論話題。'
+          "3_1": '你將收到關於此討論話題的通知，因為你建立了此討論話題。'
-          '3': '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
+          "3": '你將收到關於此討論話題的通知，因為你正在關注此討論話題。'
-          '2_8': '你將會收到通知，因為你在追蹤此分類。'
+          "2_8": '你將會收到通知，因為你在追蹤此分類。'
-          '2_4': '你將收到關於此討論話題的通知，因為你回覆了此討論話題。'
+          "2_4": '你將收到關於此討論話題的通知，因為你回覆了此討論話題。'
-          '2_2': '你將收到關於此討論話題的通知，因為你正在追蹤此討論話題。'
+          "2_2": '你將收到關於此討論話題的通知，因為你正在追蹤此討論話題。'
-          '2': '你將收到關於此討論話題的通知，因為你<a href="/users/{{username}}/preferences">看過此討論話題</a>。'
+          "2": '你將收到關於此討論話題的通知，因為你<a href="/users/{{username}}/preferences">看過此討論話題</a>。'
-          '0_7': '你正忽略此分類中的所有通知。'
+          "0_7": '你正忽略此分類中的所有通知。'
-          '0_2': '你正忽略此討論話題的所有通知。'
+          "0_2": '你正忽略此討論話題的所有通知。'
-          '0': '你正忽略此討論話題的所有通知。'
+          "0": '你正忽略此討論話題的所有通知。'
         watching_pm:
           title: "關注中"
         watching:
@@ -986,8 +983,6 @@ zh_TW:
         unpin: "取消此主題在{{categoryLink}}類別的置頂狀態"
         not_pinned: "沒有主題被釘選在 {{categoryLink}} ."
       inviting: "正在邀請..."
-      automatically_add_to_groups_optional: "邀請時同時加入以下群組: (選填, 此為管理員設定)"
-      automatically_add_to_groups_required: "邀請時同時加入以下群組: (<b>必填</b>, 此為管理員設定)"
       invite_private:
         title: '邀請訊息交流'
         email_or_username: "受邀請者的電子郵件地址或用戶名稱"
@@ -1320,10 +1315,10 @@ zh_TW:
     posts_long: "此討論話題有 {{number}} 篇文章"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
-        low {with a high like to post ratio}
+      low {with a high like to post ratio}
-        med {with a very high like to post ratio}
+      med {with a very high like to post ratio}
-        high {with an extremely high like to post ratio}
+      high {with an extremely high like to post ratio}
-        other {}}
+      other {}}
     original_post: "原始文章"
     views: "觀看"
     views_lowercase:
@@ -2175,79 +2170,3 @@ zh_TW:
           label: "新增："
           add: "新增"
           filter: "搜尋 (網址或外部網址)"
-    lightbox:
-      download: "下載"
-    search_help:
-      title: '搜尋幫助'
-    keyboard_shortcuts_help:
-      title: '快捷鍵'
-      jump_to:
-        title: '跳到'
-        home: '<b>g</b>, <b>h</b> 首頁'
-        latest: '<b>g</b>, <b>l</b> 最新'
-        new: '<b>g</b> , <b>n</b> 新'
-        unread: '<b>g</b> , <b>u</b> 未讀'
-        categories: '<b>g</b>, <b>c</b> 分類'
-        top: '<b>g</b>, <b>t</b> 頂端'
-        bookmarks: '<b>g</b>, <b>b</b> 書籤'
-        profile: '<b>g</b>, <b>p</b> 個人檔案'
-        messages: '<b>g</b>, <b>m</b> 私人訊息'
-      navigation:
-        title: '導航'
-        jump: '<b>#</b> 前往文章 #'
-        back: '<b>u</b> 返回'
-        up_down: '<b>k</b>/<b>j</b> 移動選區 &uarr; &darr;'
-        open: '<b>o</b> 或 <b>Enter</b> 開啟已選擇討論話題'
-        next_prev: '<b>shift j</b>/<b>shift k</b> 下一個/上一個段落'
-      application:
-        title: 'Application'
-        create: '<b>c</b> 表示新討論話題'
-        notifications: '<b>n</b> 開啟通知'
-        hamburger_menu: '<b>=</b> 打開漢堡選單'
-        user_profile_menu: '<b>p</b> 打開使用者選單'
-        show_incoming_updated_topics: '<b>.</b> 顯示有更新的討論話題'
-        search: '<b>/</b> 搜尋'
-        help: '<b>?</b> 打開按鍵說明'
-        dismiss_new_posts: '<b>x</b>, <b>r</b> 解除新文章或回覆的提示'
-        dismiss_topics: '<b>x</b>, <b>t</b> 解除主題的提示'
-        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> 登出'
-      actions:
-        title: '行動'
-        bookmark_topic: '<b>f</b> 加入/移除書籤'
-        pin_unpin_topic: '<b>shift p</b> 置頂/取消置頂'
-        share_topic: '<b>shift s</b> 分享討論話題'
-        share_post: '<b>s</b> 分享文章'
-        reply_as_new_topic: '<b>t</b> 回覆為關聯主題'
-        reply_topic: '<b>shift r</b> 回覆討論話題'
-        reply_post: '<b>r</b> 回覆文章'
-        quote_post: '<b>q</b> 引用文章'
-        like: '<b>l</b> 按讚'
-        flag: '<b>!</b> 投訴文章'
-        bookmark: '<b>b</b> 將文章加上書籤'
-        edit: '<b>e</b> 編輯文章'
-        delete: '<b>d</b> 刪除文章'
-        mark_muted: '<b>m</b>, <b>m</b> 消音討論話題'
-        mark_regular: '<b>m</b> , <b>r</b> 正常(預設)討論話題'
-        mark_tracking: '<b>m</b>, <b>t</b> 追蹤討論話題'
-        mark_watching: '<b>m</b>, <b>w</b> 關注討論話題'
-    badges:
-      title: 徽章
-      badge_count:
-        other: "%{count} 徽章"
-      more_badges:
-        other: "+%{count} 以上"
-      granted:
-        other: "%{count} 升級"
-      select_badge_for_title: 選擇一枚徽章作為你的稱號
-      none: "<none>"
-      badge_grouping:
-        getting_started:
-          name: 開始入門
-        community:
-          name: 社群
-        trust_level:
-          name: 信任等級
-        other:
-          name: 其他
-        posting:
-          name: 文章

config/locales/server.bs_BA.yml

@@ -10,6 +10,12 @@ bs_BA:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats 
+  date:
+    month_names: []
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Topics"
   posts: "posts"
@@ -24,6 +30,9 @@ bs_BA:
       taken: "has already been taken"
     embed:
       load_from_remote: "There was an error loading that post."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "The uploaded file should be of csv or txt format."
   backup:
@@ -71,51 +80,30 @@ bs_BA:
       trust_level_3: "trust_level_3"
       trust_level_4: "trust_level_4"
   education:
-    new-topic: |
+    'new-topic': |
       Welcome to %{site_name} &mdash; **thanks for starting a new conversation!**
-
       - Does the title accurately describe your topic? Does it sound interesting?
-
       - What is this about? Who would be interested in it? Why does it matter? What kind of responses are you hoping for from the community?
-
       - Include good search words in your topic so others can *find* it. To group your topic with related topics, select a category.
-
       For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Welcome to %{site_name} &mdash; **thanks for contributing!**
-
       - Does your reply improve the conversation in some way?
-
       - Be kind to your fellow community members.
-
       - Constructive criticism is welcome, but criticize *ideas*, not people.
-
       For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
     sequential_replies: |
-      ### Consider replying to several posts at once
-
       Rather than many sequential replies to a topic, please consider a single reply that includes quotes or @name references to previous posts.
-
       You can edit your previous reply to add a quote by highlighting text and selecting the <b>quote reply</b> button that appears.
-
       It's easier for everyone to read topics that have fewer in-depth replies versus lots of small, individual replies.
     dominating_topic: |
-      ### Let others join the conversation
-
       This topic is clearly important to you &ndash; you've posted more than %{percent}% of the replies here.
-
       Are you sure you're providing adequate time for other people to share their points of view, too?
     too_many_replies: |
-      ### You have reached the reply limit for this topic
-
       We're sorry, but new users are temporarily limited to %{newuser_max_replies_per_topic} replies in the same topic.
-
       Instead of adding another reply, please consider editing your previous replies, or visiting other topics.
     reviving_old_topic: |
-      ### Revive this topic?
-
       The last reply to this topic is now over %{days} days old. Your reply will bump the topic to the top of its list and notify anyone previously involved in the conversation.
-
       Are you sure you want to continue this old conversation?
   activerecord:
     attributes:
@@ -124,6 +112,7 @@ bs_BA:
       user_profile:
         bio_raw: "O Meni"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -140,7 +129,6 @@ bs_BA:
           attributes:
             hex:
               invalid: "is not a valid color"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>the About Me field of your profile is currently blank, <a href='/users/%{username_lower}/preferences/about-me'>would you like to fill it out?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} hasn't entered anything in the About Me field of their profile yet</div>"
@@ -152,26 +140,18 @@ bs_BA:
   assets_topic_body: "This is a permanent topic, visible only to staff, for storing images and files used in the site design. Don't delete it!\n\n\nHere's how:\n\n\n1. Reply to this topic.\n2. Upload all the images you wish to use for logos, favicons, and so forth here. (Use the upload toolbar icon in the post editor, or drag-and-drop or paste images.)\n3. Submit your reply to post it.\n4. Right click the images in your new post to get the path to the uploaded images, or click the edit icon to edit your post and retrieve the path to the images. Copy the image paths.\n5. Paste those image paths into [basic settings](/admin/site_settings/category/required).\n\n\nIf you need to enable different file type uploads, edit `authorized_extensions` in the [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Welcome to the Lounge"
-    body: |2
+    body: |
-
       Congratulations! :confetti_ball:
-
       If you can see this topic, you were recently promoted to **regular** (trust level 3).
-
       You can now &hellip;
-
       * Edit the title of any topic
       * Change the category of any topic
       * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
       * Access a private Lounge category only visible to users at trust level 3 and higher
       * Hide spam with a single flag
-
       Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
-
       Thanks for being an important part of this community!
-
       (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "About the %{category} category"
@@ -271,18 +251,6 @@ bs_BA:
       message:
         make: "This topic is now a banner. It will appear at the top of every page until it is dismissed by the user."
         remove: "This topic is no longer a banner. It will no longer appear at the top of every page."
-  unsubscribed:
-    title: 'Unsubscribed'
-    description: "You have been unsubscribed. We won't contact you again!"
-    oops: "In case you didn't mean to do this, click below."
-    error: "Error Unsubscribing"
-    preferences_link: "You can also unsubscribe from digest emails on your <a href='/my/preferences'>preferences page</a>"
-    different_user_description: "You are currently logged in as a different user than the one who the digest was mailed to. Please log out and try again."
-    not_found_description: "Sorry, we couldn't unsubscribe you. It's possible the link in your email has expired."
-  resubscribe:
-    action: "Re-Subscribe"
-    title: "Re-Subscribed!"
-    description: "You have been re-subscribed."
   reports:
     visits:
       title: "User Visits"
@@ -361,7 +329,6 @@ bs_BA:
       num_clicks: "Clicks"
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
-    ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later."
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
     gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
@@ -429,10 +396,6 @@ bs_BA:
     polling_interval: "How often should logged in user clients poll in milliseconds"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     cooldown_minutes_after_hiding_posts: "Number of minutes a user must wait before they can edit a post hidden via community flagging"
-    max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site"
-    max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site"
-    num_flags_to_block_new_user: "If a new user's posts get this many spam flags from num_users_to_block_new_user different users, hide all their posts and prevent future posting. 0 to disable."
-    num_users_to_block_new_user: "If a new user's posts get num_flags_to_block_new_user spam flags from this many different users, hide all their posts and prevent future posting. 0 to disable."
     notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
@@ -599,8 +562,6 @@ bs_BA:
     email_editable: "Allow users to change their e-mail address after registration."
     logout_redirect: "Location to redirect browser to after logout EG: (http://somesite.com/logout)"
     automatically_download_gravatars: "Download Gravatars for users upon account creation or email change."
-    digest_topics: "The maximum number of topics to display in the email digest."
-    digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters."
     max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day"
     public_user_custom_fields: "A whitelist of custom fields for a user that can be shown publically."
     allow_profile_backgrounds: "Allow users to upload profile backgrounds."
@@ -640,19 +601,6 @@ bs_BA:
       invalid_string_min_max: "Must be between %{min} and %{max} characters."
       invalid_string_min: "Must be at least %{min} characters."
       invalid_string_max: "Must be no more than %{max} characters."
-  notification_types:
-    mentioned: "%{display_username} vas je opomenuo u %{link}"
-    liked: "%{display_username} lajkovao tvoj postu u %{link}"
-    replied: "%{display_username} odgovorio na tvoj post u %{link}"
-    quoted: "%{display_username} citirao tvoj post u %{link}"
-    edited: "%{display_username} izmenio tvoj post u %{link}"
-    posted: "%{display_username} odgovorio u %{link}"
-    moved_post: "%{display_username} premjestio tvoj post na %{link}"
-    private_message: "%{display_username} poslao privatnu poruku: %{link}"
-    invited_to_private_message: "%{display_username} vas poziva na privatnu diskusiju: %{link}"
-    invitee_accepted: "%{display_username} je prihvatio tvoj poziv"
-    linked: "%{display_username} vas je povezao u %{link}"
-    granted_badge: "Zaradili ste %{link}"
   search:
     within_post: "#%{post_number} od %{username}"
     types:
@@ -713,34 +661,16 @@ bs_BA:
     subject_template: "%{invitee_name} vas poziva da pogledate '%{topic_title}' na sajtu %{site_domain_name}"
     text_body_template: |
       %{invitee_name} vas poziva na diskusiju:
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       na  Revolucionar.com
-
       > %{site_title} -- %{site_description}
-
       Ako ste zainteresovani, kliknite na link ispod:
-
       %{invite_link}
-
       Ova pozivnica dolazi od člana koji je zaslužio povjerenje na našem sajtu te smo mu/joj omogućili opciju slanja pozivnica. Što vama kao zvanici daje mogućnost da odgovorite na diskusiju bez registracije.
   invite_forum_mailer:
     subject_template: "%{invitee_name} vas poziva na novu socijalnu mrežu Revolucionar.com"
-    text_body_template: |
-      %{invitee_name} vas poziva da se pridružite:
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Ako ste zainteresovani za nešto malo drugačije, kliknite na link ispod:
-
-      %{invite_link}
-
-      Ova pozivnica dolazi od člana koji je zaslužio povjerenje na našem sajtu te smo mu/joj omogućili opciju slanja pozivnica. Što vama kao zvanici daje mogućnost da odgovorite na diskusiju bez registracije.
   invite_password_instructions:
     subject_template: "Set password for your %{site_name} account"
   test_mailer:
@@ -761,37 +691,24 @@ bs_BA:
     deferred: "Thanks for letting us know. We're looking into it."
     deferred_and_deleted: "Thanks for letting us know. We've removed the post."
   system_messages:
-    post_hidden:
-      subject_template: "Post hidden due to community flagging"
     welcome_user:
       subject_template: "Dobrodošli na Revolucionar.com!"
       text_body_template: |
         Hvala što ste se pridružili Revolucionaru, dobrodošli!
-
         %{new_user_tips}
-
         Mi vjerujemo u [civilizovanu diskusiju](%{base_url}/guidelines) na svakom nivou u svako doba.
-
         Uživajte!
     welcome_invite:
       subject_template: "Dobrodošli na Revolucionar.com!"
       text_body_template: |
         Hvala vam što ste primili pozivnicu na %{site_name} -- dobrodošli!
-
         Mi smo automatski kreirali vaše korisničko ime: **%{username}**, ali možete ga promjeniti preko [tvoj profil][postavke].
-
         Da se opet ulogujete:
-
         1. Log in using any method you like -- but it must resolve to the **same email address** that you received your original invitation email at. Otherwise we won't be able to tell it is you!
-
         2. Create a unique password for [your user profile][prefs], and use it to log in.
-
         %{new_user_tips}
-
         We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
-
         Enjoy your stay!
-
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Backup completed successfully"
@@ -799,9 +716,7 @@ bs_BA:
       subject_template: "Backup failed"
       text_body_template: |
         The backup has failed.
-
         Here's the log:
-
         ```
         %{logs}
         ```
@@ -812,9 +727,7 @@ bs_BA:
       subject_template: "Restore failed"
       text_body_template: |
         The restore has failed.
-
         Here's the log:
-
         ```
         %{logs}
         ```
@@ -825,9 +738,7 @@ bs_BA:
       subject_template: "Bulk user invite processed with errors"
       text_body_template: |
         Your bulk user invite file was processed, %{sent} invites mailed with %{failed} error(s).
-
         Here's the log:
-
         ```
         %{logs}
         ```
@@ -835,9 +746,7 @@ bs_BA:
       subject_template: "Data Export completed successfully"
       text_body_template: |
         The data export was successful.
-
         Download CSV file: <a class="attachment" href="%{download_link}">%{file_name}</a>
-
         <small>CSV file download link will expire after 48 hours.</small>
     csv_export_failed:
       subject_template: "Export failed"
@@ -852,14 +761,11 @@ bs_BA:
       subject_template: "Email issue -- Bad Reply Key"
     email_error_notification:
       subject_template: "Email issue -- POP authentication error"
-    user_automatically_blocked:
-      subject_template: "New user %{username} blocked due to community flags"
     spam_post_blocked:
       subject_template: "New user %{username} posts blocked due to repeated links"
     pending_users_reminder:
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
-
         [Please review them in the admin section](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Downloading remote images disabled"
@@ -886,13 +792,10 @@ bs_BA:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
     digest:
       why: "Ukratko šta se dešavalo na %{site_link} od vaše zadnje posjete %{last_seen_at}."
-      subject_template: "[%{site_name}] Pregled za %{date}"
       new_activity: "Nove aktivnosti ba vašim temama i postovima:"
       top_topics: "Popularni postovi"
       other_new_topics: "Popularne teme"
-      unsubscribe: "Ovaj učtiv pregled sajta je poslat sa %{site_link} kada vidimo da vas nema neko vrijeme. Da zauvijek otkažete %{unsubscribe_link}."
       click_here: "klikni ovdje"
-      from: "%{site_name} pregled"
       read_more: "Pročitaj Više"
       more_topics: "Postoji %{new_topics_since_seen} drugih novih tema otkako ste nas zadnji put posjetili %{last_seen_at}."
       more_topics_category: "Postoji %{new_topics_since_seen} drugih novih tema u ovim kategorijama otkako ste nas zadnji put posjetili %{last_seen_at}:"
@@ -900,51 +803,38 @@ bs_BA:
       subject_template: "[%{site_name}] Obnova Šifre"
       text_body_template: |
         Potražena je obnova šifre na [%{site_name}](%{base_url}).
-
         Ako je niste vi zatražili ignirišite ovaj email.
-
         Kliknite ovdje da resetujete vašu šifru:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Odredi Šifru"
       text_body_template: |
         Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
-
         If you did not make this request, you can safely ignore this email.
-
         Click the following link to choose a password:
         %{base_url}/users/password-reset/%{email_token}
     account_created:
       subject_template: "[%{site_name}] Vaš Novi Nalog"
       text_body_template: |
         Novi nalog je kreiran za vas na %{site_name}
-
         Kliknite na link ispod da kreirate šifru za vaš nalog:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: |
         Welcome to %{site_name}!
-
         A staff member approved your account on %{site_name}.
-
         Click the following link to confirm and activate your new account:
         %{base_url}/users/activate-account/%{email_token}
-
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
-
         %{new_user_tips}
-
         We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
-
         Enjoy your stay!
     signup:
       text_body_template: |
         Dobrodošli na %{site_name}!
-
         Kliknite na link ispod za aktovaciju vašeg naloga:
         %{base_url}/users/activate-account/%{email_token}
-
         Ako link iznad ne može da se klikne onda ga kopirajte i ubacite u vaš internet pretraživač.
   page_not_found:
     popular_topics: "Popularne"
@@ -954,7 +844,6 @@ bs_BA:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Welcome to %{title}](#welcome)
       Potreban je nalog. Kreirajte novi nalog ili se ulogujte.
   terms_of_service:
     title: "Terms of Service"
@@ -997,6 +886,3 @@ bs_BA:
     title: "Terms of Service"
   privacy_topic:
     title: "Privacy Policy"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.cs.yml

@@ -7,9 +7,9 @@
 
 cs:
   dates:
-    short_date_no_year: "D. MMM"
+    short_date_no_year: "D. MMMM"
-    short_date: "D. MMM, YYYY"
+    short_date: "D. MMMM, YYYY"
-    long_date: "D. MMMM YYYY h:mma"
+    long_date: "D. MMMM YYYY H:mm"
   datetime_formats: &datetime_formats
     formats:
       short: "%-d. %-m. %Y"
@@ -18,6 +18,8 @@ cs:
   date:
     month_names: [null, ledna, února, března, dubna, května, června, července, srpna, září, října, listopadu, prosince]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Témata"
   posts: "příspěvky"
@@ -82,6 +84,9 @@ cs:
       max_username_length_exists: "Nemůžeš nastavit délku maximální uživatelského jména kratší než je nejdelší uživatelské jméno. "
       max_username_length_range: "Nemůžeš nastavit maximum pod minimum."
       default_categories_already_selected: "Nemůžeš vybrat kategorii používanou v jiném seznamu."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Nahraný soubrou by měl být ve formátu csv nebo txt."
   backup:
@@ -149,33 +154,20 @@ cs:
       one: "příspěvek"
       few: "%{count} příspěvky"
       other: "%{count} příspěvků"
-    new-reply: |
+    'new-reply': |
       Vítejte na %{site_name} &mdash; **díky za přispívání!**
-
       - Přispívá nějak vaše odpověď k diskuzi?
-
       - Buďte na ostatní členy komunity milí.
-
       - Konstruktivní kritika je vítaná, ale kritizujte *myšlenky*, ne lidi.
-
       Další doporučení máme v [pravidlech komunity](/guidelines). Tenhle panel se zobrazí pouze pro vaše první %{education_posts_text}.
     dominating_topic: |
-      ### Let others join the conversation
-
       This topic is clearly important to you &ndash; you've posted more than %{percent}% of the replies here.
-
       Are you sure you're providing adequate time for other people to share their points of view, too?
     too_many_replies: |
-      ### You have reached the reply limit for this topic
-
       We're sorry, but new users are temporarily limited to %{newuser_max_replies_per_topic} replies in the same topic.
-
       Instead of adding another reply, please consider editing your previous replies, or visiting other topics.
     reviving_old_topic: |
-      ### Oživit téma?
-
       Poslední odpověď na tohle téma je přes %{days} dní stará. Vaše odpověď zvedne toto téma v seznamu nahoru a upozorní všechny diskutující.
-
       Určitě chcete pokračovat v této staré konverzaci?
   activerecord:
     attributes:
@@ -186,6 +178,7 @@ cs:
       user_profile:
         bio_raw: "O mně"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -206,12 +199,12 @@ cs:
           attributes:
             hex:
               invalid: "není platná barva"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Pole 'o mně' je v tuto chvíli prázdné, <a href='/users/%{username_lower}/preferences/about-me'>nechcete si ho vyplnit?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} o sobě zatím žádné informace nevyplnil</div>"
   vip_category_name: "VIP"
   vip_category_description: "Kategorie je přístupná výhradně členům s důvěryhodností 3 a vyšší."
+  meta_category_name: "Poznámky k webu"
   meta_category_description: "Diskutuje tento web, jeho organizaci, jak funguje a jak ho vylepšit."
   staff_category_name: "Redakce"
   staff_category_description: "Privátní kategorie pro diskuze štábu. Témata jsou viditelná pouze pro moderátory a správce."
@@ -418,17 +411,6 @@ cs:
       message:
         make: "Tento příspěvek je nyní banner. Bude se zobrazovat na vršku každé stránky dokud ho uživatel nezavře."
         remove: "Tento příspěvek už není banner. Nebude se dále zobrazovat na vršku každé stránky."
-  unsubscribed:
-    title: 'Odhlášen'
-    description: "Byli jste odhlášeni ze seznamu. Již vás nebudeme kontaktovat."
-    oops: "Pokud jste tuto akci provedli omylem, klikněte na odkaz níže."
-    error: "Chyba při odhlašování"
-    preferences_link: "Také se můžete z souhrných emailů odhlásit na <a href='/my/preferences'>stránce nastavení</a>"
-    not_found_description: "Bohužel jsme vás nemohli odhlásit ze seznamu. Je možné, že váš odkaz z emailu již není platný."
-  resubscribe:
-    action: "Znovu přihlásit"
-    title: "Znovu přihlásit!"
-    description: "Byli jste opět přihlášen k odběru."
   reports:
     visits:
       title: "Návštěvy uživatelů podle dnů"
@@ -555,7 +537,6 @@ cs:
       yaxis: "Počet návštěv"
   dashboard:
     rails_env_warning: "Váš server běží v módu %{env}."
-    ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later."
     host_names_warning: "Vaše konfigurace v souboru config/database.yml používá 'localhost' jako jméno hostitele. Změňte toto nastavení na doménu vašeho webu."
     gc_warning: 'Váš server používá výchozí nastavení ruby garbage collectoru, což způsobuje snížený výkon. Přečtěte si toto téma ohledně ladění výkonu: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq neběží. Řada úloh, jako je zasílání emailů, se provádí asynchronně na pozadí přes sidekiq. Prosím, ujistěte se, že alespoň jeden process sidekiq běží. <a href="https://github.com/mperham/sidekiq">Více o Sidekiq</a>.'
@@ -578,8 +559,6 @@ cs:
     email_custom_headers: "Seznam vlastních hlaviček emailů, oddělený svislítkem"
     enable_long_polling: "'Message bus' smí používat dlouhé výzvy"
     anon_polling_interval: "Jak často se mají zasílat výzvy anonymním uživatelům v milisekundách"
-    max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site"
-    max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site"
     notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     ga_tracking_code: "Kód pro sledování přes 'Google analytics', např. UA-12345678-9; viz http://google.com/analytics"
     ga_domain_name: "Doménové jméno pro Google analytics, např. mysite.com; viz http://google.com/analytics"
@@ -632,15 +611,6 @@ cs:
       invalid_email: "Neplatná emailová adresa."
       invalid_integer: "Hodnota musí být celé číslo."
       invalid_string: "Neplatná hodnota."
-  notification_types:
-    mentioned: "%{display_username} vás zmínil v %{link}"
-    liked: "%{display_username} se líbí váš příspěvek v %{link}"
-    replied: "%{display_username} odpověděl na váš příspěvek v %{link}"
-    quoted: "%{display_username} ocitoval váš příspěvek v %{link}"
-    edited: "%{display_username} upravil váš příspěvek v %{link}"
-    posted: "%{display_username} zaslal příspěvek do %{link}"
-    moved_post: "%{display_username} přesunul váš příspěvek do %{link}"
-    invitee_accepted: "%{display_username} přijal vaši pozvánku"
   search:
     types:
       category: 'Kategorie'
@@ -687,8 +657,6 @@ cs:
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] Updates Are Available"
   system_messages:
-    post_hidden:
-      subject_template: "%{site_name} Oznámení: Příspěvek skryt kvůli hlášením od komunity"
     welcome_user:
       subject_template: "Vítejte na %{site_name}!"
     welcome_invite:
@@ -708,7 +676,6 @@ cs:
         other: "%{count} users waiting for approval"
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
-
         [Please review them in the admin section](%{base_url}/admin/users/list/pending).
   user_notifications:
     previous_discussion: "Předchozí diskuze"
@@ -733,25 +700,20 @@ cs:
       top_topics: "Populární příspěvky"
       other_new_topics: "Populární témata"
       click_here: "klikněte zde"
-      from: "souhrn z %{site_name}"
       read_more: "Číst dále"
       more_topics_category: "Více nových témat:"
     forgot_password:
       subject_template: "[%{site_name}] Obnovení hesla"
       text_body_template: |
         Někdo zažádal o obnovení vašeho hesla na [%{site_name}](%{base_url}).
-
         Pokud jste to nebyli vy, můžete tento email ignorovat.
-
         Klikněte na následující odkaz pro vytvoření nového hesla:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Set Password"
       text_body_template: |
         Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
-
         If you did not make this request, you can safely ignore this email.
-
         Click the following link to choose a password:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
@@ -761,10 +723,8 @@ cs:
     signup:
       text_body_template: |
         Vítejte na %{site_name}!
-
         Kliknutím na následující odkaz potvrdíte a aktivujete svůj nový účet:
         %{base_url}/users/activate-account/%{email_token}
-
         Pokud tento odkaz nefunguje, zkuste ho zkopírovat a vložit přes schránku do adresního řádku vaše webového prohlížeče.
   page_not_found:
     popular_topics: "Populární"
@@ -773,7 +733,6 @@ cs:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Vítejte na %{title}](#welcome)
       Je vyžadován uživatelský účet. Prosím vytvořte si nový účet nebo se přihlaste.
   terms_of_service:
     title: "Podmínky používání."
@@ -813,8 +772,3 @@ cs:
     success: "E-mail odeslán"
     error: "Chyba!"
     submit_button: "Odeslat e-mail"
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.da.yml

@@ -18,6 +18,8 @@ da:
   date:
     month_names: [null, Januar, Februar, Marts, April, Maj, Juni, Juli, August, September, Oktober, November, December]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Emner"
   posts: "indlæg"
@@ -79,6 +81,9 @@ da:
       max_username_length_range: "Du kan ikke sætte maksimum til mindre end minimum."
       default_categories_already_selected: "Du kan ikke vælge en kategori der er brugt i en anden liste."
       s3_upload_bucket_is_required: "Du kan ikke oploade til S3 med mindre du har angivet 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Den uploadede fil skal være i .csv eller .txt format."
   backup:
@@ -148,43 +153,25 @@ da:
     until_posts:
       one: "indlæg"
       other: "%{count} indlæg"
-    new-reply: |
+    'new-reply': |
       Velkommen til %{site_name} &mdash; **tak for at du deltager i samtalen!**
-
       Husk venligst mens du skriver dit svar:
-
       - Forbedrer dit svar samtalen på en eller anden måde?
-
       - Behandl dine meddebattører med den samme respekt, som du ønsker at blive behandlet med.
-
       - Det er godt med kritik, men husk at kritisere *ideer*, ikke personer.
-
       For flere tips, [se vores retningslinier](/guidelines). Denne boks dukker kun op for dine første %{education_posts_text}.
     avatar: |
-      ### Hvad med et billede til din konto?
-
       Du har oprettet et par emner og svar, men dit avatar er ikke så unik som du er -- det er bare et bogstav.
-
       Har du overvejet at **[gå til din brugerprofil](%{profile_path})** og uploade et billede, der repræsenterer dig?
-
       Det er lettere at følge diskussioner og finde interessant mennesker i samtaler, hvor alle har en unik avatar!
     dominating_topic: |
-      ### Lad andre deltage i samtalen
-
       Dette emne er åbenbart vigtigt for dig &ndash; du har oprettet mere end %{percent}% af svarene her.
-
       Er du sikker på, at du giver tilstrækkelig tid til, at andre folk kan dele deres synspunkter?
     too_many_replies: |
-      ### Du kan ikke skrive flere indlæg i dette emne
-
       Beklager, men nye brugere er begrænset til %{newuser_max_replies_per_topic} svar i hvert emne.
-
       I stedet for at tilføje endnu et svar, bør du overveje at redigere et af dine eksisterende svar eller at besøge andre emner.
     reviving_old_topic: |
-      ### Genopliv dette emne?
-
       Det sidste svar på dette emne er nu over %{days} gammelt. dit svar vil trække dette emne til toppen af listen og vil påminde alle der tidligere have været med i samtalen.
-
       Er du sikker på du vil vække dette emne til live igen?
   activerecord:
     attributes:
@@ -195,6 +182,7 @@ da:
       user_profile:
         bio_raw: "Om mig"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -215,7 +203,6 @@ da:
           attributes:
             hex:
               invalid: "er ikke en gyldig fave"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>“Om mig” feltet på din profil er pt. tomt, <a href='/users/%{username_lower}/preferences/about-me'>ønsker du at udfylde det</a>?</div>"
     no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noget i “Om mig”-feltet endnu</div>"
@@ -410,18 +397,6 @@ da:
       message:
         make: "Dette emne er nu et banner-emne. Det optræder i toppen af alle sider indtil brugeren fjerner det."
         remove: "Dette emne er ikke mere et banner-emne. Det optræder ikke længere i toppen af alle sider."
-  unsubscribed:
-    title: 'Frameldt'
-    description: "Du er blevet frameldt. Vi skriver ikke til dig igen."
-    oops: "Klik herunder hvis det ikke var din hensigt at framelde dig."
-    error: "Fejl ved framelding"
-    preferences_link: "Du kan også framelde dig opsummerings-emails på din <a href='/my/preferences'>indstillinger side</a>"
-    different_user_description: "Du er logget ind som en anden buger den den som uddragene blev sendt til. Log ud og prøv igen."
-    not_found_description: "Beklager, vi kunne ikke framelde dig. Det er muligt at linket i din e-mail er udløbet."
-  resubscribe:
-    action: "Tilmeld igen"
-    title: "Tilmeldt igen!"
-    description: "Du er blevet tilmeldt igen."
   reports:
     visits:
       title: "Brugerbesøg"
@@ -544,7 +519,6 @@ da:
       yaxis: "Antal besøg"
   dashboard:
     rails_env_warning: "Din server kører i %{env}-tilstand."
-    ruby_version_warning: "Du kører en version af Ruby 2.0.0 som har kendte problemer. Opgradér til patch-level 247 eller senere."
     host_names_warning: "Filen config/database.yml bruger localhost som værtsnavn. Opdatér den med sitets værtsnavn."
     gc_warning: 'Din server bruger Rubys standard garbage collection, hvilket ikke giver dig den bedste performance. Læs dette emne om performance-tuning: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq kører ikke. Mange opgaver, som f.eks. udsendelse af e-mail, afvikles asynkront af sidekiq. Du skal sikre dig at der kører mindst én sidekiq-proces. <a href="https://github.com/mperham/sidekiq" target="_blank">Læs mere om Sidekiq her</a>.'
@@ -568,8 +542,6 @@ da:
     email_custom_headers: "En liste af brugerdefinerede e-mail-headers adskilt af |-tegn."
     enable_long_polling: "Message bus til underretninger kan bruge long polling"
     anon_polling_interval: "Hvor ofte skal anonyme brugere polle, i millisekunder."
-    max_topics_in_first_day: "Det maksimale antal indlæg en bruger har lov til at oprette på deres første dag på sitet."
-    max_replies_in_first_day: "Det maksimale antal svar en bruger har lov til at oprette på deres første dag på sitet."
     notify_mods_when_user_blocked: "Send en besked til alle moderatorer hvis en bruger blokeres automatisk"
     ga_tracking_code: "Google analytics sporingskode, f.eks.: UA-12345678-9; se http://google.com/analytics."
     ga_domain_name: "Google analytics domænenavn, f.eks.: example.com; se http://google.com/analytics."
@@ -613,7 +585,6 @@ da:
     enable_mobile_theme: "Mobile enheder bruger et mobilvenligt tema, med mulighed for at skifte til det fulde site. Deaktivér dette hvis du ønsker at anvende et brugerdefineret stylesheet som er fuldstændigt responsivt."
     short_progress_text_threshold: "Når antallet af indlæg overstiger dette tal viser statuslinjen kun det aktuelle indlægsnummer. Hvis du ændrer bredden af statuslinjen kan det være nødvendigt at opdatere denne værdi."
     default_code_lang: "Standard syntax highlighting som bruges i GitHub kodeblokke (lang-auto, ruby, python etc.)."
-    default_email_digest_frequency: "Hvor ofte brugerne som standard modtager e-mail-sammendrag. "
     default_email_private_messages: "Send som standard en email når nogen sender brugeren en besked."
     default_email_direct: "Send som standard en email når nogen citerer/svarer/nævner/inviterer brugeren."
     default_email_mailing_list_mode: "Send som standard en email for hvert nyt indlæg."
@@ -624,18 +595,10 @@ da:
     default_other_enable_quoting: "Slå som standard \"svar på den markerede tekst\" til."
     default_other_dynamic_favicon: "Vis som standard nyt / opdateret emnetal på browserikon"
     default_other_disable_jump_reply: "Spring ikke som standard til det nye indlæg efter brugeren har svaret"
+    default_other_edit_history_public: "Offentliggør som standard rettelser til indlæg."
     default_categories_watching: "Liste over kategorier der som standard overvåges."
     default_categories_tracking: "Liste over kategorier der som standard følges."
     default_categories_muted: "Liste over kategorier der som standard ignoreres."
-  notification_types:
-    mentioned: "%{display_username} nævnte dig i %{link}"
-    liked: "%{display_username} synes om dit indlæg i %{link}"
-    replied: "%{display_username} svarede på dit indlæg i %{link}"
-    quoted: "%{display_username} citerede dit indlæg i %{link}"
-    edited: "%{display_username} redigerede dit indlæg i %{link}"
-    posted: "%{display_username} skrev et indlæg i %{link}"
-    moved_post: "%{display_username} flyttede dit indlæg til %{link}"
-    invitee_accepted: "%{display_username} accepterede din invitation"
   search:
     types:
       category: 'Kategorier'
@@ -682,8 +645,6 @@ da:
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] Opdateringer er tilgængelige"
   system_messages:
-    post_hidden:
-      subject_template: "Indlæg skjult på grund af feedback fra brugerne"
     welcome_user:
       subject_template: "Velkommen til %{site_name}!"
     welcome_invite:
@@ -694,7 +655,6 @@ da:
         other: "%{count} brugere afventer godkendelse"
       text_body_template: |
         Der er nye brugere, som afventer godkendelse (eller afvisning) før de kan tilgå dette forum.
-
         [Gennemgå dem venligst på administrationssiden](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Download af eksterne billeder er slået fra"
@@ -718,22 +678,17 @@ da:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
     digest:
       why: "Et kort resume af %{site_link} siden dit sidste besøg %{last_seen_at}"
-      subject_template: "Sammenfatning af [%{site_name}]"
       new_activity: "Ny aktivitet på dine emner og indlæg:"
       top_topics: "Populære emner"
       other_new_topics: "Populære emner"
-      unsubscribe: "Dette resume er sent fra %{site_link} hvor vi ikke har set dig i et stykke tid. Hvis du ikke vil modtage disse mails, så %{unsubscribe_link}."
       click_here: "klik her"
-      from: "%{site_name} opsummering"
       read_more: "Læs mere"
       more_topics_category: "Flere nye emner: "
     forgot_password:
       subject_template: "[%{site_name}] Nulstil kodeord"
       text_body_template: |
         Nogen har bedt om at få nulstillet dit kodeord på [%{site_name}](%{base_url}).
-
         Hvis det ikke var dig, så kan du trygt ignorere denne e-mail.
-
         Klik her for at vælge et nyt kodeord:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
@@ -741,9 +696,7 @@ da:
       text_body_template: |
         Nogen har bedt om at tilføje et kodeord til din konto på [%{site_name}](%{base_url}).
         Du kan også loge ind med en af de undestøttede online services (Google, Facebook o.s.v. ) som associeret med denne bekræftede emailadresse.
-
         Hvis ikke du har bedt om dette kan du blot ignorere denne email.
-
         Klik på følgende for at vælge et kodeord.:
         %{base_url}/users/password-reset/%{email_token}
     account_created:
@@ -754,10 +707,8 @@ da:
       subject_template: "[%{site_name}] Bekræft din nye konto"
       text_body_template: |
         Velkommen til %{site_name}!
-
         Klik på det følgende link for at bekræfte og aktivere din nye konto:
         %{base_url}/users/activate-account/%{email_token}
-
         Hvis linket ikke virker, så prøv at kopiere hele linket ind i adressefeltet på din web browser.
   page_not_found:
     popular_topics: "Populære"
@@ -849,8 +800,3 @@ da:
     error: "Fejl!"
     email_input: "Admin email"
     submit_button: "Send email"
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.et.yml

@@ -18,6 +18,8 @@ et:
   date:
     month_names: [null, jaanuar, veebruar, märts, aprill, mai, juuni, juuli, august, september, oktoober, november, detsember]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Teemad"
   posts: "postitused"
@@ -95,6 +97,9 @@ et:
       max_username_length_range: "Sa ei tohi maksimaalset seada minimaalsest väiksemaks."
       default_categories_already_selected: "Sa ei saa valida teises nimekirjas valitud liiki."
       s3_upload_bucket_is_required: "Ei saa aktiveerida S3 üleslaadimist, kui 's3_upload_bucket' ei ole määratud."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Üles laetud fail peab olema kas csv või txt formaadis."
   backup:
@@ -147,7 +152,6 @@ et:
   user_is_suspended: "Peatatud kasutajatel pole lubatud postitada."
   topic_not_found: "Midagi on valesti. Kas on võimalik, et antud teema suleti või kustutati samal ajal, kui te seda vaatasite?"
   just_posted_that: "on liiga sarnane sellele, mida sa hiljuti postitasid"
-  has_already_been_used: "on juba kasutusel"
   invalid_characters: "sisaldab ebasobivaid tähemärke"
   is_invalid: "pole korrektne, püüa kirjeldada täpsemalt"
   next_page: "järgmine leht →"
@@ -196,41 +200,25 @@ et:
     until_posts:
       one: "1 postitus"
       other: "%{count} postitust"
-    new-topic: |
+    'new-topic': |
       Teretulemast saidile %{site_name} &mdash; **tänud uue vestluse alustamise eest!**
-
       - Kas pealkiri kõlab kuvitavalt kui sa seda kõvasti loed? Kas see on hea kokkuvõte?
-
       - Kas võiksid olla sellest huvitatud? Miks see oluline on? Millist tagasisidet sa soovid?
-
       - Lisa enim kasutatud sõnad oma teemasse et teised *leiaksid* selle üles. Et grupeerida oma teema teiste sarnaste teemadega vali liik.
-
       Rohkema info saamiseks [vaata meie kommuuni juhiseid](/guidelines). See paneel ilmub ainult esimesel %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Teretulemast saidile %{site_name} &mdash; **täname osalemast!**
-
       - Kas sinu vastus parandab vestlust mingil moel?
-
       - Ole kommuuni liikmete vastu lahke.
-
       - Konstruktiivne kriitika on tervitatav aga kritiseeri *ideid*, mitte inimesi.
-
       Rohkema info saamiseks [vaata meie kommuuni juhiseid](/guidelines). See paneel ilmub ainult esimesel %{education_posts_text}.
     avatar: |
-      ### Kuidas oleks, kui lisaksid oma kontole pildi?
-
       Oled postitanud mõned teemad ja vastused aga sinu profiilipilt pole hetkel sama unikaalne nagu sina... see on lihtsalt üks täht.
-
       Kas sa oled kaalunud **[külastada oma profiili](%{profile_path})** laadimaks üles sind ennast kujutav pilt?
-
       Diskussioone jälgida ja vestlustest huvitavaid inimesi leida on lihtsam, kui kõigil on unikaalne profiilipilt!
     sequential_replies: |
-      ### Kaalu mitmele postitusele samaaegset vastamist
-
       Selle asemel, et vastata mitu korda järjest paljudele sõnumitele, palun kaalu ühe postituse kasutamist eelnevaid postitusi tsiteerides või kasutades viidet @nimi.
-
       Saad muuta oma varasemat postitust ning lisada tsitaati valides teksti ning vajutades nähtavale ilmunud nuppu <b>tsiteeri</b>.
-
       Kõigil on lihtsam lugeda teemasid, milles on põhjalikumad vastused paljude pisikeste vastuste asemel.
   activerecord:
     attributes:
@@ -241,6 +229,7 @@ et:
       user_profile:
         bio_raw: "Minust"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -261,7 +250,6 @@ et:
           attributes:
             hex:
               invalid: "pole korrektne värv"
-      <<: *errors
   vip_category_name: "Lounge"
   vip_category_description: "Liik, mis on eksklusiivne kasutajatele, kellel on usaldustase 3 või kõrgem."
   meta_category_name: "Saidi tagasiside."
@@ -417,8 +405,6 @@ et:
   archetypes:
     banner:
       title: "Teema Bänneriks"
-  unsubscribed:
-    title: 'Eemaldatud'
   reports:
     visits:
       xaxis: "Päev"
@@ -568,8 +554,3 @@ et:
     error: "Viga!"
     email_input: "Admini kiri"
     submit_button: "Saada kiri"
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.gl.yml

@@ -18,6 +18,8 @@ gl:
   date:
     month_names: [null, Xaneiro, Febreiro, Marzo, Abril, Maio, Xuño, Xullo, Agosto, Setembro, Outubro, Novembro, Decembro]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Temas"
   posts: "publicacións"
@@ -62,6 +64,9 @@ gl:
       load_from_remote: "Produciuse un erro cargando esta publicación."
     site_settings:
       min_username_length_range: "O mínimo non pode ser maior que o máximo."
+  activemodel:
+    errors:
+      <<: *errors
   not_logged_in: "Debes iniciar sesión para facer iso."
   not_found: "Non foi posíbel atopar o recurso ou URL solicitado."
   invalid_access: "Non se che permite ver o recurso solicitado."
@@ -124,6 +129,7 @@ gl:
       user_profile:
         bio_raw: "Verbo de min"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -142,7 +148,6 @@ gl:
           attributes:
             hex:
               invalid: "non é unha cor válida"
-      <<: *errors
   vip_category_name: "Taberna"
   vip_category_description: "Unha categoría exclusiva para membros cun nivel de confianza igual ou maior a 3."
   meta_category_name: "Opinións sobre o sitio"
@@ -262,13 +267,6 @@ gl:
       title: "Tema normal"
     banner:
       title: "Tema do báner"
-  unsubscribed:
-    title: 'Dado de baixa'
-    description: "Démoste de baixa. Non contactaremos contigo de novo."
-  resubscribe:
-    action: "Re-subscribir"
-    title: "Subscrito de novo"
-    description: "Subscribícheste de novo"
   reports:
     visits:
       title: "Visitas de usuarios"
@@ -413,8 +411,6 @@ gl:
     full_name_required: "O nome completo no perfil do usuario é obrigatorio."
     embed_username_key_from_feed: "Clave para recuperar o nome do usuario desde a fonte."
     enable_emoji: "Activar emojis"
-  notification_types:
-    liked: "A %{display_username} gustoulle a túa publicación en %{link}"
   search:
     types:
       category: 'Categorías'
@@ -435,19 +431,13 @@ gl:
     deferred_and_deleted: "Grazas por comunicárnolo. Xa eliminamos a publicación."
   temporarily_closed_due_to_flags: "Este tema está pechado temporalmente polo gran número de denuncias da comunidade."
   system_messages:
-    post_hidden:
-      subject_template: "Publicación oculta polas denuncias da comunidade."
     welcome_user:
       subject_template: "Benvido/a a %{site_name}!"
       text_body_template: |
         Grazas por unirte %{site_name}, e benvido/a!
-
         %{new_user_tips}
-
         Cremos nun [comportamento civilizado da comunidade](%{base_url}/guidelines) en todo momento.
-
         Goza da túa estancia!
-
         (Se precisas comunicarte cos [membros do equipo](%{base_url}/about) como novo usuario responde a esta mensaxe.)
     welcome_invite:
       subject_template: "Benvido/a a %{site_name}!"
@@ -475,8 +465,3 @@ gl:
   admin_login:
     error: "Erro!"
     submit_button: "Enviar correo-e"
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.he.yml

@@ -18,6 +18,8 @@ he:
   date:
     month_names: [null, ינואר, פברואר, מרס, אפריל, מאי, יוני, יוני, אוגוסט, ספטמבר, אוקטובר, נובמבר, דצמבר]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "נושאים"
   posts: "הודעות"
@@ -79,6 +81,9 @@ he:
       max_username_length_range: "לא ניתן לקבוע את המקסימום מתחת למינימום."
       default_categories_already_selected: "לא ניתן לבחור קטגוריה שהשתמשו בה ברשימה אחרת"
       s3_upload_bucket_is_required: "אינך יכול להעלות ל-S3 ללא 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "הקובץ המועלה צריך להיות בפורמט csv או txt."
   backup:
@@ -158,40 +163,35 @@ he:
     until_posts:
       one: "הודעה אחת"
       other: "%{count} הודעות"
-    new-topic: "ברוכים באים ל%{site_name} &mdash; **תודה שהתחלת שיחה חדשה! **\n-הכותרת נשמעת מעניינת כשאת/ה קורא/ת אותה בקול רם? האם היא תקציר טוב?\n-מי יתעניין בזה? איזה סוג של תגובות את/ה רוצה?\n-השתמש/י במילים נפוצות בכותרת שלך כך שאחרים יוכלו למצוא אותה. כדי לשייך את הנושא שלך עם נושאים קשורים בחר קטגוריה.\n-לעוד טיפים, [ראה את כללי התנהלות בקהילה] (/guidelines). \nהפנל הזה יופיע רק עבור  %{education_posts_text}. הראשונים.\n"
+    'new-topic': |
-    new-reply: |
+      ברוכים באים ל%{site_name} &mdash; **תודה שהתחלת שיחה חדשה! **
+      -הכותרת נשמעת מעניינת כשאת/ה קורא/ת אותה בקול רם? האם היא תקציר טוב?
+      -מי יתעניין בזה? איזה סוג של תגובות את/ה רוצה?
+      -השתמש/י במילים נפוצות בכותרת שלך כך שאחרים יוכלו למצוא אותה. כדי לשייך את הנושא שלך עם נושאים קשורים בחר קטגוריה.
+      -לעוד טיפים, [ראה את כללי התנהלות בקהילה] (/guidelines).
+      הפנל הזה יופיע רק עבור  %{education_posts_text}. הראשונים.
+    'new-reply': |
       ברוכים באים ל %{site_name} &mdash; ** תודה על תרומתך! **
-
       - האם התגובה שלך משפרת את השיחה בדרך כלשהיא?
-
       - היו נחמדים לחברים בקהילה
-
       - ביקורת מבנה היא רצויה, אבל אנא בקרו *רעיונות*, לא אנשים.
-
       למידע נוסף [ראו את הכללים המנחים שלנו]/guidelines). פאנל זה יופיע רק ב-%{education_posts_text} תגובות  הראשונות שלך.
     avatar: |
-      ###מה דעתך להוסיף תמונה לחשבון שלך?
       כבר פרסמת כמה נושאים ותגובות, אבל תמונת הפרופיל שלך לא מיוחדת- היא רק אות.
       שקלת **[להכנס לפרופיל משתמש שלך ](%{profile_path})** ולהעלות תמונה שמייצגת אותך?
       יותר קל לעקוב אחרי שיחות ולמצוא אנשים מעניינים כשלכולם יש תמונת פרופיל יחודית!
-    sequential_replies: "### שקלו להשיב לכמה פרסומים בבת אחת\n\nבמקום להשיב בתגובות עוקבות לנושא, שקלו בבקשה לפרסם תגובה אחת שכוללת ציטוטים מהפרסומים הקודמים או הפניות ל@שם_משתמש/ת.\n\nתוכל/י לערוך תגובה קודמת שלך כדי להוסיף ציטוט על ידי הדגשת הטקסט ובחירה בכפתור <b>ציטוט התגובה</b> שיופיע.\n\nקל יותר לכולם לקרוא נושאים עם מספר נמוך יחסית תגובות מעמיקות מאשר הרבה תגובות קצרות ונפרדות.\n \n"
+    sequential_replies: |
+      במקום להשיב בתגובות עוקבות לנושא, שקלו בבקשה לפרסם תגובה אחת שכוללת ציטוטים מהפרסומים הקודמים או הפניות ל@שם_משתמש/ת.
+      תוכל/י לערוך תגובה קודמת שלך כדי להוסיף ציטוט על ידי הדגשת הטקסט ובחירה בכפתור <b>ציטוט התגובה</b> שיופיע.
+      קל יותר לכולם לקרוא נושאים עם מספר נמוך יחסית תגובות מעמיקות מאשר הרבה תגובות קצרות ונפרדות.
     dominating_topic: |
-      ### אפשר לאחרים להצטרף לשיחה
-
       הנושא הזה בבירור חשוב לך &ndash; פרסמת יותר מ-%{percent}% מהתגובות כאן.
-
       בטוח שאתה נותן מספיק זמן לאחרים כדי לחלוק את נקודת מבטם?
     too_many_replies: |
-      ### הגעת למגבלת התגובות של הנושא הזה
-
       אנחנו מצטערים, אבל משתמשים חדשים מודבלים זמנית לפרסום %{newuser_max_replies_per_topic} תגובות באותו הנושא.
-
       במקום להוסיף תגובה נוספת, ניתן לערוך תגובה קודמת, או לבקר בנושאים אחרים.
     reviving_old_topic: |
-      ### להחיות נושא זה?
-
       התגובה האחרונה לנושא הזה היא כבר בת יותר מ-%{days} ימים. התגובה שלך תקפיץ את הנושא הזה לראש הרשימה שלו ותודיע לכל מי שהיה מעורב בשיחה בו.
-
       אתה בטוח שברצונך להמשיך את הדיון הישן הזה?
   activerecord:
     attributes:
@@ -202,6 +202,7 @@ he:
       user_profile:
         bio_raw: "אודותיי"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -222,7 +223,6 @@ he:
           attributes:
             hex:
               invalid: "זהו אינו צבע תקני"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>שדה האודות של הפרופיל שלך ריק כרגע, <a href='/users/%{username_lower}/preferences/about-me'>תרצה למלא אותו?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} עדיין לא הזין דבר בשדה אודות של הפרופיל שלהם</div>"
@@ -235,25 +235,18 @@ he:
   assets_topic_body: "זהו נושא קבוע, הגלוי רק לצוות, לשמירת תמונות וקבצים שמשמשים לעיצוב האתר. אל תמחקו אותו!\n\n\nכיצד:\n\n\n1. הגיבו לנושא זה.\n2. העלו כאן את כל התמונות שברצונכם להשתמש כלוגואים, לוגואים מוקטנים (favicons) וכן הלאה. (השתמשו בלוגו ההעלאה בסרגל הכלים בעורך הפרסום, או גררו-שחררו או הדביקו את התמונות.)\n3. שלחו את התגובה כדי לפרסם אותה.\n4. הקליקו עם הכפתור הימני על התמונות בפרסום החש שלכם כדי להשיג את הכתובת של התמונה שהועלתה, או הקליקו על סמל העריכה כדי לערוך את הפרסום ולאחזר את הכתובת של התמונות. העתיקו את הכתובות.\n5. הדביקו את כתובות התמונות אלתוך [הגדרות בסיסיות](/מנהל/הגדרות_אתגר/קטגוריה/נדרש).\n\nאם אתכם צריכים לאפשר העלאת קבצים מסוגים שונים, ערכו את \"הרחבות מאושרות\" בתוך [הגדרות_קובץ](/מנהל/הגדרות_אתר/קטגוריה/קבצים)."
   lounge_welcome:
     title: "ברוכים הבאים ללאונג'"
-    body: |2
+    body: |
-
       ברכות!: confetti_ball
-
       אם את/ה רואה נושא זה, קודמת לאחרונה ל**משתשמ/ת** (trust level 3).
-
       אתם יכולים עכשיו &hellip;
       * לערוך כותרות של כל נושא
       * לשנות את הקטגוריה של כל נושא
       * לאפשר מעקב אחר כל הקישורים שלכם (([automatic nofollow]) (http://en.wikipedia.org/wiki/Nofollow) ) יוסר.
       * לגשת לקטגוריית הלאונג' הפרטי הזמינה רק למשתמשים ברמת אמון 3 ומעלה
       * להסתיר ספאם בעזרת סימון אחד
-
       הנה [רשימת החברים שלך למעמד זה(/badges/3/regular). אתם מוזמנים להגיד שלום.
-
       תודה על החלק החשוב שאתם נוטלים בקהילה שלנו!
-
       למידע נוסף על רמות האמון, [ראו נושא זה][trust]. שימו לב בבקשה שרק חברים שממשיכים לעמוד בבדירשות לאורך זמן נשארים ברמת אמון זו).
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "אודות הקטגוריה %{category}"
@@ -451,18 +444,6 @@ he:
       message:
         make: "נושא זה הוא כעת באנר. הוא יופיע בראש כל עמוד עד שישוחרר על ידי המשתמשים."
         remove: "נושא זה כבר אינו באנר. הוא לא יופיע יותר בראש כל עמוד."
-  unsubscribed:
-    title: 'מנוי בוטל'
-    description: "המנוי שלך בוטל. לא ניצור איתך קשר יותר!"
-    oops: "במקרה שלא התכוונת לעשות את זה, לחץ מטה."
-    error: "תקלה בביטול ההרשמה"
-    preferences_link: "אתם יכולים לבטל את ההרשמה מדוא\"לי הסיכום גם ב<a href='/my/preferences'>עמוד ההעדפות שלך</a>"
-    different_user_description: "את/ה כרגע מחובר כשם משתמש אחר מזה אליו נשלח דוא\"ל הסיכום. אנא התנתקו ונסו פעם נוספת."
-    not_found_description: "סליחה, לא יכולנו לבטל את המנוי שלך. זה אפשרי שפג תוקף הקישור בהודעת הדואר שלך."
-  resubscribe:
-    action: "צור מנוי מחדש"
-    title: "מנוי נוצר!"
-    description: "נוצר לך מנוי מחדש."
   reports:
     visits:
       title: "ביקורי משתמש"
@@ -597,7 +578,6 @@ he:
       yaxis: "מספר ביקורים"
   dashboard:
     rails_env_warning: "השרת שלך רץ במצב %{env}."
-    ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later."
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
     gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
@@ -679,13 +659,9 @@ he:
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     background_polling_interval: "באיזו תכיפות צריכים לקוחות לבצע תשאול (poll) במילישניות (כאשר החלון נמצא ברקע)"
     cooldown_minutes_after_hiding_posts: "מספר הדקות שמשתמש/ת חייבים לחכות לפני שהם יכולים לערוך פרסום מוסתר דרך סימון קהילתי"
-    max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site"
-    max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site"
     tl2_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl2 (משתמש) באמצעות הכפלה במספר זה. "
     tl3_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl3 (רגיל) באמצעות הכפלה במספר זה. "
     tl4_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl4 (מנהיג) באמצעות הכפלה במספר זה. "
-    num_flags_to_block_new_user: "אם פרסומים של משתמש/ת חדשים מסומנים כספאם על ידי num_users_to_block_new_user משתשמים שונים, הסתירו את כל הפרסומים שלהם ומנעו מהם פרסום עתידי. 0 כדי לנטרל."
-    num_users_to_block_new_user: "אם פרסומים של משתמש/ת חדשים מסומנים כספאם על ידי  num_flags_to_block_new_user  משתמשים שונים, הסתירו את כל הפרסומים שלהם ומנעו מהם פרסום עתידי. 0 כדי לנטרל."
     notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     flag_sockpuppets: "אם משתמש/ת חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפרסומים של שניהם כספאם פוטנציאלי."
     traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה."
@@ -896,9 +872,6 @@ he:
     allow_animated_thumbnails: "יצירת תמונות אנימציה מוקטנות קטנות של קבצי אנימציית gif."
     default_avatars: "כתובות URL לאווטרים אשר ישמשו כברירת מחדל למשתמשים חדשים עד אשר ישנו אותם."
     automatically_download_gravatars: "הורדת גראווטרים למשתמשים בעת יצירת החשבון או שינוי כתובת הדוא\"ל."
-    digest_topics: "מספר הנושאים המקסימלי להצגה במייל סיכום."
-    digest_min_excerpt_length: "מספר התווים המינימלי למובאות מתוך הפרסום במייל הסיכום."
-    disable_digest_emails: "נטרול דוא\"ל סיכום לכל המשתמשים."
     detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures."
     max_daily_gravatar_crawls: "מספר הפעמים המקסימלי ש-Discourse יבדוק אווטרים ב-Gravatar ביום"
     public_user_custom_fields: "רשימה לבנה (whitelist) של שדות מותאמים למשתמש שיכולים להיות מוצגים באופן פומבי."
@@ -910,6 +883,7 @@ he:
     allow_profile_backgrounds: "אפשרו למשתמשים להעלות רקעים לפרופיל."
     enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive."
     dominating_topic_minimum_percent: "איזה אחוז מהפרסומים משתמש צריך לייצר בנושא לפני שיקבל תזכורת לגבי שליטת/שתלטנות יתר על הנושא."
+    daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
     suppress_uncategorized_badge: "אל תציגו את התג (badge) לנושאים נטולי קטגוריה ברשימת הנושאים."
     global_notice: "הציגו הודעת אזהרה דחופה כללית לכל המבקרים, החליפו לריק כדי להסתיר אותה (ניתן להשתמש ב-HTML)."
     disable_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל."
@@ -942,7 +916,6 @@ he:
     emoji_set: "איך אתם אוהבים את ה-emoji שלכם?"
     enforce_square_emoji: "חובת מימדי ריבועיים בכל ה-emojis."
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
-    default_email_digest_frequency: "באיזה תדירות משתמשים מקבלים מייל עדכון בתור ברירת מחדל. "
     default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל."
     default_email_direct: "שלח מייל כשמישהו מצטט/ מגיב ל/מזכיר או מזמין משתמש, בתור ברירת מחדל. "
     default_email_mailing_list_mode: "שלח מייל עבור כל פרסום חדש בתור ברירת מחדל. "
@@ -953,6 +926,7 @@ he:
     default_other_enable_quoting: "Enable quote reply for highlighted text by default."
     default_other_dynamic_favicon: "Show new/updated topic count on browser icon by default."
     default_other_disable_jump_reply: "Don't jump to user's post after they reply by default."
+    default_other_edit_history_public: "Make the post revisions public by default."
     default_categories_watching: "List of categories that are watched by default."
     default_categories_tracking: "List of categories that are tracked by default."
     default_categories_muted: "List of categories that are muted by default."
@@ -970,19 +944,6 @@ he:
       invalid_string_min: "חייב להיות לפחות %{min} תווים."
       invalid_string_max: "נדרשים לא יותר מ-%{max} תווים."
       invalid_reply_by_email_address: "Value must contain '%{reply_key}' and be different from the notification email."
-  notification_types:
-    mentioned: "%{display_username} אזכר אותך ב %{link}"
-    liked: "%{display_username} נתן לייק להודעה שלך ב %{link}"
-    replied: "%{display_username} הגיב להודעה שלך ב %{link}"
-    quoted: "%{display_username} ציטט הודעה שלך ב %{link}"
-    edited: "%{display_username} ערך הודעה שלך ב %{link}"
-    posted: "%{display_username} פרסם ב %{link}"
-    moved_post: "%{display_username} העביר את ההודעה שלך ל %{link}"
-    private_message: "%{display_username}  שלח/ה לך הודעה: %{link}"
-    invited_to_private_message: "%{display_username}  הזמין אותך להודעה:  %{link}"
-    invitee_accepted: "%{display_username} קיבל את הזמנתך"
-    linked: "%{display_username} קישר אליך ב %{link}"
-    granted_badge: "הרווחת %{link}"
   search:
     within_post: "#%{post_number} פרסומים של %{username}"
     types:
@@ -1086,35 +1047,16 @@ he:
     subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}"
     text_body_template: |
       %{invitee_name} הזמין/הזמינה אותך לדיון
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       באתר
-
       > %{site_title} -- %{site_description}
-
       אם את/ה מעוניינים להצטרף לדיון, הקישו על הקישור הבא:
-
       %{invite_link}
-
       הזמנה זו נשלחה על ידי משתמש/ת מוכר/ת ולכן אתם יכולים להשיב לדיון הנ"ל באופן מיידי.
   invite_forum_mailer:
     subject_template: "%{invitee_name} הזמינ/ה אותך להצטרף ל%{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} הזמינ/ה אותך להצטרף.
-
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      אם הינכם מעוניינים לחצו על הקישור הבא:
-
-      %{invite_link}
-
-      הודעה זו נשלחה על ידי משתמש/ת מוכרים כך שאינך חייב/ת להתחבר.
   invite_password_instructions:
     subject_template: "צרו סיסמא עבור חשבון ה-%{site_name} שלכם."
     text_body_template: |
@@ -1131,9 +1073,6 @@ he:
     subject_template:
       one: "[%{site_name}] תגובה אחת מחכה לבדיקה"
       other: "[%{site_name}] %{count}  תגובות ממתינים לבדיקה"
-    text_body_template: |
-      שלום,
-      יש תגובות ממשתמשים חדשים שממינות לתגובה [ניתן לאשר או לדחות אותן כאן] (%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "הפרסום שלך סומן כ **מחוץ לנושא**: הקהילה מרגישה שהוא לא מתאים לנושא, כפי שמוגדר על ידי הכותרת והפרסום הראשון. "
     inappropriate: "התגובה שלך סומנה כ**לא מתאימה**: הקהילה מרגישה שהוא פוגעני או הפרה של [our community guidelines](/guidelines)"
@@ -1147,35 +1086,36 @@ he:
     deferred_and_deleted: "תודה שעדכנתם אותנו. הסרנו את הפרסום."
   temporarily_closed_due_to_flags: "נושא זה סגור באופן זמני בעקבות מספר רב של סימונים של הקהילה. "
   system_messages:
-    post_hidden:
-      subject_template: "הודעה הוסתרה בעקבות סימון"
     welcome_user:
       subject_template: "ברוכים הבאים ל %{site_name}!"
       text_body_template: |
         תודה שהצטרפת ל %{site_name}!
-
         %{new_user_tips}
-
         אנו מאמינים ומאמינות ב  [התנהגות קהילתית מתורבתת ](%{base_url}/guidelines) בכל זמן.
-
         תהנו!
-
         (אם ברצונך לתקשר עם [מנהל אתר](%{base_url}/about) כמשתמשת חדשה, השיבי להודעה הזו. )
     welcome_invite:
       subject_template: "Welcome to %{site_name}!"
-      text_body_template: "תודה שקיבלת את ההזמנה שלך ל %{site_name} - ברוכים הבאים!\n\nיצרנו חשבון חדש **%{username}** בשבילך, ואת/ה מחובר/ת. תוכל/י תמיד לשנות את שמך באמצעות ביקור  [ בפרופיל שלך ][prefs].\n\nעל מנת להתחבר שוב:\n\n1. השתמשו תמיד **באותו חשבון מייל מההזמנה המקורית** בעת ההתחברות. אחרת לא נוכל לדעת שזה את/ה!\n\n2. צרו סיסמא יחודית עבור  [ הפרופיל שלך] [prefs] והשתמשו בה בשביל להתחבר. \n\n%{new_user_tips}\n\nאנו מאמינים ומאמינות ב [התנהגות קהילתית מתורבתת] (%{base_url}/guidelines)  בכל זמן. \n\nתהנו!\n\n(אם ברצונך לתקשר עם [מנהלת אתר] (%{base_url}/about) כמשתמש/ת חדש/ה השיבי להודעה זו.)\n\n[prefs]: %{user_preferences_url}\n"
+      text_body_template: |
+        תודה שקיבלת את ההזמנה שלך ל %{site_name} - ברוכים הבאים!
+        יצרנו חשבון חדש **%{username}** בשבילך, ואת/ה מחובר/ת. תוכל/י תמיד לשנות את שמך באמצעות ביקור  [ בפרופיל שלך ][prefs].
+        על מנת להתחבר שוב:
+        1. השתמשו תמיד **באותו חשבון מייל מההזמנה המקורית** בעת ההתחברות. אחרת לא נוכל לדעת שזה את/ה!
+        2. צרו סיסמא יחודית עבור  [ הפרופיל שלך] [prefs] והשתמשו בה בשביל להתחבר.
+        %{new_user_tips}
+        אנו מאמינים ומאמינות ב [התנהגות קהילתית מתורבתת] (%{base_url}/guidelines)  בכל זמן.
+        תהנו!
+        (אם ברצונך לתקשר עם [מנהלת אתר] (%{base_url}/about) כמשתמש/ת חדש/ה השיבי להודעה זו.)
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "הגיבוי הושלם בהצלחה."
       text_body_template: "הגיבוי נוצר בהצלחה!\nבקר ב  [admin > backup section](%{base_url}/admin/backups)  על מנת להוריד את הגיבוי החדש שלך."
     backup_failed:
       subject_template: "הגיבוי נכשל."
-      text_body_template: |+
+      text_body_template: |
         הגיבוי נכשל.
-
         הנה הלוג:
-
         %{logs}
-
     restore_succeeded:
       subject_template: "השחזור הסתיים בהצלחה."
       text_body_template: "השחזור הצליח."
@@ -1184,7 +1124,6 @@ he:
       text_body_template: |
         האחזור נכשל.
         הנה רישום הפעולות:
-
         ```
         %{logs}
         ```
@@ -1195,17 +1134,17 @@ he:
       subject_template: "ההזמנה הקבותית עובדה עם שגיאות"
       text_body_template: |
         ההזמנה הקבוצתית שלך עובדה,  %{sent} הזמנות נשלחו עם %{failed} תקלה/ות.
-
         רישום המערכת:
-
         Here's the log:
         ```
-
         %{logs}
         ```
     csv_export_succeeded:
       subject_template: "יצוא הנתונים הושלם"
-      text_body_template: "הנתונים שלך יוצאו בהצלחה! :dvd:\n\n<a class=\"attachment\" href=\"%{download_link}\">%{file_name}</a> (%{file_size})\n\nלינק ההורדה יהיה זמין במשך 48 שעות. \n"
+      text_body_template: |
+        הנתונים שלך יוצאו בהצלחה! :dvd:
+        <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
+        לינק ההורדה יהיה זמין במשך 48 שעות.
     csv_export_failed:
       subject_template: "ייצוא הנתונים נכשל"
       text_body_template: "צר לנו, אך ייצוא הנתונים שלכם נכשל. אנא בדקו את רישומי המערכת או צרו קשר עם איש/אשת צוות."
@@ -1215,7 +1154,9 @@ he:
       subject_template: "[%{site_name}]  בעיית מייל -- ללא תוכן"
     email_reject_parsing:
       subject_template: "[%{site_name}]  בעיית מייל -- תוכן לא זוהה."
-      text_body_template: "אנחנו מתנצלים, אבל הודעת המייל שלך ל- %{destination}  (titled %{former_title})  לא עבדה. \n\nלא מצאנו תוכן במייל שלך. אנא ודא שהתגובה שלך בראש המייל, אנחנו לא יכולים לעבד תגובות בין השורות. \n"
+      text_body_template: |
+        אנחנו מתנצלים, אבל הודעת המייל שלך ל- %{destination}  (titled %{former_title})  לא עבדה.
+        לא מצאנו תוכן במייל שלך. אנא ודא שהתגובה שלך בראש המייל, אנחנו לא יכולים לעבד תגובות בין השורות.
     email_reject_invalid_access:
       subject_template: "[%{site_name}]  בעיית מייל -- גישה לא תקינה"
     email_reject_reply_key:
@@ -1228,8 +1169,6 @@ he:
       subject_template: "[%{site_name}]  בעיית מייל -- תגובה נוצרה אוטומטית"
     email_error_notification:
       subject_template: "[%{site_name}]  בעיית מייל -- בעיית אימות POP"
-    user_automatically_blocked:
-      subject_template: "המשתמש/ת החדשים %{username} נחסמו בשל התראות מהקהילה."
     spam_post_blocked:
       subject_template: "הודעות של המשתמש/ת החדש/ה %{username} נחסמו בשל קישורים חוזרים."
     pending_users_reminder:
@@ -1238,7 +1177,6 @@ he:
         other: "%{count} users waiting for approval"
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
-
         [Please review them in the admin section](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "הורדת תמונות מרחוק מנוטרלת"
@@ -1265,13 +1203,10 @@ he:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
     digest:
       why: "סיכום קצר של %{site_link} מאז ביקורך האחרון ב-%{last_seen_at}"
-      subject_template: "[%{site_name}] תקציר"
       new_activity: "New activity on your topics and posts:"
       top_topics: "Recent posts the community enjoyed:"
       other_new_topics: "Other New Topics:"
-      unsubscribe: "תקציר זה נשלח אליך מ-%{site_link} מכיוון שלא ראינו אותך מזה זמן מה. קישור לביטול ההרשמה %{unsubscribe_link}."
       click_here: "click here"
-      from: "%{site_name} digest"
       read_more: "Read More"
       more_topics: "ישנם %{new_topics_since_seen} נושאים חדשים נוספים."
       more_topics_category: "עוד נושאים חדשים:"
@@ -1279,41 +1214,47 @@ he:
       subject_template: "[%{site_name}] Password reset"
       text_body_template: |
         Somebody asked to reset your password on [%{site_name}](%{base_url}).
-
         If it was not you, you can safely ignore this email.
-
         Click the following link to choose a new password:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Set Password"
       text_body_template: |
         Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
-
         If you did not make this request, you can safely ignore this email.
-
         Click the following link to choose a password:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] התחברות"
-      text_body_template: "מישהו ביקש להתחבר לחשבונך ב [%{site_name}](%{base_url}).\nאם לא ביקשת זאת, תוכל להתעלם מהמייל הזה. \nלחץ על הקישור הבא להתחבר:\n%{base_url}/users/admin-login/%{email_token}\n"
+      text_body_template: |
+        מישהו ביקש להתחבר לחשבונך ב [%{site_name}](%{base_url}).
+        אם לא ביקשת זאת, תוכל להתעלם מהמייל הזה.
+        לחץ על הקישור הבא להתחבר:
+        %{base_url}/users/admin-login/%{email_token}
     account_created:
       subject_template: "[%{site_name}] החשבון החדש שלך"
       text_body_template: |
         חשבון חדש נוצר עבורך ב%{site_name}
-
         הקישו על הקישור המצורף כדי להגדיר סיסמא לחשבונך החדש:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
-      text_body_template: "ברוכים הבאים ל%{site_name}!\n\nחבר צוות אישר את החשבון שלך ב %{site_name}. \n\nלחץ על הקישור הבא לאשר והפעיל את החשבון החדש שלך:\n%{base_url}/users/activate-account/%{email_token}\n\nאם הלינק לא לחיץ, נסה להעתיק ולהדביק אותו לסרגל הכתובת בראש הדפדפן. \n\n%{new_user_tips}\n\nאנו מאמינים ב  [civilized community behavior](%{base_url}/guidelines)  בכל זמן.\n\nתהנה מהביקור!\n\n(אם אתה צריך ליצור קשר עם [staff members](%{base_url}/about)  כחבר חדש, רק השב להודעה זאת. )\n\n"
+      text_body_template: |
+        ברוכים הבאים ל%{site_name}!
+        חבר צוות אישר את החשבון שלך ב %{site_name}.
+        לחץ על הקישור הבא לאשר והפעיל את החשבון החדש שלך:
+        %{base_url}/users/activate-account/%{email_token}
+        אם הלינק לא לחיץ, נסה להעתיק ולהדביק אותו לסרגל הכתובת בראש הדפדפן.
+        %{new_user_tips}
+        אנו מאמינים ב  [civilized community behavior](%{base_url}/guidelines)  בכל זמן.
+        תהנה מהביקור!
+        (אם אתה צריך ליצור קשר עם [staff members](%{base_url}/about)  כחבר חדש, רק השב להודעה זאת. )
     signup:
       subject_template: "[%{site_name}]  אשר את חשבונך החדש"
       text_body_template: |
         Welcome to %{site_name}!
-
         Click the following link to confirm and activate your new account:
         %{base_url}/users/activate-account/%{email_token}
-
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
   page_not_found:
     popular_topics: "פופלארי"
@@ -1323,7 +1264,6 @@ he:
     search_google: "גוגל"
   login_required:
     welcome_message: |
-      #[ברוכים הבאים אל %{title}](#welcome)
       נדרש חשבון. אנא צרו חשבון או התחברו כדי להמשיך.
   terms_of_service:
     title: "תנאי השימוש"
@@ -1382,8 +1322,3 @@ he:
   performance_report:
     initial_post_raw: 'נושא זה כולל דוחות פעילות יומיים עבור האתר שלך. '
     initial_topic_title: דוחות פעילות לאתר
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.id.yml

@@ -15,6 +15,11 @@ id:
       short: "%m-%d-%Y"
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
+  date:
+    month_names: []
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Topik"
   posts: "post"
@@ -78,6 +83,9 @@ id:
       max_username_length_exists: "Anda tidak boleh menentukan jumlah karakter maksimum username dibawah username terpendek. "
       max_username_length_range: "Anda tidak bisa menentukan jumlah maksimum dibawah jumlah minimum."
       default_categories_already_selected: "Anda tidak boleh memilih kategori yang digunakan di daftar lainnya."
+  activemodel:
+    errors:
+      <<: *errors
   backup:
     operation_already_running: "Proses lain sedang berjalan. Tidak dapat menjalankan proses baru saat ini."
     backup_file_should_be_tar_gz: "File backup harus berupa arsip .tar.gz."
@@ -280,10 +288,6 @@ id:
       blocked: "Registrasi baru dari alamat IP Anda tidak diijinkan."
       max_new_accounts_per_registration_ip: "Registrasi baru dari alamat IP Anda tidak diijinkan (telah mencapai batas maksimum). Silahkan hubungi staff."
   system_messages:
-    too_many_spam_flags:
-      subject_template: "Akun baru disuspensi atas alasan laporan dari komunitas"
-    user_automatically_blocked:
-      subject_template: "Pengguna baru %{username} disuspensi atas laporan komunitas"
     spam_post_blocked:
       subject_template: "Pengguna baru %{username} disuspensi atas penulisan tautan yang berulang-ulang kali"
     pending_users_reminder:
@@ -298,20 +302,14 @@ id:
       more_topics_category: "Topik baru lebih banyak:"
     account_created:
       subject_template: "[%{site_name}] Akun Baru Anda"
-      text_body_template: |+
+      text_body_template: |
         Anda mendapatkan akun baru di %{site_name}
-
-
         Silahkan sentuh tautan dibawah ini untuk menentukan sandi dari akun baru Anda:
-
         %{base_url}/users/password-reset/%{email_token}
-
     confirm_new_email:
       subject_template: "[%{site_name}] Konfirmasi email baru Anda"
       text_body_template: |
         Silahkan mengkonfirmasi email baru Anda di %{site_name} dengan mengunjungi tautan dibawah:
-
-
         %{base_url}/users/authorize-email/%{email_token}
     signup:
       subject_template: "[%{site_name}] Konfirmasi akun baru Anda"
@@ -331,10 +329,3 @@ id:
     title: "Ketentuan Layanan"
   privacy_topic:
     title: "Kebijakan Privasi"
-  date:
-    <<: *datetime_formats
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.it.yml

@@ -20,9 +20,9 @@ it:
     month_names: [null, Gennaio, Febbraio, Marzo, Aprile, Maggio, Giugno, Luglio, Agosto, Settembre, Ottobre, Novembre, Dicembre]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Argomenti"
   posts: "messaggi"
@@ -94,6 +94,9 @@ it:
       max_username_length_range: "Non puoi impostare il massimo inferiore al minimo."
       default_categories_already_selected: "Non puoi selezionare una categoria usata in un'altra lista."
       s3_upload_bucket_is_required: "Non è possibile attivare i caricamenti da S3 a meno che non imposti l'opzione 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Il file caricato deve essere in formato csv o txt."
   backup:
@@ -196,36 +199,34 @@ it:
     until_posts:
       one: "1 messaggio"
       other: "%{count} messaggi"
-    new-topic: "Benvenuto in %{site_name} &mdash; **grazie per iniziare una nuova conversazione!**\n\n- Il titolo sembra interessante? E' un buon riassunto?\n\n- Chi potrebbe essere interessato a questo argomento? Perché è importante? Che risposte speri di ricevere? \n\n- Includi delle buone parole di ricerca nell'argomento così gli altri lo potranno *trovare*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria. \n\nPer maggiori informazioni, [leggi le linee guida della comunità](/guidelines). Questo pannello sarà visualizzato solo per i primi %{education_posts_text}.\n"
+    'new-topic': |
-    new-reply: |
+      Benvenuto in %{site_name} &mdash; **grazie per iniziare una nuova conversazione!**
+      - Il titolo sembra interessante? E' un buon riassunto?
+      - Chi potrebbe essere interessato a questo argomento? Perché è importante? Che risposte speri di ricevere?
+      - Includi delle buone parole di ricerca nell'argomento così gli altri lo potranno *trovare*. Per raggruppare questo argomento con altri argomenti correlati, seleziona una categoria.
+      Per maggiori informazioni, [leggi le linee guida della comunità](/guidelines). Questo pannello sarà visualizzato solo per i primi %{education_posts_text}.
+    'new-reply': |
       Benvenuto in %{site_name} &mdash; **grazie per il tuo contributo !**
-
       - La tua risposta migliora in qualche modo la conversazione?
-
       - Sii gentile con gli altri membri della comunità.
-
       - Le critiche costruttive sono benvenute, ma critica le *idee* non le persone.
-
       Per maggiori informazioni, [leggi le linee guida della nostra comunità](/guidelines). Questo pannello sarà visualizzato soltanto per i primi %{education_posts_text}.
-    avatar: "### Che ne dici di un'immagine per il tuo account? \n\nHai pubblicato alcuni argomenti e risposte, ma l'immagine del tuo profilo non è speciale quanto te -- è solo una lettera. \n\nPerché non **[accedi al tuo profilo utente](%{profile_path})** e carichi un'immagine che ti rappresenta? \n\nÈ più facile seguire le discussioni e trovare persone interessanti nelle conversazioni se tutti hanno un'immagine profilo univoca!\n"
+    avatar: |
-    sequential_replies: "### Considera la possibilità di rispondere a più messaggi contemporaneamente\n\nPiuttosto che inviare più risposte di seguito ad un messaggio, considera la possibilità di inserire un'unica risposta con citazioni o riferimenti @nome ai messaggi precedenti. \n\nPuoi modificare la tua precedente risposta per aggiungere una citazione evidenziando il testo e selezionando il bottone <b>Rispondi citando<b> che compare. \n\nE' più facile per chiunque leggere argomenti che hanno poche risposte più dettagliate, rispetto a molte brevi risposte individuali.\n"
+      Hai pubblicato alcuni argomenti e risposte, ma l'immagine del tuo profilo non è speciale quanto te -- è solo una lettera.
+      Perché non **[accedi al tuo profilo utente](%{profile_path})** e carichi un'immagine che ti rappresenta?
+      È più facile seguire le discussioni e trovare persone interessanti nelle conversazioni se tutti hanno un'immagine profilo univoca!
+    sequential_replies: |
+      Piuttosto che inviare più risposte di seguito ad un messaggio, considera la possibilità di inserire un'unica risposta con citazioni o riferimenti @nome ai messaggi precedenti.
+      Puoi modificare la tua precedente risposta per aggiungere una citazione evidenziando il testo e selezionando il bottone <b>Rispondi citando<b> che compare.
+      E' più facile per chiunque leggere argomenti che hanno poche risposte più dettagliate, rispetto a molte brevi risposte individuali.
     dominating_topic: |
-      ### Permetti agli altri di partecipare alla conversazione
-
       Questo argomento è chiaramente importante per te &ndash; più del %{percent}% delle risposte sono tue.
-
       Sei sicuro di lasciare anche agli altri il tempo di esprimere il loro punto di vista?
     too_many_replies: |
-      ### Hai raggiunto il numero massimo di risposte per questo argomento
-
       Spiacenti, ma i nuovi utenti sono limitati a %{newuser_max_replies_per_topic} risposte nello stesso argomento.
-
       Invece di aggiungere una nuova risposta, valuta l'ipotesi di modificare le tue precedenti o di partecipare a un altro argomento.
     reviving_old_topic: |
-      ### Resuscitare questo argomento?
-
       L'ultima risposta a questo argomento è vecchia di %{days} giorni. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti verranno notificati.
-
       Sei davvero sicuro di voler continuare questo vecchio argomento?
   activerecord:
     attributes:
@@ -238,6 +239,7 @@ it:
       user_profile:
         bio_raw: "Su di me"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -258,7 +260,6 @@ it:
           attributes:
             hex:
               invalid: "non è un colore valido"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>il campo \"Su di me\" del tuo profilo è vuoto, <a href='/users/%{username_lower}/preferences/about-me'>vuoi compilarlo?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} non ha ancora compilato il campo \"Su di me\" del suo profilo</div>"
@@ -271,7 +272,19 @@ it:
   assets_topic_body: "Questo è un argomento permanente, visibile solo allo staff, per salvare immagini e file utilizzati nel design del sito. Non eliminarlo!\n\n\nEcco come fare:\n\n\n1. Rispondi a questo argomento.\n2. Carica qui tutte le immagini che desideri usare per loghi, favicon e così via (usa l'icona di caricamento nell'editor del messaggio o trascina direttamente le immagini).\n3. Invia la risposta per creare il messaggio.\n4. Fai click con il tasto destro sulle immagini nel tuo nuovo messaggio per prelevare il percorso delle immagini caricate, o clicca l'icona di modifica messaggio e ottieni il percorso alle immagini. Copia il percorso delle immagini.\n5. Incolla i percorsi nella sezione [impostazioni di base](/admin/site_settings/category/required).\n\nSe vuoi permettere di caricare file di diverso tipo, modifica `authorized_extensions` nelle [impostazioni file](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Benvenuto nel Lounge"
-    body: "\nCongratulazioni! :confetti_ball: \n\nSe vedi questo argomento, sei stato recentemente promosso a **esperto** (livello di esperienza 3). \n\nAdesso puoi &hellip; \n\n* Modificare il titolo di qualunque argomento \n* Cambiare la categoria di qualunque argomento \n* Seguire tutti i tuoi collegamenti (è rimosso il [nofollow automatico](http://it.wikipedia.org/wiki/Nofollow) ) \n* Accedere alla categoria privata Lounge visibile solo agli utenti con livello di esperienza 3 o superiore \n* Cancellare i messaggi spam con un singolo clic\n\nEcco l'elenco degli altri [utenti esperti](/badges/3/regular). Vai a salutarli. \n\nGrazie per essere una parte importante di questa comunità! \n\n(Per maggiori informazioni sui livelli di esperienza, [leggi questa discussione][trust]. Nota che possono rimanere utenti esperti solo quegli utenti che continuano a soddisfare i criteri di selezione)\n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n"
+    body: |
+      Congratulazioni! :confetti_ball:
+      Se vedi questo argomento, sei stato recentemente promosso a **esperto** (livello di esperienza 3).
+      Adesso puoi &hellip;
+      * Modificare il titolo di qualunque argomento
+      * Cambiare la categoria di qualunque argomento
+      * Seguire tutti i tuoi collegamenti (è rimosso il [nofollow automatico](http://it.wikipedia.org/wiki/Nofollow) )
+      * Accedere alla categoria privata Lounge visibile solo agli utenti con livello di esperienza 3 o superiore
+      * Cancellare i messaggi spam con un singolo clic
+      Ecco l'elenco degli altri [utenti esperti](/badges/3/regular). Vai a salutarli.
+      Grazie per essere una parte importante di questa comunità!
+      (Per maggiori informazioni sui livelli di esperienza, [leggi questa discussione][trust]. Nota che possono rimanere utenti esperti solo quegli utenti che continuano a soddisfare i criteri di selezione)
+      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Definizione della categoria %{category}"
     replace_paragraph: "(Sostituisci questo primo paragrafo con una breve descrizione della nuova categoria. Questa guida apparirà nell'area di selezione della categoria, perciò cerca di stare sotto i 200 caratteri. **Finché non modifichi questo testo o non crei argomenti, questa categoria non apparirà sulla pagina delle categorie.**)"
@@ -479,18 +492,6 @@ it:
       message:
         make: "Questo argomento è ora uno striscione. Apparirà in cima ad ogni pagina finché non viene chiuso dall'utente."
         remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina."
-  unsubscribed:
-    title: 'Iscrizione annullata'
-    description: "La tua iscrizione è stata annullata. Non ti contatteremo più!"
-    oops: "Se non intendevi farlo, clicca sotto."
-    error: "Errore nell'annullamento dell'iscrizione"
-    preferences_link: "Puoi anche annullare l'iscrizione alle email di riepilogo nella tua <a href='/my/preferences'>pagina delle preferenze</a>"
-    different_user_description: "Sei attualmente collegato con un utente diverso da quello che ha ricevuto il riepilogo. Per favore scollegati e riprova."
-    not_found_description: "Spiacenti, non è stato possibile annullare l'iscrizione. E' possibile che il collegamento nella email sia scaduto."
-  resubscribe:
-    action: "Iscriviti di nuovo"
-    title: "Iscritto di nuovo!"
-    description: "Sei stato iscritto di nuovo."
   reports:
     visits:
       title: "Visite Utente"
@@ -625,7 +626,6 @@ it:
       yaxis: "Numero di visite"
   dashboard:
     rails_env_warning: "Il tuo server è in modalità %{env}."
-    ruby_version_warning: "Stai eseguendo la versione 2.0.0 di Ruby che ha problemi noti. Effettua l'upgrade alla patch livello 247 o seguenti."
     host_names_warning: "Il tuo file config/database.yml usa l'hostname di default: localhost. Aggiornalo con l'hostname del tuo sito."
     gc_warning: 'Il tuo server usa i parametri di garbage collection di default di ruby, che potrebbero non garantirti le migliori prestazioni. Leggi questo argomento sulla taratura delle prestazioni: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq non è in esecuzione. Molte attività, come l''invio di email, sono eseguite in maniera asincrona da sidekiq. Assicurati che almeno un processo sidekiq sia in esecuzione. <a href="https://github.com/mperham/sidekiq"  target="_blank">Leggi altro su sidekiq qui</a>.'
@@ -708,13 +708,9 @@ it:
     anon_polling_interval: "Frequenza in millisecondi con cui client anonimi effettuano il poll"
     background_polling_interval: "Quanto spesso i client devono fare poll in millisecondi (quando la finestra è in background)"
     cooldown_minutes_after_hiding_posts: "Quanti minuti l'utente deve attendere prima di poter modificare un messaggio che è stato nascosto a causa di segnalazioni"
-    max_topics_in_first_day: "Numero massimo di argomenti che l'utente può creare nel suo primo giorno di forum"
-    max_replies_in_first_day: "Numero massimo di risposte che un utente può pubblicare nel suo primo giorno sul sito"
     tl2_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 2 (Assiduo), moltiplicando per questo numero"
     tl3_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 3 (Esperto) moltiplicando per questo numero"
     tl4_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 4 (Veterano), moltiplicando per questo numero"
-    num_flags_to_block_new_user: "Se i messaggi di un nuovo utente ricevono segnalazioni di spam da num_users_to_block_new_user diversi utenti, nascondi tutti i messaggi dell'utente e impediscigli ulteriori invii. 0 per disabilitare questa funzionalità."
-    num_users_to_block_new_user: "Se i messaggi di un nuovo utente ricevono num_flags_to_block_new_user segnalazioni di spam da così tanti utenti diversi, nascondi tutti i messaggi dell'utente e impediscigli ulteriori invii. 0 per disabilitare questa funzionalità."
     notify_mods_when_user_blocked: "Se un utente è bloccato automaticamente, manda un messaggio ai moderatori."
     flag_sockpuppets: "Se un nuovo utente risponde ad un argomento dallo stesso indirizzo IP dell'utente che ha aperto l'argomento stesso, segnala entrambi i messaggi come potenziale spam."
     traditional_markdown_linebreaks: "Usa l'accapo tradizionale in Markdown, cioè due spazi a fine riga per andare a capo."
@@ -903,7 +899,6 @@ it:
     allow_animated_thumbnails: "Genera miniature animate delle gif animate."
     default_avatars: "URL degli avatar che verranno utilizzati come predefiniti per i nuovi utenti, fintanto che non li cambieranno esplicitamente."
     automatically_download_gravatars: "Scarica i Gravatars per gli utenti quando viene creato l'account o quando viene modificata l'email"
-    digest_topics: "Numero massimo di argomenti da mostrare nelle email riepilogative."
     allow_profile_backgrounds: "Permetti agli utenti di caricare immagini di sfondo per il profilo."
     enable_mobile_theme: "I dispositivi mobili usano un tema apposito, con possibilità di passare alla visualizzazione completa. Disabilita questa opzione se vuoi usare un foglio di stile personalizzato che sia completamente reattivo."
     suppress_uncategorized_badge: "Non mostrare la targhetta per gli argomenti senza categoria nell'elenco degli argomenti."
@@ -934,17 +929,6 @@ it:
       invalid_string_min_max: "Il numero di caratteri deve essere tra %{min} e %{max}."
       invalid_string_min: "Il numero di caratteri deve essere di almeno %{min}."
       invalid_string_max: "Il numero di caratteri non deve eccedere %{max}."
-  notification_types:
-    mentioned: "%{display_username} ti ha menzionato in %{link}"
-    liked: "a %{display_username} è piaciuto il tuo messaggio in %{link}"
-    replied: "%{display_username} ha risposto al tuo messaggio in %{link}"
-    quoted: "%{display_username} ha citato il tuo messaggio in %{link}"
-    edited: "%{display_username} ha modificato il tuo messaggio in %{link}"
-    posted: "%{display_username} ha commentato in %{link}"
-    moved_post: "%{display_username} ha spostato il tuo messaggio in %{link}"
-    invitee_accepted: "%{display_username} ha accettato il tuo invito"
-    linked: "%{display_username} ti ha collegato in %{link}"
-    granted_badge: "Hai guadagnato %{link}"
   search:
     within_post: "n°%{post_number} di %{username}"
     types:
@@ -1031,10 +1015,18 @@ it:
       other: "%{count} segnalazioni in attesa di essere revisionate"
   invite_mailer:
     subject_template: "%{invitee_name} ti ha invitato a '%{topic_title}' su %{site_domain_name}"
-    text_body_template: "%{invitee_name} ti invita ad una discussione\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nsu\n\n> %{site_title} -- %{site_description}\n\nSe sei interessato, clicca il collegamento qui sotto:\n\n%{invite_link}\n\nL'invito è da parte di un utente affidabile, perciò puoi rispondere alla discussione immediatamente. \n"
+    text_body_template: |
+      %{invitee_name} ti invita ad una discussione
+      > **%{topic_title}**
+      >
+      > %{topic_excerpt}
+      su
+      > %{site_title} -- %{site_description}
+      Se sei interessato, clicca il collegamento qui sotto:
+      %{invite_link}
+      L'invito è da parte di un utente affidabile, perciò puoi rispondere alla discussione immediatamente.
   invite_forum_mailer:
     subject_template: "%{invitee_name} ti invita a partecipare su %{site_domain_name}"
-    text_body_template: "%{invitee_name} ti invita a partecipare a \n\n> **%{site_title}**\n>\n> %{site_description}\n\nSe sei interessato, clicca il collegamento in basso:\n\n%{invite_link}\n\nQuesto invito è da parte di un utente affidabile, perciò non dovrai effettuare un login.\n"
   invite_password_instructions:
     subject_template: "Imposta la password per il tuo account su %{site_name}"
   test_mailer:
@@ -1056,11 +1048,21 @@ it:
     deferred_and_deleted: "Grazie per averci informato. Abbiamo rimosso il messaggio."
   system_messages:
     post_hidden:
-      subject_template: "Messaggio nascosto a causa di segnalazioni dalla comunità"
+      text_body_template: |
-      text_body_template: "Salve,\n\nquesto è un messaggio automatico da parte di %{site_name} per informarti che il tuo messaggio è stato nascosto. \n\n%{base_url}%{url} \n\n%{flag_reason} \n\nVari membri della comunità hanno segnalato il messaggio prima che venisse nascosto, quindi per favore pensa come modificarlo alla luce di queste osservazioni. **Puoi modificare il messaggio dopo %{edit_delay} minuti, e verrà automaticamente ripubblicato.** \n\nTuttavia, se il messaggio dovesse venire nascosto dalla comunità una seconda volta, rimarrà nascosto fino a che un membro dello staff se ne occuperà – e saranno possibili ulteriori sanzioni, compresa la sospensione del tuo account. \n\nPer ulteriori informazioni, puoi far riferimento alle nostre [linee guida della comunità](%{base_url}/guidelines).\n"
+        Salve,
+        questo è un messaggio automatico da parte di %{site_name} per informarti che il tuo messaggio è stato nascosto.
+        %{base_url}%{url}
+        %{flag_reason}
+        Vari membri della comunità hanno segnalato il messaggio prima che venisse nascosto, quindi per favore pensa come modificarlo alla luce di queste osservazioni. **Puoi modificare il messaggio dopo %{edit_delay} minuti, e verrà automaticamente ripubblicato.**
+        Tuttavia, se il messaggio dovesse venire nascosto dalla comunità una seconda volta, rimarrà nascosto fino a che un membro dello staff se ne occuperà – e saranno possibili ulteriori sanzioni, compresa la sospensione del tuo account.
+        Per ulteriori informazioni, puoi far riferimento alle nostre [linee guida della comunità](%{base_url}/guidelines).
     welcome_user:
       subject_template: "Benvenuto su %{site_name}!"
-      text_body_template: "Grazie per esserti unito a %{site_name}, e benvenuto!\n\n%{new_user_tips} \n\nNoi crediamo in un [comportamento comunitario civile](%{base_url}/guidelines), sempre. Buona permanenza!\n\n(Se desideri comunicare con [i membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio.)\n"
+      text_body_template: |
+        Grazie per esserti unito a %{site_name}, e benvenuto!
+        %{new_user_tips}
+        Noi crediamo in un [comportamento comunitario civile](%{base_url}/guidelines), sempre. Buona permanenza!
+        (Se desideri comunicare con [i membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio.)
     welcome_invite:
       subject_template: "Benvenuto su %{site_name}!"
     backup_succeeded:
@@ -1069,9 +1071,7 @@ it:
       subject_template: "Backup fallito"
       text_body_template: |
         Il backup è fallito.
-
         Questo è il log:
-
         ```
         %{logs}
         ```
@@ -1082,9 +1082,7 @@ it:
       subject_template: "Ripristino fallito"
       text_body_template: |
         Il ripristino è fallito.
-
         Ecco il log:
-
         ```
         %{logs}
         ```
@@ -1107,6 +1105,11 @@ it:
       subject_template: "[%{site_name}] Problema relativo all'email -- Accesso non valido"
     email_reject_reply_key:
       subject_template: "[%{site_name}] Problema relativo all'email -- Chiave di risposta sconosciuta"
+    email_reject_bad_destination_address:
+      subject_template: "[%{site_name}] Problema email -- Destinatario sconosciuto"
+      text_body_template: |
+        Spiacenti, ma il tuo messaggio email a %{destination} (intitolato %{former_title}) non è stato inviato.
+        Non è stato riconosciuto alcuno degli indirizzi email di destinazione. Assicurati di inviare a indirizzi email validi.
     email_reject_topic_not_found:
       subject_template: "[%{site_name}] Problema relativo all'email -- Argomento Non Trovato"
     email_reject_topic_closed:
@@ -1116,16 +1119,20 @@ it:
     email_error_notification:
       subject_template: "[%{site_name}] Problema relativo all'email -- Errore di autenticazione POP"
     too_many_spam_flags:
-      text_body_template: "Salve, \n\nquesto è un messaggio automatico da %{site_name} per informarti che i tuoi messaggi sono stati temporaneamente nascosti perché segnalati dalla comunità. \n\nCome misura precauzionale, il tuo nuovo account non può creare altre risposte o argomenti finché il tuo account non verrà revisionato da un membro dello staff. Ci scusiamo per il disagio.\n\nPer ulteriori informazioni, ti rimandiamo alle [linee guida della comunità](%{base_url}/guidelines).\n"
+      text_body_template: |
-    user_automatically_blocked:
+        Salve,
-      subject_template: "Nuovo utente %{username} bloccato a causa delle segnalazioni"
+        questo è un messaggio automatico da %{site_name} per informarti che i tuoi messaggi sono stati temporaneamente nascosti perché segnalati dalla comunità.
+        Come misura precauzionale, il tuo nuovo account non può creare altre risposte o argomenti finché il tuo account non verrà revisionato da un membro dello staff. Ci scusiamo per il disagio.
+        Per ulteriori informazioni, ti rimandiamo alle [linee guida della comunità](%{base_url}/guidelines).
     spam_post_blocked:
       subject_template: "Il messaggi del nuovo utente %{username} sono stati bloccati a causa dell'invio di ripetuti collegamenti."
     pending_users_reminder:
       subject_template:
         one: "1 utente in attesa di approvazione"
         other: "%{count} utenti in attesa di approvazione"
-      text_body_template: "Ci sono nuove iscrizioni in attesa di essere approvate (o rifiutate) prima che possano accedere a questo forum. \n\n[Per favore valutale nella sezione di amministrazione](%{base_url}/admin/users/list/pending).\n"
+      text_body_template: |
+        Ci sono nuove iscrizioni in attesa di essere approvate (o rifiutate) prima che possano accedere a questo forum.
+        [Per favore valutale nella sezione di amministrazione](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Lo scaricamento delle immagini remote è disabilitato"
       text_body_template: "L'impostazione `download_remote_images_to_local` è stata disabilitata perché è stato raggiunto il limite di spazio su disco definito in `download_remote_images_threshold`."
@@ -1159,13 +1166,10 @@ it:
       subject_template: "%{optional_re}%{topic_title}"
     digest:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
-      subject_template: "[%{site_name}] Riepilogo"
       new_activity: "Nuove attività nei tuoi argomenti e messaggi:"
       top_topics: "Messaggi di successo"
       other_new_topics: "Argomenti più attivi"
-      unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Per annullare l'iscrizione %{unsubscribe_link}."
       click_here: "clicca qui"
-      from: "%{site_name} riepilogo"
       read_more: "Leggi Altro"
       more_topics: "Ci sono stati %{new_topics_since_seen} altri nuovi argomenti."
       more_topics_category: "Ulteriori nuovi argomenti:"
@@ -1173,34 +1177,42 @@ it:
       subject_template: "[%{site_name}] Reimposta password"
       text_body_template: |
         Qualcuno ha richiesto l'azzeramento della tua password su [%{site_name}](%{base_url}).
-
         Se non sei stato tu, puoi tranquillamente ignorare questa email.
-
         Clicca il seguente collegamento per scegliere una nuova password:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Imposta Password"
-      text_body_template: "Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook ecc.) associato con questo indirizzo email validato. \n\nSe non hai fatto tu questa richiesta, ignora tranquillamente questa email.\n\nClicca sul seguente collegamento per scegliere una password:\n%{base_url}/users/password-reset/%{email_token}\n"
+      text_body_template: |
+        Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook ecc.) associato con questo indirizzo email validato.
+        Se non hai fatto tu questa richiesta, ignora tranquillamente questa email.
+        Clicca sul seguente collegamento per scegliere una password:
+        %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Login"
     account_created:
       subject_template: "[%{site_name}] Il Tuo Nuovo Account "
       text_body_template: |
         Ti è stato creato un account su %{site_name}
-
         Fai clic sul seguente collegamento per scegliere una password per il tuo nuovo account:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "Sei stato ammesso su %{site_name}!"
-      text_body_template: "Benvenuto su %{site_name}! \n\nUn membro dello staff ha approvato il tuo account su %{site_name}. \n\nClicca sul seguente collegamento per confermare e attivare il tuo nuovo account:\n%{base_url}/users/activate-account/%{email_token} \n\nSe il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser. \n\n%{new_user_tips}\n\nNoi crediamo in un [comportamento comunitario civile](%{base_url}/guidelines), sempre.\n\nBuona permanenza!\n\nps: se vuoi comunicare privatamente con i [membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio.\n"
+      text_body_template: |
+        Benvenuto su %{site_name}!
+        Un membro dello staff ha approvato il tuo account su %{site_name}.
+        Clicca sul seguente collegamento per confermare e attivare il tuo nuovo account:
+        %{base_url}/users/activate-account/%{email_token}
+        Se il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser.
+        %{new_user_tips}
+        Noi crediamo in un [comportamento comunitario civile](%{base_url}/guidelines), sempre.
+        Buona permanenza!
+        ps: se vuoi comunicare privatamente con i [membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio.
     signup:
       subject_template: "[%{site_name}] Conferma il tuo nuovo account"
       text_body_template: |
         Benvenuto su %{site_name}!
-
         Clicca sul collegamento seguente per confermare ed attivare il tuo nuovo account:
         %{base_url}/users/activate-account/%{email_token}
-
         Se il collegamento non è cliccabile, copialo ed incollalo manualmente nella barra degli indirizzi del tuo browser.
   page_not_found:
     title: "La pagina richiesta non esiste oppure è privata."
@@ -1211,7 +1223,6 @@ it:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Benvenuto su %{title}](#welcome)
       E' richiesto un account. Per continuare, crea un nuovo account oppure collegati.
   terms_of_service:
     title: "Termini di Servizio"
@@ -1304,6 +1315,3 @@ it:
     title: "Etichette"
     staff_tag_remove_disallowed: "L'etichetta \"%{tag}\" può essere cancellata soltanto dallo staff."
   rss_by_tag: "Argomenti etichettati %{tag}"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.ja.yml

@@ -18,9 +18,9 @@ ja:
     month_names: [null, 1月, 2月, 3月, 4月, 5月, 6月, 7月, 8月, 9月, 10月, 11月, 12月]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "午前"
     pm: "午後"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "トピック"
   posts: "投稿"
@@ -78,6 +78,9 @@ ja:
       load_from_remote: "投稿の読み込みに失敗しました。"
     site_settings:
       min_username_length_range: "最小値を最大値より上にすることはできません。"
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "アップロードするファイルは、csv または txt 形式である必要があります。"
   backup:
@@ -148,42 +151,30 @@ ja:
   education:
     until_posts:
       other: "%{count} 投稿"
-    new-topic: |
+    'new-topic': |
       %{site_name} へようこそ！&mdash; ** 新たなトピックの作成ありがとうございます！**
-
       - タイトルはトピックの内容を正しく説明していますか？他の人にとって興味深いタイトルになっていますか？
-
       - このトピックは何をカバーするものですか？このトピックに興味を示しそうなのは誰でしょう？なぜこのトピックは重要なのでしょうか？コミュニティよりどのような回答を期待していますか？
-
       - トピックに適切な検索用ワードを含めると、他の人がトピックを *発見* しやすくなります。詳細は [コミュニティガイドライン](/guidelines) を参照してください。このパネルは最初から %{education_posts_text} 回目までの投稿のときにだけ表示されます。
-    new-reply: "%{site_name} へようこそ &mdash; **コミュニティへの貢献ありがとうございます!** \n- あなたの回答は議論に何らかの形で貢献していますか?\n - コミュニティメンバー同士のやりとりは礼儀正しく、マナーを保ちましょう。\n - 建設的な批判は歓迎します。ただし批判は「人」に対してではなく「アイデア」に対して行いましょう。 \n詳細は[コミュニティガイドライン](/guidelines)を参照してください。このパネルは最初の %{education_posts_text} のみに表示されます。\n"
+    'new-reply': |
-    sequential_replies: |+
+      %{site_name} へようこそ &mdash; **コミュニティへの貢献ありがとうございます!**
-      ### 一度に複数の投稿に返信する
+      - あなたの回答は議論に何らかの形で貢献していますか?
-
+      - コミュニティメンバー同士のやりとりは礼儀正しく、マナーを保ちましょう。
+      - 建設的な批判は歓迎します。ただし批判は「人」に対してではなく「アイデア」に対して行いましょう。
+      詳細は[コミュニティガイドライン](/guidelines)を参照してください。このパネルは最初の %{education_posts_text} のみに表示されます。
+    sequential_replies: |
       トピックにたくさん返信する代わりに、以前の投稿への @name メンションや引用などを活用して返信を一つの投稿にまとめましょう。
-
       文章を選択し、<b>引用して返信</b>ボタンをクリックすることで、文章を引用して編集することができます。
-
       こまごまと何度も返信するより、まとまって返信をすることで、より見やすく、より話しやすくなります。
-
     dominating_topic: |
-      ### 他のユーザも議論に参加させてあげましょう
-
       このトピックはあなたにとても重要なもののようですね &ndash; ここの回答のうち %{percent}% 以上があなたによってなされています。
-
       他のユーザが回答するために十分な時間的猶予を与えているか、ちょっと振り返ってみませんか?
     too_many_replies: |
-      ### このトピックに回答出来る制限を超えました
-
       申し訳ありません。新しいユーザーの同じトピックへの返信は%{newuser_max_replies_per_topic} 回に一時的に制限されています。
-
       回答を追加する代わりに、以前の回答を編集するか、別のトピックを訪れる事を検討してください。
     reviving_old_topic: |
-      ### このトピックを復活させてもよろしいですか？
-
       このトピックへの最後の返信は%{days}日前です。
       あなたの返信はトピック一覧の一番上に移動させ、以前に返信した人宛に通知が送られます。
-
       本当に過去の会話を復元してもよろしいですか？
   activerecord:
     attributes:
@@ -194,6 +185,7 @@ ja:
       user_profile:
         bio_raw: "自己紹介"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -214,7 +206,6 @@ ja:
           attributes:
             hex:
               invalid: "は有効なカラーではありません"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>プロフィールの自己紹介フィールドが空欄のようです。<a href='/users/%{username_lower}/preferences/about-me'>自己紹介をしてみませんか?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} は、まだプロフィールの自己紹介フィールドに何も書いていません</div>"
@@ -385,18 +376,6 @@ ja:
       message:
         make: "このトピックはバナートピックに設定されています。ユーザが解除しない限り、ページ毎の一番上に表示されます"
         remove: "このトピックはバナーではなくなりました。トップページには表示されなくなります"
-  unsubscribed:
-    title: '購読解除'
-    description: "購読解除されました。メールの送信をストップしました。"
-    oops: "誤って購読解除した場合は、下をクリックしてください。"
-    error: "購読解除エラー"
-    preferences_link: "あなたの <a href='/my/preferences'>設定画面</a>からの確認メールでも解除することができます"
-    different_user_description: "確認メールを送ったユーザとは別のユーザでログインしています。ログアウトしてから試してください"
-    not_found_description: "申し訳ありませんが購読解除に失敗しました。メール内のリンクの有効期限が切れているのかもしれません。"
-  resubscribe:
-    action: "再購読"
-    title: "再購読!"
-    description: "再購読が完了しました。"
   reports:
     visits:
       title: "訪問ユーザ"
@@ -434,7 +413,7 @@ ja:
       xaxis: "日"
       yaxis: "お気に入りされたトピックの数"
     users_by_trust_level:
-      title: "トラストレベル毎のユーザ"
+      title: "ユーザーごとのトラストレベル"
       xaxis: "トラストレベル"
       yaxis: "ユーザ数"
     emails:
@@ -538,7 +517,6 @@ ja:
       yaxis: "訪問者数"
   dashboard:
     rails_env_warning: "サーバは %{env} モードで起動中です。"
-    ruby_version_warning: "現在起動中の Ruby 2.0.0 にはいくつか問題があります。パッチレベル p247 以降にアップグレードしてください。"
     host_names_warning: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。"
     gc_warning: '現在サーバはデフォルトの ruby ガベージコレクションパラメータを使用しており、パフォーマンスが最適化されていません。パフォーマンス・チューニングの方法についてはこちらのトピックを参考にしてください: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq が起動していません。メール送信等、多くのタスクが sidekiq により非同期に実行されます。少なくとも sidekiq のプロセスを1つは起動してください。<a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq についてはこちらを参考にしてください</a>。'
@@ -618,13 +596,9 @@ ja:
     anon_polling_interval: "匿名ユーザのクライアントのポーリング間隔 (ミリ秒)"
     background_polling_interval: "ウィンドウがバックグラウンド時のクライアントのポーリング間隔（ミリ秒)"
     cooldown_minutes_after_hiding_posts: "通報により非表示状態になったポストをユーザが編集可能になるまでの時間 (分)"
-    max_topics_in_first_day: "サイト利用初日にユーザが作成することのできるトピックの最大数"
-    max_replies_in_first_day: "サイト利用日にユーザが作成することのできる回答の最大数"
     tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の1日あたりの「いいね！」の上限を増やします"
     tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の1日あたりの「いいね！」の上限を増やします"
     tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の1日あたりの「いいね！」の上限を増やします"
-    num_flags_to_block_new_user: "もし新しいユーザがnum_users_to_block_new_userで定義されている数の通報を受けたらそれらの投稿を全て非表示にし、今後の投稿をブロックします。0で無効にします。"
-    num_users_to_block_new_user: "新規ユーザのポストに対して、ここで指定した数のユーザにより何個のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化"
     notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。"
     flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか"
     traditional_markdown_linebreaks: "Markdown の従来形式のラインブレーク (行の終わりにダブルスペース) を使う"
@@ -830,9 +804,6 @@ ja:
     allow_animated_thumbnails: "アニメgifからアニメーションサムネイルを生成する"
     default_avatars: "新規ユーザが変更するまで使用されるデフォルトのプロフィール画像URL"
     automatically_download_gravatars: "アカウントの生成時、メールアドレスの変更時にGravatarをダウンロード"
-    digest_topics: "まとめメールに表示されるトピックの最大数"
-    digest_min_excerpt_length: "まとめメール内の投稿の抜粋の最小文字数"
-    disable_digest_emails: "すべてのユーザのまとめメールを無効にする"
     detect_custom_avatars: "ユーザがプロフィール画像をアップロードしたか確認する"
     max_daily_gravatar_crawls: "Discourseがプロフィール画像の確認をgravastarに行う回数の上限"
     public_user_custom_fields: "パブリックに公開されるカスタムフィールドのホワイトリスト"
@@ -844,6 +815,7 @@ ja:
     allow_profile_backgrounds: "プロフィール背景のアップロードを許可"
     enable_mobile_theme: "モバイル端末にモバイル向けテーマ (通常サイト用テーマにスイッチ可能) を利用する。レスポンシブなスタイルシートを使用する場合はこの設定を無効にしてください。"
     dominating_topic_minimum_percent: "ユーザがトピックを占拠しているとリマインドを行う、ポスト投稿支配率 "
+    daily_performance_report: "日別のNGINXのログを解析し、Staff Onlyトピックへ詳細を投稿する"
     suppress_uncategorized_badge: "トピック一覧でカテゴライズされていないトピックのバッジは表示しない"
     global_notice: "緊急の内容を表示します。全ての訪問者の緊急バナーで注意を行います。隠すには空白に変更してください(HTMLが許可されています)"
     disable_edit_notifications: "システムユーザが'download_remote_images_to_local' を有効にした場合、編集時の通知を無効にする"
@@ -890,19 +862,6 @@ ja:
       invalid_string_min: "少なくとも%{min}文字は必要です"
       invalid_string_max: "%{max}文字以下である必要があります"
       invalid_reply_by_email_address: "値は'%{reply_key}'を含む必要があり、通知メールとは異なる必要があります"
-  notification_types:
-    mentioned: "%{link} で %{display_username} があなたをタグ付けしました"
-    liked: "%{link} で %{display_username} があなたのポストを「いいね！」しました"
-    replied: "%{link} で %{display_username} があなたのポストに回答しました"
-    quoted: "%{link} で %{display_username} があなたのポストを引用しました"
-    edited: "%{link} で %{display_username} があなたのポストを編集しました"
-    posted: "%{link} に %{display_username} がポストを投稿しました"
-    moved_post: "%{display_username} があなたのポストを %{link} に移動しました"
-    private_message: "%{display_username} があなたにメッセージを送信しました: %{link}"
-    invited_to_private_message: "%{display_username} がメッセージにあなたを招待しました: %{link}"
-    invitee_accepted: "%{display_username} があなたの招待を受けました"
-    linked: "%{display_username} は%{link}であなたをリンクしました"
-    granted_badge: "あなたは%{link}を獲得しました"
   search:
     within_post: "#%{post_number} by %{username}"
     types:
@@ -996,73 +955,46 @@ ja:
     subject_template: "%{invitee_name} があなたを %{site_domain_name}の'%{topic_title}'に招待しました"
     text_body_template: |
       %{invitee_name} があなたを招待しました
-
       > %{site_title} -- %{site_description}
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       もし興味があれば下のリンクをクリックしてください:
-
       %{invite_link}
-
       これは信頼されたユーザからの招待のため、すぐに議論に返答することができます
   invite_forum_mailer:
     subject_template: "%{invitee_name} あなたを %{site_domain_name}に招待しました。"
-    text_body_template: |
-      %{invitee_name} があなたを招待しました
-
-      > %{site_title} -- %{site_description}
-
-      もし興味があれば下のリンクをクリックしてください:
-
-      %{invite_link}
-
-      これは信頼されたユーザからの招待のため、あなたはログインする必要がありません
   invite_password_instructions:
     subject_template: "%{site_name} アカウントのパスワードを設定"
-    text_body_template: "%{site_name} へようこそ\n\nこのリンクをクリックしてパスワードを設定してください:\n%{base_url}/users/password-reset/%{email_token}\n\n(リンクの有効期限が切れていた場合は、\"パスワードを忘れたました\"を選択しメールアドレスを入力してください) \n"
+    text_body_template: |
+      %{site_name} へようこそ
+      このリンクをクリックしてパスワードを設定してください:
+      %{base_url}/users/password-reset/%{email_token}
+      (リンクの有効期限が切れていた場合は、"パスワードを忘れたました"を選択しメールアドレスを入力してください)
   test_mailer:
     subject_template: "[%{site_name}] メール送信テスト"
   new_version_mailer:
     subject_template: "[%{site_name}] Discourseの新しいバージョンがあります。"
     text_body_template: |
       最新版の[Discourse](http://www.discourse.org)が利用出来ます！
-
       現在利用しているバージョン: %{installed_version}
       新しいバージョン: **%{new_version}**
-
       - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。
-
       - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。
-
       - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] アップデートがあります"
-    text_body_template: |+
+    text_body_template: |
       最新版の[Discourse](http://www.discourse.org)が利用出来ます！
-
       現在利用しているバージョン: %{installed_version}
       新しいバージョン: **%{new_version}**
-
       - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。
-
       - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。
-
       - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。
-
-      ### リリースノート
-
       %{notes}
-
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} 件の投稿がレビュー待ちです"
-    text_body_template: |
-      こんにちは
-
-      新規ユーザーの投稿がレビュー待ちになっています。[ 承認、または拒否を行うことができます] (%{base_url}/queued-posts)
   flag_reasons:
     off_topic: "あなたの投稿/トピックは「話題に関係ない」として通報されました"
     inappropriate: "あなたの投稿は「不適切」として通報されました。攻撃的、 [コミュニティガイドライン](/guidelines)に違反している可能性があります。"
@@ -1076,23 +1008,27 @@ ja:
     deferred_and_deleted: "伝えてくれてありがとうございます。投稿を削除しました"
   temporarily_closed_due_to_flags: "このトピックへの通報が多いため、一時的に投稿が制限されています。"
   system_messages:
-    post_hidden:
-      subject_template: "通報により、投稿が非表示になりました"
     welcome_user:
       subject_template: "%{site_name} へようこそ!"
-      text_body_template: |2
+      text_body_template: |
-         %{site_name}への参加ありがとうございます。ようこそ！
+        %{site_name}への参加ありがとうございます。ようこそ！
-
         %{new_user_tips}
-
         私たちは、[ガイドライン](%{base_url}/guidelines) を常に信じています
-
         楽しんでください!
-
         (もし[スタッフメンバー](%{base_url}/about) に新規ユーザーとして連絡する必要がある場合、このメッセージに返信してください)
     welcome_invite:
       subject_template: "%{site_name}へようこそ!"
-      text_body_template: "ようこそ%{site_name} へ！\nあなたのアカウント**%{username}** を作成して、あなたはログインしています。\n氏名の変更は [your user profile][prefs] より行ってください。\n\n次回ログインするときは、\n\n1. かならず招待をうけたメールアドレスを使ってログインしてください。\n\n2.[your user profile][prefs]でパスワードを設定して、ログインのときはそれを使用してください。\n\n%{new_user_tips} [civilized community behavior](%{base_url}/guidelines)をお守りいただき、健全なコミュニティとなるよう皆様のご協力をお願いいたします。 \n\nそれではお楽しみください! \n\n(もし個人的に [staff members](%{base_url}/about) と連絡を取る必要がある場合、このメッセージに返信してください)\n\n[prefs]: %{user_preferences_url}\n"
+      text_body_template: |
+        ようこそ%{site_name} へ！
+        あなたのアカウント**%{username}** を作成して、あなたはログインしています。
+        氏名の変更は [your user profile][prefs] より行ってください。
+        次回ログインするときは、
+        1. かならず招待をうけたメールアドレスを使ってログインしてください。
+        2.[your user profile][prefs]でパスワードを設定して、ログインのときはそれを使用してください。
+        %{new_user_tips} [civilized community behavior](%{base_url}/guidelines)をお守りいただき、健全なコミュニティとなるよう皆様のご協力をお願いいたします。
+        それではお楽しみください!
+        (もし個人的に [staff members](%{base_url}/about) と連絡を取る必要がある場合、このメッセージに返信してください)
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "バックアップは正常に完了しました"
       text_body_template: "バックアップが成功しました。\n [admin > backup section](%{base_url}/admin/backups) から、バックアップをダウンロードしてください"
@@ -1100,9 +1036,7 @@ ja:
       subject_template: "バックアップ失敗"
       text_body_template: |
         バックアップが失敗しました
-
         ログ:
-
         ```
         %{logs}
         ```
@@ -1113,9 +1047,7 @@ ja:
       subject_template: "復元に失敗しました"
       text_body_template: |
         リストアが失敗しました
-
         ログ:
-
         ```
         %{logs}
         ```
@@ -1126,9 +1058,7 @@ ja:
       subject_template: "ユーザの一括招待中にエラーが発生しました"
       text_body_template: |
         一括ユーザ招待が処理され、%{sent} 通の招待メールが送信され、%{failed}個のエラーが発生しました
-
         ログ:
-
         ```
         %{logs}
         ```
@@ -1136,9 +1066,7 @@ ja:
       subject_template: "データのダウンロード準備が完了しました"
       text_body_template: |
         データ出力が完了しました! :dvd:
-
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
-
         このダウンロードリンクは48時間有効です
     csv_export_failed:
       subject_template: "データのエクスポートに失敗しました"
@@ -1149,7 +1077,9 @@ ja:
       subject_template: "[%{site_name}] Email issue -- 本文なし"
     email_reject_parsing:
       subject_template: "[%{site_name}] Email issue -- 認識されていないコンテンツ"
-      text_body_template: "申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした \nメールから回答を見つける事ができませんでした。返信はメールのトップにあることを確認してください。インライン回答を見つける事はできません。\n"
+      text_body_template: |
+        申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした
+        メールから回答を見つける事ができませんでした。返信はメールのトップにあることを確認してください。インライン回答を見つける事はできません。
     email_reject_invalid_access:
       subject_template: "[%{site_name}] Email issue -- 不正なアクセス"
     email_reject_reply_key:
@@ -1162,10 +1092,6 @@ ja:
       subject_template: "[%{site_name}] Email issue -- 自動生成された返信"
     email_error_notification:
       subject_template: "[%{site_name}] Email issue -- POP認証エラー"
-    too_many_spam_flags:
-      subject_template: "新しいアカウントが通報によりブロックされました"
-    user_automatically_blocked:
-      subject_template: "新規ユーザの%{username}が通報によってブロックされました"
     spam_post_blocked:
       subject_template: "同一リンクの連続投稿による新規ユーザ %{username} のブロック"
     pending_users_reminder:
@@ -1173,7 +1099,6 @@ ja:
         other: "%{count} 人のユーザか承認を待っています。"
       text_body_template: |
         新たなユーザが、フォーラム参加のための承認（もしくは拒否）待ち状態になっています。
-
         [管理者セクションで確認する](/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "リモート画像のダウンロードを無効化"
@@ -1200,13 +1125,10 @@ ja:
       subject_template: "[%{site_name}] [プライベートメッセージ] %{topic_title}"
     digest:
       why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです"
-      subject_template: "[%{site_name}] のまとめ"
       new_activity: "あなたのトピックおよびポストにおけるアクティビティ:"
       top_topics: "人気の投稿"
       other_new_topics: "人気のトピック"
-      unsubscribe: "このまとめは、サイトへのアクセスが一定期間無い場合に、%{site_link}から送られます。配信停止はこちらから行えます: %{unsubscribe_link}"
       click_here: "ここをクリック"
-      from: "%{site_name} のまとめ"
       read_more: "もっと読む"
       more_topics: " %{new_topics_since_seen}個の新しいトピックがありました"
       more_topics_category: "もっと新しいトピック:"
@@ -1216,18 +1138,14 @@ ja:
       subject_template: "[%{site_name}] パスワードのリセット"
       text_body_template: |
         [%{site_name}](%{base_url}) にて、パスワードのリセットリクエストが行われました。
-
         もしリクエストを行っていない場合は、このメールを無視してください。
-
         新たなパスワードを設定する場合は次のリンクをクリックしてください: %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] パスワード設定"
       text_body_template: |
         [%{site_name}](%{base_url}) のあなたのアカウントに対してパスワード追加のリクエストがありました。
         あるいは、この検証済みメールアドレスに関連付けられている任意のサポートされているオンラインサービス（グーグル、フェイスブックなど）を使用してログインすることができます。
-
         もし、リクエストをしていない場合は、このメールを無視してください。
-
         パスワードを選択する場合は次のリンクをクリックしてください:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
@@ -1236,14 +1154,12 @@ ja:
       subject_template: "[%{site_name}] あなたの新しいアカウント"
       text_body_template: |
         %{site_name}のあなたの新しいアカウントが作成されました。
-
         以下のリンクをクリックしてパスワードを設定してください:
         %{base_url}/users/password-reset/%{email_token}
     confirm_new_email:
       subject_template: "[%{site_name}] 新しいメールアドレスを確認してください"
       text_body_template: |
         以下のリンクをクリックして、%{site_name}で利用するメールアドレスを有効化してください:
-
         %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "%{site_name} への参加承認完了!"
@@ -1251,10 +1167,8 @@ ja:
       subject_template: "[%{site_name}] アカウントの確認"
       text_body_template: |
         Welcome to %{site_name}!
-
         リンクをクリックして、アカウントを有効化してください:
         %{base_url}/users/activate-account/%{email_token}
-
         もし、上記のURLがクリックできない場合は、ブラウザのアドレスバーへURLをコピーして貼り付けて下さい。
   page_not_found:
     title: "ページが見つからないか、アクセス出来ない場所にあります。"
@@ -1265,7 +1179,6 @@ ja:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[%{title}へようこそ](#welcome)
       アカウントが必要です。アカウントを作成するかログインしてください
   terms_of_service:
     title: "利用規約"
@@ -1353,6 +1266,3 @@ ja:
   performance_report:
     initial_post_raw: このトピックでは、あなたのサイトの毎日のパフォーマンスレポートが含まれています。
     initial_topic_title: ウェブサイトパフォーマンスレポート
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.ko.yml

@@ -18,6 +18,8 @@ ko:
   date:
     month_names: []
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "글타래"
   posts: "글"
@@ -71,6 +73,9 @@ ko:
         other: '%{model} 저장 시에 %{count}개의 에러가 발생하여 진행을 못했습니다.'
     embed:
       load_from_remote: "글 로딩 중 오류가 발생하였습니다."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "CSV 또는 TXT형식의 파일을 업로드해야 합니다."
   backup:
@@ -100,6 +105,17 @@ ko:
   too_many_mentions:
     other: "죄송합니다, 이 포스트에서 %{count}명의 사용자만 언급할 수 있습니다."
   no_mentions_allowed_newuser: "죄송합니다. 새로운 사용자는 다른 사용자를 언급할 수 없습니다."
+  too_many_mentions_newuser:
+    other: "죄송합니다. 신규 회원은 %{count}명의 사용자만 언급할 수 있습니다."
+  no_images_allowed: "죄송합니다. 신규 회원은 글에 이미지를 넣을 수 없습니다."
+  too_many_images:
+    other: "죄송합니다. 신규회원은 글 하나에 %{count}개의 이미지만 넣을 수 있습니다."
+  no_attachments_allowed: "죄송합니다. 신규회원은 글에 파일을 첨부할 수 없습니다."
+  too_many_attachments:
+    other: "죄송합니다. 신규회원은 글 하나에 %{count}개의 파일만 첨부할 수 있습니다."
+  no_links_allowed: "죄송합니다. 신규회원은 글에 링크를 넣을 수 없습니다."
+  too_many_links:
+    other: "죄송합니다. 신규회원은 글 하나에 링크를 %{count}개까지 넣을 수 있습니다."
   spamming_host: "죄송합니다. 회원님은 링크를 첨부할 수 없습니다."
   user_is_suspended: "가입이 보류된 회원은 글을 쓸 수 없습니다."
   topic_not_found: "뭔가 잘못됐네요. 아마 글 보려는 도중에 글타래가 닫혔거나 지워진 건 아닐까요?"
@@ -144,60 +160,43 @@ ko:
   education:
     until_posts:
       other: "글 %{count}개"
-    new-topic: |
+    'new-topic': |
       %{site_name}에 오신 것을 환영합니다 &mdash; **새로운 대화를 시작해서 감사합니다.**
-
       - 제목을 큰소리로 읽어봤을 때 흥미롭게 들리던가요? 좋은 요약문인가요?
-
       - 누가 무엇때문에 관심을 보일까요? 어떤 대답을 듣고 싶나요?
-
       - 사람들이 *검색*할 수 있도록 글타래에 흔히 사용하는 단어를 집어넣으세요. 관련 글타래와 같이 엮으려면 해당 카테고리를 선택하시고요.
-
       이 글은 당신의 첫 %{education_posts_text} 에서만 나옵니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)을 참조하세요.
-    new-reply: |
+    'new-reply': |
       %{site_name}에 오신것을 환영합니다! &mdash; **참여해주셔서 감사합니다!**
-
       - 당신의 댓글이 어떤 식으로든 토론을 발전시키나요?
-
       - 당신의 커뮤니티 회원에게 예의를 갖춰주세요.
-
       - 건설적인 비판은 환영입니다만, 사람 말고 *아이디어*를 비판해주세요.
-
       이 도움말은 최초 %{education_posts_text}번 글을 올릴 때까지만 나타납니다. 자세한 내용은 [커뮤니티 가이드라인](/guidelines)를 참조하여 주세요.
     sequential_replies: |
-      ### 여러 글에 답글 한번에 달아보세요.
-
       답글을 연속으로 한 글타래에 달기 보다는 지난 글을 인용하거나 @사용자이름 해서 답글 하나로 작성해보세요.
-
       원하시는 글을 선택하시고 <b>답글을 인용</b> 버튼을 선택함으로써 이전에 쓰셨던 답글에 추가로 인용을 달거나 수정하실 수 있습니다.
-
       작은 답글을 여러개 다는 것보다 한개의 상세한 답글이 모두에게 글타래를 읽기 편하게 만듭니다.
     dominating_topic: |
-      ### 다른 유저들도 이 대화에 참여할 수 있도록 해주세요
-
       이 주제에 %{percent}% 이상의 답글을 다셨군요.
-
       다른 유저들도 그들의 의견을 나눌 수 있도록 충분한 시간을 기다리고 계신가요?
     too_many_replies: |
-      ### 댓글 개수 제한에 걸렸습니다.
-
       죄송합니다. 신규 사용자들은 같은 주제에 %{count}개까지만 댓글을 달 수 있습니다.
       댓글을 다는 대신 이전 댓글의 내용을 수정하거나, 다른 글타래를 읽어보는 건 어떨까요?
     reviving_old_topic: |
-      ### 이 글타래를 부활시키겠습니까?
-
       이 글타래에 달린 마지막 댓글은 이미 %{days}일 이전에 달렸습니다. 댓글을 새로 달면 이 글타래가 글 목록의 최상단으로 올라가게 되고, 글에 참여한 사람들에게 알림이 됩니다.
-
       이 글타래에 대한 논의를 재개하고 싶으신 게 확실하신가요?
   activerecord:
     attributes:
       category:
         name: "카테고리 이름"
+      topic:
+        title: '사이트 이름'
       post:
         raw: "본문"
       user_profile:
         bio_raw: "내 소개"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -218,7 +217,6 @@ ko:
           attributes:
             hex:
               invalid: "유효한 색상이 아닙니다."
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>프로필이 현재 비어있습니다. <a href='/users/%{username_lower}/preferences/about-me'>지금 작성하시겠습니까?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name}님께서는 아직 프로필을 작성하지 않으셨습니다</div>"
@@ -231,8 +229,7 @@ ko:
   assets_topic_body: "이 글타래는 스태프에게만 보이는 영구적인 글타래입니다. 사이트 디자인을 위한 이미지를 저장할 수 있습니다. 지우지 마세요!\n\n다음처럼 하세요:\n\n1. 이 글타래에 답글을 작성하세요.\n2. 로고, 파비콘 등으로 사용하고 싶은 모든 이미지들을 업로드한다. (글 에디터 툴바의 업로드 아이콘을 사용하거나, 드래그 앤 드롭으로 이미지를 올려주세요.)\n3. 답글을 제출합니다.\n4. 답글의 업로드된 이미지를 우클릭하거나, 수정 버튼을 눌러 이미지의 경로를 확인하세요. 해당 이미지의 경로를 복사하세요.\n5. 복사한 이미지 경로를 [basic settings](/admin/site_settings/category/required)에 붙여넣으세요.\n\n\n다른 유형의 이미지를 사용해야한다면 [file settings](/admin/site_settings/category/files)의 `authorized_extensions` 를 수정하세요."
   lounge_welcome:
     title: "라운지에 오신 것을 환영합니다."
-    body: |2
+    body: |
-
       축하합니다! :confetti_ball: 당신의 회원등급이 **지도자** (회원등급 3등급)로 올라갔기 때문에 이 글타래를 볼 수 있게 되었습니다. 이제부터 아래의 행동들을 할 수 있습니다 &hellip; * 글타래를 제목을 수정할 수 있습니다 * 글타래의 카테고리를 수정할 수 있습니다 * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다) * 회원등급 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다 * 좋아요와 신고의 가중치가 높아집니다 [정규 멤버 목록](&#x2F;badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요. 이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다! (회원등급에 관한 더 자세한 정보를 보시려면, [이 글타래를 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.) [trust]:  https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "'%{category}' 카테고리의 설명"
@@ -334,6 +331,8 @@ ko:
     confirmed: "이메일 주소가 변경되었습니다."
     please_continue: "%{site_name}으로 가기"
     error: "이메일 주소를 변경하는데 문제가 있습니다. 주소가 이미 사용되고 있나요?"
+    authorizing_old:
+      title: "이메일 주소를 확인해 주셔서 감사합니다."
   activation:
     action: "여기를 눌러 계정을 활성화하세요."
     already_done: "죄송합니다. 이 계정 확인 링크는 더 이상 유효하지 않습니다."
@@ -384,9 +383,7 @@ ko:
       long_form: '스팸으로 신고하였습니다.'
     inappropriate:
       title: '부적절함'
-      description: '이 글은 평균적인 사람들의 관점에서 볼 때 공격적이나 모욕적인 글을 담고 있거나,
+      description: '이 글은 평균적인 사람들의 관점에서 볼 때 공격적이나 모욕적인 글을 담고 있거나, <a href="/guidelines">커뮤니티 가이드라인</a>에 맞지 않습니다.'
-
-        <a href="/guidelines">커뮤니티 가이드라인</a>에 맞지 않습니다.'
       long_form: '부적절함으로 신고하였습니다.'
     notify_moderators:
       title: "뭔가 다른것"
@@ -404,18 +401,6 @@ ko:
       message:
         make: "이 글타래는 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다."
         remove: "이 글타래는 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다."
-  unsubscribed:
-    title: '구독 해지"'
-    description: "구독이 해지되었습니다."
-    oops: "만약 실수였다면 아래를 클릭하여주세요."
-    error: "구독 해지하는데 문제가 발생하였습니다."
-    preferences_link: "<a href='/my/preferences'>환경설정 페이지</a>에서 요약 메일도 구독 해지할 수 있습니다."
-    different_user_description: "요약 메일을 받는 다른 사용자로 로그인되어 있습니다. 로그아웃 한 후 다시 시도해주세요."
-    not_found_description: "죄송합니다. 구독 해지할 수 없습니다. 이메일의 구독해지 링크 기한이 만료되었을 수도 있습니다."
-  resubscribe:
-    action: "재구독"
-    title: "재구독 되었습니다!"
-    description: "재구독 되었습니다."
   reports:
     visits:
       title: "사용자 방문"
@@ -550,7 +535,6 @@ ko:
       yaxis: "방문 횟수"
   dashboard:
     rails_env_warning: "당신의 서버는 %{env} 모드에서 실행되고 있습니다."
-    ruby_version_warning: "당신은 문제가 자주 발생하는 루비 버전 2.0.0을 사용하시고 있습니다. 247 또는 이후 패치 레벨로 업그레이드를 해주세요."
     host_names_warning: "당신의 config/database.yml 파일은 기본 호스트네임을 사용하고 있습니다. 사이트의 호스트네임으로 업데이트 하세요."
     gc_warning: '당신의 서버는 최상의 성능을 내지 못하는 기본 ruby garbage collection parameter를 사용하고 있습니다. 성능 튜닝에 대해 읽어보세요. : <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Discourse를 위한 루비와 레일즈 튜닝</a>.'
     sidekiq_warning: 'Sidekiq 이 현재 실행되고 있지 않습니다. Sidekiq는 이메일 전송 같은 많은 작업들을 비동기식으로 처리합니다. 적어도 하나의 sidekiq 프로세서를 실행시켜 주세요. <a href="https://github.com/mperham/sidekiq">Sidekiq 배우기</a>.'
@@ -610,6 +594,7 @@ ko:
     post_excerpt_maxlength: "글 인용에 허용되는 최대 글자수"
     post_onebox_maxlength: "onebox가 적용된 Discourse 글에 허용되는 최대 글자수"
     onebox_domains_whitelist: "onebox 사용을 허가할 도메일 리스트; 이 도메인은 OpenGraph나 oEmbed를 지원하여야합니다. 테스트: http://iframely.com/debug"
+    logo_url: "좌측 상단의 로고이미지는 직사각형 모양이어야 합니다. 설정하지 않을 경우 사이트 이름이 출력됩니다."
     apple_touch_icon_url: "애플 디바이스는 144px의 아이콘을 사용함. 144px X 144px 사이즈를 추천함"
     notification_email: "The from: 이 이메일 주소는 모든 기본 시스템 메일을 보내는데 사용됩니다. 여기에 명시된 도메인은 SPF, DKIM가 적용되어 있어야하며, reverse PTR 레코드가 제대로 설정되어 있어야 메일이 도착 할 수 있습니다."
     email_custom_headers: "커스텀 이메일 해더의 pipe-delimited"
@@ -626,16 +611,13 @@ ko:
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     background_polling_interval: "(페이지를 안 보고 있을 때) 클라이언트가 몇 밀리초마다  poll해야 하는 지"
     cooldown_minutes_after_hiding_posts: "신고 당해서 숨겨진 글을 사용자가 편집할 수 있기 전까지 기대려야 하는 시간(분)"
-    max_topics_in_first_day: "사용 첫 날에 글타래를 생성할 수 있는 최대 허용 개수"
-    max_replies_in_first_day: "사용 첫 날에 사용자가 생성할 수 있는 답글의 최대 허용 개수"
     tl2_additional_likes_per_day_multiplier: "tl2 (회원)의 일별 좋아요 제한을 올릴 배수"
     tl3_additional_likes_per_day_multiplier: "tl3 (정회원)의 일별 좋아요 제한을 올릴 배수"
     tl4_additional_likes_per_day_multiplier: "tl4 (리더)의 일별 좋아요 제한을 올릴 배수"
-    num_flags_to_block_new_user: "신규 사용자가 n명의 다른 사용자들로부터 이 수치에 해당하는 스팸 신고를 받으면, 작성한 모든 글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)"
-    num_users_to_block_new_user: "신규 사용자가 이 수치에 해당하는 다른 사용자들로부터 x개의 스팸 신고를 받으면, 작성한 모든 글을 숨기고 더 이상 글 게시를 금지 (0으로 설정하면 이기능을 사용하지 않음)"
     notify_mods_when_user_blocked: "만약 사용자가 자동 블락되면 중간 운영자에게 메시지 보내기"
     flag_sockpuppets: "어떤 신규 사용자(예:24이내 가입자)가 글타래를 생성하고 같은 IP주소의 또 다른 신규 사용자가 댓글을 쓰면 자동 스팸 신고"
     traditional_markdown_linebreaks: "Markdown에서 전통적인 linebreak를 사용, linebreak시 두개의 trailing space를 사용하는 것."
+    allow_html_tables: "마크다운 문서에 HTML 테이블을 허용합니다. TABLE, THEAD, TD, TR, TH 태그를 사용할 수 있습니다.(테이블이 포함된 이전 게시물에 적용하려면 rebake 해야 합니다.)"
     post_undo_action_window_mins: "사용자가 어떤 글에 대해서 수행한 작업(신고 등)을 취소하는 것이 허용되는 시간(초)"
     must_approve_users: "스태프는 반드시 사이트 엑세스권한을 허용하기 전에 모든 신규가입계정을 승인해야 합니다. 경고: 이것을 활성화하면 기존 스태프 아닌 회원들의 엑세스권한이 회수됩니다."
     pending_users_reminder_delay: "새로운 사용자가 승인을 기다리는 시간이 여기에 지정된 시간횟수보다 더 길어길경우 운영자에게 알려줍니다. 알림을 해제하려면 -1로 설정하세요."
@@ -769,6 +751,7 @@ ko:
     title_max_word_length: "글타래 제목안에 단어들의 최대 길이"
     title_min_entropy: "글타래 제목에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)"
     body_min_entropy: "글 본문에 필요한 최소 엔트로피(서로 다른 글자들이 몇개 존재해야하는지)"
+    allow_uppercase_posts: "제목과 내용을 모두 대문자로 작성하는 것을 허용하기"
     title_fancy_entities: "글타래 제목에 일반 ASCII 문자로 만든 기호들을 보기 좋은 HTML로 변환시켜준다. 참고: SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "유사 글타래에 대한 체크가 있기 전, 최소 제목 글자 수"
     min_body_similar_length: "유사 글타래에 대한 체크가 있기 전, 글의 최소 본문 글자 수"
@@ -830,9 +813,6 @@ ko:
     allow_animated_thumbnails: "움직이는 gif로 썸네일을 만듭니다."
     default_avatars: "신규가입자가 받게될 기본 아바타 URL"
     automatically_download_gravatars: "사용자가 계정을 만들거나 이메일을 변경하자마자 Gravatar를 다운로드합니다."
-    digest_topics: "요약 이메일에서 보여질 최대 글타래 개수"
-    digest_min_excerpt_length: "요약 이메일에서 최소 글 발췌 수"
-    disable_digest_emails: "모든 유저들 이메일 다이제스트 못하게 하기"
     max_daily_gravatar_crawls: "하루에 Discourse가 커스텀 아파타를 위해 Gravatar를 체크하는 최대 횟수"
     public_user_custom_fields: "유저가 쓸 수 있는 공개 커스텀 필드 목록"
     staff_user_custom_fields: "스태프가 쓸 수 있는 공개 커스텀 필드 목록"
@@ -843,6 +823,7 @@ ko:
     allow_profile_backgrounds: "사용자에게 프로필 배경 이미지 업로드를 허용합니다."
     enable_mobile_theme: "모바일 디바이스는 모바일 환경에 친화적인 테마를 사용합니다, 그리고 PC용 화면으로 전환할 수 있습니다. 만약 커스텀 스타일 시트를 사용한다면 이것을 비활성화 시키세요."
     dominating_topic_minimum_percent: "한 글타래에서 한 사용자의 영향력을 결정하는 글 수의 퍼센트"
+    daily_performance_report: "NGINX 일별 로그를 분석하고 상세정보를 스태프들에게 글타래 게시"
     suppress_uncategorized_badge: "글타래 리스트에서 카테고리가 없는 글타래에 대한 훈장을 보여주지 않는다."
     global_notice: "긴급, 비상 전체 배너를 모든 방문자에게 표시합니다. 숨기려면 빈칸으로 바꾸면 됩니다(HTML 허용)."
     disable_edit_notifications: "'download_remote_images_to_local'가 활성화되있으면 시스템 사용자에 의한 수정 알림을 비활성화합니다."
@@ -888,19 +869,6 @@ ko:
       invalid_string_min: "글자수가 %{min}자 이상이어야 합니다."
       invalid_string_max: "글자 수가 %{max}자 이상이어야 합니다."
       invalid_reply_by_email_address: "값이 반드시 '%{reply_key}'를 갖고 있어야하며 알림 이메일과 달라야합니다."
-  notification_types:
-    mentioned: "%{display_username} 사용자가 %{link} 에서 당신을 언급하였습니다."
-    liked: "%{display_username} 사용자가 %{link} 를 좋아합니다."
-    replied: "%{display_username} 사용자가 %{link} 에 당신의 글에 답글을 달았습니다."
-    quoted: "%{display_username} 사용자가 %{link} 에서 당신의 글을 인용했습니다."
-    edited: "%{display_username} 사용자가 %{link} 에서 당신의 글을 수정하였습니다."
-    posted: "%{display_username} 사용자가 %{link} 에 글을 게시 했습니다."
-    moved_post: "%{display_username} 사용자가 %{link} 에 당신의 글을 이동하였습니다."
-    private_message: "%{display_username} 회원님이 메세지를 보냈습니다: %{link}"
-    invited_to_private_message: "%{display_username} 회원님이 메세지에 초대했습니다: %{link}"
-    invitee_accepted: "%{display_username} 사용자가 당신의 초대를 수락하였습니다."
-    linked: "%{display_username} 사용자가 %{link} 에서 당신을 링크했습니다."
-    granted_badge: "당신은 %{link}를 획득했습니다."
   search:
     within_post: "#%{post_number} by %{username}"
     types:
@@ -986,34 +954,16 @@ ko:
     subject_template: "%{invitee_name} 회원님이 %{site_domain_name} 에 '%{topic_title}'에 초대하였습니다."
     text_body_template: |
       %{invitee_name}님께서 당신을 토의에 초대했습니다.
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       사이트:
-
       > %{site_title} -- %{site_description}
-
       관심이 있으시면 아래 링크로 들어가기:
-
       %{invite_link}
-
       신뢰된 사용자에게서 온 초대므로 이 토의에 바로 답글을 달 수 있습니다.
   invite_forum_mailer:
     subject_template: "%{site_domain_name}의 %{invitee_name}님께서 당신을 초대하였습니다."
-    text_body_template: |
-      %{invitee_name} 님께서 당신을 초대하였습니다.
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      초대를 허락하시려면 아래 링크를 클릭하여 주세요.
-
-      %{invite_link}
-
-      당신은 신뢰받는 사용자로부터 초대를 받으셨습니다. 그래서 로그인 하지 않아도 됩니다.
   invite_password_instructions:
     subject_template: "%{site_name} 계정을 위해 비밀번호 설정"
   test_mailer:
@@ -1025,10 +975,6 @@ ko:
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}]의 %{count}개의 글이 검토를 기다리고 있습니다."
-    text_body_template: |
-      안녕하세요,
-
-      새 유저가 쓴 글가 심의를 기다리고 있습니다. [여기서 승인 또는 거절합니다](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "내가 올린 글타래가 **주제 벗어난 이야기**으로 신고 되었습니다. 사람들이 이 글타래의 제목이랑 글 내용이 안 맞는다고 느끼나 봅니다. "
     inappropriate: "내가 올린 글타래가 **부적절**로 신고 되었습니다. 사람들이 이 글타래가 [가이드라인](/guidelines)에서 벗어나 공격적, 모욕적, 폭력적이라고 느낍니다."
@@ -1042,134 +988,26 @@ ko:
     deferred_and_deleted: "알려줘서 감사합니다. 해당 글을 삭제했습니다."
   temporarily_closed_due_to_flags: "이 글타래는 많은 신고가 들어와 임시로 닫힌 상태입니다."
   system_messages:
-    post_hidden:
-      subject_template: "포럼 신고로 인한 글 숨김"
-    usage_tips:
-      text_body_template: |
-        시작하기 위한 몇 가지 간단한 팁을 알려드릴께요:
-
-        ## 읽기
-
-        더 읽으시려면, **그냥 계속해서 스크롤다운 하세요!**
-
-        새 댓글이나 새 포픽이 올라오면 자동으로 나타나기 때문에 페이지 새로고침할 필요가 없습니다.
-
-        ## 탐색
-
-        - 검색 또는 <kbd>☰</kbd> 메뉴, 사용자페이지는 **화면 우상단에 있는 아이콘 버튼**을 사용하세요.
-
-        - 토픽을 선택하면 항상 당신이 그 토픽에서 **읽지 않은 다음 댓글**로 바로 갑니다. 제일 위나 아래로 가려면, 댓글 카운트 또는 마지막 댓글 날짜를 선택하세요.
-
-          <img src="%{base_url}/images/welcome/topic-list-select-areas-2x.png" width="593" height="59">
-
-        - 토픽을 읽는 도중에는, 우하단에 있는 프로그레스 바를 이용해서 전체 탐색하세요. 토픽 제목을 선택하면 제일 위로 바로 갈 수 있답니다. 초스피드 키보드 단축키 목록이 궁금하면 <kbd>?</kbd>키를 누르세요.
-
-          <img src="%{base_url}/images/welcome/progress-bar-2x.png" width="153" height="181">
-
-        ## 댓글달기
-
-        - 토픽에 **평범하게 댓글 달때**는, 토픽 맨 밑에 있는 <img src="%{base_url}/images/welcome/reply-topic-2x.png" width="25" height="23"> 버튼을 이용하세요.
-
-        - **특정 사람**에게 댓글 달때는, 그 글에 딸린 <img src="%{base_url}/images/welcome/reply-post-2x.png" width="25" height="23"> 버튼을 이용하세요.
-
-        - **새로운 토픽으로** 댓글 달때는, 글 오른쪽에 있는 <img src="%{base_url}/images/welcome/reply-as-linked-topic-2x.png" width="20" height="25"> 버튼을 이용하세요. 오래된 토픽과 새 토픽 모두 자동적으로 함께 링크됩니다.
-
-        댓글은 간단한 HTML 또는 BBCode, [마크다운 (Markdown)](http://commonmark.org/help/) 형식으로 쓸 수 있습니다.
-
-          이건 **볼드체**입니다.
-          이건 <b>볼드체</b>입니다.
-          이건 [b]볼드체[/b]입니다.
-
-        마크다운을 배우고 싶으시다면? [저희의 10분짜리 재밌는 인터랙티브 튜토리얼을 해보세요!](http://commonmark.org/help/tutorial/)
-
-        인용문을 삽입하려면, 인용하고 싶은 텍스트를 선택한 다음에 댓글달기(응답하기) 버튼 아무거나 누르세요. 인용문이 여러개면 앞 동작을 반복하세요.
-
-        <img src="%{base_url}/images/welcome/quote-reply-2x.png" width="326" height="128">
-
-        댓을을 누군가에게 알리고 싶을 때는 그 사람 이름을 언급하세요. `@` 키를 쳐서 사용자이름 선택하기를 시작할 수 있답니다.
-
-        <img src="%{base_url}/images/welcome/username-completion-2x.png" width="191" height="125">
-
-        [표준 이모지(Emoji)](http://www.emoji.codes/)를 사용하려면, 그냥 `:`키를 눌러서 매칭되는 이름을 찾거나 예전부터 써온 `;)` 웃음표시를 이용하세요.
-
-        <img src="%{base_url}/images/welcome/emoji-completion-2x.png" width="144" height="153">
-
-        링크 요약을 생성하려면, 편집기 화면에 그 링크를 그냥 아래처럼 붙여넣기 하세요:
-
-        <img src="%{base_url}/images/welcome/link-oneboxing-animation.gif" width="480" height="228">
-
-        ## 액션
-
-        각각의 글 밑에는 액션 버튼들이 있습니다:
-
-        <img src="%{base_url}/images/welcome/like-link-flag-bookmark-2x.png" width="162" height="42">
-
-        누군가의 글이 마음에 쏙 들어서 감사표시를 하고 싶으면 **좋아요** 버튼을 이용하세요. 애정을 공유하는 거에요!
-
-        누군가의 글에 문제가 있으면, **신고** 버튼으로 글쓴이에게 또는 [우리 운영진](%{base_url}/about)에게 개인적으로 조용히 알려주세요. 그 글로 가는 링크를 **공유**하거나 **북마크**해서 당신의 사용자 페이지에서 나중에 참고할 수도 있습니다.
-
-        ## 알림
-
-        누군가 당신에게 댓글달거나 당신의 글을 인용, 또는 당신의 `@아이디`를 언급하면, 페이지 우상단에 숫자가 즉시 나타납니다. **알림**으로 접근할 때 그걸 이용하세요.
-
-          <img src="%{base_url}/images/welcome/notification-panel-2x.png" width="160" height="54">
-
-        댓글 놓칠까봐 걱정하지 마세요 - 당신이 없는 사이에 온 알림은 이메일로 보내드릴 꺼에요.
-
-        ## 환경설정
-
-          - **쓴지 이틀이 안 된** 모든 토픽은 새글로 간주합니다.
-
-          - **당신이 활동적으로 참여한** (글쓰기, 댓글달기, 일정시간 이상 읽기 등) 토픽은 자동적으로 추적됩니다.
-
-        이 토픽들 바로 옆에는 파란색 new 또는 읽지 않는 댓글수가 표시됩니다:
-
-        <img src="%{base_url}/images/welcome/topics-new-unread-2x.png" width="341" height="106">
-
-        토픽 맨 밑에 있는 알림제어판을 통해 어떤 토픽이든지 알림설정을 바꿀 수 있습니다.
-
-        <img src="%{base_url}/images/welcome/topic-notification-control-2x.png" width="608" height="312">
-
-        그리고 만일 특정 카테고리의 모든 새토픽을 지켜보고 싶으면, 카테고리 별로 알림설정 할 수 있습니다.
-
-        설정을 바꾸려면 [당신의 사용자 환경설정](%{base_url}/my/preferences)을 참고하세요.
-
-        ## 커뮤니티 신뢰
-
-        이곳에 참여하시면, 시간이 지남에 따라 커뮤니티의 신뢰를 받게 되고 정회원이 되어 신규회원 제한은 사라질 꺼에요. 충분이 높은 [회원등급이 되면](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), 우리 커뮤니티를 함께 꾸려나가는 걸 도와줄 새능력을 얻을 껍니다.
     welcome_user:
       subject_template: "%{site_name} 사이트에 오신것을 환영합니다!"
       text_body_template: |
         %{site_name}에 가입해주셔서 감사합니다, 환영합니다!
-
         %{new_user_tips}
-
         우리는 [문화시민의 커뮤니티 활동지침](%{base_url}/guidelines)을 항상 따릅니다.
-
         커뮤니티를 즐겨주세요!
-
         (할 말이 있을 땐 새 사용자로서 [스태프](%{base_url}/about)들에게 이야기 주세요, 이 메세지에 답글로 주시면 바로 올라갑니다.)
     welcome_invite:
       subject_template: "%{site_name} 사이트에 오신것을 환영합니다!"
       text_body_template: |
         %{site_name}의 초대에 응해주셔서 감사합니다 반갑습니다!
-
         **%{username}**로 새 사용자를 만들었고 로그인된 상태입니다. [사용자 정보][prefs]에 들어가 이름을 바꿀 수 있습니다.
-
         나중에 다시 로그인하려면:
-
         1. 항상 **초대 받은 이메일 주소를 사용해서** 로그인해주셔야지 안 그러면 같은 사람이라고 인식 못할 겁니다!
-
         2. [사용자 정보][prefs],에서 유니크한 비밀번호를 만들어 사용해주세요.
-
         %{new_user_tips}
-
         우리는 [문화시민의 커뮤니티 활동 지침](%{base_url}/guidelines)을 항상 따릅니다.
-
         커뮤니티를 즐려주세요!
-
         (할 말이 있을 땐 새 사용자로서 [스태프](%{base_url}/about)들에게 이야기주세요, 이 메세지에 답글로 주시면 바로 올라갑니다.)
-
         [사용자 정보 설정]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "백업 성공"
@@ -1178,9 +1016,7 @@ ko:
       subject_template: "백업에 실패했습니다."
       text_body_template: |
         백업이 실패하였습니다.
-
         로그:
-
         ```
         %{logs}
         ```
@@ -1191,9 +1027,7 @@ ko:
       subject_template: "복원 실패"
       text_body_template: |
         복구가 실패하였습니다.
-
         로그:
-
         ```
         %{logs}
         ```
@@ -1204,9 +1038,7 @@ ko:
       subject_template: "대량 사용자 초대 중 오류가 났습니다."
       text_body_template: |
         대량 유저 초대 파일이 처리됐습니다. %{sent}개의 초대장이 보내졌고 %{failed}개의 에러 (전송안됨)가 났습니다.
-
         로그:
-
         ```
         %{logs}
         ```
@@ -1214,9 +1046,7 @@ ko:
       subject_template: "데이터 추출이 완료되었습니다."
       text_body_template: |
         데이터 내보내기가 성공적으로 끝났습니다! :dvd:
-
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
-
         48시간 후에 위의 다운로드 링크는 지워집니다.
     csv_export_failed:
       subject_template: "데이터 추출 실패"
@@ -1229,7 +1059,6 @@ ko:
       subject_template: "[%{site_name}]  이메일 문제 -- 내용 인식 불가"
       text_body_template: |
         죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다.
-
         이메일에 내용이 안 보입니다. 답글이 이메일 상단에 있는지 확인 해주세요 -- 한줄 답변은 처리 못합니다.
     email_reject_invalid_access:
       subject_template: "[%{site_name}]  이메일 문제 -- 잘못된 접근"
@@ -1243,8 +1072,6 @@ ko:
       subject_template: "[%{site_name}] 이메일 문제 -- 자동 생성된 답글"
     email_error_notification:
       subject_template: "[%{site_name}] 이메일 문제 -- POP 인증 오류"
-    user_automatically_blocked:
-      subject_template: "%{username} 신규가입자가 커뮤니티 신고로 블락됨"
     spam_post_blocked:
       subject_template: "%{username} 신규가입자가 연속 링크로 블락됨"
     pending_users_reminder:
@@ -1252,7 +1079,6 @@ ko:
         other: "%{count}명의 새로운 사용자가 가입 승인 대기중 입니다."
       text_body_template: |
         가입 승인 대기중(또는 거절된)인 새로운 사용자가 있습니다.
-
         [운영자 색션에서 새로운 사용자들을 리뷰하세요](/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "외부에서 이미지 다운로드 못함"
@@ -1279,13 +1105,10 @@ ko:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
     digest:
       why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황"
-      subject_template: "[%{site_name}] 근황"
       new_activity: "당신의 글타래과 글에 등록된 새로운 활동:"
       top_topics: "인기 글"
       other_new_topics: "인기 글타래"
-      unsubscribe: "%{site_link} 근황은 한동안 접속을 안해서 보냈어요. 스팸 같아서 보기도 싫으면 %{unsubscribe_link}."
       click_here: "클릭"
-      from: "%{site_name} 요약"
       read_more: "더 읽기"
       more_topics: "%{new_topics_since_seen}개의 글타래가 새로 올라왔어요."
       more_topics_category: "더 많은 새글:"
@@ -1293,60 +1116,45 @@ ko:
       subject_template: "[%{site_name}] 패스워드 재설정"
       text_body_template: |
         [%{site_name}](%{base_url}) 사이트에서 누군가 당신의 패스워드를 재설정 요청하였습니다.
-
         아래 링크를 클릭하여 패스워드를 재설정하세요:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] 패스워드 재설정"
       text_body_template: |
         [%{site_name}](%{base_url})의 회원님 계정에 비밀번호를 추가 요청을 받았습니다. 이 이메일이 사용된 다른 온라인 서비스 (Google, Facebook, etc)를 이용해 로그인할 수 있습니다.
-
         이 요청을 하지 않았다면, 이 메일은 무시해도 안전합니다.
-
         비밀번호 선택 페이지:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] 로그인"
       text_body_template: |
         [%{site_name}](%{base_url})의 회원님 계정에 로그인 요청을 받았습니다.
-
         이 요청을 하지 않았다면, 이 메일은 무시해도 안전합니다.
-
         로그인 페이지:
         %{base_url}/users/admin-login/%{email_token}
     account_created:
       subject_template: "[%{site_name}] 당신의 새 계정"
       text_body_template: |
         %{site_name}에 새 계정이 만들어 졌습니다.
-
         비밀번호 설정 페이지:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "당신은 %{site_name} 가입이 승인되었습니다!"
       text_body_template: |
         %{site_name}에 오신 것을 환영합니다!
-
         스태프가 %{site_name} 계정을 승인했습니다.
-
         새 계정을 활성화해서 시작하려면 아래를 클릭:
         %{base_url}/users/activate-account/%{email_token}
-
         링크가 안 될 경우 복사 붙여넣기로 주소에 넣어 들어가주세요.
-
         %{new_user_tips}
-
         우리는 [문화시민의 커뮤니티 활동 지침](%{base_url}/guidelines)을 항상 따릅니다.
-
         커뮤니티를 즐겨주세요!
-
         (새 사용자로서 할말이 있으시면 이글에 답변함으로써 [스태프](%{base_url}/about)들에게 이야기해주세요.)
     signup:
       text_body_template: |
         %{site_name}에 오신것을 환영합니다!
-
         당신의 계정 인증을 위해 아래 링크를 클릭해주세요:
         %{base_url}/users/activate-account/%{email_token}
-
         만약 위의 링크를 클릭 할 수 없으면 주소를 복사하여 당신의 웹브라우저에 붙여넣으세요.
   page_not_found:
     popular_topics: "인기"
@@ -1356,7 +1164,6 @@ ko:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[%{title}에 오신 것을 환영합니다.](#welcome)
       계정이 필요합니다. 회원가입 또는 로그인 해주세요
   terms_of_service:
     title: "서비스 이용약관"
@@ -1396,9 +1203,8 @@ ko:
   csv_export:
     boolean_yes: "네"
     boolean_no: "아니오"
-  static_topic_first_reply: |+
+  static_topic_first_reply: |
     이 글타래인 %{page_name} 페이지의 첫글 수정.
-
   guidelines_topic:
     title: "FAQ/가이드"
   tos_topic:
@@ -1415,8 +1221,3 @@ ko:
   performance_report:
     initial_post_raw: 이 글타래는 웹사이트의 일일 성능 보고를 포함하고 있습니다.
     initial_topic_title: 웹사이트 성능 보고
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.nb_NO.yml

@@ -10,6 +10,12 @@ nb_NO:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats 
+  date:
+    month_names: []
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Emner"
   posts: "innlegg"
@@ -66,6 +72,9 @@ nb_NO:
       load_from_remote: "Det oppstod et problem med innlastingen av innlegget."
     site_settings:
       min_username_length_range: "Du kan ikke sette minimum høyere enn maksimum."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Den opplastede filen må være i .csv eller .txt format."
   backup:
@@ -136,51 +145,30 @@ nb_NO:
     until_posts:
       one: "1 innlegg"
       other: "%{count} innlegg"
-    new-topic: |
+    'new-topic': |
       Velkommen til %{site_name} &mdash; **takk for at du startet et nytt innlegg!**
-
       - Høres tittelen på innlegget interessant ut hvis du leser det høyt? Er det en god oppsummering?
-
       - Hvem vil være interessert i dette? Hvorfor betyr det noe? Hva slags respons er du ute etter?
-
       - Bruk relevante begreper i emnet så andre kan *finne* det. Venligst velg en kategori for å gruppere emnet ditt med andre liknende emner.
-
       [Se våre retningslinjer](/guidelines) for mer informasjon. Denne meldingen vises kun for ditt første %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Velkommen til %{site_name} &mdash; **takk for bidraget!**
-
       - Forbedrer innlegget ditt samtalen på noen måte?
-
       - Vær snill med andre medlemmer
-
       - Konstruktiv kritikk ønskes velkommen, men husk å kritiser ideèr, ikke mennesker.
-
       For mer informasjon [see våre retningslinjer](/guidelines). Dette panelet vil kun vises for ditt første %{education_posts_text}.
     sequential_replies: |
-      ### Vurder å svare til flere innlegg på samme tid
-
       I stedet for mange sekvensielle svar til et emne så kan du vurdere ett enkelt svar som inkluderer sitater fra tidligere innlegg og @navn referanser.
-
       Du kan redigere og legge til sitater i tidligere svar ved å markere tekst og velge <b>quote reply</b> knappen som dukker opp.
-
       Det er lettere for alle å lese emner som har færre og dypere svar enn mange små individuelle svar.
     dominating_topic: |
-      ### La andre delta i diskusjonen
-
       Dette emnet er tydeligvis viktig for deg &ndash; du har skrevet mer enn %{percent}% av svarene her.
-
       Er du sikker du gir nok tid til andre å dele sine innspill også?
     too_many_replies: |
-      ### Du har nådd det maksimale antallet mulige svar for dette emnet
-
       Vi beklager, men nye brukere er midlertidig begrenset til %{newuser_max_replies_per_topic} svar per emne.
-
       Fremfor å legge inn nok et svar kan du vurdere å redigere dine tidligere svar eller delta i andre diskusjoner.
     reviving_old_topic: |
-      ### Gjenoppliv dette emnet?
-
       Det siste innlegget er nå mer enn %{days} dager gammelt. Svaret ditt vil bumpe emnet opp til toppen av listen og vil varsle alle som tidligere har vært involvert i samtalen.
-
       Er du sikker du vil fortsette denne gamle samtalen?
   activerecord:
     attributes:
@@ -191,6 +179,7 @@ nb_NO:
       user_profile:
         bio_raw: "Om meg"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -211,7 +200,6 @@ nb_NO:
           attributes:
             hex:
               invalid: "er ikke en gyldig farge"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Om meg-feltet på din profil er for øyeblikket blankt, <a href='/users/%{username_lower}/preferences/about-me'>ønsker du å fylle det ut?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} har ikke skrevet noe i Om meg-feltet på sin profil ennå</div>"
@@ -224,26 +212,18 @@ nb_NO:
   assets_topic_body: "Dette er et permanent emne, synlig bare for staben, for å lagre bilder of filer brukt i designet på siden. Ikke slett det!\n\n\nHvordan legge til nye filer:\n\n\n1. Svar på dette emnet.\n2. Last opp alle bilder du vil bruke, som logoer, favicons osv. (Bare dra bildene inn i skrivefeltet, eller bruk knappen for opplasting.)\n3. Send ditt svar.\n4. Høyrklikk bildene i din nye post for å få lenken til de opplastede bildene, eller klikk på redigeringsikonet for å kopiere lenkene fra skrivefeltet.\n5. Lim disse lenkene inn i [basic settings](/admin/site_settings/category/required).\n\n\nHvis du trenger å tillate andre filtyper, rediger `authorized_extensions` i [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Velkommen til Salongen"
-    body: |2
+    body: |
-
       Gratulerer! :confetti_ball:
-
       Hvis du kan se dette emnet har du nylig blitt promotert til **trofast** (tillitsnivå 3).
-
       Du kan nå &hellip;
-
       * Redigere tittelen på alle emner
       * Endre kategorien på alle emner
       * Få lenkene dine fulgt opp ([automatisk nofollow](http://en.wikipedia.org/wiki/Nofollow) er fjernet)
       * Tilgang til en privat Lounge kategori bare synlig for brukere med tillitsnivå 3 eller høyere.
       * All spam du flagger vil bli gjemt umiddelbart.
-
       Her er den [oppdaterte listen over andre "trofaste"](/badges/3/regular). Si gjerne hei!
-
       Takk for at du er en aktiv del av fellesskapet vårt.
-
       (For mer informasjon om tillitsnivå, [see dette emnet][trust]. Vennligst merk at bare medlemmer som fortsetter å oppfylle kravene over tid vil forbli *trofaste*.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Om kategorien %{category} "
@@ -425,18 +405,6 @@ nb_NO:
       message:
         make: "Dette emnet er nå en banner. Det vil vises på toppen av hver side til brukeren lukker det."
         remove: "Dette emnet er ikke lenger en banner. Det vil ikke lenger vises på toppen av hver side."
-  unsubscribed:
-    title: 'Avmeldt'
-    description: "Du har avsluttet ditt abonnement. Vi vil ikke kontakte deg igjen!"
-    oops: "I tilfelle du ikke mente å gjøre dette, klikk nedenfor."
-    error: "Feil ved avmelding"
-    preferences_link: "Du kan også velge å ikke mota sammendrag eposten på dine <a href='/my/preferences'>instillinger</a>"
-    different_user_description: "Du er logget inn som en annen bruker enn den emailen ble sendt til. Vær så snill og logg ut og prøv igjen."
-    not_found_description: "Beklager, men vi kan ikke avmelde deg. Det er mulig at linken i din email har gått ut på dato."
-  resubscribe:
-    action: "Abonnere igjen"
-    title: "Abonnerer igjen!"
-    description: "Du har begynt ditt abonnement igjen. "
   reports:
     visits:
       title: "Brukerbesøk"
@@ -569,7 +537,6 @@ nb_NO:
       yaxis: "Antall besøk"
   dashboard:
     rails_env_warning: "Serveren din kjører i %{env] modus."
-    ruby_version_warning: "Du kjører en versjon av Ruby 2.0.0 som er kjent for å ha problemer. Oppgrader derfor til patch level 247 eller senere."
     host_names_warning: "Din config/database.yml fil bruker standard localhost hostnavn. Venligst legg inn ditt ønskede hostnavn"
     memory_warning: 'Serveren din kjører med mindre enn 1 GB med minne. Minst 1 GB RAM er anbefalt.'
     title_nag: "Oppgi navnet på nettstedet. Oppdater tittelen under <a href='/admin/site_settings'>Nettstedinstillinger</a>."
@@ -626,11 +593,6 @@ nb_NO:
     errors:
       invalid_email: "Ugyldig e-mail adresse"
       invalid_string: "Ugyldig verdi"
-  notification_types:
-    mentioned: "%{display_username} neonate deg i %{link}"
-    liked: "%{display_username} like innlegget ditt i %{link}"
-    private_message: "%{display_username} sendte deg en melding: %{link}"
-    invited_to_private_message: "%{display_username}inviterte deg til en samtale: %{link}"
   search:
     types:
       category: 'Kategorier'
@@ -693,8 +655,6 @@ nb_NO:
     deferred: "Takk for at du sier ifra. Vi ser på saken. "
     deferred_and_deleted: "Takk for at du sier ifra. Vi har fjernet innlegget. "
   system_messages:
-    post_hidden:
-      subject_template: "Innlegg skjult grunnet fellesskaps varslinger"
     welcome_user:
       subject_template: "Velkommen til %{site_name}!"
     welcome_invite:
@@ -705,7 +665,6 @@ nb_NO:
       new_activity: "Ny aktivitet rundt dine emner og innlegg:"
       top_topics: "Populære innlegg"
       other_new_topics: "Populære emner"
-      unsubscribe: "Dette sammendraget er sent fra %{site_link} siden vi ikke har sett deg på en stund. For å melde deg av %{unsubscribe_link}."
       click_here: "trykk her"
       read_more: "Les Mer"
       more_topics_category: "Flere nye emner:"
@@ -713,14 +672,12 @@ nb_NO:
       subject_template: "[%{site_name}] Din Nye Konto"
       text_body_template: |
         En ny konto ble registrert for deg på %{site_name}
-
         Trykk på følgende link for å velge et passord for kontoen din:
         %{base_url}/users/password-reset/%{email_token}
     signup:
       subject_template: "[%{site_name}] Bekreft din nye konto"
       text_body_template: |
         Velkommen til %{site_name}!
-
         Trykk på denne lenken for å aktivere kontoen din:
         %{base_url}/users/activate-account/%{email_token}
   page_not_found:
@@ -730,7 +687,6 @@ nb_NO:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Velkommen til %{title}](#welcome)
       En bruker er påkrevd. Lag en bruker eller logg inn for å fortsette.
   terms_of_service:
     title: "Betingelser"
@@ -754,6 +710,3 @@ nb_NO:
   csv_export:
     boolean_yes: "Ja"
     boolean_no: "Nei"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.nl.yml

@@ -15,9 +15,14 @@ nl:
       short: "%d-%m-%Y"
       short_no_year: "%-d %B"
       date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
   date:
     month_names: [null, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november, december]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+    am: "am"
+    pm: "pm"
   title: "Discourse"
   topics: "Topics"
   posts: "berichten"
@@ -30,19 +35,23 @@ nl:
   emails:
     incoming:
       default_subject: "Inkomende email van %{email}"
+      show_trimmed_content: "Toon getrimde inhoud"
+      maximum_staged_user_per_email_reached: "Het maximum aantal staged gebruikers dat per e-mail wordt aangemaakt is bereikt."
       errors:
         empty_email_error: "Gebeurt wanneer de mail die wij ontvangen hebben leeg is."
-        no_message_id_error: "Gebeurt wanneer de mail geen  'Message-Id' header heeft."
+        no_message_id_error: "Gebeurt wanneer de mail geen 'Message-Id' header heeft."
         auto_generated_email_error: "Gebeurt wanneer de 'voorrang' header is ingesteld op: lijst, ongewenst, bulk of automatisch auto_reply, of wanneer een andere header bevat: auto-submitted, auto-replied of auto-generated."
-        inactive_user_error: "Gebeurt wanneer de zender niet actief is."
+        no_body_detected_error: "Gebeurt wanneer er geen body uit de mail gehaald kan worden, en er geen bijlagen gevonden worden."
-        blocked_user_error: "Gebeurt wanneer de zender is geblokkeerd."
+        inactive_user_error: "Gebeurt wanneer de afzender niet actief is."
+        blocked_user_error: "Gebeurt wanneer de afzender is geblokkeerd."
         bad_destination_address: "Gebeurt wanneer geen van de E-mail adressen in de To/Cc/Bcc velden gelijk zijn aan de geconfigureerde inkomende E-mail adressen."
         strangers_not_allowed_error: "Gebeurt wanneer een gebruiker heeft geprobeerd een nieuw topic aan te maken in een categorie waar zijn geen lid van zijn."
         insufficient_trust_level_error: "Gebeurt als een gebruiker heeft geprobeerd om een nieuw topic aan te maken in een categorie waarvoor hij niet het benodigde vertrouwensniveau heeft."
         reply_user_not_matching_error: "Gebeurt wanneer een reactie kwam van een ander E-mail adres dan waar de notificatie was heen gestuurd. "
         topic_not_found_error: "Gebeurt wanneer een reactie binnen kwam, maar het topic al is verwijdert."
         topic_closed_error: "Gebeurt wanneer een reactie binnen kwam, maar het verwante topic is gesloten."
-        auto_generated_email_reply: "Email bevat een antwoord naar een automatisch gegenereerd bericht."
+        bounced_email_error: "E-mail is een gebounced e-mailrapport."
+        screened_email_error: "Gebeurt wanneer het e-mailadres van de verzender al gescreend was."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -96,6 +105,9 @@ nl:
       max_username_length_range: "Je kan het maximum niet lager instellen dan het minimun."
       default_categories_already_selected: "Je kan geen categorie selecteren die wordt gebruikt in een andere lijst."
       s3_upload_bucket_is_required: "U kunt niet de uploads van de S3 toestaan totdat u de 's3_upload_bucket' hebt verleend."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Het bestand moet in csv- of txt-formaat zijn."
   backup:
@@ -106,8 +118,8 @@ nl:
   not_found: "De opgevraagde URL of resource kan niet gevonden worden."
   invalid_access: "Je hebt geen permissie om de opgevraagde resource te bekijken."
   read_only_mode_enabled: "De site is in read only modus. Interactie is niet mogelijk."
-  reading_time: "leestijd"
+  reading_time: "Leestijd"
-  likes: "'Vind ik leuks' "
+  likes: "Likes"
   too_many_replies:
     one: "Sorry, nieuwe gebruikers mogen één reactie plaatsen in hetzelfde topic."
     other: "Sorry, nieuwe gebruikers mogen %{count} reacties plaatsen in hetzelfde topic."
@@ -165,19 +177,27 @@ nl:
   rss_description:
     latest: "Nieuwste topics"
     hot: "Hot topics"
-    top: "Top topics"
+    top: "Populaire topics"
     posts: "Nieuwste berichten"
-    private_posts: "Laatste privé berichten"
+    private_posts: "Recente privé-berichten"
-    group_posts: "Meest recente posts van %{group_name}"
+    group_posts: "Meest recente berichten van %{group_name}"
+    group_mentions: "Laatste vermeldingen van %{group_name}"
+    user_posts: "Laatste berichten van @%{username}"
+    user_topics: "Laatste topics van @%{username}"
     tag: "Gemarkeerde onderwerpen"
   too_late_to_edit: "Dat bericht is lang geleden geschreven. Het kan niet meer gewijzigd of verwijderd worden."
+  revert_version_same: "De huidige versie is dezelfde als de versie waar je naar probeert terug te draaien."
   excerpt_image: "afbeelding"
   queue:
     delete_reason: "Verwijderd via de bericht moderatie wachtrij"
   groups:
     errors:
+      can_not_modify_automatic: "Je kunt automatische groepen niet wijzigen"
       member_already_exist: "'%{username}' is al lid van deze groep."
       invalid_domain: "%{domain}' is geen geldig domein."
+      invalid_incoming_email: "%{email}' is geen geldig e-mailadres."
+      email_already_used_in_group: "'%{email}' wordt al gebruikt door de groep '%{group_name}'."
+      email_already_used_in_category: "'%{email}' wordt al gebruikt door de categorie '%{category_name}'."
     default_names:
       everyone: "iedereen"
       admins: "admins"
@@ -192,62 +212,47 @@ nl:
     until_posts:
       one: "één bericht"
       other: "%{count} berichten"
-    new-topic: |
+    'new-topic': |
       Welkom op %{site_name} &mdash; **bedankt voor het starten van een nieuwe conversatie!**
-
       - Klink de titel interessant als je deze hardop leest? Is het een goede samenvatting?
-
       - Wie zou hier in geïnteresseerd zijn? Waarom is het van belang? Wat voor reacties verwacht je te krijgen?
-
       - Gebruik algemeen gebruikte steekwoorden zodat anderen je topic kunnen *vinden*. Selecteer een categorie om je topic te groeperen met gerelateerde topics.
-
       Voor meer informatie, [bekijk onze gemeenschaps-regels](/guidelines). Dit paneel verschijnt alleen bij je eerste %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Welkom op %{site_name} &mdash; **bedankt voor het deelnemen aan de conversatie!**
-
       - Geeft je reactie een nuttige bijdrage aan de conversatie, hoe klein dan ook?
-
       - Wees aardig voor de andere leden.
-
       - Je mag best kritisch zijn, maar onthoud dat je kritiek moet geven op *ideeën*, niet op mensen.
-
       Voor meer informatie, [bekijk onze regels](/guidelines). Deze tekst zal alleen verschijnen bij je eerste %{education_posts_text}.
-    avatar: "### Hoe lijkt het je om een foto te gebruiken voor je account?\n\nJe heb al een aantal topics en reacties geplaatst, maar je profielfoto is nog niet zo uniek als jij zelf -- het is maar een letter. \n\nHeb je overwogen **[visiting your user profile](%{profile_path})** en een foto die weergeeft wie jij bent te uploaden?\n\nHet is gemakkelijker om discussies en interessante personen in conversaties te volgen als iedereen een unieke profielfoto heeft!\n"
+    avatar: |
+      Je heb al een aantal topics en reacties geplaatst, maar je profielfoto is nog niet zo uniek als jij zelf -- het is maar een letter.
+      Heb je overwogen **[visiting your user profile](%{profile_path})** en een foto die weergeeft wie jij bent te uploaden?
+      Het is gemakkelijker om discussies en interessante personen in conversaties te volgen als iedereen een unieke profielfoto heeft!
     sequential_replies: |
-      ### Overweeg om op meerdere berichten ineens te reageren
-
       In plaatst van een reactie per bericht te plaatsten, kan je ook meerdere berichten ineens citeren en @namen noemen in je reactie.
-
       Je kan je vorige reactie wijzigen en er een citaat aan toevoegen door de betreffende tekst te selecteren en op de <b>citeer</b> knop te drukken die dan verschijnt.
-
       Het is voor iedereen makkelijker om topics te lezen met minder losstaande reacties.
     dominating_topic: |
-      ### Laat anderen meedoen in de conversatie
-
       Deze topic is duidelijk belangrijk voor je &ndash; meer dan %{percent}% van de reacties zijn van jou.
-
       Hou je in de gaten dat anderen ook de ruimte krijgen om hun visie te geven?
     too_many_replies: |
-      ### Je hebt de reactielimiet voor deze topic bereikt
-
       Sorry, maar nieuwe gebruikers mogen tijdelijk niet meer dan %{newuser_max_replies_per_topic} reacties plaatsen in het desbetreffende topic.
-
       Overweeg een eerdere reactie te wijzigen in plaats van nog een nieuwe reactie te plaatsen.
     reviving_old_topic: |
-      ### Oude topic weer ophalen?
-
       De laatste reactie op dit bericht was meer dan %{days} dagen geleden. Als je nu een reactie plaatst, zal deze topic weer bovenaan de lijst verschijnen en zal iedereen die meedeed aan deze topic bericht krijgen.
-
       Weet je zeker dat je verder wil gaan met deze oude topic?
   activerecord:
     attributes:
       category:
         name: "Naam categorie"
+      topic:
+        title: 'Titel'
       post:
         raw: "Inhoud"
       user_profile:
         bio_raw: "Over mij"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -268,7 +273,6 @@ nl:
           attributes:
             hex:
               invalid: "is niet een geldige kleur"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Het Over Mij-profielveld is nog leeg, <a href='/users/%{username_lower}/preferences/about-me'>zou je deze willen invullen?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} heeft nog niks in zijn of haar Over Mij-profielveld ingevuld</div>"
@@ -281,26 +285,18 @@ nl:
   assets_topic_body: "Dit is een permanent topic, dat alleen zichtbaar is voor de staf, en dient als opslag voor afbeeldingen en documenten die worden gebruikt in het design van de site . Gooi deze niet weg!\n\n\nHoe het werkt:\n\n\n1. Antwoord op dit topic.\n2. Upload hier alle afbeeldingen die je wenst te gebruiken als logo's, favicons enzovoort. (Gebruik het upload icoon in de toolbar, sleep afbeeldingen, of plak afbeeldingen.)\n3. Verzend je bericht om het te posten.\n4. Klik met de rechtermuisknop op de afbeeldingen in je nieuwe bericht om het pad naar de geüploade afbeelding te verkrijgen, of klik het bewerken icoon om je bericht te wijzigen en zo het pad naar de afbeeldingen te verkrijgen. Kopieer het pad naar de afbeeldingen.\n5. Plak deze paden naar de afbeeldingen in [basic settings](/admin/site_settings/category/required).\n\n\nAls je andere bestandstypen wilt kunnen uploaden, moet je dit instellen in `authorized_extensions` in de [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Welkom in de Lounge"
-    body: |2
+    body: |
-
       Gefeliciteerd! :confetti_ball:
-
       Als je dit bericht kunt zien ben je recent gepromoveerd naar **Vaste bezoeker** (trust level 3).
-
       Je kunt nu &hellip;
-
       * De titel wijzigen van ieder topic
       * De categorie wijzigen van ieder topic
       * Al je links worden gevolgd ([automatische nofollow](http://en.wikipedia.org/wiki/Nofollow) is verwijderd)
       * De privé-lounge categorie in welke alleen zichtbaar is voor gebruikers op trust level 3 en hoger
       * Spam verbergen met een enkele vlag
-
       Hier is de [huidige lijst van vaste bezoekers](/badges/3/regular). Zeg zeker even hallo.
-
       Bedankt dat je een belangrijk onderdeel bent van deze gemeenschap!
-
       (Voor meer informatie over trust levels, [bekijk dit topic][trust]. Wees wel bewust dat alleen leden die blijven voldoen aan de voorwaarden vaste gebruikers blijven.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Over de categorie %{category}"
@@ -310,6 +306,9 @@ nl:
       uncategorized_parent: "Ongecategoriseerd kan geen bovenliggende categorie hebben"
       self_parent: "Een categorie kan niet zijn eigen bovenliggende categorie zijn"
       depth: "Je kan een subcategorie niet onder een andere subcategorie plaatsen"
+      invalid_email_in: "'%{email}' is geen geldig e-mailadres."
+      email_already_used_in_group: "'%{email}' wordt al gebruikt door de groep '%{group_name}'."
+      email_already_used_in_category: "'%{email}' wordt al gebruikt door de categorie '%{category_name}'."
     cannot_delete:
       uncategorized: "De categorie Ongecategoriseerd kan niet verwijderd worden"
       has_subcategories: "Deze categorie kan niet verwijderd worden, omdat deze subcategorieën bevat"
@@ -440,6 +439,10 @@ nl:
     confirmed: "Je e-mailadres is aangepast."
     please_continue: "Ga verder naar %{site_name}"
     error: "Er ging iets mis bij het wijzigen van je e-mailadres. Wellicht is deze al in gebruik?"
+    error_staged: "Er ging iets mis bij het wijzigen van je e-mailadres. Het adres is reeds in gebruik door een staged gebruiker."
+    authorizing_old:
+      title: "Dank voor het bevestigen van je e-mailadres"
+      description: "We sturen nu ter bevestiging een e-mail naar je nieuwe adres."
   activation:
     action: "Klik hier om je account te activeren"
     already_done: "Sorry, de link om je account te activeren is niet langer geldig. Wellicht is je account al geactiveerd?"
@@ -513,17 +516,10 @@ nl:
         make: "Dit topic is nu een banner. Het zal bovenaan elke pagina verschijnen totdat het is weggeklikt door de gebruiker."
         remove: "Dit topic is geen banner meer. Het zal niet meer bovenaan elke pagina verschijnen."
   unsubscribed:
-    title: 'Uitgeschreven'
+    title: "Afgemeld!"
-    description: "Je hebt je uitgeschreven. Je krijgt geen mails meer van ons!"
+  unsubscribe:
-    oops: "Als dat niet de bedoeling was, klik dan hieronder."
+    title: "Afmelden"
-    error: "Fout bij afmelden"
+    log_out: "Uitloggen"
-    preferences_link: "U kunt zich ook uitschrijven voor de verzamel emails op uw <a href='/my/preferences'>voorkeuren pagina</a>"
-    different_user_description: "Je bent op het ogenblik ingelogd als een andere gebruiker dan degene aan wie de digest gemaild is. Log a.u.b. uit en probeer opnieuw."
-    not_found_description: "Sorry, we hebben je niet uit kunnen schrijven. Het is mogelijk dat de link in je e-mail is verlopen."
-  resubscribe:
-    action: "Opnieuw inschrijven"
-    title: "Opnieuw ingeschreven!"
-    description: "Je bent opnieuw ingeschreven."
   reports:
     visits:
       title: "Bezoeken"
@@ -658,7 +654,6 @@ nl:
       yaxis: "Aantal bezoeken"
   dashboard:
     rails_env_warning: "Je server draait in %{env} modus."
-    ruby_version_warning: "Je gebruikt een versie van Ruby 2.0.0 die wel vaker problemen geeft. Upgrade naar patch level 247 of later."
     host_names_warning: "Het bestand config/database.yml heeft localhost als standaard hostname. Verander dat in de hostname van je site."
     gc_warning: 'Je server gebruikt de standaard ruby garbage collection instellingen, en daarmee krijg je niet de beste prestaties. Lees deze topic over instellingen voor prestaties: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq draait niet. Veel taken, zoals het versturen van e-mails, worden asynchroon uitgevoerd door sidekiq. Zorg ervoor dat er altijd een sidekiq process draait. <a href="https://github.com/mperham/sidekiq">Hier is meer informatie over sidekiq</a>.'
@@ -742,13 +737,9 @@ nl:
     anon_polling_interval: "Hoe vaak een anonieme client een 'poll' moet uitvoeren in milliseconden"
     background_polling_interval: "Hoe vaak zouden de clients moeten pollen in milliseconden (als het venster in de achtergrond staat)"
     cooldown_minutes_after_hiding_posts: "Het aantal minuten dat een gebruiker moet wachten voordat zij een door de gemeenschap verborgen bericht kunnen wijzigen"
-    max_topics_in_first_day: "Het maximum aantal topics dat een gebruiker mag maken tijdens hun eerste dag op de site"
-    max_replies_in_first_day: "Het maximum aantal reacties dat een gebruiker mag schrijven tijdens hun eerste dag op de site"
     tl2_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl2 (lid) door te vermenigvuldigen met dit getal"
     tl3_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl3 (vaste bezoeker) door te vermenigvuldigen met dit getal"
     tl4_additional_likes_per_day_multiplier: "Verhoog de limiet van likes per dag voor tl4 (leider) door te vermenigvuldigen met dit getal"
-    num_flags_to_block_new_user: "Als de berichten van een nieuwe gebruiker dit aantal spammarkeringen krijgen van num_users_to_block_new_user verschillende gebruikers, verberg dan alle berichten van deze gebruiker en houdt nieuwe berichten tegen. 0 om deze mogelijkheid uit te zetten."
-    num_users_to_block_new_user: "Als de berichten van een nieuwe gebruiker num_flags_to_block_new_user spammarkeringen krijgen van zoveel andere gebruikers, verberg dan alle berichten van deze gebruiker en houdt nieuwe berichten tegen. 0 om deze mogelijkheid uit te zetten."
     notify_mods_when_user_blocked: "Als een gebruiker automatisch geblokkeerd is, stuur dan een bericht naar alle moderatoren."
     flag_sockpuppets: "Als een nieuwe gebruiker antwoord op een topic vanaf hetzelfde ip-adres als de nieuwe gebruiker die het topic opende, markeer dan beide berichten als potentiële spam."
     traditional_markdown_linebreaks: "Gebruik traditionele regeleinden in Markdown, welke 2 spaties aan het einde van een regel nodig heeft voor een regeleinde."
@@ -951,6 +942,8 @@ nl:
     strip_images_from_short_emails: "Verwijder afbeeldingen met grootte van minder dan 2800 Bytes uit e-mails."
     short_email_length: "Korte e-mail lengte in Bytes"
     display_name_on_email_from: "Toon de volledige naam in het afzenderveld van e-mails."
+    enable_staged_users: "Maak automatisch staged gebruikers aan bij het verwerken van inkomende e-mails."
+    maximum_staged_users_per_email: "Het maximum aantal staged gebruikers dat bij het verwerken van een inkomende e-mail wordt aangemaakt, is bereikt."
     pop3_polling_enabled: "Poll via POP3 voor antwoorden per e-mail."
     pop3_polling_ssl: "Gebruik SSL bij de verbinding naar de POP3 server. (Aanbevolen)"
     pop3_polling_period_mins: "De periode in minuten tussen controleren van het POP3 account voor e-mail. LET OP: vereist een herstart."
@@ -975,10 +968,6 @@ nl:
     allow_animated_thumbnails: "Genereer bewegende miniaturen van bewegende gifs."
     default_avatars: "URL's naar standaard te gebruiken avatars voor nieuwe gebruikers, totdat ze deze veranderen."
     automatically_download_gravatars: "Download Gravatars voor gebruikers bij account creatie of aanpassing van email."
-    digest_topics: "Het maximum aantal topics dat in de e-maildigest opgenomen wordt."
-    digest_min_excerpt_length: "Hoeveel karakters er per bericht getoond worden in de mail digest"
-    delete_digest_email_after_days: "Blokkeer e-mails met periodieke samenvattingen voor gebruikers die al meer dan (n) dagen niet meer op de site zijn gezien."
-    disable_digest_emails: "Uitschakelen e-mails met korte verslagen voor alle gebruikers."
     detect_custom_avatars: "Wel of niet te verifiëren of gebruikers eigen profielfoto's hebben geüpload.  "
     max_daily_gravatar_crawls: "Maximaal aantal keren op een dag dat Discourse Gravatar zal controleren voor aangepaste avatars"
     public_user_custom_fields: "Een toegestane lijst van veldnamen voor een gebruiker dat publiekelijk kan worden getoond."
@@ -992,6 +981,7 @@ nl:
     sequential_replies_threshold: "Aantal berichten dat een gebruiker achter elkaar in één topic moet plaatsen voordat hij een melding krijgt over te veel opeenvolgende reacties."
     enable_mobile_theme: "Mobiele apparaten gebruiken een mobiel-vriendelijke theme met de mogelijkheid te schakelen naar de volledige site. Schakel deze optie uit als je een eigen stylesheet wil gebruiken die volledig responsive is."
     dominating_topic_minimum_percent: "Welk percentage van de berichten een gebruiker moet maken in een onderwerp voordat ze worden herinnerd aan het te veel domineren van een topic."
+    daily_performance_report: "Analyseer elke dag NGINX logs en post een Alleen Voor Medewerkers topic met de details"
     suppress_uncategorized_badge: "Laat de badge niet zien voor topics zonder categorie in de topiclijsten."
     global_notice: "Laat een LET OP, BELANGRIJK-banner zien aan alle gebruikers. Laat leeg om niet te tonen (HTML is toegestaan)."
     disable_edit_notifications: "Schakelt bewerkingsnotificaties van de systeemgebruiker uit als 'download_remote_images_to_local' actief is."
@@ -1026,7 +1016,6 @@ nl:
     enforce_square_emoji: "Forceer een vierkant aspect ratio bij alle emojis."
     approve_post_count: "Het aantal berichten van een nieuwe of normale gebruiker dat moet worden goedgekeurd"
     approve_unless_trust_level: "Posts voor gebruikers onder dit vertrouwensniveau moeten worden goedgekeurd"
-    default_email_digest_frequency: "Hoe vaak ontvangen gebruikers standaard een samenvattings-e-mails."
     default_email_private_messages: "Stuur standaard een e-mail als iemand de gebruiker bericht."
     default_email_direct: "Stuur standaard een e-mail wanneer iemand de gebruiker citeert/beantwoordt/vermeldt of uitnodigt."
     default_email_mailing_list_mode: "Stuur standaard een email voor elk nieuw bericht."
@@ -1037,6 +1026,7 @@ nl:
     default_other_enable_quoting: "Citeer antwoord standaard inschakelen voor gemarkeerde tekst."
     default_other_dynamic_favicon: "Toon standaard een teller van nieuwe/bijgewerkte topics op browser icoon."
     default_other_disable_jump_reply: "Spring standaard niet naar de gebruiker post nadat ze hebben geantwoord."
+    default_other_edit_history_public: "Maak standaard de aanpassingen aan de post openbaar."
     default_other_like_notification_frequency: "Stuur gebruikers standaard een bericht bij een like"
     default_topics_automatic_unpin: "Standaard automatisch topics ontpinnen wanneer de gebruiker het einde van de pagina heeft bereikt."
     default_categories_watching: "Lijst van categorieën die standaard worden bekeken."
@@ -1056,19 +1046,6 @@ nl:
       invalid_string_min: "Moet te minste uit %{min} tekens bestaan."
       invalid_string_max: "Mag uit niet meer dan %{max} tekens bestaan."
       invalid_reply_by_email_address: "Waarde moet '%{reply_key}' bevatten en moet afwijken van de e-mail notificatie."
-  notification_types:
-    mentioned: "%{display_username} heeft je genoemd in %{link}"
-    liked: "%{display_username} vond je bericht in %{link} leuk"
-    replied: "%{display_username} reageerde op je bericht in %{link}"
-    quoted: "%{display_username} heeft je bericht geciteerd in %{link}"
-    edited: "%{display_username} bewerkte je bericht in %{link}"
-    posted: "%{display_username} heeft een bericht geplaatst in %{link}"
-    moved_post: "%{display_username} verplaatste je bericht naar %{link}"
-    private_message: "%{display_username} heeft je een bericht gestuurd: %{link}"
-    invited_to_private_message: "%{display_username} heeft je uitgenodigd voor een bericht: %{link}"
-    invitee_accepted: "%{display_username} heeft je uitnodiging geaccepteerd"
-    linked: "%{display_username} heeft je gelinkt in %{link}"
-    granted_badge: "%{link} is aan jou toegekend"
   search:
     within_post: "#%{post_number} door %{username}"
     types:
@@ -1175,51 +1152,28 @@ nl:
     text_body_template: |
       Iemand (jij misschien?) heeft verzocht om op dit adres niet langer e-mails met nieuws van %{site_domain_name} te ontvangen.
       Klik op de volgende link als je dit wil bevestigen:
-
       %{confirm_unsubscribe_link}
-
-
       Als je deze e-mails wel wil blijven ontvangen, kan je deze e-mail negeren.
   invite_mailer:
     subject_template: "%{invitee_name} nodigt je uit voor '%{topic_title}' op %{site_domain_name}"
     text_body_template: |
       %{invitee_name} nodigt je uit voor een discussie
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       op
-
       > %{site_title} -- %{site_description}
-
       Ben je geïnteresseerd, klik dan op de onderstaande link:
-
       %{invite_link}
-
       Deze uitnodiging komt van een vertrouwde gebruiker, je kunt direct deelnemen aan de discussie.
   invite_forum_mailer:
     subject_template: "%{invitee_name} heeft je uitgenodigd voor %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} nodigt je uit voor
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Ben je geïnteresseerd, klik dan op de onderstaande link:
-
-      %{invite_link}
-
-      Deze uitnodiging is van een vertrouwde gebruiker, het is daarom niet nodig om in te loggen.
   invite_password_instructions:
     subject_template: "Geeft wachtwoord voor je %{site_name} account"
     text_body_template: |
       Bedankt voor het accepteren van je uitnodiging bij %{site_name} -- welkom!
-
       Klik deze link om nu een wachtwoord te kiezen:
       %{base_url}/users/password-reset/%{email_token}
-
       (Als bovenstaande link is verlopen, kies dan "Ik ben mijn wachtwoord vergeten" tijdens het inloggen met je e-mail adres.)
   test_mailer:
     subject_template: "[%{site_name}] E-mail Bezorgtest"
@@ -1231,10 +1185,6 @@ nl:
     subject_template:
       one: "[%{site_name}] 1 bericht wacht op beoordeling"
       other: "[%{site_name}] %{count} berichten wachten op beoordeling"
-    text_body_template: |
-      Hallo,
-
-      Er zijn berichten van nieuwe gebruikers die nog moeten worden beoordeeld. [Ze kunnen hier worden goedgekeurd of afgekeurd] (% {base_url}/queued-posts).
   flag_reasons:
     off_topic: "Je bericht is gemarkeerd als **off-topic**: de gemeenschap meent het niet goed past bij het onderwerp, zoals momenteel bepaald door de titel en de eerste post."
     inappropriate: "Je bericht is gemarkeerd als **ongepast**: de gemeenschap vindt het bericht beledigend, grof, of een schending van [onze gemeenschapsrichtlijnen](/guidelines)."
@@ -1248,8 +1198,6 @@ nl:
     deferred_and_deleted: "Bedankt dat je het ons hebt laten weten. We hebben het bericht verwijderd."
   temporarily_closed_due_to_flags: "Dit topic is tijdelijk gesloten vanwege een groot aantal vlaggen vanuit de gebruikersgroep"
   system_messages:
-    post_hidden:
-      subject_template: "Bericht van %{site_name}: je bericht is verborgen wegens meldingen uit de community"
     welcome_user:
       subject_template: "Welkom bij %{site_name}!"
     welcome_invite:
@@ -1260,9 +1208,7 @@ nl:
       subject_template: "Backup mislukt"
       text_body_template: |
         De backup is mislukt.
-
         Hier is het log:
-
         ```
         %{logs}
         ```
@@ -1287,41 +1233,32 @@ nl:
       subject_template: "[%{site_name}] E-mailprobleem -- Gebruiker inactief"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         Het account dat bij dit e-mailadres hoort, is niet geactiveerd. Je moet je account activeren voordat je e-mails instuurt.
     email_reject_blocked_user:
       subject_template: "[%{site_name}] E-mailprobleem -- Geblokkeerde gebruiker"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         Het account dat bij dit e-mailadres hoort, is geblokkeerd.
     email_reject_reply_user_not_matching:
       subject_template: "[%{site_name}] E-mailprobleem -- Reagerende gebruiker komt niet overeen"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         Je reactie werd verstuurd van een ander e-mailadres dan we verwacht hadden, dus we weten niet zeker of dit dezelfde persoon is. Probeer de e-mail vanaf een ander adres te sturen, of neem contact op met de staf.
     email_reject_no_account:
       subject_template: "[%{site_name}] E-mailprobleem -- Onbekende account"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         We konden geen accounts vinden die overeenkomen met je e-mailadres. Probeer de e-mail van een ander adres te sturen, of neem contact op met de staf.
     email_reject_empty:
       subject_template: "[%{site_name}] E-mailprobleem -- Geen inhoud"
-      text_body_template: |+
+      text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         We konden geen bruikbare tekst in je e-mail vinden.
-
         Als je deze melding krijgt en _wel_ een reactie had gestuurd, kan je het opnieuw proberen met een eenvoudigere opmaak.
-
-
     email_reject_parsing:
       subject_template: "[%{site_name}] E-mailprobleem -- Inhoud niet herkend"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         We konden je reactie niet in je e-mail vinden. **Zorg ervoor dat je reactie bovenaan de e-mail staat**, we kunnen ingebedde reacties niet verwerken.
     email_reject_invalid_access:
       subject_template: "[%{site_name}] E-mailprobleem -- Ongeldige toegang"
@@ -1331,41 +1268,32 @@ nl:
       subject_template: "[%{site_name}] E-mailprobleem -- Foutmelding bij het plaatsen"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         Dit kan bijvoorbeeld komen door complexe opmaak of door een te groot of te klein bericht. Probeer het opnieuw of plaats je bericht via de website als het nog steeds niet lukt.
     email_reject_invalid_post_specified:
       subject_template: "[%{site_name}] E-mailprobleem -- Foutmelding bij het plaatsen"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        Reden:
-
         %{post_error}
-
         Probeer het opnieuw als je het probleem kan oplossen.
     email_reject_rate_limit_specified:
       subject_template: "[%{site_name}] E-mailprobleem -- Gelimiteerde snelheid"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         Reden: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] E-mailprobleem -- Ongeldige plaatsingsactie"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         De plaatsingsactie werd niet herkend. Probeer het opnieuw of plaats je bericht via de website als het nog steeds niet lukt.
     email_reject_reply_key:
       subject_template: "[%{site_name}] E-mailprobleem -- Onbekende antwoordsleutel"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         De antwoordsleutel in de e-mail is ongeldig of onbekend, dus we weten niet waar deze e-mail een reactie op is. Neem contact op met de staf.
     email_reject_bad_destination_address:
       subject_template: "[%{site_name}] E-mailprobleem -- Onbekend bestemmingsadres"
       text_body_template: |
         Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
         Geen van de bestemmingsadressen werd herkend. Zorg ervoor dat je je e-mail naar het juiste door de staf verstrekte e-mailadres stuurt.
     email_reject_topic_not_found:
       subject_template: "[%{site_name}] E-mailprobleem -- Topic niet gevonden"
@@ -1375,8 +1303,6 @@ nl:
       subject_template: "[%{site_name}] E-mailprobleem -- Automatisch gegenereerde reactie"
     email_error_notification:
       subject_template: "[%{site_name}] Email probleem -- POP authenticatie fout"
-    user_automatically_blocked:
-      subject_template: "Nieuwe gebruiker %{username} geblokkeerd wegens meldingen van andere gebruikers"
     spam_post_blocked:
       subject_template: "Berichten van nieuwe gebruiker %{username} geblokkeerd vanwege herhaalde links"
     pending_users_reminder:
@@ -1385,7 +1311,6 @@ nl:
         other: "%{count} gebruikers wachten op goedkeuring"
       text_body_template: |
         Er zijn nieuwe gebruikers die zich hebben ingeschreven en wachten op goedkeuring (of afwijzing) voor zij het forum op kunnen.
-
         [Beoordeel deze gebruikers in het admingedeelte](/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Het downloaden van externe afbeeldingen is uitgeschakeld"
@@ -1412,13 +1337,10 @@ nl:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
     digest:
       why: "Een korte samenvatting van %{site_link} sinds we je voor het laatst zagen op %{last_seen_at}."
-      subject_template: "[%{site_name}] Digest"
       new_activity: "Nieuwe reacties op je topics en berichten:"
       top_topics: "Populaire berichten"
       other_new_topics: "Populaire topics"
-      unsubscribe: "Deze samenvatting wordt door %{site_link} verstuurd als we je een tijdje niet gezien hebben op onze site. Mocht je dit uit willen zetten of je e-mailvoorkeur willen veranderen, %{unsubscribe_link}."
       click_here: "klik hier"
-      from: "%{site_name} Digest"
       read_more: "Lees verder"
       more_topics: "Er waren %{new_topics_since_seen} andere nieuwe topics gepost."
       more_topics_category: "Meer nieuwe topics:"
@@ -1426,63 +1348,47 @@ nl:
       subject_template: "[%{site_name}] Wachtwoord herstellen"
       text_body_template: |
         Iemand heeft aangegeven je wachtwoord te willen herstellen op [%{site_name}](%{base_url}).
-
         Ben jij dit niet, dan kan je zonder problemen deze e-mail negeren.
-
         Klik op de volgende link om een nieuw wachtwoord te kiezen:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Stel wachtwoord in"
       text_body_template: |
         Iemand heeft verzocht een wachtwoord aan je account toe te voegen op [%{site_name}](%{base_url}). Je kan ook nog - indien geactiveerd - inloggen met een online service (Google, Facebook, etc) waar je met hetzelfde mailadres geregistreerd staat.
-
         Als je dit verzoek niet van jou kwam, kun je deze mail negeren.
-
         Klik op de volgende link om een wachtwoord in te stellen:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Login"
       text_body_template: |
         Iemand heeft geprobeerd om met je account op [%{site_name}](%{base_url}) in te loggen.
-
         Als jij het niet was, kan je deze e-mail gewoon negeren.
-
         Klik op de volgende link om in te loggen:
         %{base_url}/users/admin-login/%{email_token}
     account_created:
       subject_template: "[%{site_name}] Uw Nieuwe Account"
       text_body_template: |
         Er is een nieuw account voor je aangemaakt op  %{site_name}
-
         Klik op deze link om een wachtwoord in te stellen voor je nieuwe account:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "Je inschrijving op %{site_name} is geaccepteerd!"
       text_body_template: |
         Welkom op %{site_name}!
-
         Een staflid heeft je account op %{site_name} goedgekeurd.
-
         Klik op de volgende link om je nieuwe account te bevestigen en activeren:
         %{base_url}/users/activate-account/%{email_token}
-
         Als de bovenstaande link niet is aan te klikken, probeer deze dan te kopiëren en te plakken in de adresregel van je webbrowser.
-
         %{new_user_tips}
-
         Wij geloven in de volgende richtlijnen: [civilized community behavior](%{base_url}/guidelines)
-
         Veel plezier!
-
         (Als je contact wilt opnemen met [staff members](%{base_url}/about) als nieuwe gebruiker, stuur dan een reply op dit bericht.)
     signup:
       subject_template: "[%{site_name}] Bevestig je nieuwe account"
       text_body_template: |
         Welkom op %{site_name}!
-
         Klik op de volgende link om je nieuwe account te bevestigen en te activeren:
         %{base_url}/users/activate-account/%{email_token}
-
         Mocht je de bovenstaande link niet kunnen aanklikken, probeer deze dan te kopiëren en te plakken in de adresbalk van je web browser.
   page_not_found:
     title: "Oeps! Die pagina bestaat niet of is privé."
@@ -1493,7 +1399,6 @@ nl:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Welkom op %{title}](#welcome)
       Voor dit forum is een account nodig. Maak een account aan of log in om verder te gaan.
   terms_of_service:
     title: "Algemene Voorwaarden"
@@ -1504,7 +1409,7 @@ nl:
     unauthorized: "Sorry, je mag dat bestand niet uploaden (toegestane extensies: %{authorized_extensions})."
     pasted_image_filename: "Geplakte afbeelding"
     store_failure: "Het opslaan van upload #%{upload_id} voor gebruiker #%{user_id} is mislukt."
-    file_missing: "Sorry, maar je moet een bestand leveren om te uploaden."
+    file_missing: "Sorry, maar je moet een bestand selecteren om te uploaden."
     attachments:
       too_large: "Sorry, het bestand dat je wil uploaden is te groot (maximum grootte is %{max_size_kb}%KB)."
     images:
@@ -1550,12 +1455,7 @@ nl:
   discourse_hub:
     access_token_problem: "Licht een admin in: Gelieve de site instellingen bijwerken met de juiste discourse_org_access_key."
   performance_report:
-    initial_post_raw: Deze topic bevat dagelijkse performance rapporten van je site
+    initial_post_raw: Deze topic bevat dagelijkse performancerapporten van je site
-    initial_topic_title: Website performance rapporten
+    initial_topic_title: Performancerapportages van de website
   topic_invite:
-    user_exists: "Excuus, die gebruiker is al uitgenodigd. Je kan een gebruiker maar een keer voor een topic uitnodigen."
+    user_exists: "Sorry, die gebruiker is al uitgenodigd. Je kan een gebruiker maar een keer voor een topic uitnodigen."
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.pl_PL.yml

@@ -18,6 +18,8 @@ pl_PL:
   date:
     month_names: [null, Styczeń, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Październik, Listopad, Grudzień]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Tematy"
   posts: "wpisy"
@@ -87,6 +89,9 @@ pl_PL:
       max_username_length_range: "Nie możesz ustawić maksimum poniżej minimum."
       default_categories_already_selected: "Nie możesz wybrać kategorii użytej w innej liście."
       s3_upload_bucket_is_required: "Nie możesz wysyłać na S3 jeżeli nie podasz 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Wysłany plik powinien być w formacie CSV lub TXT."
   backup:
@@ -160,41 +165,35 @@ pl_PL:
       one: "1 wpis"
       few: "%{count} wpisy"
       other: "%{count} wpisów"
-    new-topic: "Witaj na %{site_name} &mdash; **dziękujemy za rozpoczęcie nowej dyskusji!**\n\n- Czy tytuł brzmi interesująco, gdy przeczytasz go na głos? Czy jest dobrym podsumowaniem treści?\n\n- Kto będzie tym zainteresowany? Dlaczego temat jest istotny?  Jakiego rodzaju odpowiedzi oczekujesz? \n\n- Postaraj się umieścić słowa kluczowe w tytule, dzięki czemu inni będą mogli łatwo *wyszukać* temat. Przypisz go do kategorii o pokrewnej tematyce. \n\nAby dowiedzieć się więcej, [zobacz przewodnik społeczności](/guidelines). Ten panel pojawi się tylko przy pierwszym %{education_posts_text}.\n\n\n"
+    'new-topic': |
-    new-reply: "Witaj na %{site_name} &mdash; **dziękujemy za zaangażowanie!**\n\n- Czy twoja odpowiedź wnosi coś pozytywnego do dyskusji?\n\n- Zachowuj się przyjaźnie w stosunku do innych.\n\n- Konstruktywna krytyka jest mile widziana, ale krytykujemy *pomysły*, a nie ludzi.\n\nWięcej informacji znajdziesz [w przewodniku społeczności](/guidelines). \nTen panel pojawi się tylko przy pisaniu pierwszych %{education_posts_text}.\n"
+      Witaj na %{site_name} &mdash; **dziękujemy za rozpoczęcie nowej dyskusji!**
+      - Czy tytuł brzmi interesująco, gdy przeczytasz go na głos? Czy jest dobrym podsumowaniem treści?
+      - Kto będzie tym zainteresowany? Dlaczego temat jest istotny?  Jakiego rodzaju odpowiedzi oczekujesz?
+      - Postaraj się umieścić słowa kluczowe w tytule, dzięki czemu inni będą mogli łatwo *wyszukać* temat. Przypisz go do kategorii o pokrewnej tematyce.
+      Aby dowiedzieć się więcej, [zobacz przewodnik społeczności](/guidelines). Ten panel pojawi się tylko przy pierwszym %{education_posts_text}.
+    'new-reply': |
+      Witaj na %{site_name} &mdash; **dziękujemy za zaangażowanie!**
+      - Czy twoja odpowiedź wnosi coś pozytywnego do dyskusji?
+      - Zachowuj się przyjaźnie w stosunku do innych.
+      - Konstruktywna krytyka jest mile widziana, ale krytykujemy *pomysły*, a nie ludzi.
+      Więcej informacji znajdziesz [w przewodniku społeczności](/guidelines).
+      Ten panel pojawi się tylko przy pisaniu pierwszych %{education_posts_text}.
     avatar: |
-      ### A może dodasz zdjęcie profilowe do swojego konta?
-
       Otworzyłeś kilka tematów i napisałeś kilka odpowiedzi, ale twoje zdjęcie profilowe nie jest tak niezwykłe jak ty - to tylko litera.
-
       Myślałeś o **[odwiedzeniu swojego profilu użytkownika](%{profile_path})** i załączeniu przedstawiającego cię zdjęcia?
-
       Kiedy każdy ma unikatowe zdjęcie profilowe, łatwiej jest obserwować dyskusje i znaleźć interesujących ludzi do rozmów!
     sequential_replies: |
-      ### Pomyśl o odpowiadaniu na kilka postów jednocześnie
-
       Zamiast kilku kolejnych odpowiedzi do tematu, pomyśl o pojedynczej odpowiedzi, która zawierałaby cytaty z wcześniejszych postów lub wzmianki @imię.
-
       Możesz edytować swoje wcześniejsze odpowiedzi, aby dodać cytat, poprzez podświetlenie tekstu i wybranie przycisku <b>quote reply</b>.
-
       Każdemu łatwiej będzie przeczytać temat, który ma kilka pogłębionych odpowiedzi, zamiast wielu niewielkich, indywidualnych replik.
     dominating_topic: |
-      ### Pozwól innym dołączyć do rozmowy
-
       Ten temat jest dla Ciebie wyraźnie istotny  &ndash; ponad %{percent}% odpowiedzi jest Twojego autorstwa.
-
       Czy na pewno dajesz innym wystarczająco czasu na przedstawienie swoich punktów widzenia?
     too_many_replies: |
-      ### Osiągnąłeś limit odpowiedzi w tym temacie
-
       Przepraszamy, ale nowi użytkownicy są obecnie ograniczeni do %{newuser_max_replies_per_topic} odpowiedzi w tym samym temacie.
-
       Zamiast dodawać kolejną odpowiedź, rozważ edycję swoich poprzednich odpowiedzi lub odwiedzenie innych tematów.
     reviving_old_topic: |
-      ### Ożywić ten temat?
-
       Ostatnia odpowiedź w tym temacie ma ponad %{days} dni. Twoja odpowiedź przesunie temat na górę listy i spowoduje powiadomienie wszystkich wcześniej uczestniczących w rozmowie.
-
       Czy na pewno chcesz kontynuować tę starą rozmowę?
   activerecord:
     attributes:
@@ -205,6 +204,7 @@ pl_PL:
       user_profile:
         bio_raw: "O mnie"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -225,7 +225,6 @@ pl_PL:
           attributes:
             hex:
               invalid: "nie jest poprawnym kolorem"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Pole O mnie w Twoim profilu jest obecnie puste, <a href='/users/%{username_lower}/preferences/about-me'>czy chcesz je wypełnić?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} jeszcze nie podał swojego opisu w profilu</div>"
@@ -238,26 +237,18 @@ pl_PL:
   assets_topic_body: "Ten temat jest widoczny tylko dla członków zespołu. Służy do przechowywania obrazów i plików wykorzystywanych w wyglądzie serwisu. Nie usuwaj go!\n\n\nJak go używać:\n\n\n1. Odpowiedz na ten temat.\n2. Dodaj wszystkie grafiki jakich chcesz użyć jako logo, favicon itd. (Użyj ikony wysyłania w edytorze wpisu lub przeciągnij i upuść.)\n3. Wyślij odpowiedź, aby je zachować.\n4. Kliknij prawym przyciskiem myszy na grafice i skopiuj jej adres URL.\n5. Wklej adres w [ogólnych ustawieniach](/admin/site_settings/category/required).\n\nJeśli chcesz włączyć możliwość przesyłania dodatkowych typów plików, zmień  `authorized_extensions` w [ustawieniach plików](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Witaj w Salonie"
-    body: |2
+    body: |
-
       Gratulacje! :confetti_ball:
-
       Jeśli widzisz ten temat, twoje konto osiągnęło trzeci poziom zaufania.
-
       Od teraz możesz &hellip;
-
       * Edytować tytuł każdego tematu
       * Przenieść temat do innej kategorii
       * Twoje linki nie będą posiadać już atrybutu [nofollow](http://en.wikipedia.org/wiki/Nofollow)
       * Korzystać z prywatnego Salonu, kategorii która jest widoczna jedynie dla użytkowników na 3 poziomie zaufania lub wyższym
       * Przyznawać polubienia i flagi o większej wadze
-
       Możesz zobaczyć [wszystkie osoby z tym poziomem zaufania](/badges/3/regular). Nie zapomnij się przywitać.
-
       Dziękujemy, że jesteś tak aktywną częścią naszej społeczności!
-
       (Więcej informacji o poziomach zaufania znajduje się [pod tym adresem][trust]. Pamiętaj, że trzeci poziom zaufania zależy od utrzymywania aktywności danego konta na określonym poziomie.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "O kategorii %{category}"
@@ -477,18 +468,6 @@ pl_PL:
       message:
         make: "Ten temat został ustawiony jako baner. Będzie pojawiać się na górze każdej strony do czasu zamknięcia przez użytkownika."
         remove: "Ten temat nie jest już banerem. Nie będzie pojawiać się na górze każdej strony."
-  unsubscribed:
-    title: 'Wypisano'
-    description: "Zostałeś wypisany. Nie skontaktujemy się z Tobą więcej!"
-    oops: "Jeśli nie chciałeś tego zrobić, kliknij poniżej."
-    error: "Błąd podczas wypisywania"
-    preferences_link: "Możesz zrezygnować z podsumowań email w <a href='/my/preferences'>ustawieniach konta</a>"
-    different_user_description: "Jesteś zalogowany jako inny użytkownik niż ten do którego wysłano to podsumowanie. Wyloguj się i spróbuj ponownie."
-    not_found_description: "Przepraszamy: nie mogliśmy Cię wypisać. Możliwe, że link wysłany w wiadomości email wygasł."
-  resubscribe:
-    action: "Zapisz ponownie"
-    title: "Zapisano ponownie!"
-    description: "Zostałeś zapisany ponownie."
   reports:
     visits:
       title: "Wizyty użytkowników"
@@ -623,7 +602,6 @@ pl_PL:
       yaxis: "Liczba wizyt"
   dashboard:
     rails_env_warning: "Twój serwer działa w trybie %{env}"
-    ruby_version_warning: "Używasz Ruby w wersji 2.0.0, która może powodować problemy. Zaktualizuj się do patch level 247 lub późniejszej. "
     host_names_warning: "Twój plik config/database.yml używa domyślnej nazwy serwera localhost. Zmień go by używał nazwy serwera Twojej strony."
     gc_warning: 'Twój serwer wykorzystuje domyślne ustawienia odśmiecacza ruby, który nie da Ci optymalnej wydajności. Przeczytaj ten temat o optymalizacji wydajności: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq nie działa. Wiele zadań, takich jak wysyłanie emaili, jest wykonywane asynchronicznie przez sidekiqa. Zagwarantuj, że przynajmniej jeden proces sidekiqa działa. <a href="https://github.com/mperham/sidekiq" target="_blank">Dowiedz się więcej o Sidekiqu</a>.'
@@ -694,8 +672,6 @@ pl_PL:
     enable_long_polling: "Message bus used for notification can use long polling"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     cooldown_minutes_after_hiding_posts: "Liczba minut, ile musi odczekać użytkownik, zanim będzie mógł edytować post ukryty w wyniku oflagowania przez społeczność"
-    max_topics_in_first_day: "Maksymalna liczba tematów, jakie może stworzyć użytkownik pierwszego dnia na tej stronie."
-    max_replies_in_first_day: "Maksymalna liczba odpowiedzi, jakie może napisać użytkownik pierwszego dnia na tej stronie."
     tl2_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl2 (członek), mnożąc przez tę liczbę"
     tl3_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl3 (użytkownik stały), mnożąc przez tę liczbę"
     tl4_additional_likes_per_day_multiplier: "Zwiększ limit lajków na dzień dla tl4 (lider), mnożąc przez tę liczbę"
@@ -797,9 +773,6 @@ pl_PL:
     relative_date_duration: "Liczba dni od wysłania wpisu gdy wyświetlana jest data relatywna (7d) zamiast absolutnej (20 Lut)."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
     email_editable: "Allow users to change their e-mail address after registration."
-    digest_topics: "Maksymalna liczba tematów w podsumowaniu e-mail."
-    digest_min_excerpt_length: "Minimalny wycinek wpisu (liczba znaków) w podsumowaniu e-mail."
-    disable_digest_emails: "Wyłącz wysyłanie podsumowania e-mail wszystkim uzytkownikom. "
     allow_anonymous_posting: "Zezwól użytkownikom na przechodzenie w tryb anonimowości."
     allow_profile_backgrounds: "Zezwól użytkownikom na przesyłanie obrazu tła dla profilu."
     enable_mobile_theme: "Urządzenia mobilne używają dedykowanego mobilnego szablonu. Wyłącz to, jeśli chcesz użyć własnego, pojedynczego i responsywnego szablonu stylów. "
@@ -825,19 +798,6 @@ pl_PL:
       invalid_string_min: "Musi być co najmniej %{min} znaków."
       invalid_string_max: "Musi być nie więcej niż %{max} znaków."
       invalid_reply_by_email_address: "Wartość musi zawierać '%{reply_key}' i musi być inna niż mail z powiadomieniem."
-  notification_types:
-    mentioned: "%{display_username} wspomina o Tobie w %{link}"
-    liked: "%{display_username} polubił(-a) Twój wpis w %{link}"
-    replied: "%{display_username} odpowiada na Twój wpis w %{link}"
-    quoted: "%{display_username} cytuje Twój wpis w %{link}"
-    edited: "%{display_username} edytuje Twój wpis w %{link}"
-    posted: "%{display_username} pisze w %{link}"
-    moved_post: "%{display_username} przenosi twój wpis do %{link}"
-    private_message: "%{display_username} wysłał ci wiadomość: %{link}"
-    invited_to_private_message: "%{display_username} zaprosił cię do wiadomości: %{link}"
-    invitee_accepted: "%{display_username} przyjął(-ęła) Twoje zaproszenie"
-    linked: "%{display_username} powiązał cię z %{link}"
-    granted_badge: "Zdobywasz %{link}"
   search:
     within_post: "#%{post_number} przez %{username}"
     types:
@@ -936,33 +896,13 @@ pl_PL:
     subject_template: "%{invitee_name} zaprosił cię do '%{topic_title}' na %{site_domain_name}"
   invite_forum_mailer:
     subject_template: "%{invitee_name} zaprosił cię do dołączenia do %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} wysłał Tobie zaproszenie
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Kliknij link poniżej by dowiedzieć się więcej:
-
-      %{invite_link}
-
-      To zaproszenie zostało wysłane przez zaufanego użytkownika, nie musisz się logować.
   invite_password_instructions:
     subject_template: "Ustaw hasło dla swojego konta na %{site_name}"
-    text_body_template: |+
+    text_body_template: |
       Dziękujemy za zaakceptowanie zaproszenia do %{site_name} -- witamy!
-
-
-
       Kliknij ten link, by wybrać hasło:
-
       %{base_url}/users/password-reset/%{email_token}
-
-
-
       (Jeśli powyższy link wygasł, wybierz "Zapomniałem hasła", logując się za pomocą adresu email.)
-
   test_mailer:
     subject_template: "[%{site_name}] Test dostarczania poczty"
   new_version_mailer:
@@ -981,8 +921,6 @@ pl_PL:
     deferred_and_deleted: "Dziękujemy za zwrócenie uwagi. Wpis został usunięty."
   temporarily_closed_due_to_flags: "Ten temat został tymczasowo zamknięty z uwagi na wysoką liczbę oflagowań wykonanych przez społeczność."
   system_messages:
-    post_hidden:
-      subject_template: "Wpis został ukryty z powodu oflagowania przez społeczność"
     welcome_user:
       subject_template: "Witaj na %{site_name}!"
     welcome_invite:
@@ -993,9 +931,7 @@ pl_PL:
       subject_template: "Kopia zapasowa nieudana"
       text_body_template: |
         Tworzenie kopii zapasowej było nieudane.
-
         Log poniżej:
-
         ```
         %{logs}
         ```
@@ -1006,9 +942,7 @@ pl_PL:
       subject_template: "Przywracanie nieudane"
       text_body_template: |
         Przywrócenie z kopii zapasowej było nieudane.
-
         Log poniżej:
-
         ```
         %{logs}
         ```
@@ -1017,30 +951,21 @@ pl_PL:
       text_body_template: "Plik z zaproszeniami został przetworzony. Wysłanych zaproszeń: %{sent}."
     bulk_invite_failed:
       subject_template: "Plik z zaproszeniami został przetworzony z błędami."
-      text_body_template: |+
+      text_body_template: |
         Plik z zaproszeniami został przetworzony -- wysłanych: %{sent}, błędów: %{failed}.
-
         Dziennik operacji:
-
         ```
         %{logs}
         ```
-
-
     csv_export_succeeded:
       subject_template: "Zakończono eksport danych"
-      text_body_template: |+
+      text_body_template: |
         Eksport danych zakończył się sukcesem! :dvd:
-
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
-
         Powyższy link będzie aktywny przez 48 godzin.
-
     csv_export_failed:
       subject_template: "Nieudany eksport danych"
       text_body_template: "Przepraszamy, ale eksport danych zakończył się niepowodzeniem. Sprawdź logi lub skontaktuj się z operatorami serwisu."
-    user_automatically_blocked:
-      subject_template: "Nowy użytkownik %{username} został zablokowany z powodu oflagowania przez społeczność"
     pending_users_reminder:
       subject_template:
         one: "1 użytkownik czeka na zatwierdzenie"
@@ -1065,66 +990,49 @@ pl_PL:
     user_posted_pm:
       subject_template: "[%{site_name}] [PW] %{topic_title}"
     digest:
-      subject_template: "[%{site_name}] Podsumowanie"
       new_activity: "Nowa aktywność w twoich tematach i wpisach:"
       top_topics: "Popularne wpisy"
       other_new_topics: "Popularne wątki"
       click_here: "kliknij tutaj"
-      from: "podsumowanie %{site_name} "
       read_more: "Czytaj więcej"
     forgot_password:
       subject_template: "[%{site_name}] Reset hasła"
       text_body_template: |
         Ktoś poprosił o zresetowanie Twojego hasła na [%{site_name}](%{base_url}).
-
         Jeśli to nie Ty, możesz bezpiecznie zignorować tę wiadomość.
-
         Kliknij na poniższy link by wybrać nowe hasło:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Ustaw hasło"
       text_body_template: |
         Ktoś poprosił o dodanie hasła do twojego konta [%{site_name}](%{base_url}). Możesz się zalogować przy pomocy konta w i innym serwisie (Google, Facebook, itd.) które zostało powiązane z twoim potwierdzonym adresem email.
-
         Jeśli to nie była twoja prośba, możesz zignorować tą wiadomość.
-
         Kliknij odnośnik poniżej by ustawić hasło:
         %{base_url}/users/password-reset/%{email_token}
     account_created:
       subject_template: "[%{site_name}] Twoje nowe konto"
       text_body_template: |
         Utworzyliśmy Twoje konto na %{site_name}
-
         Kliknij na linku poniżej, aby ustawić swoje hasło:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "Zostałeś zaakceptowany na forum %{site_name}!"
-      text_body_template: |+
+      text_body_template: |
         Witamy na %{site_name}!
-
         Nasz personel zatwierdził twoje konto na %{site_name}.
-
         Kliknij na podany link, aby potwierdzić i aktywować swoje nowe konto:
         %{base_url}/users/activate-account/%{email_token}
-
         Jeśli podany link nie działa, spróbuj skopiować go i przykleić w pasku adresów swojej wyszukiwarki.
-
         %{new_user_tips}
-
         Wierzymy, że [cywilizowana dyskusja](%{base_url}/guidelines) jest zawsze możliwa.
-
         Baw się dobrze!
-
         (Jeśli potrzebujesz skontaktować się z [członkiem zespołu](%{base_url}/about) jako nowy użytkownik, odpowiedz na tę wiadomość.)
-
     signup:
       subject_template: "[%{site_name}] Potwierdź swoje nowe konto"
       text_body_template: |
         Witaj na %{site_name}!
-
         Kliknij na poniższy link by potwierdzić i aktywować Twoje nowe konto:
         %{base_url}/users/activate-account/%{email_token}
-
         Jeśli powyższy link nie jest klikalny, spróbuj skopiować i wkleić go do pasku adresu Twojej przeglądarki.
   page_not_found:
     popular_topics: "Popularne"
@@ -1173,8 +1081,3 @@ pl_PL:
   performance_report:
     initial_post_raw: 'Ten temat zawiera codzienne raporty wydajności dla twojej witryny. '
     initial_topic_title: 'Testy wydajności witryny. '
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.pt_BR.yml

@@ -19,9 +19,9 @@ pt_BR:
     month_names: [null, Janeiro, Fevereiro, Março, Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro]
     <<: *datetime_formats
   time:
+    <<: *datetime_formats
     am: "am"
     pm: "pm"
-    <<: *datetime_formats
   title: "Discourse"
   topics: "Tópicos"
   posts: "postagens"
@@ -49,7 +49,6 @@ pt_BR:
         reply_user_not_matching_error: "Ocorre quando uma resposta chega em um endereço de email diferente ao da notificação enviada."
         topic_not_found_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi excluído."
         topic_closed_error: "Ocorre quando uma resposta foi enviada mas o tópico relacionado foi fechado."
-        auto_generated_email_reply: "O email contém uma resposta a um email gerado automaticamente."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -103,6 +102,9 @@ pt_BR:
       max_username_length_range: "Você não pode definir o máximo abaixo no mínimo."
       default_categories_already_selected: "Você não pode selecionar uma categoria usada noutra lista."
       s3_upload_bucket_is_required: "Você não pode habilitar uploads para o S3 a não ser que tenha provido o 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "O arquivo enviado deve ser do formado csv ou txt."
   backup:
@@ -206,50 +208,37 @@ pt_BR:
     until_posts:
       one: "1 mensagem"
       other: "%{count} mensagens"
-    new-topic: |
+    'new-topic': |
       Bem vindo ao %{site_name} &mdash; **obrigado por iniciar uma nova conversa!**
-
       - O título parece interessante se você ler em voz alta? É um bom resumo?
-
       - Quem estaria interessado nisto? Por que é relevante? Que tipo de resposta você quer?
-
       - Incluir palavras geralmente usadas no seu tópico para que outros possam *encontrar*. Para agrupar seu tópico com outros relacionados, selecione uma categoria.
-
       Para mais, [veja os guias da comunidade](/guidelines). Este painel só irá aparecer para seu primeiro %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Bem-vindo ao %{site_name} &mdash; **obrigado por contribuir!**
-
       - Sua resposta melhora a conversa de alguma forma?
-
       - Seja gentil aos seus companheiros membros da comunidade.
-
       - Críticas construtivas são bem-vindas, mas critique *idéias*, não pessoas.
-
       Para mais, [veja nosso guia da comunidade](/guidelines). Esta mensagem aparecerá somente para o seu primeiro %{education_posts_text}.
     avatar: |
-      ### Que tal uma imagem para a sua conta?
-
       Você postou alguns tópicos e respostas, mas a sua imagem de perfil não é tão original como você é -- é apenas uma carta.
-
       Você já considerou ** [visitando o seu perfil de usuário](%{profile_path})** e carregar uma imagem que representa você?
-
       É mais fácil seguir as discussões e encontrar pessoas interessantes em conversas quando todo mundo tem uma imagem de perfil única!
     sequential_replies: |
-      ### Considere responder a várias mensagens simultaneamente
-
       No lugar de várias respostas em seguida para um tópico, por favor considere uma única resposta que inclui citações de mensagens anteriores ou referência ao @nome.
-
       Você pode editar sua resposta anterior para adicionar uma citação destacando o texto e selecionando o botão <b>citar resposta</b> que aparece.
-
       É mais fácil para todos lerem tópicos que tem menos respostas em profundidade contra muitas respostas curtas individuais.
     dominating_topic: |
-      ### Deixe que os outros se juntem à conversa⏎
       ⏎
       Este tópico é claramente importante para você &ndash; você postou mais de %{percent}% das respostas aqui.⏎
       ⏎
       Tem certeza de que você está fornecendo o tempo adequado para outras pessoas também poderem compartilhar seus pontos de vista?⏎
-    too_many_replies: "# # # Você está no limite de resposta para este tópico \n \nLamentamos, mas novos usuários estão temporariamente limitados a %{newuser_max_replies_per_topic} respostas no mesmo tópico. \n \nEm vez de adicionar outra resposta, por favor, considere editar suas respostas anteriores ou visitar outros tópicos. \n"
+    too_many_replies: |
-    reviving_old_topic: "# # # Reviver este tópico?\n \nA última resposta a este tópico foi a %{days} atrás. Sua resposta vai levar o tópico para o topo da sua lista e avisar a qualquer um anteriormente envolvido na conversa. \n \nTem certeza de que quer continuar esta velha conversa? \n"
+      Lamentamos, mas novos usuários estão temporariamente limitados a %{newuser_max_replies_per_topic} respostas no mesmo tópico.
+      Em vez de adicionar outra resposta, por favor, considere editar suas respostas anteriores ou visitar outros tópicos.
+    reviving_old_topic: |
+      A última resposta a este tópico foi a %{days} atrás. Sua resposta vai levar o tópico para o topo da sua lista e avisar a qualquer um anteriormente envolvido na conversa.
+      Tem certeza de que quer continuar esta velha conversa?
   activerecord:
     attributes:
       category:
@@ -261,6 +250,7 @@ pt_BR:
       user_profile:
         bio_raw: "Sobre Mim"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -281,7 +271,6 @@ pt_BR:
           attributes:
             hex:
               invalid: "Não é uma cor válida"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>o campo Sobre mim do seu perfil está em branco, <a href='/users/%{username_lower}/preferences/about-me'>quer completar?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} ainda não colocou nada no campo Sobre Mim</div>"
@@ -294,26 +283,18 @@ pt_BR:
   assets_topic_body: "Esse é um tópico permanente, visível apenas para a equipe, para arquivar imagens e arquivos usados no design do fórum. Não o delete!\n\n\nAqui está como:\n\n\n1. Responda a esse tópico.\n2. Envie todas as imagens que você deseja para serem usadas como logos, favicons e assim por diante aqui. (Utilize o ícone da barra de upload no editor de post, arraste e solte ou cole imagens.)\n3. Enviar sua resposta para publicá-la.\n4. Clique com o botão direito do mouse nas imagens em sua nova postagem para obter o endereço das imagens enviadas, ou clique no ícone de edição para editar o seu post e recuperar o caminho para as imagens. Copie o endereço da imagem.\n5. Copie o endereço das imagens nas [configurações básicas](/admin/site_settings/category/required).\n\nTambém, se você precisa ativar diferentes tipos de envios de arquivos, edite o `authorized_extensions` em [configurações de arquivo](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Bem-vindo ao Salão"
-    body: |2
+    body: |
-
       Parabéns! :confetti_ball:
-
       Se você pode ver neste tópico, você foi recentemente promovido a  **regular** (nível de confiança 3).
-
       Agora você pode &hellip;
-
       * Editar o título de qualquer tópico
       * Alterar a categoria de qualquer assunto
       * Ter todos os seus links seguidos ([nofollow automática] (http://en.wikipedia.org/wiki/Nofollow) é removido)
       * Acesso a categoria privada Sala visíveis apenas para os utilizadores a nível de confiança 3 e superior
       * Esconder o spam com uma única sinalização
-
       Aqui está o [lista atual de companheiros regulares] (/badges/3/regular). Não se esqueça de dizer oi.
-
       Obrigado por ser uma parte importante dessa comunidade!
-
       (Para obter mais informações sobre os níveis de confiança, [veja este tópico][trust]. Por favor note que somente os membros que continuam a atender aos requisitos ao longo do tempo permanecerá regulares.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Sobre a categoria %{category} "
@@ -529,18 +510,6 @@ pt_BR:
       message:
         make: "Este tópico é agora um banner. Ele aparecerá no topo de cada página até que seja julgado improcedente pelo usuário."
         remove: "Este tópico não é mais um banner. Ela deixará de aparecer no topo de todas as páginas."
-  unsubscribed:
-    title: 'Desinscrito'
-    description: "Você se desinscreveu. Não vamos mais enviar mensagens!"
-    oops: "Caso não seja esta sua intenção, clique em baixo."
-    error: "Erro ao cancelar "
-    preferences_link: "Você também pode cancelar a assinatura de e-mails de resumo na sua <a href='/my/preferences'>página de preferências</a>"
-    different_user_description: "Você está logado como um usuário diferente do que aquele que o resumo foi enviado para. Por favor, faça logout e tente novamente."
-    not_found_description: "Desculpe, não conseguimos cancelar sua inscrição. É possível que o link no seu email tenha expirado."
-  resubscribe:
-    action: "Re-Inscrever"
-    title: "Re-Inscrever!"
-    description: "Foste re-inscrito."
   reports:
     visits:
       title: "Visitas do Usuário"
@@ -683,7 +652,6 @@ pt_BR:
       yaxis: "Número de visitas"
   dashboard:
     rails_env_warning: "Seu servidor está rodando no modo %{env}."
-    ruby_version_warning: "Você está executando uma versão do Ruby 2.0.0, que é conhecido por ter problemas. Atualize para o patch 247 ou superior."
     host_names_warning: "O arquivo config/database.yml está usando hostname padrão localhost. Modifique para usar o hostname do seu site."
     gc_warning: 'Seu servidor está rodando a coleta de lixo do ruby com os parâmetros padrão (default ruby garbage collection parameters), os quais não irão propiciar a melhor performance. Leia este tópico sobre ajuste de performance: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq não está em execução. Muitas tarefas, como envio de emails, são executadas de forma assíncrona pelo sidekiq. Por favor certifique-se de que ao menos um processo sidekiq esteja execução. <a href="https://github.com/mperham/sidekiq" target="_blank">Aprenda sobre Sidekiq aqui</a>.'
@@ -759,13 +727,9 @@ pt_BR:
     anon_polling_interval: "Com que frequencia os clientes não registrados podem solicitar o servidor em milisegundos"
     background_polling_interval: "Com que frequência os clientes podem solicitar o servidor em milisegundos ( em segundo plano )"
     cooldown_minutes_after_hiding_posts: "Número de minutos que um usuário deve esperar antes de poder editar uma publicação que foi ocultada devido a sinalização da comunidade."
-    max_topics_in_first_day: "O número máximo de tópicos que um usuário tem permissão para criar em seu primeiro dia no site"
-    max_replies_in_first_day: "O número máximo de respostas que um usuário tem permissão para criar em seu primeiro dia no site"
     tl2_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl2 (membros) multiplicando por esse número"
     tl3_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl3 (regular) multiplicando por esse número"
     tl4_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl4 (lideres) multiplicando por esse número"
-    num_flags_to_block_new_user: "Se os posts de um novo usuário receber várias sinalizações de spam de num_users_to_block_new_user diferentes usuários, esconder todos os posts deste usuário e prevenir postagem futura. 0 para desabilitar."
-    num_users_to_block_new_user: "Se os posts de um novo usuário receber num_flags_to_block_new_user sinalizações de spam deste tanto de usuários diferentes, esconder todos os seus posts e prevenir posts futuros. 0 oara desabilitar."
     notify_mods_when_user_blocked: "Se um usuário for bloqueado de forma automática, enviar uma mensagem para todos os moderadores."
     flag_sockpuppets: "Se um novo usuário responder um tópico usando o mesmo endereço de IP do novo usário que começou o tópico, sinalize as duas publicações como um potencial spam."
     traditional_markdown_linebreaks: "Use quebras de linhas tradicionais em Markdown, as quais requerem dois espaços à direita para uma quebra de linha."
@@ -966,9 +930,6 @@ pt_BR:
     allow_animated_thumbnails: "Gera thumbnails animados a partir de gifs animados."
     default_avatars: "URLs para avatars que serão usadas por padrão para novos usuários até que sejam alteradas por eles."
     automatically_download_gravatars: "Fazer download de Gravatars dos usuários ao criar conta ou mudança de email."
-    digest_topics: "O número máximo de tópicos a serem mostrados no resumo via email."
-    digest_min_excerpt_length: "O excerto mínimo de post no resumo via email, em caracteres."
-    disable_digest_emails: "Desabilitar emails de resumo para todos os usuários."
     max_daily_gravatar_crawls: "Número máximo de vezes que o Discourse irá checar o Gravatar por avatares personalizados em um dia"
     public_user_custom_fields: "Um conjunto de campos personalizados para um usuário que podem ser apresentados publicamente."
     staff_user_custom_fields: "Um conjunto de campos personalizados para um usuário que pode ser mostrado para membros da equipe."
@@ -980,6 +941,7 @@ pt_BR:
     allow_profile_backgrounds: "Permitir usuários de fazerem upload de backgrounds para o perfil"
     enable_mobile_theme: "Os dispositivos móveis usam um tema mobile-friendly, com a possibilidade de mudar para o site completo. Desative isso se você quiser usar um estilo personalizado que é totalmente responsivo."
     dominating_topic_minimum_percent: "Qual o percentual de postagens que um usuário precisa fazer em um tópico antes de ser relembrado sobre ser excessivamente dominante em um tópico."
+    daily_performance_report: "Analiza logs do NGINX diariamente e cria um tópico na categoria Somente Equipe com os detalhes."
     suppress_uncategorized_badge: "Não mostrar emblema para assuntos não categorizados em listas de tópicos"
     global_notice: "Mostrar um banner global URGENTE, de EMERGÊNCIA para todos os visitantes, mude para branco para esconder (HTML permitido)."
     disable_edit_notifications: "Desabilitar modificação de notificações pelo sistema quando 'download_remote_images_to_local' estiver ativado."
@@ -1027,19 +989,6 @@ pt_BR:
       invalid_string_min: "Precisa ter no mínimo %{min} caracteres."
       invalid_string_max: "Deve ser não mais que %{max} caracteres."
       invalid_reply_by_email_address: "O valor deve conter '%{reply_key}' e ser diferente do email de notificação."
-  notification_types:
-    mentioned: "%{display_username} mencionou-te em %{link}"
-    liked: "%{display_username} curtiu sua postagem em %{link}"
-    replied: "%{display_username} repondeu à sua postagem em %{link}"
-    quoted: "%{display_username} citou a sua postagem em %{link}"
-    edited: "%{display_username} editou a sua postagem em %{link}"
-    posted: "%{display_username} postou em %{link}"
-    moved_post: "%{display_username} moveu a sua postagem para %{link}"
-    private_message: "%{display_username} enviou-te uma mensagem particular: %{link}"
-    invited_to_private_message: "%{display_username} convidou-te para uma conversa privada: %{link}"
-    invitee_accepted: "%{display_username} aceitou o seu convite"
-    linked: "%{display_username} linkou você em %{link}"
-    granted_badge: "Você ganhou %{link}"
   search:
     within_post: "#%{post_number} por %{username}"
     types:
@@ -1139,42 +1088,22 @@ pt_BR:
     subject_template: "%{invitee_name} convidou você para '%{topic_title}' em %{site_domain_name}"
     text_body_template: |
       %{invitee_name} convidou você para uma conversa
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       em
-
       > %{site_title} -- %{site_description}
-
       Se estiver interessado, clique no link abaixo:
-
       %{invite_link}
-
       Este convite é de um usuário de nossa confiança, assim você poderá participar da conversa imediatamente.
   invite_forum_mailer:
     subject_template: "%{invitee_name} convidou você para participar de %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} convidou você para participar
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Se você estiver interessado, clique no link abaixo:
-
-      %{invite_link}
-
-      Este convite vem de um usuário confiável, então você não precisa se logar.
   invite_password_instructions:
     subject_template: "Defina uma senha para a sua %{site_name}  conta"
     text_body_template: |
       Obrigado por aceitar o seu convite para %{site_name} -- Bem-Vindo!
-
       Clique neste link para escolher uma senha agora:
       %{base_url}/users/password-reset/%{email_token}
-
       (Se o link acima expirou, escolha a opção "Esqueci minha senha" quando efetuar o login com o seu endereço de e-mail.)
   test_mailer:
     subject_template: "[%{site_name}] Teste de entrega de email"
@@ -1186,10 +1115,6 @@ pt_BR:
     subject_template:
       one: "[%{site_name}] 1 mensagem aguardando revisão"
       other: "[%{site_name}] %{count} mensagens aguardando revisão"
-    text_body_template: |
-      Olá,
-
-      Existem tópicos de usuários novos que aguardam serem revisados. [Eles podem ser aprovados ou rejeitados aqui](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Sua postagem foi sinalizada como **off-topic**: a comunidade sente que não é uma boa adequação ao tópico, como atualmante definido de acordo com o título e o primeiro post."
     inappropriate: "Sua postagem foi sinalizada como **não apropriada**: a comunidade sente que ela é ofensiva, abusiva, ou uma violação das [nossas orientações da comunidade](/guidelines)."
@@ -1203,41 +1128,26 @@ pt_BR:
     deferred_and_deleted: "Obrigado por nos avisar. Nós removemos o post."
   temporarily_closed_due_to_flags: "Este tópico foi temporariamente fechado devido a um grande número de sinalizações da comunidade."
   system_messages:
-    post_hidden:
-      subject_template: "%{site_name} Aviso: Postagem escondida devido a Sinalização pela Comunidade"
     welcome_user:
       subject_template: "Bem-vindo ao %{site_name}!"
       text_body_template: |
         Obrigado por participar do %{site_name}, e bem-vindo!
-
         %{new_user_tips}
-
         Nós acreditamos sempre no [comportamento comunitário civilizado](%{base_url}/guidelines).
-
         Aproveite sua participação!
-
         (Se precisar se comunicar com [membros da equipe](%{base_url}/about) como um novo usuário, apenas responda a esta mensagem.)
     welcome_invite:
       subject_template: "Bem-vindo ao %{site_name}!"
       text_body_template: |
         Obrigado por aceitar seu convite para %{site_name} -- bem vindo!
-
         Nós criamos uma nova conta **%{username}** para você, e você está autenticado. Pode mudar seu nome visitando o [perfil de seu usuário][prefs].
-
         Para entrar novamente depois:
-
         1. Sempre **use o mesmo endereço de email de seu convite original** quando se registrou. Caso contrário não saberemos que é você!
-
         2. Crie uma senha única para o [perfil de seu usuário][prefs], e use para entrar.
-
         %{new_user_tips}
-
         Nós acreditamos sempre em [comportamento comunitário civilizado](%{base_url}/guidelines).
-
         Aproveite sua participação!
-
         (Se precisar se comunicar com um [membro da equipe](%{base_url}/about) como novo usuário, apenas responda a esta mensagem.)
-
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Backup completado com sucesso"
@@ -1246,9 +1156,7 @@ pt_BR:
       subject_template: "O backup falhou"
       text_body_template: |
         O backup falhou.
-
         Aqui está o log:
-
         ```
         %{logs}
         ```
@@ -1259,9 +1167,7 @@ pt_BR:
       subject_template: "A restauração falhou"
       text_body_template: |
         A restauração falhou.
-
         Aqui está o log:
-
         ```
         %{logs}
         ```
@@ -1272,9 +1178,7 @@ pt_BR:
       subject_template: "Seus convites não forma enviados, contate os moderadores."
       text_body_template: |
         Seu arquivo de convite de usuários em massa foi processado, %{sent} convites enviados com %{failed} erro(s).
-
         Aqui está o log:
-
         ```
         %{logs}
         ```
@@ -1282,9 +1186,7 @@ pt_BR:
       subject_template: "Exportação de dados completada"
       text_body_template: |
         Sua exportação de dados foi bem-sucedida! :dvd:
-
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
-
         O link acima será válido por 48 horas.
     csv_export_failed:
       subject_template: "A exportação de dados falhou"
@@ -1307,15 +1209,15 @@ pt_BR:
       subject_template: "[%{site_name}] Problema com email -- Resposta Gerada Automaticamente"
     email_error_notification:
       subject_template: "[%{site_name}] Problema com email -- Erro de autenticação POP"
-    user_automatically_blocked:
-      subject_template: "Novo usuário %{username} foi bloqueado devido a denúncias da comunidade"
     spam_post_blocked:
       subject_template: "Novo usuário %{username} teve postagem bloqueada por repetidos links"
     pending_users_reminder:
       subject_template:
         one: "1 usuário aguardando aprovação"
         other: "%{count} usuários aguardando aprovação"
-      text_body_template: "Há novos cadastros de usuários à espera de serem aprovados (ou rejeitados), antes de poderem acessar este fórum. \n \n[Por favor, analisá-los na seção de administração] ( %{base_url}/admin/users/list/pending).\n"
+      text_body_template: |
+        Há novos cadastros de usuários à espera de serem aprovados (ou rejeitados), antes de poderem acessar este fórum.
+        [Por favor, analisá-los na seção de administração] ( %{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Baixar imagens remotas desativado"
       text_body_template: "A configuração `download_remote_images_to_local` está desativada porque o espaço limite no disco configurado em `download_remote_images_threshold` foi alcançado."
@@ -1343,13 +1245,10 @@ pt_BR:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
     digest:
       why: "Um breve resumo de %{site_link} desde que viu pela última vez em %{last_seen_at}."
-      subject_template: "Resumo [%{site_name}]"
       new_activity: "Nova atividade nos seus tópicos e postagens:"
       top_topics: "Tópicos populares"
       other_new_topics: "Tópicos populares"
-      unsubscribe: "Este resumo é enviado por %{site_link} quando nós não o temos visto em um tempo. Para cancelar a assinatura %{unsubscribe_link}."
       click_here: "clique aqui"
-      from: "resumo de %{site_name}"
       read_more: "Leia Mais"
       more_topics: "Há %{new_topics_since_seen} outros novos tópicos."
       more_topics_category: "Mais tópicos novos:"
@@ -1357,50 +1256,42 @@ pt_BR:
       subject_template: "[%{site_name}] Redefinição de senha"
       text_body_template: |
         Alguém pediu para redefinir a sua senha em [%{site_name}](%{base_url}).
-
         Se não foi você, por favor ignore este email.
-
         Para escolher a sua nova senha clique no link a seguir:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Definir Senha"
-      text_body_template: "Alguém solicitou para adicionar uma senha para a sua conta em [%{site_name}] (% {base_url}). Alternativamente, você pode fazer login usando qualquer serviço online suportado (Google, Facebook, etc) que está associado a este endereço de e-mail validado.\n \nSe você não fez esse pedido, você pode ignorar este e-mail. \n \nClique no link abaixo para escolher uma senha: \n%{base_url}/users/password-reset/%{email_token}\n"
+      text_body_template: |
+        Alguém solicitou para adicionar uma senha para a sua conta em [%{site_name}] (% {base_url}). Alternativamente, você pode fazer login usando qualquer serviço online suportado (Google, Facebook, etc) que está associado a este endereço de e-mail validado.
+        Se você não fez esse pedido, você pode ignorar este e-mail.
+        Clique no link abaixo para escolher uma senha:
+        %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Login"
     account_created:
       subject_template: "[%{site_name}] Sua nova Conta"
       text_body_template: |
         Uma nova conta foi criada para você em %{site_name}
-
         Clique no link a seguir para escolher uma senha para a sua nova conta:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "Você foi aprovado no %{site_name}!"
       text_body_template: |
         Bem vindo a %{site_name}!
-
         Um membro interno aprovou sua conta no %{site_name}.
-
         Selecione o endereço a seguir para confirmar e ativar sua nova conta:
         %{base_url}/users/activate-account/%{email_token}
-
         Se preferir, tente copiar e colar o endereço acima no seu navegador.
-
         %{new_user_tips}
-
         Nós acreditamos sempre em [comportamento comunitario civilizado](%{base_url}/guidelines).
-
         Aproveite sua participação!
-
         (Se precisar se comunicar com um [membro interno](%{base_url}/about) como um novo usuário, só responder a esta mensagem.)
     signup:
       subject_template: "[%{site_name}] Confirme sua nova conta"
       text_body_template: |
         Ben-vindo ao %{site_name}!
-
         Clique no seguinte link para confirmar e aticar a sua nova conta:
         %{base_url}/users/activate-account/%{email_token}
-
         Se não conseguires clicar no link em cima, tenta copia-lo e cola-lo na barra de endereções do seu browser de internet.
   page_not_found:
     title: "Oops! Essa página não existe ou é privada."
@@ -1411,7 +1302,6 @@ pt_BR:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Welcome to %{title}](#welcome)
       Este fórum de discussão requer uma conta para visualizar %{title}.  Para continuar a ler, por favor, crie uma nova conta ou entre na sua conta.
   terms_of_service:
     title: "Termos de Serviço"
@@ -1452,7 +1342,8 @@ pt_BR:
   csv_export:
     boolean_yes: "Sim"
     boolean_no: "Não"
-  static_topic_first_reply: "Altere o primeiro post desse tópico para mudar seu conteúdo na página de %{page_name} \n"
+  static_topic_first_reply: |
+    Altere o primeiro post desse tópico para mudar seu conteúdo na página de %{page_name}
   guidelines_topic:
     title: "Perguntas frequentes/Diretrizes"
   tos_topic:
@@ -1513,6 +1404,3 @@ pt_BR:
     staff_tag_disallowed: "A marcação \"%{tag}\" pode ser aplicada somente pelo pessoal de apoio."
     staff_tag_remove_disallowed: "A marcação \"%{tag}\" pode ser removida somente pelo pessoal de apoio."
   rss_by_tag: "Tópicos marcados com %{tag}"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.ro.yml

@@ -10,6 +10,12 @@ ro:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats 
+  date:
+    month_names: []
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Discuții"
   posts: "postări"
@@ -62,6 +68,9 @@ ro:
       body: 'Au apărut probleme cu următoarele câmpuri:'
     embed:
       load_from_remote: "S-a semnalat o eroare la încarcarea postării."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Fișierul încărcat ar trebuii să fie de formatul csv sau txt."
   backup:
@@ -130,33 +139,20 @@ ro:
       one: "1 mesaj"
       few: "%{count} postări"
       other: "%{count} postări"
-    new-reply: |
+    'new-reply': |
       Bine ai venit la %{site_name} &mdash; **Mulțumim pentru contribuție!**
-
       - Răspunsul tău îmbunatațește discuția în vreun fel?
-
       - Fii amabil cu membri comunității.
-
       - Critica constructivă e binevenită, criticați *ideea*, nu oamenii.
-
       Pentru detalii, [verifică regulile comune](/reguli). Acest panel va apărea doar pentru prima %{education_posts_text}.
     dominating_topic: |
-      ### Permite și altora să se alăture la conversație
-
       Această discuție este importantă pentru tine și &ndash; Ai postat mai mult de %{percent}%  din răspunsuri aici.
-
       Ești sigur că dai destul timp și altora să-și exprime punctul de vedere?
     too_many_replies: |
-      ### Ați atins limita maximă de răspunsuri pentru aceasta discuție
-
       Ne pare rău, dar utilizatorii noi au un număr limitat de %{newuser_max_replies_per_topic} într-o discuție.
-
       Nu adăugați un nou răspuns, încercați mai bine să editați un răspuns precedent, sau să vizitați o altă discuție.
     reviving_old_topic: |
-      ### Reînvie această discuție?
-
       Ultimul răspuns la această discuție a fost dat acum %{days} de zile. Răspunsul tăuva merge în capătul listei și toată lumea ce a fost implicată în discuție va fi notificată.
-
       Ești sigur că dorești să continui această conversație?
   activerecord:
     attributes:
@@ -167,6 +163,7 @@ ro:
       user_profile:
         bio_raw: "Despre Mine"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -185,7 +182,6 @@ ro:
           attributes:
             hex:
               invalid: "nu este o culoare validă"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='profil-lipsa'>câmpul despre mine din profilul dvs este gol momentan, <a href='/useri/%{username_lower}/preferințe/despre-mine'>Doriți să-l completați?</a></div>"
     no_info_other: "<div class='profil-lipsă'>%{name} nu a introdus înca nimic în câmpul despre mine din profil</div>"
@@ -197,27 +193,18 @@ ro:
   assets_topic_body: "Aceasta e o discuție permanentă, vizibilă doar pentru admini și personal, pentru stocat imaginile folosite la designul forumului. Vă rugăm nu ștergeți!\n\n\nIată cum:\n\n\n1. Răspunde la această discuție.\n2. Încărcați toate imaginile dorite pentru logouri , iconițe și așa mai departe. (Folosiți iconița de încarcare din bara editorului de discuție, sau trageți și aruncați sau lipiți imaginile.)\n3. Aprobați răspunsul pentru a-l posta.\n4. Click dreapta pe imaginile din noua postare pt a ajunge la sursa imaginii încărcate, sau click icoana de editare pt a edita postarea și a obține calea la imagini. Copiază adrsa imaginii.\n5. Lipiți imaginile acelea în [Setări principale](/admin/site_settings/category/required).\n\n\n și dacă doriți să activați diferite feluri de fișiere încărcate, editați `extensii_autorizate` în secțiunea [setări fișiere](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Bine ați venit în Lounge"
-    body: |2
+    body: |
-
       Congratulations! :confetti_ball:
-
       Dacă poți vedea această discuție, ai fost promovat recent la [nivel de încredere 3 (lider)][încredere].
-
       > Liderii sunt cei mai activi contribuitori. Ei dau un exemplu pozitiv comunității prin acțiunile și postările lor.
-
       Acum poți să  &hellip;
-
       * Editează titlul oricărei discuții
       * Schimbă categoria oricărei discuții
       * Toate adresele tale sunt urmărite ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) este dezactivat)
       * Accesul permis la secțiunea privată din Lounge unde au acces numai utilizatorii de nivel 3 sau mai mare
-
       Aici este  [lista utilizatorilor ce au ajuns la nivelul de încredere 3](/insigne/3/lider). Salută-i!
-
       Mulțumim că ești o parte importantă a acestei comunități!
-
       (Pentru mai multe informații despre nivelele de încredere, [vedeți discuția aceasta][încredere]. Luați aminte că doar membrii ce împlinesc criteriile rămân la nivelul de încredere 3. )
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Despre categoria %{category}"
@@ -394,16 +381,6 @@ ro:
       message:
         make: "Această discuție este de acum o discuție cu stindard. Va apărea în capătul fiecărei ferestre până când va fi înlăturată de către utilizator."
         remove: "Această discuție nu mai este una cu stindard. Nu va mai apărea în capătul fiecărei pagini."
-  unsubscribed:
-    title: 'dezabonat'
-    description: "Ați fost dezabonat. Nu vă vom mai contacta!"
-    oops: "În cazul în care nu intenționați asta, faceți click dedesubt."
-    error: "Eroare la dezabonare"
-    not_found_description: "Ne pare rău, nu te-am putut dezabona. Este posibil ca adresa din email să fi expirat."
-  resubscribe:
-    action: "Reabonare"
-    title: "Reabonat!"
-    description: "Ați fost reabonat."
   reports:
     visits:
       title: "Vizite de utilizatori"
@@ -509,7 +486,6 @@ ro:
       yaxis: "Total cereri"
   dashboard:
     rails_env_warning: "Serverul funcționează în modul %{env}."
-    ruby_version_warning: "Dețineți o versiune de Ruby 2.0.0 cunoscută ca având probleme. Reactualiza-ți la nivelul 247 sau mai mare."
     host_names_warning: "Fișierul config/database.yml folosește din oficiu numele gazdei locale. Reactualizați pt a folosii numele de gazdă al site-ului."
     gc_warning: 'Serverul dvs funcționează pe parametrii de colecție de gunoi ruby, ceea ce nu oferă cea mai bună performanță. Citiți această discuție despre setările performanței: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Modificarea Ruby și Rails pentru Discourse</a>.'
     sidekiq_warning: 'Sidekiq nu este pornit. Multe acțiuni, cum ar fi trimiterea de emailuri, sunt executate în nesincronizare de către sidekiq. Asigurați-vă că măcar un porces din sidekiq este pornit. <a href="https://github.com/mperham/sidekiq" target="_blank"> Învață despre Sidekiq aici</a>.'
@@ -568,8 +544,6 @@ ro:
     polling_interval: "Cât de des e intervalul de sondaj în milisecunde al utilizatorilor autentificați"
     anon_polling_interval: "Cat de des e intervalul de sondaj în milisecunde al clienților anonimi"
     cooldown_minutes_after_hiding_posts: "Numărul de minute pr care un utilizator trebuie să le aștepte până când poate edita sau ascunde o postare prin marcajele comune"
-    num_flags_to_block_new_user: "Dacă postarea unui utilizator nou primește atâtea marcaje de spam de la num_utilizatori_blocare_utilizator_nou dferiti utilizatori, se vor ascunde toate postările respectivului și va fi incapacitat să mai posteze. 0 pt dezactivare."
-    num_users_to_block_new_user: "Dacă postarea unui utilizator nou primește num_flags_to_block_new_user marcaje de spam de la atâția utilizatori, se vor ascunde toate postările respectivului și va fi incapacitat să mai posteze. 0 pt dezactivare."
     notify_mods_when_user_blocked: "Dacă un utilizator este blocat automat , trimite un mesaj tuturor moderatorilor."
     flag_sockpuppets: "Dacă un utilizator nou răspunde unei discuții de la același IP ca utilizatorul ce a pornit discuția, marchează ambele postări ca potențial spam."
     post_undo_action_window_mins: "Numarum de minute în care utilizatorii pot anula acțiunile recente într-o postare (aprecieri, marcări, etc)."
@@ -719,17 +693,6 @@ ro:
       invalid_integer: "Valoarea trebuie să fie un întreg."
       regex_mismatch: "Valoare nu se potrivește formatului cerut."
       invalid_string: "Valoare invalidă."
-  notification_types:
-    mentioned: "%{display_username} te-a menționat în %{link}"
-    liked: "%{display_username} a apreciat postarea ta în %{link}"
-    replied: "%{display_username} a răspuns postării tare în %{link}"
-    quoted: "%{display_username} a citat postarea ta în %{link}"
-    edited: "%{display_username} a editat postarea ta în %{link}"
-    posted: "%{display_username} a postat în %{link}"
-    moved_post: "%{display_username} ți-a mutat postarea la %{link}"
-    invitee_accepted: "%{display_username} ți-a acceptat invitația"
-    linked: "%{display_username} ți-a făcut legătura în %{link}"
-    granted_badge: "Ți s-a acordat %{link}"
   search:
     within_post: "#%{post_number} după %{username}: %{excerpt}"
     types:
@@ -784,19 +747,13 @@ ro:
     subject_template: "%{invitee_name} te-a invitat la '%{topic_title}' pe %{site_domain_name}"
     text_body_template: |
       %{invitee_name} te-a invitat la o discuție
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       la
-
       > %{site_title} -- %{site_description}
-
       Dacă sunteți interesat, click pe adresa dedesubt:
-
       %{invite_link}
-
       Aceasta invitație este de la un utilizator de încredere, deci puteți răspunde discuției cât mai curând.
   invite_forum_mailer:
     subject_template: "%{invitee_name} te-a invitat să te alături %{site_domain_name}"
@@ -813,8 +770,6 @@ ro:
     agreed_and_deleted: "Mulțumim pentru avertizare. Suntem de acord că este o problemă și postarea va fi eliminată."
     disagreed: "Mulțumim pentru avertizare. Ne vom interesa."
   system_messages:
-    post_hidden:
-      subject_template: "Postare ascunsă datorită marcajelor comunității"
     welcome_user:
       subject_template: "Bine ați venit la %{site_name}!"
     welcome_invite:
@@ -830,20 +785,15 @@ ro:
       subject_template: "Invitația multiplă a fost procesată cu erori"
       text_body_template: |
         Fișierul dvs de invitații multiple a fost procesat, %{sent}  de invitații trimise cu %{failed} de erori.
-
         Aici este raportul:
-
         ```
         %{logs}
         ```
-    user_automatically_blocked:
-      subject_template: "Noul utilizator %{username} a fost blocat datorită marcajelor date de comunitate"
     spam_post_blocked:
       subject_template: "Utilizatorul nou %{username} are postările blocate datorită adreselor repetate"
     pending_users_reminder:
       text_body_template: |
         Exista înscrieri de noi utilizatori ce așteaptă să fie aprobate (sau respinse) înainte de a putea accesa forumul.
-
         [Vă rugăm să le vizualizați în secțiunea de admin](%{base_url}/admin/users/list/în așteptare).
     download_remote_images_disabled:
       subject_template: "Downloadul de imagini de legătura dezactivat"
@@ -879,18 +829,14 @@ ro:
       subject_template: "[%{site_name}] Resetare parolă"
       text_body_template: |
         Cineva a cerut resetarea parolei dvs. pe site-ul [%{site_name}](%{base_url}).
-
         Dacă nu ați fost dumneavoastră, puteți ignora fără griji aces email.
-
         Click pe următoarea adresă pentru a reseta parola:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Alege parola"
       text_body_template: |
         Cineva a cerut crearea unei parole pe siteul [%{site_name}](%{base_url}). Alternativ, vă puteți autentifica folosind orice serviciu online acceptat (Google, Facebook, etc), serviciu ce este asociat cu acesta adresa de email validată.
-
         Dacă nu ați cerut asta, puteți ignora fără griji acest email.
-
         Click pe adresa următoare pentru a alege o parolă:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
@@ -900,10 +846,8 @@ ro:
     signup:
       text_body_template: |
         Bine ați venit la %{site_name}!
-
         Click pe următoarea adresă pentru a confirma și activă noul dvs. cont:
         %{base_url}/users/activate-account/%{email_token}
-
         Dacă adresa de mai sus nu e accesibilă, încercați să o copiați și să o lipiți în bară de adrese a propriului browser.
   page_not_found:
     popular_topics: "Populare"
@@ -913,7 +857,6 @@ ro:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Bine ați venit la %{title}](#welcome)
       Pe acest forum de discuții aveți nevoie de un cont pentru a vizualiza %{title}. Vă rugăm creați un cont sau autentificați-vă pentru a continua.
   terms_of_service:
     title: "Termeni și condiții"
@@ -963,6 +906,3 @@ ro:
     error: "Eroare!"
     email_input: "Email Admin"
     submit_button: "Trimite Email"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.sk.yml

@@ -18,6 +18,8 @@ sk:
   date:
     month_names: [null, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "DIscourse"
   topics: "Témy"
   posts: "príspevky"
@@ -89,6 +91,9 @@ sk:
       max_username_length_range: "Nemôžete nastaviť maximum menšie ako minimum."
       default_categories_already_selected: "Nemôžete vybrať kategóriu použitú v inom zozname."
       s3_upload_bucket_is_required: "Nemôžete nahrávať na S3 pokiaľ ste nezadali 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Nahrávaný súbor by mal byť vo formáte csv alebo txt."
   backup:
@@ -190,59 +195,34 @@ sk:
       one: "jeden príspevok"
       few: "%{count} príspevky"
       other: "%{count} príspevkov"
-    new-topic: |
+    'new-topic': |
       Víitajte na %{site_name} &mdash; **Ďakujeme za založenie novej konverzácie!**
-
       - Znie titulok zaujímavo ak ho čítate nahlas ? Zodpovedá obsahu ?
-
       - Koho by to mohlo zaujímať ? Prečo je to dôležité ? Akú reakciu očakávate ?
-
       - Vložte často používane slová vo vašej téme aby ju ostatní vedeli "nájsť". Pre zlúčenie vašej témy so súvisiacimi témami vyberte kategóriu .
-
       Pre viac informácií, [pozri návody](/guidelines). Tento panel sa zobrazí iba raz %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Vitajte na %{site_name} &mdash; **Ďakujeme za príspevok!**
-
       - Vylepší vaša odpoveď nejakým spôsobom diskusiu ?
-
       - Buďte ohľaduplní k ostatným členom komunity.
-
       - Konštruktívna kritika je vítana, avšak kritizujte "nápady", nie ľudí.
-
       Pre viac informácií, [pozri návody](/guidelines). Tento panel sa zobrazí iba raz %{education_posts_text}.
     avatar: |
-      ### Čo tak pridať fotku k svojmu účtu?
-
       Už ste pridali zopár tém a odpovedi, ale Váš profil nie je taký jedinečný ako Vy -- Je to len písmeno.
-
       Zvážili ste  **[pozrieť váš profil](%{profile_path})** a pridať obrázok , ktorý Vás vystihuje?
-
       Je jednoduchšie sledovať diskusie a nájsť zaujímave osoby v konverzácii pokiaľ ma každý z nich v profile jedinečný obrázok !
     sequential_replies: |
-      ### Zvážte možnosť odpovedať na viacero príspevkov naraz
-
       Namiesto množstva postupných odpovedí na tému prosím zvážte použitie jednej odpovede, ktorá bude obsahovať citácie z predchádzajúcich príspevkov, alebo odkazy na @meno
-
       Ak chcete dať časť svojho vloženého príspevku do úvodzoviek, stačí označiť text a stlačiť  tlačidlo <b>quote reply</b> , ktoré sa následne objaví.
-
       Pre všetkých je jednoduchšie čítať témy, ktoré majú menšiu hĺbku vnorených odpovedi v porovnaní s množstvom malých individuálnych odpovedí.
     dominating_topic: |
-      ### Umožnite ostatným nech sa zapoja do debaty
-
       Táto téma je pre Vás zjavne dôležitá &ndash; prispeli ste do nej viac než %{percent}% odpovedí.
-
       Ste si istí, že posktujete dostatok času aj ostatným aby prezentovali svoj názor ?
     too_many_replies: |
-      ### Dosiahli ste limit počtu odpovedí na túto tému
-
       Ľutujeme, noví užívatelia môžu dočasne vložiť len %{newuser_max_replies_per_topic}  odpovedí na jednu tému.
-
       Namiesto nového príspevku zvážte možnosť úpravy predchádzajúcich odpovedí, alebo skúste inú tému.
     reviving_old_topic: |
-      ### Oživiť túto tému ?
-
       Posledná odpoveď k tejto téme je staršia ako  %{days} dní. Vaša odpoveď posunie tému na vrchol tém a upozorní všetkých, ktorí sa zapojili do diskusie.
-
       Ste si istí, že chcete pokračovať v tejto starej diskusii?
   activerecord:
     attributes:
@@ -253,6 +233,7 @@ sk:
       user_profile:
         bio_raw: "O mne"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -273,7 +254,6 @@ sk:
           attributes:
             hex:
               invalid: "nesprávna farba"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Položka \"O mne\" vo Vašom profile je prázdna, <a href='/users/%{username_lower}/preferences/about-me'>želáte si ju doplníť?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} nevložil zatiaľ nič do profilu \"O mne\"</div>"
@@ -286,26 +266,18 @@ sk:
   assets_topic_body: "Toto je permanentná téma, viditeľná len pre redaktorov, na uchovávanie obrázkov a súborov použitých v dizajne tohto webu. Nezmazávajte ju!\n\n\nTu je návod:\n\n\n1. Odpovedzte na túto tému.\n2. Nahrajte sem všetky obrázky, ktoré si prajete použit pre logá, favikony a pod. (Použite ikonku „nahrať“ v paneli nástrojov editora, alebo obrázky potiahnite alebo „vložte“)\n3. Odošlite svoju odpoveď.\n4. Pre získanie adresy k nahratým obrázkom kliknite pravým tlačítkom na obrázky vo svojom novom príspevku, alebo kliknite na ikonku úpravy príspevku a následne si adresu skopírujte. \n5. Cesty k obrázkom vložte do [základného nastavenia](/admin/site_settings/category/required).\n\n\nAk potrebujete povoliť nahratie pre iné typy súborov, upravte `authorized_extensions` v [nastavení súborov](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Vítajte v Salóne"
-    body: |2
+    body: |
-
       Gratulácia! :confetti_ball:
-
       Ak vidíte túto tému, boli ste nedávno povýšený na **pravidelný** (úroveň dôvery 3).
-
       Teraz môžete &hellip;
-
       * Upravovať nadpis akejkoľvek témy
       * Meniť kategóriu akejkoľvek témy
       * Mať sledované všetky Vaše odkazy ([automatické nofollow](http://en.wikipedia.org/wiki/Nofollow) je odstránené)
       * Prístup do privátnej katogógie Lounge prístupnej iba členom s úrovňou dôvery 3 a vyššou
       * Skryť spam pomocou vlajky
-
       Tu je [aktuálny zoznam pravidelných členov](/badges/3/regular). Určite ich pozdravte.
-
       Ďakujeme, že ste dôležitou súčasťou našej komunity!
-
       (Pre viac informácií o úrovniach dôvery, [pozrite túto tému][trust]. Prosím nezabudnite, že iba členovia, ktorý neustále spĺňajú požiadavky zostanú platnými členmy.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "O kategórii: %{category} "
@@ -540,18 +512,6 @@ sk:
       message:
         make: "Téma je odteraz baner. Bude sa zobrazovať navrchu každej stránky, pokiaľ ju používateľ nezavrie."
         remove: "Téma odteraz nie je baner. Už sa nebude viac zobrazovat navrchu každej stránky."
-  unsubscribed:
-    title: 'Odhlásiť'
-    description: "Boli ste odhlásený. Už vás znovu nebudeme kontaktovať."
-    oops: "V prípade že ste to tak nemysleli, kliknite nižšie"
-    error: "Chyba pri odhlasovaní"
-    preferences_link: "Zo súhrnných emailov sa môžete odhlásiť na <a href='/my/preferences'>stránke nastavení</a>"
-    different_user_description: "Aktuálne ste prihlásený ako iný používateľ než ten, komu bol zaslaný súhrnný email. Prosíme odhláste sa a skúste znovu."
-    not_found_description: "Prepáčte, nedokázali sme Vás odhlásiť. Je možné, že platnosť odkazu vo Vašom emaile vypršala."
-  resubscribe:
-    action: "Znovu-prihlásiť"
-    title: "Znovu-prihlásený!"
-    description: "Boli ste znovu prihlásený."
   reports:
     visits:
       title: "Používateľské návštevy"
@@ -686,7 +646,6 @@ sk:
       yaxis: "Počet návštev"
   dashboard:
     rails_env_warning: "Váš server beží v %{env} móde"
-    ruby_version_warning: "Používate Ruby 2.0.0,  ktorá má známe problémy. Aktualizujte prosím na záplatu 247, alebo novšiu."
     host_names_warning: "Váš súbor config/database.yml používa lokálne meno hostiteľa. Aktualizujte ho menom Vašej stránky."
     gc_warning: 'Váš server používa východzie nastavenia ruby garbage collectora, ktorý neposktytuje najlepší výkon. Prečítajte si tento príspevok ohľadom ladenia výkonu <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Ladenie Ruby and Rails pre Discourse</a>.'
     sidekiq_warning: 'Sidekiq neni spustený. Množstvo úloh, ako napríklad posielanie emailov, je vykonávaných asynchrónne prostrednictvom sidekiq. Prosim zabezpečte aby bol spustený aspoň jeden proces sidekiq <a href="https://github.com/mperham/sidekiq" target="_blank">Viac o Sidekiq</a>.'
@@ -771,13 +730,9 @@ sk:
     anon_polling_interval: "Ako často majú byť dotazovaný anonymný klienti v milisekundách"
     background_polling_interval: "Ako často majú byť dotazovaný klienti v milisekundách (ak je okno v pozadí)"
     cooldown_minutes_after_hiding_posts: "Počet minút koľko musí používateľ počkať pred tým než môže upraviť príspevok skytý pomocou komunitných značiek"
-    max_topics_in_first_day: "Maximálny počet tém, ktoré používateľ môže vytvoriť v jeho prvý deň ."
-    max_replies_in_first_day: "Maximálny povolený počet odpovedí, ktoré môže používateľa vytvoriť v jeho prvý deň."
     tl2_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 2 (člen) vynásobením týmto číslom"
     tl3_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 3 (bežný) vynásobením týmto číslom"
     tl4_additional_likes_per_day_multiplier: "Zvýšiť počet páči sa mi na deň pre úroveň dôvery 4 (vedúci) vynásobením týmto číslom"
-    num_flags_to_block_new_user: "Ak príspevky nového používateľa dostanú takéto množstvo spamových vlajok od num_users_to_block_new_user rôznych používateľov, skry všetky jeho príspevky a zabráň vytváraniu príspevkov v budúcnosti. 0 na vypnutie."
-    num_users_to_block_new_user: "Ak príspevky nového používateľa dostanú num_flags_to_block_new_user spamových vlajok od takéhoto množstva rôznych používateľov, skry všetky jeho príspevky a zabráň vytváraniu príspevkov v budúcnosti. 0 na vypnutie."
     notify_mods_when_user_blocked: "Ak je používateľ automaticky zablokovaný, pošli správu všetkým moderátorom."
     flag_sockpuppets: "Ak nový používateľ odpovedá na tému z rovnakej IP adresy, ako nový používateľ, ktorý danú tému vytvoril, označ oba ich príspevky ako potencionálny spam."
     traditional_markdown_linebreaks: "V Markdown použiť tradičné oddeľovače riadkov, čo vyžaduje dve koncové medzery ako oddeľovač riadku."
@@ -1007,10 +962,6 @@ sk:
     allow_animated_thumbnails: "Generovať animované náhľady anomovaných gifov."
     default_avatars: "URL na avatara, ktorý bude štandardne použitý pre nových používateľov pokiaľ si ho nezmenia."
     automatically_download_gravatars: "Po vytvorení účtu alebo zmene heslo stiahnuť používateľov Gravatar."
-    digest_topics: "Maximálny počet tém, ktoré sa zobrazia v súhrnnom emaile."
-    digest_min_excerpt_length: "Minimálny výťah príspevku v sumarizačnom emaile, v znakoch."
-    delete_digest_email_after_days: "Zakázat súhrnný email používateľom, ktorí neboli na stránkach viac ako (n) dní."
-    disable_digest_emails: "Vypnúť sumárny email pre všetkých používateľov."
     detect_custom_avatars: "Má alebo nemá sa kontrolovať nahratie vlastného profilového obrázka používateľa?"
     max_daily_gravatar_crawls: "Koľkokrát denne má Discourse kontrolovať Gravatar na zistenie vlastného avatara."
     public_user_custom_fields: "Schválený zoznam vlastných polí používateľa, ktoré budú verejne zobrazené."
@@ -1025,6 +976,7 @@ sk:
     enable_mobile_theme: "Mobilné zariadenia používajú tému pre mobilné zariadenia s možnosťou prepnutia na plnú verziu stránok. Vypnite, ak chcete použiť vlastný štýl, ktorý podporuje mobilné zariadenia."
     dominating_topic_minimum_percent: "Koľko percent príspevkou musí pouťívateľ pridať do témy než sa mu zobrazí pripomienka o dominovaní témy."
     disable_avatar_education_message: "Vypnúť informatívnu hlášku na zmenu avatara."
+    daily_performance_report: "Denne analyzuj NGINX logy a z detailov vytváraj témy iba pre zamestnancov."
     suppress_uncategorized_badge: "V zozname tém nezobrazuj odznak za nekategorizované príspevky."
     global_notice: "Pre všetkých návštevníkov zobraz URGENTNÉ, KRÍZOVÉ globálné záhlavie, zmeň na čierne a schovaj (HTML povolené)."
     disable_edit_notifications: "Ak je premenná 'download_remote_images_to_local' aktívna, vypnúť notifikácie o úpravách systémového používateľa."
@@ -1060,7 +1012,6 @@ sk:
     emoji_set: "Aké emoji chcete mať?"
     enforce_square_emoji: "Vynútiť švorcový pomer strán na všetkých emoji."
     approve_unless_trust_level: "Príspevky používateľov pod touto úrovňou důvery musia byť schválené"
-    default_email_digest_frequency: "Ako často štandardne používatelia dostávajú sumárny email."
     default_email_private_messages: "Štandardne poslať email použivateľovi, ktorému niekto poslal správu."
     default_email_direct: "Štandardne poslať email ak niekto cituje/odpovedá/uvednie alebo pozve používateľa."
     default_email_mailing_list_mode: "Štandardne poslať email pre každý nový príspevok."
@@ -1071,6 +1022,7 @@ sk:
     default_other_enable_quoting: "Štandardne na vybraný text zapnúť citované odpovede."
     default_other_dynamic_favicon: "Štandardne zobraziť počet nových/aktualizovaných tém v ikone prehliadača."
     default_other_disable_jump_reply: "Štandardne po odpovedi neskákať na používateľov príspevok."
+    default_other_edit_history_public: "Štandardne zobraziť revízie príspevku verejne."
     default_topics_automatic_unpin: "Štandardne automaticky odopnúť témy ak používateľ dosiahne posledný príspevok."
     default_categories_watching: "Štandardný zoznam kategórií, ktoré sú sledované."
     default_categories_tracking: "Štandardný zoznam kategórií, ktoré sú sledované."
@@ -1093,20 +1045,6 @@ sk:
       pop3_polling_username_is_empty: "Pred nastavením POP3 sťahovania musíte nastaviť 'pop3 používateľské meno'."
       pop3_polling_password_is_empty: "Pred nastavením POP3 sťahovania musíte nastaviť 'pop3 heslo'."
       pop3_polling_authentication_failed: "POP3 autentikácia zlyhala. Prosíme overte zadané pop3 nastavenia."
-  notification_types:
-    group_mentioned: "%{group_name} bola spomenutá v %{link}"
-    mentioned: "%{display_username} sa o Vás zmienil v %{link}"
-    liked: "%{display_username} sa páčil Váš príspevok v %{link}"
-    replied: "%{display_username} odpovedal na Váš príspevok v %{link}"
-    quoted: "%{display_username} citoval Váš príspevok v %{link}"
-    edited: "%{display_username} upravil  Váš príspevok v %{link}"
-    posted: "%{display_username} prispel do %{link}"
-    moved_post: "%{display_username} presunul  Váš príspevok do %{link}"
-    private_message: "%{display_username} vám poslal správu: %{link}"
-    invited_to_private_message: "%{display_username} Vás pozval k správe: %{link}"
-    invitee_accepted: "%{display_username} prijal vaše pozvanie"
-    linked: "%{display_username} odkazuje na Vás v %{link}"
-    granted_badge: "Získali ste %{link}"
   search:
     within_post: "#%{post_number} od %{username}"
     types:
@@ -1221,51 +1159,28 @@ sk:
     text_body_template: |
       Niekto (pravdepodobne vy?) požiadal aby ďalej na túto adresu neboli zasielané emailové aktualizácie z %{site_domain_name}.
       Ak si prajete potvrdiť, prosíme kliknite na odkaz:
-
       %{confirm_unsubscribe_link}
-
-
       Ak chcete pokračovať v prijímaní emailových aktualizácií, môžete tento email ignorovať.
   invite_mailer:
     subject_template: "%{invitee_name} Vás pozval '%{topic_title}' na %{site_domain_name}"
     text_body_template: |
       %{invitee_name} Vás pozval do diskusie
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       na
-
       > %{site_title} -- %{site_description}
-
       Ak Vás to zaujalo, kliknite na odkaz nižšie:
-
       %{invite_link}
-
       Táto pozvánka je od dôveryhodného užívateľa, takže môžete okamžite odpovedať na diskusiu .
   invite_forum_mailer:
     subject_template: "%{invitee_name} Vás pozval na %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} Vás pozval, aly ste sa pripojili na
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Ak Vás to zaujíma, kliknite na nižšie uvedený odkaz:
-
-      %{invite_link}
-
-      Toto pozvanie je od dôveryhodného používateľa, takze sa nebudete musieť prihlasovať.
   invite_password_instructions:
     subject_template: "Nastavte heslo pre účet na  %{site_name}"
     text_body_template: |
       Ďakujeme za akceptovanie Vašej pozvánky na %{site_name} -- vitajte!
-
       Kliknite na odkaz aby ste si vybrali heslo:
       %{base_url}/users/password-reset/%{email_token}
-
       (Ak vyššie uvedený odkaz vyexpiroval, vyberte "Zabudol som heslo" keď sa prihlasujete pomocou svojej emailovej adresy.)
   test_mailer:
     subject_template: "[%{site_name}] Overenie doručiteľnosti emailu"
@@ -1278,10 +1193,6 @@ sk:
       one: "%{site_name}] 1 príspevok čaká na revíziu"
       few: "[%{site_name}] %{count} príspevky čakajú na revíziu"
       other: "[%{site_name}] %{count} príspevkov čaká na revíziu"
-    text_body_template: |
-      Ahoj,
-
-      Existujú príspevky nových používateľov, ktoré čakajú na revíziu. [Schválené alebo zamietnuté môžu byť tu](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Váš príspevok bol označený ako \"mimo-témy\": komunita cíti, že nie je vhodný do témy tak, ako je definovaná nadpisom a prvým príspevkom"
     inappropriate: "Váš príspevok bol označený ako **nevhodný**: komunita cíti, že je úrážlivý, nemiestny alebo porušuje [naše pravidlá komunity](/guidelines)."
@@ -1295,101 +1206,6 @@ sk:
     deferred_and_deleted: "Ďakujeme za upozornenie. Daný príspevok sme odstránili."
   temporarily_closed_due_to_flags: "Tento príspevok je dočasne uzamknutý z dôvodu veľkého množstva vlajok od komunity."
   system_messages:
-    post_hidden:
-      subject_template: "Príspevok skrytý z dôvodu konumitného označenia vlajkou"
-    usage_tips:
-      text_body_template: |
-        Tu je niekoľko rád, ako začať:
-
-        ## Čítanie
-
-        Ak chcete pokračovať v čítaní, **jednoducho pokračujte v skrolovaní!**
-
-        V prípade, že dorazia nové odpovede alebo témy, automaticky sa zobrazia - žiadna nutnosť obnovovať stránku.
-
-        ## Navigácia
-
-        - Použite **ikonu s tlačítkom vpravo hore** pr vyhľadávanie, Vašu používateľskú stránku a <kbd>☰</kbd> menu.
-
-        - Ak vyberiete nádpis témy, vždy sa zobrazí **prvá neprečítaná odpoveď** danej témy. Vyberte počet odpovedí alebo dátum poslednej odpovede na zobrazenie začiatku alebo konca.
-
-            <img src="%{base_url}/images/welcome/topic-list-select-areas-2x.png" width="593" height="59">
-
-        - K plnej kontrole navigácie v priebehu čítania témy použite ukazovateľ priebehu v pravom spodnom časti stránky. Rýchlo skočte na začiatok kliknutím na nadpis témy. Na zobrazenie zoznamu klávesových skratiek stlačte <kbd>?</kbd>.
-
-            <img src="%{base_url}/images/welcome/progress-bar-2x.png" width="153" height="181">
-
-        ## Odpovede
-
-        - K odpovedi na **tému celkovo**, použite <img src="%{base_url}/images/welcome/reply-topic-2x.png" width="25" height="23">  na úplnom konci témy.
-
-        - K odpovedi pre **konkrétnu osobu**, použite <img src="%{base_url}/images/welcome/reply-post-2x.png" width="25" height="23"> na ich príspevkoch.
-
-        - K odpovedi pomocou **novej témya**, použite <img src="%{base_url}/images/welcome/reply-as-linked-topic-2x.png" width="20" height="25"> na pravej strane od príspevku. Oba príspevky, pôvodný i nový budú spojené odkazom.
-
-        Vaša odpoveď môže byť formátovaná pomocou jednoduchého HTML, BBCode alebo [Markdown](http://commonmark.org/help/):
-
-            Toto je **tučné**.
-            Toto je <b>tučné</b>.
-            Toto je [b]tučné[/b].
-
-        Chcete sa naučiť Markdown? [Prejdite si tento zábavný 10 minutový interaktívny tutotiál!](http://commonmark.org/help/tutorial/)
-
-        Na vloženie citácie, vyberte text k citovaniu a stlačte tlačítko Odpovedať. Opakujte pre viacnásobné citovanie.
-
-        <img src="%{base_url}/images/welcome/quote-reply-2x.png" width="326" height="128">
-
-        Zmieňte meno, ak chcete niekoho upozorniť na Vašu odpoveď. Napíšte `@` aby ste mohli vybrať používateľské meno.
-
-        <img src="%{base_url}/images/welcome/username-completion-2x.png" width="191" height="125">
-
-        Na použitie [štandardných Emoji](http://www.emoji.codes/), napíšte jednoducho `:` na vyhľadanie podľa mena, alebo použite tradičných smajlíkov `;)`
-
-        <img src="%{base_url}/images/welcome/emoji-completion-2x.png" width="144" height="153">
-
-        Na vygenerovanie náhľadu a sumáru pre odkaz ho jednoducho vložte na samostatný riadok:
-
-        <img src="%{base_url}/images/welcome/link-oneboxing-animation.gif" width="480" height="228">
-
-        ## Akcie
-
-        Na spodu každého príspevku sú akčné tlačítka:
-
-        <img src="%{base_url}/images/welcome/like-link-flag-bookmark-2x.png" width="162" height="42">
-
-        Ak chcete niekomu dať vedieť, že ste s príspevkom spokojný a oceňujete ho, použite tlačítko **páči sa mi**. Zdieľajte lásku!
-
-        Ak vidíte možný problém na príspevku niehoho, dajte im súkromne vedieť, alebo dajte vedieť [našim zamestnancom](%{base_url}/about), pomocou tlačítka **označiť**. Odkaz na príspevok môžete tiež **zdieľať**, alebo **založiť** na neskoršie použitie na vašej používateľskej stránke.
-
-        ## Oznámenia
-
-        Ak Vám niekto odpovedá, cituje Váš príspevok, alebo váš zmieni pomocou `@používateľskémeno`, zobrazí sa číslo na pravej vrchnej časti stránky. Použite ho na prístup k Vašim **oznámeniam**.
-
-        <img src="%{base_url}/images/welcome/notification-panel-2x.png" width="160" height="54">
-
-        Nebojte sa, že zmeškáte nejakú odpoveď - ak budete preč, všetky notifikácie Vám dorazia emailom.
-
-        ## Vaše nastavenia
-
-          - Všetky témy menej ako **dna dni staré** sú považované za nové.
-
-          - Každá téma, do ktorej ste **aktívne prispeli** (vytvorením, odpovedaním, alebo čítaním dlhšiu dobu) budú automaticky sledované.
-
-        Ako indikátor uvidíte modré kolečko, alebo počet neprečítaných u týchto tém:
-
-        <img src="%{base_url}/images/welcome/topics-new-unread-2x.png" width="341" height="106">
-
-        Nastavenia oznámení sa dajú zmeniť pre akúkoľvek tému pomocou ovladania na spodnej časti témy.
-
-        <img src="%{base_url}/images/welcome/topic-notification-control-2x.png" width="608" height="312">
-
-        Ak chcete sledovať každú novú tému v danej kategórií môžete nastaviť notifikácie v rámci kategórie.
-
-        Na zmenu si pozrite [Vaše používateľské nastavenia](%{base_url}/my/preferences).
-
-        ## Dôvera v komunite
-
-        Ak tu prispievate, v priebehu času získate dôveru komunity, stanete sa právoplatným občanom a Vaše používateľské oprávnenia budú navýšené. Ak budete mať dostatočne vysokú [úroveň dôvery](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), získate nové možnosti ako nám pomôcť spravovať našu komunitu spoločne s nami.
     welcome_user:
       subject_template: "Vitajte na %{site_name}!"
     welcome_invite:
@@ -1401,9 +1217,7 @@ sk:
       subject_template: "Záloha sa nepodarila"
       text_body_template: |
         Zaloha sa nepodarila.
-
         Tu je zápis:
-
         ```
         %{logs}
         ```
@@ -1414,9 +1228,7 @@ sk:
       subject_template: "Obnova zlyhala"
       text_body_template: |
         Obnova zlyhala.
-
         Tu je zápis:
-
         ```
         %{logs}
         ```
@@ -1427,9 +1239,7 @@ sk:
       subject_template: "Zpracovanie pozvania viacerých používateľov dopadlo s chybami"
       text_body_template: |
         Váš súbor na hromadné pozvanie používateľov bol zpracovaný, emailom bolo poslaných %{sent} prihlášok s %{failed} chybou(chybami).
-
         Tu je záznam:
-
         ```
         %{logs}
         ```
@@ -1447,15 +1257,12 @@ sk:
       subject_template: "[%{site_name}] Problém s emailom -- Žiadny obsah"
       text_body_template: |
         Prepáčte, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
         Vo Vašom emaile sa nám nepodarilo nájsť žiadny pridávaný obsah.
-
         Ak ste si istý, že ste obsah pridali, pokúste sa znovu a použite jednoduchšie formátovanie.
     email_reject_parsing:
       subject_template: "[%{site_name}] Problém s emailom -- Nerozpoznaný obsah"
       text_body_template: |
         Prepáčte, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala.
-
         Vo Vašom emaile se nepodarilo nájsť pridávaný obsah. **Uistite sa, že ste odpoveď uviedli na začiatku emailu** -- nedokážeme spracovať vložené odpovede.
     email_reject_invalid_access:
       subject_template: "[%{site_name}] Problém s emailom -- Nesprávny prístup"
@@ -1479,8 +1286,6 @@ sk:
       subject_template: "[%{site_name}] Problém s emailom -- Automaticky generovaná odpoveď"
     email_error_notification:
       subject_template: "[%{site_name}] Problém s emailom -- Chyba pri POP autentifikácií"
-    user_automatically_blocked:
-      subject_template: "Nový uživateľ %{username} je zablokovaný kôli označeniu komunitou"
     spam_post_blocked:
       subject_template: "Nový uživateľ %{username} je zablokovaný kôli opakovaným odkazom"
     pending_users_reminder:
@@ -1520,12 +1325,10 @@ sk:
       subject_template: "%{optional_re}%{topic_title}"
     digest:
       why: "Krátky súhrn zo stránky  %{site_link} od Vašej poslednej návštevy %{last_seen_at}"
-      subject_template: "[%{site_name}] Výber"
       new_activity: "Nová aktivita na Vašich témach a príspevkoch:"
       top_topics: "Populárne príspevky"
       other_new_topics: "Populárne témy"
       click_here: "kliknite tu"
-      from: "%{site_name} výber"
       read_more: "Čítať viac"
       more_topics: "Boli vytvorené %{new_topics_since_seen} ďalšie nové témy."
       more_topics_category: "Viac nových tém:"
@@ -1533,9 +1336,7 @@ sk:
       subject_template: "[%{site_name}] Obnovenie hesla"
       text_body_template: |
         Niekto si vyžiadal reset Vášho hesla na [%{site_name}](%{base_url}).
-
         Ak ste to neboli Vy, môžte ignorovať tento email.
-
         Pre zmenu hesl kliknite na nasledujúci odkaz
         %{base_url}/users/password-reset/%{email_token}
     set_password:
@@ -1546,7 +1347,6 @@ sk:
       subject_template: "[%{site_name}] Váš nový účet"
       text_body_template: |
         Nový účet bol pre Vás vytvorený na %{site_name}
-
         Kliknite na nasledujúci odkaz pre nastavenie hesla k Vášmu novému účtu:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
@@ -1599,108 +1399,54 @@ sk:
   csv_export:
     boolean_yes: "Áno"
     boolean_no: "Nie"
-  static_topic_first_reply: |+
+  static_topic_first_reply: |
     Upravte prvý príspevok v téme pre zmenu obsahu %{page_name} stránky.
-
   guidelines_topic:
     title: "FAQ/Pravidlá"
     body: |
       <a name="civilized"></a>
-
-      ## [Toto je miesto pre civilizovanú diskusiu](#civilized)
-
       Prosíme majte k tejto diskusii rešpekt podobný ako k verejnému parku. My, sme tiež zdieľaný zdroj &mdash; miesto na zdieľanie znalostí, vedomostí a záujmov pomocou nepretržitej diskusie.
-
       Toto nie sú jednoznačné pravidlá, skôr návod ľudskému úsudku naše komunity. Použite tieto pravidlá na udržanie prehľadnú a svetlého miesta pre civilizovanú verejnú diskusiu.
-
       <a name="improve"></a>
-
-      ## [Vylepšujte diskusiu](#improve)
-
       Pomôžte nám tvoriť toto skvelé miesto akýmkoľvek snahou o zlepšenie diskuzie, stačí drobnosť. Ak nie ste si istý že Váš príspevok posúva diskuziu, premyslite si čo chcete povedať a skúste neskôr.
-
       Diskutované témy sú nám blízke a chceme, aby ste sa správali tak, akoby Vám boli blízke tiež. Rešpektujte témy a diskutujúcich dokonca i v prípade, ak nesúhlasíte s tým, čo bolo povedané.
-
       Jedným zo spôsobov ako vylepšiť diskusiu je objavenie tej ktoré už prebieha. Prosíme, venujte trochu času zoznámeniu sa s témami predtým, ako začnete odpovedať alebo začínať svoje vlastné a budete mať vačšiu šancu stretnúť tých, ktorý s Vami zdieľajú záujmy.
-
       <a name="agreeable"></a>
-
-      ## [Buďte príjemný i keď nesúhlasíte](#agreeable)
-
       Môžete mať túžbu odpovedať na niečo s čím nesúhlasíte. To je v poriadku. Ale pamätajte _kritizujte myšienky a nie ľudí_. Prosíme, vyvarujte sa:
-
       * Posmeškom.
       * Útokom na konkrétnu osobu.
       * Odpovediam na tón príspevku miesto skutočného obsahu.
       * Impulzívnym reakciám.
-
       Namiesto toho poskytnite logické proti argumenty, ktoré zlepšia konverzáciu.
-
       <a name="participate"></a>
-
-      ## [Vaša účasť sa počíta](#participate)
-
       Konverzácie, ktoré tu máme nastavujú tón pre všetkých. Pomôžte nám ovplyvniť budúcnosť tejto komunity zapojením sa do diskusií ktoré z tohoto fóra robia zaujímavé miesto a vyhýbaním sa tým ktoré to nerobia.
-
       Discourse poskytuje nástroje, ktoré komunite spoločne umožňujú identifikovať najlepšie (a najhoršie) príspevky, záložky, páči sa mi, značky, odpovede, úpravy a podobne. Použite ich na vylepšenie Vašej skúsenosti i skúsenosti kohokoľvek iného.
-
       Poďme náš park zanechať v lepšom stave než v akom sme ho našli.
-
       <a name="flag-problems"></a>
-
-      ## [Ak vidíte problém označte ho](#flag-problems)
-
       Moderátori majú špeciálnu autoritu, sú zodpovedný za fórum. Ale Vy tiež. S Vašou pomocou sa moderátori môžu stať sprostredkovateľmi a nie iba školníkmi alebo políciou.
-
       Ak vidíte nevhodné chovanie, neodpovedajte. Reakciou naň ho posiľujete, míňate svoju energiu a strácate čas nás všetkých. _Oba ho označte_. Ak sa zíde viačej značiek, budú prijaté opatrenia, či už automatické alebo zásahom moderátora.
-
       Na správu komunity majú moderátori vyhradené práva na odstránenie akéhokoľvek obsahu a používateľského účtu kedukoľvek z akéhokoľvek dôvodu. Moderátori žiadnym spôsobom nekontrolujú príspevky, moderátori a vlastníci stránky nepreberajú žiadku zodpovednosť za obsah publikovaný komunitou.
-
       <a name="be-civil"></a>
-
-      ## [Buďte civilizovaný](#be-civil)
-
       Nič nesabotuje zdravú diskusiu tak ako hrubosť:
-
       * Buďte zdvorilí, Neuverejňujte nič, čo by múdra osoba považovala za urážlivé, znevažujúce alebo nenávistné.
       * Udržujte poriadok. Neuverejnujte nič nemravné alebo explicitne sexuálne.
       * Rešpektujte iných. Neprenasledujte alebo nezarmucujte ostatných, nenapodobnujte ľudí, alebo nezverejňujte ich súkromné informácie.
       * Rešpektujte naše fórum. Neuverejňujte spam alebo iným spôsobom nevandalizujte fórum.
-
       Toto nie sú jednoznačné pravidlá s presnými definiciami &mdash; vyhnite sa čo i len _náznaku_ akejkoľvek z týchto vecí. Ak nie ste si istý, spýtajte sa, či by Váš príspevok bol zverejnený na hlavnej strane New York Times.
-
       Toto je verejné fórum a diskusie sú indexované vyhľadávačmi. Udržujte jazyk, odkazy a obrázky bezpečné pre rodinu a priateĺov.
-
       <a name="keep-tidy"></a>
-
-      ## [Udržujte poriadok](#keep-tidy)
-
       Vynaložte snahu dať veci na správne miesto, tak môžeme stráviť viac času diskusiou a menej udržiavaním poriadku. Takže:
-
       * Nezačínajte tému v nesprávnej kategórií.
       * Neuverejňujte rovnaké veci vo viacetých témach.
       * Nepublikujte príspevky bez obsahu.
       * Nepresmerujte tému zmenou uprostred.
       * Nepodpisujte sa &mdash; každý príspevok má pripojený odkaz na Váš profil.
-
       Namiesto poslania “+1” or “Súhlasím”, radšej použite tlačítko Páči sa mi. Namiesto radikálnej zmeny témy v priebehu diskusie radšej odpovedzte spojenou témou.
-
       <a name="stealing"></a>
-
-      ## [Uverejňujte iba svoj obsah](#stealing)
-
       Bez dovolenia nemôžete publikovať nič digitálne, čo patrí niekomu inému. Nemôžete publikovať popis, odkazy alebo metódy na kradnutie niekoho intelektuálneho vlastníctva (softvéru, videa, audia, obrázkov), alebo porušovať akýkoľvek iný zákon.
-
       <a name="power"></a>
-
-      ## [Založené na Vás](#power)
-
       Táto stránka je prevádzkovaná [miestnym priateľským personálom](/about) a *Vami*, komunitou. Ak máte akékoľvek ďalšie otázky ako by tu veci mali fungovať, založte novú tému v [kategórií spätná väzba](/c/site-feedback) a poďme diskutovať! Ak ste narazili na kritický alebo urgentný problém ktorý nemôže byť riešený pomocou tém v meta alebo príznakom, kontaktujte nás pomocou [stránky personálu](/about).
-
       <a name="tos"></a>
-
-      ## [Podmienky](#tos)
-
       Áno, právnický žargón je nudný, ale musíme chrániť seba &ndash; tým následne i Vás a vaše dáta &ndash; voči nepriateľským ľuďom. Máme  [Podmienky](/tos) popisujúce Vaše (a naše ) správanie a práva súvisiace s obsahom, súkromým a legislatívou. K používaniu tejto služby musíte dodžiavať naše [Pravidlá](/tos).
   tos_topic:
     title: "Podmienky používania"
@@ -1716,8 +1462,3 @@ sk:
   performance_report:
     initial_post_raw: Táto téma obsahuje denné reporty rýchlosti Vašich stránok.
     initial_topic_title: Reporty rýchlosti stránok
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.sq.yml

@@ -15,6 +15,11 @@ sq:
       short: "%m-%d-%Y"
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
+  date:
+    month_names: []
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Tema"
   posts: "postime"
@@ -67,6 +72,9 @@ sq:
         other: '%{count} errors prohibited this %{model} from being saved'
     embed:
       load_from_remote: "Postimi nuk mundi të ngarkohet. Riprovoheni!"
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Skedari duhet të jete i formatit csv ose txt"
   backup:
@@ -138,59 +146,34 @@ sq:
     until_posts:
       one: "1 postim"
       other: "%{count} postime"
-    new-topic: |
+    'new-topic': |
       Welcome to %{site_name} &mdash; **thanks for starting a new conversation!**
-
       - Does the title sound interesting if you read it out loud? Is it a good summary?
-
       - Who would be interested in this? Why does it matter? What kind of responses do you want?
-
       - Include commonly used words in your topic so others can *find* it. To group your topic with related topics, select a category.
-
       For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Mirë se vini tek %{site_name} &mdash; **faleminderit për kontributin!**
-
       - Does your reply improve the conversation in some way?
-
       - Be kind to your fellow community members.
-
       - Constructive criticism is welcome, but criticize *ideas*, not people.
-
       For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
     avatar: |
-      ### How about a picture for your account?
-
       You've posted a few topics and replies, but your profile picture isn't as unique as you are -- it's just a letter.
-
       Have you considered **[visiting your user profile](%{profile_path})** and uploading a picture that represents you?
-
       It's easier to follow discussions and find interesting people in conversations when everyone has a unique profile picture!
     sequential_replies: |
-      ### Consider replying to several posts at once
-
       Rather than many sequential replies to a topic, please consider a single reply that includes quotes from previous posts or @name references.
-
       You can edit your previous reply to add a quote by highlighting text and selecting the <b>quote reply</b> button that appears.
-
       It's easier for everyone to read topics that have fewer in-depth replies versus lots of small, individual replies.
     dominating_topic: |
-      ### Let others join the conversation
-
       This topic is clearly important to you &ndash; you've posted more than %{percent}% of the replies here.
-
       Are you sure you're providing adequate time for other people to share their points of view, too?
     too_many_replies: |
-      ### You have reached the reply limit for this topic
-
       We're sorry, but new users are temporarily limited to %{newuser_max_replies_per_topic} replies in the same topic.
-
       Instead of adding another reply, please consider editing your previous replies, or visiting other topics.
     reviving_old_topic: |
-      ### Revive this topic?
-
       The last reply to this topic is now over %{days} days old. Your reply will bump the topic to the top of its list and notify anyone previously involved in the conversation.
-
       Are you sure you want to continue this old conversation?
   activerecord:
     attributes:
@@ -201,6 +184,7 @@ sq:
       user_profile:
         bio_raw: "Rreth Meje"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -221,7 +205,6 @@ sq:
           attributes:
             hex:
               invalid: "nuk është një ngjyrë e vlefshme"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>the About Me field of your profile is currently blank, <a href='/users/%{username_lower}/preferences/about-me'>would you like to fill it out?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} hasn't entered anything in the About Me field of their profile yet</div>"
@@ -234,26 +217,18 @@ sq:
   assets_topic_body: "This is a permanent topic, visible only to staff, for storing images and files used in the site design. Don't delete it!\n\n\nHere's how:\n\n\n1. Reply to this topic.\n2. Upload all the images you wish to use for logos, favicons, and so forth here. (Use the upload toolbar icon in the post editor, or drag-and-drop or paste images.)\n3. Submit your reply to post it.\n4. Right click the images in your new post to get the path to the uploaded images, or click the edit icon to edit your post and retrieve the path to the images. Copy the image paths.\n5. Paste those image paths into [basic settings](/admin/site_settings/category/required).\n\n\nIf you need to enable different file type uploads, edit `authorized_extensions` in the [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Mirë se vini në Lounge"
-    body: |2
+    body: |
-
       Congratulations! :confetti_ball:
-
       If you can see this topic, you were recently promoted to **regular** (trust level 3).
-
       You can now &hellip;
-
       * Edit the title of any topic
       * Change the category of any topic
       * Have all your links followed ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)
       * Access a private Lounge category only visible to users at trust level 3 and higher
       * Hide spam with a single flag
-
       Here's the [current list of fellow regulars](/badges/3/regular). Be sure to say hi.
-
       Thanks for being an important part of this community!
-
       (For more information on trust levels, [see this topic][trust]. Please note that only members who continue to meet the requirements over time will remain regulars.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Rreth kategorisë %{category}"
@@ -441,18 +416,6 @@ sq:
       message:
         make: "This topic is now a banner. It will appear at the top of every page until it is dismissed by the user."
         remove: "This topic is no longer a banner. It will no longer appear at the top of every page."
-  unsubscribed:
-    title: 'Unsubscribed'
-    description: "You have been unsubscribed. We won't contact you again!"
-    oops: "In case you didn't mean to do this, click below."
-    error: "Error Unsubscribing"
-    preferences_link: "You can also unsubscribe from digest emails on your <a href='/my/preferences'>preferences page</a>"
-    different_user_description: "You are currently logged in as a different user than the one who the digest was mailed to. Please log out and try again."
-    not_found_description: "Sorry, we couldn't unsubscribe you. It's possible the link in your email has expired."
-  resubscribe:
-    action: "Ri-abonohu"
-    title: "Re-Subscribed!"
-    description: "You have been re-subscribed."
   reports:
     visits:
       title: "User Visits"
@@ -585,7 +548,6 @@ sq:
       yaxis: "Number of visits"
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
-    ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later."
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
     gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
@@ -665,13 +627,9 @@ sq:
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     background_polling_interval: "How often should the clients poll in milliseconds (when the window is in the background)"
     cooldown_minutes_after_hiding_posts: "Number of minutes a user must wait before they can edit a post hidden via community flagging"
-    max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site"
-    max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site"
     tl2_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl2 (member) by multiplying with this number"
     tl3_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl3 (regular) by multiplying with this number"
     tl4_additional_likes_per_day_multiplier: "Increase limit of likes per day for tl4 (leader) by multiplying with this number"
-    num_flags_to_block_new_user: "If a new user's posts get this many spam flags from num_users_to_block_new_user different users, hide all their posts and prevent future posting. 0 to disable."
-    num_users_to_block_new_user: "If a new user's posts get num_flags_to_block_new_user spam flags from this many different users, hide all their posts and prevent future posting. 0 to disable."
     notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators."
     flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam."
     traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak."
@@ -874,9 +832,6 @@ sq:
     allow_animated_thumbnails: "Generates animated thumbnails of animated gifs."
     default_avatars: "URLs to avatars that will be used by default for new users until they change them."
     automatically_download_gravatars: "Download Gravatars for users upon account creation or email change."
-    digest_topics: "The maximum number of topics to display in the email digest."
-    digest_min_excerpt_length: "Minimum post excerpt in the email digest, in characters."
-    disable_digest_emails: "Disable digest emails for all users."
     detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures."
     max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day"
     public_user_custom_fields: "A whitelist of custom fields for a user that can be shown publicly."
@@ -888,6 +843,7 @@ sq:
     allow_profile_backgrounds: "Allow users to upload profile backgrounds."
     enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive."
     dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic."
+    daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
     suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists."
     global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)."
     disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
@@ -933,19 +889,6 @@ sq:
       invalid_string_min: "Must be at least %{min} characters."
       invalid_string_max: "Must be no more than %{max} characters."
       invalid_reply_by_email_address: "Value must contain '%{reply_key}' and be different from the notification email."
-  notification_types:
-    mentioned: "%{display_username} mentioned you in %{link}"
-    liked: "%{display_username} liked your post in %{link}"
-    replied: "%{display_username} replied to your post in %{link}"
-    quoted: "%{display_username} quoted your post in %{link}"
-    edited: "%{display_username} edited your post in %{link}"
-    posted: "%{display_username} posted in %{link}"
-    moved_post: "%{display_username} moved your post to %{link}"
-    private_message: "%{display_username} sent you a message: %{link}"
-    invited_to_private_message: "%{display_username} invited you to a message: %{link}"
-    invitee_accepted: "%{display_username} accepted your invitation"
-    linked: "%{display_username} linked you in %{link}"
-    granted_badge: "You earned %{link}"
   search:
     within_post: "#%{post_number} by %{username}"
     types:
@@ -1048,42 +991,22 @@ sq:
     subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}"
     text_body_template: |
       %{invitee_name} invited you to a discussion
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       at
-
       > %{site_title} -- %{site_description}
-
       If you're interested, click the link below:
-
       %{invite_link}
-
       This invitation is from a trusted user, so you can reply to the discussion immediately.
   invite_forum_mailer:
     subject_template: "%{invitee_name} invited you to join %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} invited you to join
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      If you're interested, click the link below:
-
-      %{invite_link}
-
-      This invitation is from a trusted user, so you won't need to log in.
   invite_password_instructions:
     subject_template: "Set password for your %{site_name} account"
     text_body_template: |
       Thanks for accepting your invitation to %{site_name} -- welcome!
-
       Click this link to choose a password now:
       %{base_url}/users/password-reset/%{email_token}
-
       (If the link above has expired, choose "I forgot my password" when logging in with your email address.)
   test_mailer:
     subject_template: "[%{site_name}] Email Deliverability Test"
@@ -1095,10 +1018,6 @@ sq:
     subject_template:
       one: "[%{site_name}] 1 post waiting to be reviewed"
       other: "[%{site_name}] %{count} posts waiting to be reviewed"
-    text_body_template: |
-      Hello,
-
-      There are posts from new users that are waiting to be reviewed. [They can be approved or rejected here](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post."
     inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](/guidelines)."
@@ -1112,41 +1031,26 @@ sq:
     deferred_and_deleted: "Thanks for letting us know. We've removed the post."
   temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags."
   system_messages:
-    post_hidden:
-      subject_template: "Post hidden due to community flagging"
     welcome_user:
       subject_template: "Mirë se vini tek %{site_name}!"
       text_body_template: |
         Thanks for joining %{site_name}, and welcome!
-
         %{new_user_tips}
-
         We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
-
         Enjoy your stay!
-
         (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.)
     welcome_invite:
       subject_template: "Mirë se vini tek %{site_name}!"
       text_body_template: |
         Thanks for accepting your invitation to %{site_name} -- welcome!
-
         We've created a new account **%{username}** for you, and you are logged in. You can change your name by visiting [your user profile][prefs].
-
         To log in again later:
-
         1. Always **use the same email address from your original invitation** when logging in. Otherwise we won't be able to tell it's you!
-
         2. Create a unique password for [your user profile][prefs], and use it to log in.
-
         %{new_user_tips}
-
         We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
-
         Enjoy your stay!
-
         (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.)
-
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Backup completed successfully"
@@ -1155,9 +1059,7 @@ sq:
       subject_template: "Backup failed"
       text_body_template: |
         The backup has failed.
-
         Here's the log:
-
         ```
         %{logs}
         ```
@@ -1168,9 +1070,7 @@ sq:
       subject_template: "Restore failed"
       text_body_template: |
         The restore has failed.
-
         Here's the log:
-
         ```
         %{logs}
         ```
@@ -1181,9 +1081,7 @@ sq:
       subject_template: "Bulk user invite processed with errors"
       text_body_template: |
         Your bulk user invite file was processed, %{sent} invites mailed with %{failed} error(s).
-
         Here's the log:
-
         ```
         %{logs}
         ```
@@ -1191,9 +1089,7 @@ sq:
       subject_template: "Data export complete"
       text_body_template: |
         Your data export was successful! :dvd:
-
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
-
         The above download link will be valid for 48 hours.
     csv_export_failed:
       subject_template: "Data export failed"
@@ -1206,7 +1102,6 @@ sq:
       subject_template: "[%{site_name}] Email issue -- Content unrecognized"
       text_body_template: |
         We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.
-
         We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies.
     email_reject_invalid_access:
       subject_template: "[%{site_name}] Email issue -- Invalid Access"
@@ -1220,8 +1115,6 @@ sq:
       subject_template: "[%{site_name}] Email issue -- Auto Generated Reply"
     email_error_notification:
       subject_template: "[%{site_name}] Email issue -- POP authentication error"
-    user_automatically_blocked:
-      subject_template: "New user %{username} blocked due to community flags"
     spam_post_blocked:
       subject_template: "New user %{username} posts blocked due to repeated links"
     pending_users_reminder:
@@ -1230,7 +1123,6 @@ sq:
         other: "%{count} users waiting for approval"
       text_body_template: |
         There are new user signups waiting to be approved (or rejected) before they can access this forum.
-
         [Please review them in the admin section](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Downloading remote images disabled"
@@ -1248,120 +1140,86 @@ sq:
       subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{respond_instructions}
     user_invited_to_private_message_pm_staged:
       subject_template: "[%{site_name}] %{username} invited you to a message '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{respond_instructions}
     user_invited_to_topic:
       subject_template: "[%{site_name}] %{username} invited you to '%{topic_title}'"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{respond_instructions}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_replied_pm:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_quoted:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_linked:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_group_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_posted:
       subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_posted_pm:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
-
         %{message}
-
         %{context}
-
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |2
+      text_body_template: |
-
         %{message}
     digest:
       why: "A brief summary of %{site_link} since your last visit on %{last_seen_at}"
-      subject_template: "[%{site_name}] Digest"
       new_activity: "New activity on your topics and posts:"
       top_topics: "Popular posts"
       other_new_topics: "Popular topics"
-      unsubscribe: "This digest is sent from %{site_link} when we haven't seen you in a while. To unsubscribe %{unsubscribe_link}."
       click_here: "click here"
-      from: "%{site_name} përmbledhje"
       read_more: "Read More"
       more_topics: "There were %{new_topics_since_seen} other new topics."
       more_topics_category: "More new topics:"
@@ -1369,63 +1227,47 @@ sq:
       subject_template: "[%{site_name}] Password reset"
       text_body_template: |
         Somebody asked to reset your password on [%{site_name}](%{base_url}).
-
         If it was not you, you can safely ignore this email.
-
         Click the following link to choose a new password:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Set Password"
       text_body_template: |
         Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
-
         If you did not make this request, you can safely ignore this email.
-
         Click the following link to choose a password:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Login"
       text_body_template: |
         Somebody asked to login to your account on [%{site_name}](%{base_url}).
-
         If you did not make this request, you can safely ignore this email.
-
         Click the following link to login:
         %{base_url}/users/admin-login/%{email_token}
     account_created:
       subject_template: "[%{site_name}] Your New Account"
       text_body_template: |
         A new account was created for you at %{site_name}
-
         Click the following link to choose a password for your new account:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: |
         Welcome to %{site_name}!
-
         A staff member approved your account on %{site_name}.
-
         Click the following link to confirm and activate your new account:
         %{base_url}/users/activate-account/%{email_token}
-
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
-
         %{new_user_tips}
-
         We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
-
         Enjoy your stay!
-
         (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.)
     signup:
       subject_template: "[%{site_name}] Confirm your new account"
       text_body_template: |
         Welcome to %{site_name}!
-
         Click the following link to confirm and activate your new account:
         %{base_url}/users/activate-account/%{email_token}
-
         If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
   page_not_found:
     popular_topics: "Popular"
@@ -1435,7 +1277,6 @@ sq:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Welcome to %{title}](#welcome)
       An account is required. Please create an account or log in to continue.
   terms_of_service:
     title: "Terms of Service"
@@ -1481,121 +1322,58 @@ sq:
     title: "Pyetjet/Udhëzimet"
     body: |
       <a name="civilized"></a>
-
-      ## [This is a Civilized Place for Public Discussion](#civilized)
-
       Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource &mdash; a place to share skills, knowledge and interests through ongoing conversation.
-
       These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.
-
       <a name="improve"></a>
-
-      ## [Improve the Discussion](#improve)
-
       Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later.
-
       The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.
-
       One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.
-
       <a name="agreeable"></a>
-
-      ## [Be Agreeable, Even When You Disagree](#agreeable)
-
       You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid:
-
       *   Name-calling.
       *   Ad hominem attacks.
       *   Responding to a post’s tone instead of its actual content.
       *   Knee-jerk contradiction.
-
       Instead, provide reasoned counter-arguments that improve the conversation.
-
       <a name="participate"></a>
-
-      ## [Your Participation Counts](#participate)
-
       The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be &mdash; and avoiding those that do not.
-
       Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.
-
       Let’s try to leave our park better than we found it.
-
       <a name="flag-problems"></a>
-
-      ## [If You See a Problem, Flag It](#flag-problems)
-
       Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.
-
       When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention.
-
       In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community.
-
       <a name="be-civil"></a>
-
-      ## [Always Be Civil](#be-civil)
-
       Nothing sabotages a healthy conversation like rudeness:
-
       *   Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.
       *   Keep it clean. Don’t post anything obscene or sexually explicit.
       *   Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information.
       *   Respect our forum. Don’t post spam or otherwise vandalize the forum.
-
       These are not concrete terms with precise definitions &mdash; avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.
-
       This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.
-
       <a name="keep-tidy"></a>
-
-      ## [Keep It Tidy](#keep-tidy)
-
       Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:
-
       *   Don’t start a topic in the wrong category.
       *   Don’t cross-post the same thing in multiple topics.
       *   Don’t post no-content replies.
       *   Don’t divert a topic by changing it midstream.
       *   Don’t sign your posts &mdash; every post has your profile information attached to it.
-
       Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic.
-
       <a name="stealing"></a>
-
-      ## [Post Only Your Own Stuff](#stealing)
-
       You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.
-
       <a name="power"></a>
-
-      ## [Powered by You](#power)
-
       This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about).
-
       <a name="tos"></a>
-
-      ## [Terms of Service](#tos)
-
       Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos).
   tos_topic:
     title: "Termat e Shërbimit "
     body: |
       The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
       Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
       <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
       If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
       <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
       If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
       *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
       *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
       *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
@@ -1605,114 +1383,40 @@ sq:
       *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
       *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
       *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
       <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
       User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
       <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
       Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
       Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
       <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
       Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
       <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
       %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
       <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
       We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
       <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
       As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
       <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
       This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
       <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
       %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
       <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
       %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
       <a name="12"></a>
-
-      ## [12. Changes](#12)
-
       %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
       <a name="13"></a>
-
-      ## [13. Termination](#13)
-
       %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
       <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
       The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
       <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
       In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
       <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
       You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
       <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
       You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
       <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
       This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
       This document is CC-BY-SA. It was last updated May 31, 2013.
-
       Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Politika e Privatësisë"
@@ -1737,10 +1441,3 @@ sq:
   performance_report:
     initial_post_raw: This topic includes daily performance reports for your site.
     initial_topic_title: Raportet e performancës se faqes
-  date:
-    <<: *datetime_formats
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.te.yml

@@ -10,6 +10,12 @@ te:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats 
+  date:
+    month_names: []
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "డిస్కోర్స్"
   topics: "విషయాలు"
   posts: "టపాలు"
@@ -61,6 +67,9 @@ te:
         other: '%{count} దోషాల వల్ల  %{model} భద్రపరుచుట వీలవలేదు'
     embed:
       load_from_remote: "ఈ టపా లోడింగులో దోషం"
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "ఎగుమతించే దస్త్రం కేవలం csv లేదా txt రూపంలో ఉండాలి"
   backup:
@@ -122,16 +131,11 @@ te:
     until_posts:
       one: "ఒక టపా"
       other: "%{count} టపాలు"
-    new-reply: |
+    'new-reply': |
       స్వాగతం %{site_name} &mdash; **పాల్గొన్నందుకు ధన్యవాదాలు!**
-
       - మీ సమాధానం సంభాషణను కొంత మెరుగు పరిచిందా ?
-
       - తోటి కమ్యూనిటి సభ్యులతో మర్యాదగా ఉండండి .
-
       - నిర్మాణాత్మక విమర్శలకు స్వాగతం, కానీ *ఆలోచన*లను విమర్శించండి,వ్యక్తులని కాదు.
-
-
       మరింత సమాచారం కోసం ,[వర్గ మార్గదర్శక సూత్రాలను చూడండి](/guidelines).ఈ పట్టిక మొదట మీకే కనిపిస్తుంది%{education_posts_text}.
   activerecord:
     attributes:
@@ -142,6 +146,7 @@ te:
       user_profile:
         bio_raw: "నా గురించి"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -162,7 +167,6 @@ te:
           attributes:
             hex:
               invalid: "ఇది చెల్లని రంగు"
-      <<: *errors
   user_profile:
     no_info_other: "<div class='missing-profile'>%{పేరు} ఇంకా వారి ప్రొఫైల్ లో ఎబౌట్ మీ స్థానంలో ఏమీ చేర్చలేదు</div>"
   vip_category_name: "అడ్డా"
@@ -347,18 +351,6 @@ te:
       message:
         make: "ఈ విషయం ఇప్పుడు బ్యానరు. సభ్యుడు తుడిచే వరకూ ఈ విషయం ప్రతి పుటకు అగ్రభాగాన కనిపిస్తుంది."
         remove: "ఈ విషయం ఇప్పుడు బ్యానరు కాదు. ఇహ అది ప్రతి పుట అగ్రభాగానా కనిపించదు"
-  unsubscribed:
-    title: 'చందాముగిసింది'
-    description: "మీ చందా ముగిసింది. మిమ్ము మేము ఇహ సంప్రదించము!"
-    oops: "మీరు కోరుకున్నది ఇది కాకుంటే దిగువ నొక్కండి."
-    error: "చందా తొలగించడంలో దోషం"
-    preferences_link: "<a href='/my/preferences'>అమరికలు పుట</a> నుండి కూడా మీరు చందా తొలగించవచ్చు"
-    different_user_description: "మీరు ప్రస్తుతం వేరే పేరుతో లాగిన్ అయి ఉన్నారు. దయచేసి లాగవుట్ అయి లాగిన్ కండి. "
-    not_found_description: "క్షమించాలి. మీ చందా మేము రద్దు చేయలేకపోయాము. బహుశా మీ ఈ మెయిల్లోని లంకె కాలాతీతమై ఉండవచ్చు."
-  resubscribe:
-    action: "మరలా చందాకట్టు"
-    title: "మరలా చందాకట్టారు"
-    description: "మీ చందా మరలా చేతనమైంది"
   reports:
     visits:
       title: "సభ్యుని గణాంకాలు"
@@ -468,7 +460,6 @@ te:
       yaxis: "మొత్తం అభ్యర్థనలు"
   dashboard:
     rails_env_warning: "మీ సర్వరు %(env) రీతిలో నడుస్తోంది"
-    ruby_version_warning: "మీరు రూబీ 2.0.0 వాడుతున్నారు. ఇది సమస్యలతో కూడినది. దయచేసి పేచీ స్థాయి 247 లేదా ఆపైకి ఉన్నతీకరించగలరు"
     host_names_warning: "మీ config/database.yml దస్త్రం అప్రమేయ లోకల్ హోస్ట్ వాడుతున్నది. దాన్ని మీ సైటు పేరుకు మార్చగలరు. "
     memory_warning: 'మీ సర్వరు ఒక జీబీ కన్నా తక్కువ మెమరీతో నడుస్తున్నది. కనీసం ఒక జీబీ అయినా ఉండుట మంచిది. '
     contact_email_missing: "మీరు మీ సైట్ యొక్క సంప్రదింపు ఈ-మెయిల్ నమోదు చేయండి దాని ద్వారా సైట్‌కు సంబంధించిన అత్యవసర విషయాలు అందుకొంటారు. <a href='/admin/site_settings'>సైట్ సెట్టింగ్స్‌ లో అప్‌డేట్ చేయండి</a>."
@@ -497,8 +488,6 @@ te:
     max_image_height: "ఒక టపాలో థంబ్నైల్ గరిష్ట ఎత్తు"
     show_subcategory_list: "ఒక అంశం జాబితా వర్గంలో నమోదు చేసేటప్పుడు బదులుగా ఉపవర్గం జాబితా చూపించు."
     post_excerpt_maxlength: "ఒక టపా సంగ్రహం/సారాంశం గరిష్ట పొడవు."
-    max_topics_in_first_day: "ఈ సైట్ లో వినియోగదారు మొదటి రోజున గరిష్ఠంగా ఎన్ని విషయాలకి అనుమతి ఉంది "
-    max_replies_in_first_day: "ఈ సైట్ లో వినియోగదారు మొదటి రోజున గరిష్ఠంగా ఎన్ని జవాబులకు అనుమతి ఉంది "
     allow_moderators_to_create_categories: "మధ్యవర్తులు కొత్త వర్గాలు సృష్టించడానికి అనుమతించు"
     topics_per_period_in_top_summary: "అప్రమేయ అగ్ర విషయాల సారాంశంలో చూపే అగ్ర విషయాల సంఖ్య."
     invite_expiry_days: "వాడుకరుల ఆహ్వాన కీ ఎన్ని రోజులు చెల్లుతుంది"
@@ -615,6 +604,3 @@ te:
     title: "సేవా నిబంధనలు"
   privacy_topic:
     title: "ప్రైవసీ పోలసీ"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.tr_TR.yml

@@ -15,21 +15,31 @@ tr_TR:
       short: "%d-%m-%Y"
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
   date:
     month_names: [null, Ocak, Şubat, Mart, Nisan, Mayıs, Haziran, Temmuz, Ağustos, Eylül, Ekim, Kasım, Aralık]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+    am: "am"
+    pm: "pm"
   title: "Discourse"
   topics: "Konular"
   posts: "gönderiler"
   loading: "Yükleniyor"
   powered_by_html: 'Gücünü <a href="http://www.discourse.org">Discourse</a> ''tan alır, en iyi görünüm için JavaScript etkinleştirmeniz gerekir'
   log_in: "Giriş Yap"
+  purge_reason: "terkedilmiş, deaktif hesap olarak otomatik olarak silindi"
   disable_remote_images_download_reason: "Yeterli disk alanı kalmaması sebebiyle uzaktan görüntü indirme devre dışı bırakıldı."
   anonymous: "Anonim"
   emails:
     incoming:
       default_subject: "Bu kişiden %{email} gelen e-posta"
       show_trimmed_content: "Kısaltılmış olan yazıyı göster"
+      errors:
+        no_message_id_error: "Epostanın 'Message-Id' başlığı olmadığında olur"
+        inactive_user_error: "Gönderici aktif olmadığında olur."
+        blocked_user_error: "Gönderici bloklandığında olur."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -79,6 +89,9 @@ tr_TR:
       max_username_length_range: "En küçük değer altında en büyük değer ayarlayamazsınız."
       default_categories_already_selected: "Bir başka listede kullanılan bir kategoriyi seçemezsiniz."
       s3_upload_bucket_is_required: "Bir 's3_upload_bucket' tanımlamadıysanız, S3 yüklemelerini etkinleştiremezsiniz."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Yüklenen dosya csv veya txt formatında olmalı. "
   backup:
@@ -143,12 +156,16 @@ tr_TR:
     top: "En iyi konular"
     posts: "Son gönderiler"
     private_posts: "Son özel mesajlar"
+    user_posts: "@%{username} tarafından son yazılar"
+    user_topics: "@%{username} tarafından son konular"
+    tag: "işaretlenmiş konular"
   too_late_to_edit: "Gönderi çok uzun zaman önce oluşturulmuş. Artık düzenlenemez ya da silinemez. "
   excerpt_image: "resim"
   queue:
     delete_reason: "Gönderi yönetim sırası aracılığıyla silindi"
   groups:
     errors:
+      can_not_modify_automatic: "otomatik bir grupta değişiklik yapamazsınız"
       member_already_exist: "'%{username}' zaten grubun bir üyesi."
       invalid_domain: "'%{domain}' geçerli bir alan adı değil."
       invalid_incoming_email: "Bu '%{email}' e-posta geçerli değil."
@@ -165,33 +182,34 @@ tr_TR:
   education:
     until_posts:
       other: "%{count} gönderi"
-    new-topic: "%{site_name} forumuna hoşgeldiniz &mdash; **yeni bir sohbet başlattığınız için teşekkür ederiz! **\n\n- Yüksek sesle okuduğunuzda başlık ilgi çekici geliyor mu? İyi bir özet mi?\n\n- Bununla kim ilgilenirdi? Neden önemli? Ne gibi cevaplar almayı diliyorsunuz?\n\n- Diğerlerinin de kolayca *bulabilmesi * için konunuzun içerisine sıkça kullanılan kelimeler dahil edin. Konunuzun benzer konularla gruplanması için bir kategori seçin. \n\nDaha fazlası için, [topluluk yönergelerimize bakın](/guidelines). Bu panel sadece ilk %{education_posts_text} için görünür.\n"
+    'new-topic': |
-    new-reply: |
+      %{site_name} forumuna hoşgeldiniz &mdash; **yeni bir sohbet başlattığınız için teşekkür ederiz! **
+      - Yüksek sesle okuduğunuzda başlık ilgi çekici geliyor mu? İyi bir özet mi?
+      - Bununla kim ilgilenirdi? Neden önemli? Ne gibi cevaplar almayı diliyorsunuz?
+      - Diğerlerinin de kolayca *bulabilmesi * için konunuzun içerisine sıkça kullanılan kelimeler dahil edin. Konunuzun benzer konularla gruplanması için bir kategori seçin.
+      Daha fazlası için, [topluluk yönergelerimize bakın](/guidelines). Bu panel sadece ilk %{education_posts_text} için görünür.
+    'new-reply': |
       %{site_name} forumuna hoşgeldiniz &mdash; **katılımınız için teşekkür ederiz!**
-
       - Cevabınız sohbeti bir şekilde geliştiriyor mu?
-
       - Topluluğun diğer üyelerine karşı nazik olun.
-
       - Yapıcı eleştirici her zaman kabul edilir, ama *fikirleri* eleştirin, insanları değil.
-
       Daha fazlası için, [topluluk yönergelerine bakın](/guidelines). Bu yazı sadece ilk %{education_posts_text} için görünür.
     avatar: |
-      ### Hesabının bir resmi olsun istemez misin?
-
       Birkaç konu ve cevap gönderdin, fakat profil resmin senin kadar eşsiz değil - sadece bir harf.
-
       Hiç **[kullanıcı profiline girmeyi](%{profile_path})** ve seni ifade eden bir resim yüklemeyi düşündün mü?
-
       Herkes eşsiz bir profil resmine sahip olduğunda tartışmaları takip etmek ve tartışmalarda ilgi çekici insanlar bulmak daha kolaydır!
-    sequential_replies: "### Birden fazla gönderiyi aynı anda cevaplayabilirsin \n\nAynı konuya ardı ardına cevaplar yazmak yerine, lütfen önceki gönderilerden alıntı veya @isim referansları içeren tek bir cevap yaz. \n\nHerhangi bir yazıyı seçince çıkan <b>alıntılayarak cevapla</b> butonuna tıklayarak alıntı ekleyebilir, bir önceki cevabınızı düzenleyebilirsiniz. \n\nAz sayıda derinlemesine cevaplardan oluşan konuların okunması, çok fazla kısa ve tekil cevaplardan oluşan konulardan herkes için daha kolay oluyor.\n"
+    sequential_replies: |
-    dominating_topic: "###Sohbete başkalarının katılmasına izin verin\n\nBu konunun sizin için önemli olduğunu görüyoruz &ndash; buradaki cevapların %{percent}% oranından daha fazlasını siz göndermişsiniz. \n\nDiğerlerinin de kendi fikirlerini paylaşmaları için onlara yeteri kadar zaman tanıdığınıza emin misiniz?\n"
+      Aynı konuya ardı ardına cevaplar yazmak yerine, lütfen önceki gönderilerden alıntı veya @isim referansları içeren tek bir cevap yaz.
-    too_many_replies: "### Bu konu için cevap limitinizi doldurdunuz\n\nÜzgünüz, ancak geçici olarak, yeni kullanıcılar aynı konu içinde en fazla %{newuser_max_replies_per_topic} cevap yazabiliyorlar. \n\nYeni bir cevap yazmak yerine, önceki cevaplarınızı düzenlemeyi, ya da başka konulara göz atmayı düşünün.\n"
+      Herhangi bir yazıyı seçince çıkan <b>alıntılayarak cevapla</b> butonuna tıklayarak alıntı ekleyebilir, bir önceki cevabınızı düzenleyebilirsiniz.
+      Az sayıda derinlemesine cevaplardan oluşan konuların okunması, çok fazla kısa ve tekil cevaplardan oluşan konulardan herkes için daha kolay oluyor.
+    dominating_topic: |
+      Bu konunun sizin için önemli olduğunu görüyoruz &ndash; buradaki cevapların %{percent}% oranından daha fazlasını siz göndermişsiniz.
+      Diğerlerinin de kendi fikirlerini paylaşmaları için onlara yeteri kadar zaman tanıdığınıza emin misiniz?
+    too_many_replies: |
+      Üzgünüz, ancak geçici olarak, yeni kullanıcılar aynı konu içinde en fazla %{newuser_max_replies_per_topic} cevap yazabiliyorlar.
+      Yeni bir cevap yazmak yerine, önceki cevaplarınızı düzenlemeyi, ya da başka konulara göz atmayı düşünün.
     reviving_old_topic: |
-      ### Bu konuyu tekrar canlandırmak mı istediniz?
-
       Bu başlığa en son %{days} gün önce cevap yazılmış. Cevabınız, bu konuyu listesinin en üstüne taşıyacak ve geçmişte sohbete katılmış olan tüm yazarlara bildirim gönderecek.
-
       Bu eski sohbeti devam ettirmek istediğinize emin misiniz?
   activerecord:
     attributes:
@@ -204,6 +222,7 @@ tr_TR:
       user_profile:
         bio_raw: "Hakkımda"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -224,7 +243,6 @@ tr_TR:
           attributes:
             hex:
               invalid: "geçerli bir renk değil"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Profilinizdeki Hakkımda bölümü boş, <a href='/users/%{username_lower}/preferences/about-me'>doldurmak ister misiniz?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} profilinde Hakkımda kısmına henüz bir şey girmedi</div>"
@@ -237,26 +255,18 @@ tr_TR:
   assets_topic_body: "Bu kalıcı bir konudur, sadece görevlilere gözükür, site tasarımında kullanılan resim ve dosyaların depolanması için kullanılır. Sakın silmeyin!\n\n\nİşleyiş aşağıdaki gibidir:\n\n\n1. Bu konuyu cevaplayın.\n2. Logolar, favicon'lar vb. için kullanmak istediğiniz resimleri buraya yükleyin. (Gönderi düzenleyicisindeki yükleme düğmesini kullanabilir, veya resimleri sürükleyip bırakabilir veya kopyalayıp yapıştırabilirsiniz.)\n3. Cevabı gönderin.\n4. Yeni gönderinizdeki resimlere sağ tıklayarak ya da düzenleme ikonuna tıklayıp gönderinizi düzenleyerek resimlerin bağlantılarına ulaşabilirsiniz. Bağlantıları kopyalayın.\n5. Bağlantıları [basit ayarlar](/admin/site_settings/category/required) ilgili bölümlere yapıştırın.\n\n\nEğer farklı dosya tipleri yükleyebilmek istiyorsanız, [dosya ayarları](/admin/site_settings/category/files) sayfasındaki `authorized_extensions` ayarını düzenleyin."
   lounge_welcome:
     title: "Lobiye hoşgeldiniz"
-    body: |2
+    body: |
-
       Tebrikler! :confetti_ball:
-
       Bu konuyu görebiliyorsanız,  yakın süre önce **standart** (güven seviyesi 3) seviyesine terfi etmişsiniz demektir.
-
       Artık &hellip;
-
       * Herhangi bir konunun başlık bilgisini düzenleyebilirsiniz
       * Herhangi bir konunun kategorisini değiştirebilirsiniz
       * Eklediğiniz linkler takip edilebilir durumunda olacaktır ([otomatik nofollow] (http://en.wikipedia.org/wiki/Nofollow) kaldırıldı)
       * Sadece 3. güven seviyesi ve üzerindekilere gözüken özel Lobi kategorisine erişebilirsiniz
       * Tek bayraklamayla spam içerikli mesajları gizleyebilirsiniz
-
       [Şu anki standart seviyedeki arkadaşların listesi(/badges/3/regular). Merhaba demeyi unutmayın.
-
       Bu topluluğun önemli bir parçası olduğunuz için teşekkür ederiz!
-
       (Güven seviyeleriyle ilgili daha fazla bilgi için, [bu konuya bakın][trust]. Lütfen, sadece sürekli olarak kriterlere uyan üyelerin standart seviyede kalacağını unutmayın.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "%{category} kategorisi hakkında "
@@ -442,18 +452,8 @@ tr_TR:
       message:
         make: "Bu konu artık bir manşettir. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecektir."
         remove: "Bu konu artık manşet değildir. Artık her sayfanın en üstünde yer belirmeyecektir."
-  unsubscribed:
+  unsubscribe:
-    title: 'Aboneliğiniz İptal Edildi'
+    log_out: "Çıkış"
-    description: "Aboneliğiniz iptal edildi. Sizinle bir daha iletişime geçmeyeceğiz!"
-    oops: "Bu işlemi yanlışlıkla yaptıysanız, aşağıya tıklayın."
-    error: "Abonelik İptalinde Hata Oluştu"
-    preferences_link: "Özet e-postaları aboneliğinizi <a href='/my/preferences'>ayarlar sayfasınızdan</a> da iptal edebilirsiniz"
-    different_user_description: "Özet e-postalarının yollandığı kullanıcıdan farklı bir kullanıcı hesabı ile giriş yapmış bulunmaktasınız. Lütfen çıkış yapıp tekrar deneyin."
-    not_found_description: "Üzgünüz, aboneliğinizi iptal edemedik. E-postanızdaki bağlantı artık geçerli olmayabilir."
-  resubscribe:
-    action: "Tekrar Abone Ol"
-    title: "Tekrar Abone Olundu!"
-    description: "Tekrar abone oldunuz."
   reports:
     visits:
       title: "Kullanıcı ziyaretleri"
@@ -546,6 +546,7 @@ tr_TR:
     page_view_total_reqs:
       title: "Toplam"
       xaxis: "Gün"
+      yaxis: "Toplam Sayfa Görünümleri"
     page_view_logged_in_mobile_reqs:
       xaxis: "Gün"
     page_view_anon_mobile_reqs:
@@ -588,7 +589,6 @@ tr_TR:
       yaxis: "Ziyaret sayısı"
   dashboard:
     rails_env_warning: "Sunucunuz %{env} modunda çalışıyor."
-    ruby_version_warning: "Problemli olduğu bilinegelen Ruby 2.0.0 sürümünü kullanmaktasınız. Yama seviyesi 247 veya daha yenisine güncelleme yapınız."
     host_names_warning: "config/database.yml dosyasınızda, bilgisayar adı olarak varsayılan değer olan \"localhost\" ayarlı. Değeri, sitenizin bilgisayar adını kullanacak biçimde güncelleyiniz."
     gc_warning: 'Sunucunuz, Ruby''nin varsayılan çöp toplama ayarlarını kullanıyor ki bu size en iyi performansı vermeyecektir. Performansı ayarı için şu konuyu okuyun: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Discourse için Ruby on Rails Ayarları</a>.'
     sidekiq_warning: 'Sidekiq çalışmıyor. E-posta yollamak gibi gibi birçok asenkron görev sidekiq''in işidir. En az bir tane sidekiq süreci çalıştırdığınızdan emin olun. <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq ile ilgili bilgi burada</a>.'
@@ -673,13 +673,9 @@ tr_TR:
     anon_polling_interval: "Kaç mili saniyede bir anonim kullanıcılar sorgu yapmalı"
     background_polling_interval: "(Pencere arkaplanda olduğu zaman) kaç mili saniyede bir kullanıcılan sorgu yapmalı"
     cooldown_minutes_after_hiding_posts: "Topluluk tarafından bayraklanarak gizlenen gönderiyi düzenleyebilmek için, kullanıcının beklemesi gereken dakika süresi "
-    max_topics_in_first_day: "Kullanıcının sitedeki ilk gününde, oluşturabileceği en fazla konu sayısı"
-    max_replies_in_first_day: "Kullanıcının sitedeki ilk gününde, oluşturabileceği en fazla cevap sayısı"
     tl2_additional_likes_per_day_multiplier: "Güvenlik seviyesi 2 (Üye) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl3_additional_likes_per_day_multiplier: "Güvenlik seviyesi 3 (Müdavim) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
     tl4_additional_likes_per_day_multiplier: "Güvenlik seviyesi 4 (Lider) olanlar için günlük beğeni limitini bu rakamla çarparak artır"
-    num_flags_to_block_new_user: "Eğer, yeni bir kullanıcının gönderileri num_flags_to_block_new_user farklı kullanıcıdan buradaki sayı kadar bayrak alırsa , kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin."
-    num_users_to_block_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı kullanıcı tarafından num_flags_to_block_new_user bayrak alırsa, kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin."
     notify_mods_when_user_blocked: "Eğer bir kullanıcı otomatik olarak engellendiyse, tüm moderatörlere mesaj yolla."
     flag_sockpuppets: "Eğer, yeni kullanıcı konuya, konuyu başlatan yeni kullanıcı ile aynı IP adresinden cevap yazarsa, her iki gönderiyi de potansiyel spam olarak işaretle. "
     traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan kullan."
@@ -903,9 +899,6 @@ tr_TR:
     allow_animated_thumbnails: "Animasyonlu giflerin, animasyonlu küçük resmini oluşturur."
     default_avatars: "Yeni kullanıcılar için, onlar değiştirene kadar, varsayılan olarak kullanılacak avatarların URL'leri."
     automatically_download_gravatars: "Hesap oluşturma veya e-posta değişikliği esnasında kullanıcılar için Gravatarları indir"
-    digest_topics: "Özet e-postalarda yer alacak en fazla konu sayısı. "
-    digest_min_excerpt_length: "Özet e-postalarında, gönderi alıntılarında olması gereken en az karakter sayısı."
-    disable_digest_emails: "Tüm kullanıcılar için özet e-postalarını devre dışı bırak."
     detect_custom_avatars: "Kullanıcıların özel profil resimleri yükleyip yüklemediklerini kontrol et ya da etme."
     max_daily_gravatar_crawls: "Discourse'un gün içinde özel avatarlar için Gravatar'ı en fazla kaç kere kontrol edeceği."
     public_user_custom_fields: "Kullanıcıların için, herkes tarafından görüntülenebilir özel alanların beyaz listesi."
@@ -918,6 +911,7 @@ tr_TR:
     allow_profile_backgrounds: "Kullanıcıların profillerine arkaplan eklemesine izin ver."
     enable_mobile_theme: "Mobil cihazlar mobil uyumlu temayı kullanır, dilerse masaüstü görünüme geçebilirler. Eğer özel, duyarlı bir stil kullanıyorsanız bunu devredışı bırakın."
     dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir."
+    daily_performance_report: "NGINX kayıtlarını analiz edip detaylı bir şekilde günlük Yetkili kategorisinde bir konu içerisinde paylaş."
     suppress_uncategorized_badge: "Kategorisiz konular için olan rozeti konu listesinde gösterme."
     global_notice: "Tüm ziyaretçilere İVEDİ ACİL DURUM global manşet uyarısı göster, saklamak için boş bırakın (HTML kullanılabilir)."
     disable_edit_notifications: " 'download_remote_images_to_local' etkin olduğunda, sistem kullanıcısından gelen düzenleme bildirilerini devre dışı bırakır"
@@ -952,7 +946,6 @@ tr_TR:
     emoji_set: "Emojinizi nasıl isterdiniz?"
     enforce_square_emoji: "Tüm emojileri kare en-boy oranına zorla"
     approve_unless_trust_level: "Bu güven seviyesi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir"
-    default_email_digest_frequency: "Öntanımlı olarak kullanıcılar hangi sıklıkta özet e-postalar alırlar."
     default_email_private_messages: "Öntanımlı olarak birisi bir kullanıcıya mesaj attığında e-posta gönder."
     default_email_direct: "Öntanımlı olarak birisi bir kullanıcı hakkında alıntı yapma, cevaplama, bahsetme ya da davet etme eylemlerini gerçekleştirdiğinde e-posta gönder."
     default_email_mailing_list_mode: "Öntanımlı olarak her yeni gönderi için bir e-posta gönder."
@@ -963,6 +956,7 @@ tr_TR:
     default_other_enable_quoting: "Vurgulanmış yazılar için alıntı ile cevaplamayı, öntanımlı olarak, etkinleştir."
     default_other_dynamic_favicon: "Tarayıcı simgesinde, öntanımlı olarak, yeni/güncellenmiş konu sayısını göster."
     default_other_disable_jump_reply: "Kullanıcılar cevapladıktan sonra, öntanımlı olarak, onların gönderilerine atlama."
+    default_other_edit_history_public: "Gönderi değişikliklerini, öntanımlı olarak, herkese açık yap."
     default_topics_automatic_unpin: "Kullanıcı sayfa sonuna eriştiğinde tutturulmuş konuları otomatik olarak sayfadan ayır."
     default_categories_watching: "Öntanımlı olarak, izlenen kategorilerin listesi."
     default_categories_tracking: "Öntanımlı olarak, takip edilen kategorilerin listesi."
@@ -981,20 +975,6 @@ tr_TR:
       invalid_string_min: "En az %{min} karakter olmalı."
       invalid_string_max: "En fazla %{max} karakter olabilir."
       invalid_reply_by_email_address: "Değer '%{reply_key}' içermeli ve bildiri e-postasından farklı olmalı."
-  notification_types:
-    group_mentioned: "%{link} sayfasında %{group_name} hakkında bahsedildi."
-    mentioned: "%{display_username} sizden bahsetti: %{link}"
-    liked: "%{display_username} gönderinizi beğendi: %{link}"
-    replied: "%{display_username} gönderinize cevap verdi: %{link}"
-    quoted: "%{display_username} gönderinizi alıntıladı: %{link}"
-    edited: "%{display_username} gönderinizi düzenledi: %{link}"
-    posted: "%{display_username} gönderi oluşturdu %{link}"
-    moved_post: "%{display_username} gönderinizi buraya taşıdı: %{link}"
-    private_message: "%{display_username} sana bir mesaj gönderdi: %{link}"
-    invited_to_private_message: "%{display_username} seni bir mesaja davet etti: %{link}"
-    invitee_accepted: "%{display_username} davetinizi kabul etti"
-    linked: "%{display_username} size %{link} sayfasında bağlantı verdi"
-    granted_badge: "%{link} kazandınız"
   search:
     within_post: "%{username} tarafından #%{post_number}"
     types:
@@ -1087,29 +1067,25 @@ tr_TR:
       other: "İlgilenilmesi gereken %{count} bayrak var"
   invite_mailer:
     subject_template: "%{invitee_name}  sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti. "
-    text_body_template: "%{invitee_name} sizi \n\n> %{site_title} -- %{site_description} \n\nsitesindeki\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\ntartışmasına davet ediyor.\n\nEğer ilgileniyorsanız, aşağıdaki bağlantıya tıklayın:\n\n%{invite_link}\n\nBu davet güvenilir bir kullanıcı tarafından gönderilmiştir, cevap yazarak tartışmaya hemen katılabilirsiniz.\n"
-  invite_forum_mailer:
-    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesine katılmanız için davet etti"
     text_body_template: |
       %{invitee_name} sizi
-
+      > %{site_title} -- %{site_description}
-      > **%{site_title}**
+      sitesindeki
+      > **%{topic_title}**
       >
-      > %{site_description}
+      > %{topic_excerpt}
-
+      tartışmasına davet ediyor.
-      sitesine katılmaya davet etti.  Eğer ilgileniyorsanız, aşağıdaki bağlantıya tıklayın:
+      Eğer ilgileniyorsanız, aşağıdaki bağlantıya tıklayın:
-
       %{invite_link}
-
+      Bu davet güvenilir bir kullanıcı tarafından gönderilmiştir, cevap yazarak tartışmaya hemen katılabilirsiniz.
-      Bu davet güvenilir bir kullanıcı tarafından gönderilmiştir. O nedenle giriş yapmanız gerekmeyecek.
+  invite_forum_mailer:
+    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesine katılmanız için davet etti"
   invite_password_instructions:
     subject_template: "%{site_name} hesabınız için parola oluşturun"
     text_body_template: |
       %{site_name}'e olan davetiyeni kabul ettiğin için teşekkür ederiz -- hoşgeldin!
-
       Şimdi bir şifre seçmek için şu bağlantıya tıklayın:
       %{base_url}/users/password-reset/%{email_token}
-
       (Eğer yukarıdaki bağlantının süresi dolmuşsa e-posta adresinizle giriş yaparken "Parolamı unuttum" bağlantısına tıklayınız.)
   test_mailer:
     subject_template: "[%{site_name}] E-posta Ulaştırma Testi"
@@ -1120,9 +1096,6 @@ tr_TR:
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} konu incelenmeyi bekliyor."
-    text_body_template: |
-      Merhaba,
-      Yeni kullanıcılar tarafından oluşturulmuş ve onayınızı bekleyen konular bulunuyor. [Konuları şuradan inceleyebilirsiniz.](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Gönderiniz **konu-dışı** olarak bayraklandı: topluluk, gönderinizin konu başlığı ve ilk gönderi ile tanımlanan konu içeriğine uygun olmadığını düşünüyor. "
     inappropriate: "Gönderiniz **uygunsuz** olarak bayraklandı: topluluk gönderinizin saldırgan, kaba ya da [topluluk yönergelerine](/guidelines) aykırı olduğunu düşünüyor."
@@ -1136,20 +1109,38 @@ tr_TR:
     deferred_and_deleted: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Gönderiyi kaldırdık."
   temporarily_closed_due_to_flags: "Bu konu topluluk tarafından çok fazla rapor edildiği için geçici olarak kapatılmıştır."
   system_messages:
-    post_hidden:
-      subject_template: "Topluluk tarafından bayraklandığı için gönderiniz gizlendi"
     welcome_user:
       subject_template: "%{site_name} sitesine hoşgeldiniz!"
-      text_body_template: "%{site_name} sitesine katıldığınız için teşekkür ederiz, hoşgeldiniz!\n\n%{new_user_tips}\n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)\n"
+      text_body_template: |
+        %{site_name} sitesine katıldığınız için teşekkür ederiz, hoşgeldiniz!
+        %{new_user_tips}
+        Biz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz.
+        Ziyaretinizin keyfini çıkarın!
+        (Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)
     welcome_invite:
       subject_template: "%{site_name} sitesine hoşgeldiniz!"
-      text_body_template: "%{site_name} davetiyenizi onayladığınız için teşekkürler -- hoşgeldiniz! \n\nSizin için yeni bir hesap oluşturduk: **%{username}**, ve sisteme girişiniz yapıldı. [Kullanıcı profilinizi][prefs] ziyaret ederek kullanıcı adınızı değiştirebilirsiniz. \n\nDaha sonra tekrar giriş yapmak için: \n\n1. Giriş yaparken her zaman **ilk davetiyenizdekiyle aynı email adresini kullanın**. Yoksa sizin olduğunuzu anlayamayız! \n\n2. [Kullanıcı profiliniz][prefs] için yeni bir şifre oluşturun ve o şifre ile giriş yapın. \n\n%{new_user_tips} \n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)  \n\n[prefs]: %{user_preferences_url}\n"
+      text_body_template: |
+        %{site_name} davetiyenizi onayladığınız için teşekkürler -- hoşgeldiniz!
+        Sizin için yeni bir hesap oluşturduk: **%{username}**, ve sisteme girişiniz yapıldı. [Kullanıcı profilinizi][prefs] ziyaret ederek kullanıcı adınızı değiştirebilirsiniz.
+        Daha sonra tekrar giriş yapmak için:
+        1. Giriş yaparken her zaman **ilk davetiyenizdekiyle aynı email adresini kullanın**. Yoksa sizin olduğunuzu anlayamayız!
+        2. [Kullanıcı profiliniz][prefs] için yeni bir şifre oluşturun ve o şifre ile giriş yapın.
+        %{new_user_tips}
+        Biz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz.
+        Ziyaretinizin keyfini çıkarın!
+        (Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Yedekleme başarıyla tamamlandı"
       text_body_template: "Yedekleme işlemi başarıyla tamamlandı.\nYeni yedeğinizi [Yönetici Paneli > Yedekler](%{base_url}/admin/backups) adresinden indirebilirsiniz."
     backup_failed:
       subject_template: "Yedekleme başarısız"
-      text_body_template: "Yedekleme başarısız oldu. \n\nKayıtlar burada:\n\n```\n\n%{logs}\n\n```\n\n"
+      text_body_template: |
+        Yedekleme başarısız oldu.
+        Kayıtlar burada:
+        ```
+        %{logs}
+        ```
     restore_succeeded:
       subject_template: "Geri alma başarıyla tamamlandı"
       text_body_template: "Geri alma başarıyla tamamlandı."
@@ -1157,13 +1148,9 @@ tr_TR:
       subject_template: "Geri alma başarısız"
       text_body_template: |
         Geri alma başarısız oldu.
-
         Kayıtlar burada:
-
         ```
-
         %{logs}
-
         ```
     bulk_invite_succeeded:
       subject_template: "Toplu davet gönderimi başarıyla tamamlandı"
@@ -1172,23 +1159,15 @@ tr_TR:
       subject_template: "Toplu davet gönderiminde hata oluştu"
       text_body_template: |
         Toplu davet dosyanız işlendi, %{sent} davetiye %{failed} hata(lar) ile gönderildi.
-
-
         Kayıtları aşağıda bulabilirsiniz:
-
-
         ```
-
         %{logs}
-
         ```
     csv_export_succeeded:
       subject_template: "Dışarı veri aktarımı tamamlandı"
       text_body_template: |
         Dışarı veri aktarımı başarılı! :dvd:
-
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
-
         Bu bağlantı 48 saat boyunca geçerli olacak.
     csv_export_failed:
       subject_template: "Dışarı veri aktarımı başarısız oldu"
@@ -1197,7 +1176,10 @@ tr_TR:
       subject_template: "[%{site_name}] E-posta sorunu -- Bilinmeyen Hesap"
     email_reject_empty:
       subject_template: "[%{site_name}] E-posta sorunu -- İçerik Yok"
-      text_body_template: "Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu. \n\nE-postada herhangi bir cevap bulamadık.\n\nEğer bu mesajı alıyorsanız ve cevap eklediyseniz, daha basit bir biçimleme ile yeniden deneyin.\n\n\n\n"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu.
+        E-postada herhangi bir cevap bulamadık.
+        Eğer bu mesajı alıyorsanız ve cevap eklediyseniz, daha basit bir biçimleme ile yeniden deneyin.
     email_reject_parsing:
       subject_template: "[%{site_name}] E-posta sorunu -- Tanımlanamayan içerik"
       text_body_template: |
@@ -1214,14 +1196,14 @@ tr_TR:
       subject_template: "[%{site_name}] E-posta sorunu -- Otomatik Üretilmiş Cevap"
     email_error_notification:
       subject_template: "[%{site_name}] E-posta sorunu -- POP doğrulama hatası"
-    user_automatically_blocked:
-      subject_template: "Topluluk bayrakları nedeniyle yeni kullanıcı %{username} engellendi"
     spam_post_blocked:
       subject_template: "Üst üste aynı bağlantıların paylaşılmasından ötürü %{username} adlı yeni kullanıcının gönderileri engelledi"
     pending_users_reminder:
       subject_template:
         other: "%{count} kullanıcı onay bekliyor"
-      text_body_template: "Bu foruma giriş yapabilmek için onayınızı (ya da reddinizi) bekleyen yeni kullanıcı kayıtları var. \n\n[Lütfen admin bölümünde değerlendirmenizi yapın](%{base_url}/admin/users/list/pending).\n"
+      text_body_template: |
+        Bu foruma giriş yapabilmek için onayınızı (ya da reddinizi) bekleyen yeni kullanıcı kayıtları var.
+        [Lütfen admin bölümünde değerlendirmenizi yapın](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Uzaktaki resimlerin indirilmesi devre dışı bırakıldı"
       text_body_template: "`download_remote_images_to_local` ayarı harddisk alanı limiti `download_remote_images_threshold` aşıldığı için devre dışı bırakıldı."
@@ -1235,27 +1217,90 @@ tr_TR:
     posted_by: "%{post_date} tarihinde %{username} tarafından gönderildi"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} sizi bir mesaja davet etti '%{topic_title}'"
+    user_invited_to_private_message_pm_staged:
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{respond_instructions}
+    user_invited_to_topic:
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{respond_instructions}
     user_replied:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
+    user_replied_pm:
+      subject_template: "[%{site_name}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
     user_quoted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
+    user_linked:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
     user_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
     user_group_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
     user_posted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
+    user_watching_first_post:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
     user_posted_pm:
       subject_template: "[%{site_name}] [ÖM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+        %{message}
+        %{context}
+        %{respond_instructions}
+    user_posted_pm_staged:
+      subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |
+        %{message}
     digest:
       why: "%{last_seen_at} tarihindeki son girişinizden beri %{site_link} sitesine olanların kısa bir özeti"
-      subject_template: "[%{site_name}] Özet"
+      subject_template: "[%{site_name}] Özeti"
       new_activity: "Konu ve gönderilerinizdeki yeni aktiviteler:"
       top_topics: "Popüler gönderiler"
       other_new_topics: "Popüler konular"
-      unsubscribe: "Bu özet %{site_link} sitesini bir süre ziyaret etmediğinizde gönderilir. Almak istemiyorsanız, ayrılmak için %{unsubscribe_link}."
       click_here: "buraya tıklayın"
-      from: "%{site_name} özeti"
       read_more: "Devamını Oku"
       more_topics: "%{new_topics_since_seen} tane daha yeni konu vardı."
       more_topics_category: "Daha fazla yeni konu:"
@@ -1263,47 +1308,48 @@ tr_TR:
       subject_template: "[%{site_name}] Parola sıfırlama"
       text_body_template: |
         [%{site_name}](%{base_url}) sitesinde, biri parolanızın sıfırlanması için talepte bulundu.
-
         Eğer talepte bulunan siz değilseniz, bu e-postayı görmezden gelebilirsiniz.
-
         Yeni parola oluşturmak için aşağıdaki bağlantıya tıklayın:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Parola Oluşturun"
       text_body_template: |
         Biri, [%{site_name}](%{base_url}) sitesindeki hesabınıza parola ekleme talebinde bulundu. Dilerseniz, bu doğrulanmış email hesabınızla eşleşen, desteklediğiniz herhangi bir online servisi (Google, Facebook, vs.) kullanarak da giriş yapabilirsiniz.
-
         Eğer istekte bulunan siz değilseniz, bu e-postayı görmezden gelebilirsiniz.
-
         Parola oluşturmak için aşağıdaki bağlantıya tıklayın:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Giriş"
       text_body_template: |
         [%{site_name}](%{base_url}) sitesinde, biri hesabınıza giriş yapmaya talebinde bulundu.
-
         Eğer talepte bulunan siz değilseniz, bu e-postayı görmezden gelebilirsiniz.
-
         Giriş yapmak için aşağıdaki bağlantıya tıklayın:
         %{base_url}/users/password-reset/%{email_token}
     account_created:
       subject_template: "[%{site_name}] Yeni Hesabınız"
       text_body_template: |
         %{site_name} sitesinde sizin için yeni bir hesap oluşturuldu.
-
         Yeni hesabınıza ait bir parola oluşturmak için aşağıdaki bağlantıya tıklayın:
         %{base_url}/users/password-reset/%{email_token}
+    confirm_new_email:
+      subject_template: "[%{site_name}] Yeni mail adresinizi onaylayın"
     signup_after_approval:
       subject_template: "%{site_name} sitesinde hesabınız onaylandı!"
-      text_body_template: "%{site_name} sitesine hoşgeldiniz! \n\n%{site_name} sitesindeki hesabınız bir görevli tarafından onaylandı.\n\nAşağıdaki linke tıklayın ve yeni hesabınızı aktive edin: %{base_url}/users/activate-account/%{email_token} \n\nEğer link tıklanabilir değilse, linki kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyebilirsiniz. \n\n%{new_user_tips} \n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)\n"
+      text_body_template: |
+        %{site_name} sitesine hoşgeldiniz!
+        %{site_name} sitesindeki hesabınız bir görevli tarafından onaylandı.
+        Aşağıdaki linke tıklayın ve yeni hesabınızı aktive edin: %{base_url}/users/activate-account/%{email_token}
+        Eğer link tıklanabilir değilse, linki kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyebilirsiniz.
+        %{new_user_tips}
+        Biz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz.
+        Ziyaretinizin keyfini çıkarın!
+        (Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.)
     signup:
       subject_template: "[%{site_name}] Yeni hesabınızı onaylayın"
       text_body_template: |
         %{site_name} sitesine hoşgeldiniz!
-
         Hesabınızı onaylamak ve etkinleştirmek için aşağıdaki bağlantıya tıklayın:
-         %{base_url}/users/activate-account/%{email_token}
+        %{base_url}/users/activate-account/%{email_token}
-
         Eğer yukarıdaki bağlantı tıklanabilir değilse, bağlantıyı kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyin.
   page_not_found:
     popular_topics: "Popüler"
@@ -1313,7 +1359,6 @@ tr_TR:
     search_google: "Google"
   login_required:
     welcome_message: |
-      #[Hoşgeldiniz %{title}](#welcome)
       Hesap oluşturmanız gerekiyor. Devam etmek için lütfen bir hesap oluşturun ya da giriş yapın.
   terms_of_service:
     title: "Üyelik Sözleşmesi"
@@ -1354,8 +1399,8 @@ tr_TR:
   csv_export:
     boolean_yes: "Evet"
     boolean_no: "Hayır"
-  static_topic_first_reply: |2
+  static_topic_first_reply: |
-     %{page_name} sayfasının içeriğini değiştirmek için bu konuya ait ilk gönderiyi düzenleyin.
+    %{page_name} sayfasının içeriğini değiştirmek için bu konuya ait ilk gönderiyi düzenleyin.
   guidelines_topic:
     title: "SSS/Yönergeler"
   tos_topic:
@@ -1365,24 +1410,213 @@ tr_TR:
   badges:
     editor:
       name: Editör
+      description: İlk mesajını düzenledin.
+      long_description: |
+        Bu rozet mesajlarınızdan birini düzenlediğinizde verilecektir. Mesajlarınızı düzenlemek her zaman için iyidir — mesajlarınızı geliştirebilir, küçük hataları düzeltebilir, ya da unuttuğunuz detayları ekleyebilirsiniz. Daha iyi mesaj oluşturabilmek için düzenleyin.
+    basic_user:
+      name: Acemi
+      description: Bütün esas forum uygulamalarını kullanabilmeye <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">hak kazanılmıştır</a>
+      long_description: |
+        Bu rozet ilk rütbene ulaştığın için verildi. Forumda neler olduğunu takip ettiğiniz için ve konuları okuduğunuz için teşekkürler. Artık yeni özelliklere sahipsin; kişisel mesajlaşma, işaretleme, düzenleme, ve çoklu resim ve bağlantı paylaşablme gibi.
+    member:
+      name: Sadık Üye
+      description: Davetler, grup mesajlaşmaları, ve daha fazla beğeni <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">hakkı kazanılmıştır</a>
+      long_description: |
+        Bu rozet ikinci rütbeye ulaştığın için verildi.Bir kaç haftadır aramızda zaman geçirdiğin için teşekkürler. Artık kullanıcı sayfandan ya da konu sayfandan davetler gönderebilirsin, kişisel grup mesajları oluşturabilirsin ve günlük daha fazla beğeni yapabilirsin.
+    regular:
+      name: Daimi Üye
+      description: Yeniden kategorize etme, yeniden isimlendirme, takip edilen bağlantılar, ve daha fazla beğeni <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">hakkı kazanılmıştır</a>
+      long_description: |
+        Bu rozet üçüncü seviye rütbeye ulaştığın için verildi. Bir kaç aydır düzenli katılımcımız olduğunuz için teşekkür ederiz. Forumumuzun en aktif okuyucularından ve güvenilir katılımcılarından birisiniz. Artık konuları tekrar kategorize edip, isimlendirebilirsiniz, bazı özel alanlara da girebilirsiniz ve günlük daha fazla beğeni yapabilirsiniz.
+    leader:
+      name: Lider
+      description: Genel düzenleme, sabitleme, kapama, arşivleme, ayırma ve birleştirme, daha fazla beğeni <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">hakkı kazanılmıştır</a>
+      long_description: |
+        Bu rozet dördüncü rütbeye ulaştığın için verildi. Forumda yönetim tarafından seçilmiş bir lidersin ve yaptığınız paylaşımlarla diğer üyelere örnek oluyorsunuz. Bütün mesajları düzenleme hakkına sahipsiniz. Modaratörlerin yapabileceği, sabitleme,kapama, arşivleme, ayırma ve birleştirme gibi işlemleri yapabilrsiniz. Artık günlük çok daha fazla beğeni yapabilirsiniz.
     welcome:
       name: Hoş geldiniz
-      description: Bir beğeni aldınız
+      description: İlk Beğeni
+      long_description: |
+        Bu rozet mesajına ilk beğenini aldığın için verildi. Tebrikler forumda diğer üyelerin ilgisini çeken, yararlı bir paylaşımda bulundun!
+    autobiographer:
+      name: Güncel Profil
+      description: <a href="/my/preferences">profil</a> bilgilerini tamamlama
+      long_description: |
+        Bu rozet <a href="/my/preferences">profil sayfasını </a> tamamladığınız ve bir profil resmi oluşturduğunuz için verilmiştir. Artık diğer üyeler sizin hakkınzıda daha fazla bilgi sahibi olup, sizin ilgi alanlarınızı daha yakından takip edebilir.
+    anniversary:
+      name: Tanışma Yıldönümü
+      description: Bir sene içerisinde, en az bir kere mesaj yazmış aktif üye
+      long_description: |
+        Bu rozet en az bir mesaj yazarak bir yıllık üyeliğinizi tamamladığınız için size verilmiştir. Forumda zaman geçirdiğiniz ve bizlere katkıda bulunduğunuz için teşekkür ederiz. Sizler olmasanız yapamazdık.
+    nice_post:
+      name: Hoş Cevap
+      description: Cevaba 10 beğeni alındı
+      long_description: |
+        Bu rozet cevabınıza aldığınız 10 beğeniden dolayı verilmiştir. Cevabınız forumda etki yarattı ve sohbetin ilerlemesine yardımcı oldu.
+    good_post:
+      name: Çok İyi Cevap
+      description: Cevaba 25 beğeni alındı
+      long_description: |
+        Bu rozet cevabınıza aldığınız 25 beğeniden dolayı verilmiştir. Cevabın çok iyiydi ve forumda herkes için faydalı oldu.
+    great_post:
+      name: Muhteşem Cevap
+      description: Cevaba 50 beğeni alındı
+      long_description: |
+        Bu rozet cevabınıza aldığınız 50 beğeniden dolayı verilmiştir.Süper! Cevabın muhteşem, büyüleyici ve ilham verici. Forum üyeleri cevabına bayıldı!
+    nice_topic:
+      name: Hoş Konu
+      description: Konu 10 beğeni topladı
+      long_description: |
+        Bu rozet açtığınız konuya yapılan 10 beğeniden dolayı verilmiştir. Forum üyelerinin beğendiği ilginç bir konu başlattınız.
+    good_topic:
+      name: Çok İyi Konu
+      description: Konu 25 beğeni topladı
+      long_description: |
+        Bu rozet açtığınız konuya yapılan 25 beğeniden dolayı verilmiştir. Forum üyeleri tarafından çok beğenilen hararetli bir konu açtınız.
+    great_topic:
+      name: Muhteşem Konu
+      description: Konu 50 beğeni topladı
+      long_description: |
+        Bu rozet açtığınız konuya yapılan 50 beğeniden dolayı size verilmiştir. Forum üyelerini harekete geçiren muhteşem bir konu başlattınız. Tebrikler!
+    nice_share:
+      name: Hoş Paylaşım
+      description: Bir gönderiniz 25 tekil ziyaretci tarafından paylaşıldı
+      long_description: |
+        Bu rozeti paylaştığınız bağlantı forum dışından 25 kişi tarafından tıklandığı için kazandınız. Forumumuzun ve paylaşımlarımızın yaygınlaşmasına yardımcı olduğunuz için teşekkür ederiz.
+    good_share:
+      name: Çok İyi Paylaşım
+      description: Bir gönderiniz 300 tekil ziyaretci tarafından paylaşıldı
+      long_description: |
+        Bu rozeti paylaştığınız bağlantı forum dışından 300 kişi tarafından tıklandığı için kazandınız.Çok iyi iş başardın! Paylaşımların daha fazla kişiye ulaşmasını ve forumun gelişmesini sağladın.
+    great_share:
+      name: 'Muhteşem Paylaşım '
+      description: Bir gönderiniz 1000 tekil ziyaretci tarafından paylaşıldı
+      long_description: |
+        Bu rozeti paylaştığınız bağlantı forum dışından 1000 kişi tarafından tıklandığı için kazandınız.Süper! Tartışmayı çok büyük kitlelere ulaştırdın ve forumun büyümesine muhteşem bir katkı yaptın.
     first_like:
       name: İlk Beğeni
       description: Bir gönderiyi beğendin
+      long_description: |
+        Bu rozet ilk defa bir mesajı beğendiğin için verildi. Mesajları beğenmek diğer kullanıcıların yaptıkları paylaşımların ilgi çekici olduğunu onlara göstermek açısından oldukça önemlidir. Beğeninizi gösterin!
     first_flag:
       name: İlk İşaret
       description: Gönderiyi işaretledin
+      long_description: |
+        Bu rozet ilk kez bir mesajı şikayet ettiğiniz için verilmiştir. Şikayet etme daha huzurlu bir ortam oluşturmaya yardımcı olmak açısından oldukça önemlidir. Eğer herhangi bir mesajın yönetici tarafından incelenmesini istiyorsanız, lütfen şikayet etmekten çekinmeyin. Eğer mesajlarıyla ilgili bir sorun farkederseniz, diğer üyelerede <b>kişisel mesajlar</b> gönderebilirsiniz. Eğer bir problem farkederseniz, :flag_black: şikayet edin!
+    promoter:
+      name: Destekçi
+      description: Kullanıcı davet etme
+      long_description: |
+        Bu rozet kullanıcı sayfanızdan ya da konularının altındaki butondan başka birini forumu kullanmaya davet ettiğiniz için verilmiştir. Arkadaşlarınızı ilgilerini çekebilecek konulara davet etmek forumun büyümesi için mükemmel bir yoldur. Teşekkürler!
+    campaigner:
+      name: Mücadeleci
+      description: 3 Acemi kullanıcı davet edildi
+      long_description: |
+        Bu rozet davet ettiğiniz 3 kişi sitede vakit geçirerek acemi üye rütbesine ulaştığı için size verilmiştir. Hareketli bir forumun düzenli katkıda bulunan katılımcıları ve destekçileri olmalıdır.
+    champion:
+      name: Şampiyon
+      description: 5 sadık üye davet edildi
+      long_description: |
+        Bu rozet davet ettiğiniz 5 kişi sitede vakit geçirerek sadık üye rütbesine ulaştığı için size verilmiştir. Süper! Yeni üyelerle tanışmamıza sebep olduğunuz için teşekkürler!
+    first_share:
+      name: İlk Paylaşım
+      description: Bir bağlantı paylaşma
+      long_description: |
+        Bu rozet ilk defa bir cevabın ya da konunun bağlantısını paylaştığınız için verilmiştir. Bağlantı paylaşmak tartışmaların daha fazla kişiye ulaşması açısından çok önemlidir.
+    first_link:
+      name: İlk Bağlantı
+      description: Başka bir konuya link ekleme
+      long_description: |
+        Bu rozet ilk defa bir konuya link eklediğiniz için verilmiştir. Konu linkleri diğer okuyucularından bu diyaloglardan yararlanmalarını sağlar.
+    first_quote:
+      name: İlk Alıntı
+      description: Bir mesajdan alıntı yapma
+      long_description: |
+        Bu rozet cevabınızda başkasından alıntı yaptığınız için verilmiştir. Başka konulardan ve mesajlardan alıntı yapmak mesajlar arasındaki bağlantıyı kuvvetlendirir. En kolay alıntı yapma yolu alıntı yapacağınız bölümü seçip cevap butonuna basmaktır.
+    read_guidelines:
+      name: Site Uyumlusu
+      description: <a href="/guidelines">site kurallarını</a> okuma
+      long_description: |
+        Bu rozeti <a href="/guidelines">site kurallarını </a> okuduğunuz için kazandınız. Site kurallarını bilmek ve bu kurallara uygun davranmak daha huzurlu bir ortam içiersinde paylaşım yapmanızı sağlar.
     reader:
       name: Okuyucu
+      description: 100 cevaptan fazla cevabı olan bir konunun her cevabını okuma
+      long_description: |
+        Bu rozet 100 den fazla cevaba sahip olan bir konuyu okuduğunuz için verilmiştir. Bir tartışmayı takip etmek o konu hakkında detaylı bilgi sahibi olmanızı ve görüş açınızı genişletmenizi sağlar.
+    popular_link:
+      name: Popüler Bağlantı
+      description: 50 kere tıklanmış bir bağlantı paylaşma
+      long_description: |
+        Bu rozet 50 tıklama elde etmiş bir bağlantı paylaştığınız için verilmiştir. Yararlı bir link paylaşımı yaptığınız için teşekkür ederiz.
     hot_link:
-      name: Taze Bağlantı
+      name: Hareketli Bağlantı
+      description: 300 kere tıklanmış bir bağlantı paylaşma
+      long_description: |
+        Bu rozet 300 tıklama elde etmiş bir bağlantı paylaştığınız için verilmiştir. Bu etkileyici ve insanların tartışmalarını ilerleten linki paylaştığınız için teşekkür ederiz.
+    famous_link:
+      name: Ünlü Bağlantı
+      description: 1000 kere tıklanmış bir bağlantı paylaşma
+      long_description: |
+        Bu rozet 1000 tıklama elde etmiş bir bağlantı paylaştığınız için verilmiştir.Süper! Paylaştığınız link tartışılan konuda daha detaylı bilgi vererek konuşmayı ilerletmiştir. Muhteşem bir iş başardınız!
     appreciated:
-      name: Takdir Edildi
+      name: Takdire Layık
       description: 20 gönderine 1 beğeni aldın
+      long_description: |
+        Bu rozet 20 farklı mesajda en az bir beğeni kazandığınız için verilmiştir. Forum olarak tartışmalara olan katkınızı takdir ediyoruz!
+    respected:
+      name: Saygıdeğer
+      description: 100 gönderine 2 beğeni aldın
+      long_description: |
+        Bu rozet 100 farklı mesajda en az 2 beğeni kazandığınız için verilmiştir.Katkılarınız forum için çok değerli.
+    admired:
+      name: Çok Beğenilen
+      description: 300 gönderine 5 beğeni aldın
+      long_description: |
+        Bu rozet farklı 300 mesajda en az 5 beğeni kazandığınız için verilmiştir.Süper! Tartışmalara olan katkınız muazzam.
     out_of_love:
       name: Sevgiden Öte
+      description: Bir günde 50 beğeni kullanıldı
+      long_description: |
+        Bu rozet günlük 50 beğeni hakkınızı kullandığınız için verilmiştir.
+    higher_love:
+      name: Yüksek Beğeni
+      description: '5 gün boyunca, günde 50 beğeni hakkını kullanma '
+      long_description: |
+        Bu rozet 5 gün boyunca 50 beğeni hakkınızı kullandığınız için verilmiştir. Diğer kullanıcıların paylaşımlarını beğenerek onları cesaretlendirdiğiniz için teşekkür ederiz.
+    crazy_in_love:
+      name: Beğeni Delisi
+      description: '20 gün boyunca, günde 50 beğeni hakkını kullanma '
+      long_description: |
+        Bu rozet 20 gün boyunca 50 beğeni hakkınızı kullandığınız için verilmiştir. Süper! Diğer üyelere tam bir örneksin. Tebrik ederiz!
+    thank_you:
+      name: Teşekkürler
+      description: '20 beğeni sahibi olma ve 10 beğenme '
+      long_description: |
+        Bu rozet 20 beğenilmiş mesaj sahibi olduğunuz ve bunun karşılığında 10 ya da daha fazla beğeni yaptığınızdan dolayı size verilmiştir.
+    gives_back:
+      name: Beğenilip Beğenme
+      description: '100 beğeni sahibi olma ve 100 beğenme '
+      long_description: |
+        Bu rozet 100 beğenilmiş mesaj sahibi olduğunuz ve bunun karşılığında 100 ya da daha fazla beğeni yaptığınızdan dolayı size verilmiştir. Teşekkür ederiz!
+    empathetic:
+      name: Empatik
+      description: 500 beğeni sahibi olma ve 1000 beğeni
+      long_description: |
+        Bu rozet 500 beğenilmiş mesaj sahibi olduğunuz ve bunun karşılığında 1000 ya da daha fazla beğeni yaptığınızdan dolayı size verilmiştir. Süper! Cömetliğin ve takdirin örneğisin :two_hearts:.
+    first_emoji:
+      name: İlk Emoji
+      description: 'Bir mesajda emoji kullanma '
+      long_description: |
+        Bu rozet mesajınıza ilk defa bir emoji eklediğiniz için verilmiştir :thumbsup:.
+    first_mention:
+      name: İlk Anma
+      description: 'Mesajda bir kullanıcıdan bahsetme '
+      long_description: Bu rozet ilk defa mesajınızda başka bir kullanıcıdan bahsettiğiniz için verilmiştir. Her bahsetme bahsi geçen kullanıcıya bildirim gitmesini sağlar, böylece bu kullanıcı sizin mesajınızdan haberdar olur. Sadece bahsi geçen kullanıcı adına @ gerekir.
+    first_reply_by_email:
+      name: İlk Mail Cevabı
+      description: 'Mesaja mail yolu ile cevap verme '
+      long_description: |
+        Bu rozet ilk defa bir mesaja mail yolu ile cevap verdiğiniz için verilmiştir.
   admin_login:
     success: "E-posta Gönderildi"
     error: "Hata!"
@@ -1393,8 +1627,5 @@ tr_TR:
   performance_report:
     initial_post_raw: Bu konu siteniz hakkında günlük performans raporlarını içerir.
     initial_topic_title: Site performansı raporları
-  time:
+  tags:
-    <<: *datetime_formats
+    title: "Etiketler"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.uk.yml

@@ -10,11 +10,21 @@ uk:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  datetime_formats: &datetime_formats 
+  date:
+    month_names: []
+    <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Теми"
   posts: "дописи"
   loading: "Завантаження"
   powered_by_html: 'Створено за допомогою технології <a href="http://www.discourse.org">Discourse</a>, бажано переглядати з увімкненим JavaScript'
+  errors: &errors 
+  activemodel:
+    errors:
+      <<: *errors
   backup:
     operation_already_running: "An operation is currently running. Can't start a new job right now."
     backup_file_should_be_tar_gz: "The backup file should be a .tar.gz archive."
@@ -56,22 +66,13 @@ uk:
       trust_level_4: "trust_level_4"
   education:
     dominating_topic: |
-      ### Дайте можливість іншим включитися до обговорення
-
       Ця тема однозначно важлива для Вас &ndash; Ви опублікували тут більше %{percent}% відповідей.
-
       Ви впевнені, що даєте достатньо часу для того, щоб інші люди також мали можливість поділитися своїми думками?
     too_many_replies: |
-      ### Ви досягли обмеження на кількість відповідей для цієї теми
-
       Даруйте, але нові користувачі мають тимчасове обмеження до %{newuser_max_replies_per_topic} відповідей на одну тему.
-
       Замість того, щоб додавати нову відповідь, спробуйте відредагувати свої старі відповіді, або відвідайте інші теми.
     reviving_old_topic: |
-      ### Revive this topic?
-
       The last reply to this topic is now over %{days} days old. Your reply will bump the topic to the top of its list and notify anyone previously involved in the conversation.
-
       Are you sure you want to continue this old conversation?
   activerecord:
     attributes:
@@ -80,6 +81,7 @@ uk:
       post:
         raw: "Тіло"
     errors:
+      <<: *errors
       models:
         user:
           attributes:
@@ -162,16 +164,6 @@ uk:
   archetypes:
     regular:
       title: "Звичайна тема"
-  unsubscribed:
-    title: 'Unsubscribed'
-    description: "You have been unsubscribed. We won't contact you again!"
-    oops: "In case you didn't mean to do this, click below."
-    error: "Помилка при Відписуванні"
-    not_found_description: "Sorry, we couldn't unsubscribe you. It's possible the link in your email has expired."
-  resubscribe:
-    action: "Re-Subscribe"
-    title: "Re-Subscribed!"
-    description: "You have been re-subscribed."
   reports:
     visits:
       title: "Відвідини користувачів"
@@ -244,7 +236,6 @@ uk:
       num_clicks: "Переходи"
   dashboard:
     rails_env_warning: "Your server is running in %{env} mode."
-    ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later."
     host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname."
     gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. <a href="https://github.com/mperham/sidekiq" target="_blank">Learn about Sidekiq here</a>.'
@@ -269,8 +260,6 @@ uk:
     email_custom_headers: "Список заголовків електронної пошти, розділених вертикальною рискою"
     enable_long_polling: "Message bus used for notification can use long polling"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
-    max_topics_in_first_day: "Максимальна кількість тем, які користувач може створити на сайті в перший день"
-    max_replies_in_first_day: "Максимальна кільість відповідей, які користувач може створити на сайті в перший день"
     notify_mods_when_user_blocked: "Якщо користувача автоматично заблоковано, надіслати повідомлення всім модераторам."
     ga_tracking_code: "Код відстеження Google аналітики (ga.js), напр.: UA-12345678-9; див. http://google.com/analytics"
     ga_domain_name: "Доменне ім'я Google аналітики (ga.js), напр.: mysite.com; див. http://google.com/analytics"
@@ -325,15 +314,6 @@ uk:
       invalid_string_min_max: "Має бути між %{min} та %{max} символів."
       invalid_string_min: "Має бути не менше %{max} символів."
       invalid_string_max: "Має бути не більше ніж %{max} символів."
-  notification_types:
-    mentioned: "%{display_username} mentioned you in %{link}"
-    liked: "%{display_username} liked your post in %{link}"
-    replied: "%{display_username} replied to your post in %{link}"
-    quoted: "%{display_username} quoted your post in %{link}"
-    edited: "%{display_username} edited your post in %{link}"
-    posted: "%{display_username} posted in %{link}"
-    moved_post: "%{display_username} moved your post to %{link}"
-    invitee_accepted: "%{display_username} accepted your invitation"
   search:
     types:
       category: 'Categories'
@@ -377,8 +357,6 @@ uk:
   new_version_mailer_with_notes:
     subject_template: "оновлення [%{site_name}] доступно"
   system_messages:
-    post_hidden:
-      subject_template: "Допис приховано через скарги спільноти"
     welcome_user:
       subject_template: "Ласкаво просимо до сайта %{site_name}!"
     welcome_invite:
@@ -390,7 +368,6 @@ uk:
     pending_users_reminder:
       text_body_template: |
         Є нові користувачі, що зареєструвалися і очікують на схвалення (або відхилення) перед тим, як зможуть отримати доступ до цього форуму.
-
         [Будь ласка, розгляньте їх в адміністративній секції](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Завантаження віддалених зображені відключено"
@@ -415,24 +392,19 @@ uk:
       top_topics: "Популярні дописи"
       other_new_topics: "Популярні теми"
       click_here: "натисніть тут"
-      from: "Стислий виклад новин від %{site_name}"
       read_more: "Читати більше"
     forgot_password:
       subject_template: "[%{site_name}] Скидання пароля"
       text_body_template: |
         Хтось попросив скинути Ваш пароль на сайті [%{site_name}](%{base_url}).
-
         Якщо це були не Ви, можете спокійно проігнорувати цей лист.
-
         Перейдіть за посиланням, щоб обрати новий пароль:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Встановлення пароля"
       text_body_template: |
         Хтось попросив додати пароль до Вашого облікового запису на сайті [%{site_name}](%{base_url}). Замість цього, Ви можете входити в систему, використовуючи будь-який із підтримуваних онлайн-сервісів (Google, Facebook, і т. ін.), який поєднаний із цією перевіреною електронною скринькою.
-
         Якщо Ви не робили такого запиту, можете спокійно проігнорувати цей лист.
-
         Перейдіть за посиланням, щоб обрати пароль:
         %{base_url}/users/password-reset/%{email_token}
     signup_after_approval:
@@ -440,10 +412,8 @@ uk:
     signup:
       text_body_template: |
         Вітаємо у %{site_name}!
-
         Натисніть це посилання для підтвердження та активації Вашого нового облікового запису:
         %{base_url}/users/activate-account/%{email_token}
-
         Якщо наведене посилання не є клікабельним, спробуйте скопіювати та вставити його в адресний рядок Вашого веб-оглядача.
   page_not_found:
     popular_topics: "Популярні"

config/locales/server.vi.yml

@@ -18,6 +18,10 @@ vi:
   date:
     month_names: [null, Tháng Một, Tháng Hai, Tháng Ba, Tháng Tư, Tháng Năm, Tháng Sáu, Tháng Bảy, Tháng Tám, Tháng Chín, Tháng Mười, Tháng Mười Một, Tháng Mười Hai]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
+    am: "sa"
+    pm: "ch"
   title: "Discourse"
   topics: "Chủ đề"
   posts: "bài viết"
@@ -91,6 +95,9 @@ vi:
       max_username_length_range: "Bạn không thể thiết lập số tối đa nhỏ hơn số tối thiểu"
       default_categories_already_selected: "Bạn không thể chọn một danh mục được sử dụng trong danh sách khác."
       s3_upload_bucket_is_required: "Bạn không thể tải lên S3 mà chưa thiết lập 's3_upload_bucket'."
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "Tập tin tải lên nên ở dạng csv hoặc txt."
   backup:
@@ -159,6 +166,7 @@ vi:
     group_mentions: "Đề cập mới từ %{group_name}"
     user_posts: "Bài viết mới của @%{username}"
     user_topics: "Chủ đề mới của @%{username}"
+    tag: "Những chủ đề được gắn thẻ"
   too_late_to_edit: "Bài đăng đã được tạo từ rất lâu. Nó không thể được chỉnh sửa hoặc xóa nữa."
   revert_version_same: "Phiên bản hiện tại giống với phiên bản mà bạn muốn hoàn nguyên."
   excerpt_image: "hình ảnh"
@@ -166,6 +174,7 @@ vi:
     delete_reason: "Đã xóa thông qua hàng đợi kiểm duyệt"
   groups:
     errors:
+      can_not_modify_automatic: "Bạn không thể sửa một nhóm tự động"
       member_already_exist: "'%{username}' đã là thành viên của nhóm"
       invalid_domain: "'%{domain}' không phải là tên miền hợp lệ."
       invalid_incoming_email: "'%{email}' không phải là email hợp lệ."
@@ -184,59 +193,47 @@ vi:
   education:
     until_posts:
       other: "%{count} bài đăng"
-    new-topic: |
+    'new-topic': |
       Chào mừng bạn đến với %{site_name} &mdash; **cảm ơn vì đã đăng cuộc thảo luận mới!**
-
       - Bạn có cảm thấy tiêu đề có thú vị không khi bạn đọc to nó? Đó có phải là một đoạn tóm tắt tốt không?
-
       - Những ai sẽ hứng thú với cuộc thảo luận này? Tại sao đó lại trở thành vấn đề? Bạn muốn những loại phản hồi thế nào?
-
       - Sử dụng những từ khóa phổ biến để người khác có thể tìm thấy chủ đề của bạn dễ hơn. Để nhóm chủ đề của bạn với các chủ đề liên quan khác, hãy chọn chuyên mục cho chủ đề của mình.
-
       Xem thêm, [hướng dẫn cộng đồng của chúng tôi](/guidelines). Bảng điều khiển này sẽ chỉ xuất hiện vào lần đầu %{education_posts_text}.
-    new-reply: |
+    'new-reply': |
       Chào mừng bạn đến với %{site_name} &mdash; **cám ơn vì đã đóng góp!**
-
       - Câu trả lời của bạn có làm cuộc thảo luận tốt hơn về mặt nào đó?
-
       - Hãy đối xử tốt với các thành viên khác trong cộng đồng của bạn.
-
       - Lời phê bình mang tính đóng góp cũng được chào đón, nhưng bạn nên phê bình *ý tưởng* chứ không phải con người.
-
       [Đọc hướng dẫn cộng đồng](/guidelines) để có thêm thông tin. Bảng này chỉ xuất hiện cho bài viết đầu tiên của bạn %{education_posts_text}.
     avatar: |
-      ### How about a picture for your account?
-
       You've posted a few topics and replies, but your profile picture isn't as unique as you are -- it's just a letter.
-
       Have you considered **[visiting your user profile](%{profile_path})** and uploading a picture that represents you?
-
       It's easier to follow discussions and find interesting people in conversations when everyone has a unique profile picture!
     sequential_replies: |
-      ### Xem xét việc trả lời nhiều bài viết cùng lúc
-
       Thay vì trả lời nhiều tuần tự đến từng chủ đề, xin vui lòng xem xét một bài trả lời duy nhất mà bao gồm các trích dẫn từ bài viết trước hoặc dùng tham chiếu @name.
-
       Bạn có thể sửa bài trả lời trước đó của bạn để thêm một trích dẫn bằng cách bôi đen và nhấn chọn nút <b>quote reply</b> vừa xuất hiện.
-
       Sẽ dễ dàng hơn cho tất cả mọi người để đọc chủ đề mà có ít câu trả lời sâu với nhiều cấp, trả lời cá nhân
-    dominating_topic: "### Hãy để người khác tham gia vào cuộc thảo luận\n\nChủ đề này rõ ràng là quan trọng với bạn & ndash; bạn đã đăng nhiều hơn% %{percent}% của các câu trả lời tại đây.\n\nBạn có chắc chắn bạn đang cung cấp đủ thời gian cho những người khác để chia sẻ quan điểm của mình? \n"
+    dominating_topic: |
+      Chủ đề này rõ ràng là quan trọng với bạn & ndash; bạn đã đăng nhiều hơn% %{percent}% của các câu trả lời tại đây.
+      Bạn có chắc chắn bạn đang cung cấp đủ thời gian cho những người khác để chia sẻ quan điểm của mình?
     too_many_replies: |
-      ### Bạn đã đạt đến giới hạn trả lời cho chủ đề này
-
       Chúng tôi xin lỗi, nhưng người dùng mới bị giới hạn %{newuser_max_replies_per_topic} trả lời trong cùng một chủ đề.
-
       Thay vì thêm một câu trả lời khác, xin vui lòng xem xét chỉnh sửa trả lời trước đó của bạn, hoặc truy cập vào các chủ đề khác.
-    reviving_old_topic: "### Xem lại chủ đề này? \n\nCâu trả lời cuối cùng cho chủ đề này đã hơn hơn %{days} ngày. Trả lời của bạn sẽ đẩy chủ đề đó lên đầu danh sách và thông báo cho bất cứ ai liên quan đến cuộc thảo luận.\n\nBạn có chắc chắn bạn muốn tiếp tục cuộc trò chuyện cũ này? \n"
+    reviving_old_topic: |
+      Câu trả lời cuối cùng cho chủ đề này đã hơn hơn %{days} ngày. Trả lời của bạn sẽ đẩy chủ đề đó lên đầu danh sách và thông báo cho bất cứ ai liên quan đến cuộc thảo luận.
+      Bạn có chắc chắn bạn muốn tiếp tục cuộc trò chuyện cũ này?
   activerecord:
     attributes:
       category:
         name: "Tên chuyên mục"
+      topic:
+        title: 'Tiêu đề'
       post:
         raw: "Thân"
       user_profile:
         bio_raw: "GIới thiệu bản thân"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -257,7 +254,6 @@ vi:
           attributes:
             hex:
               invalid: "không phải là một màu không hợp lệ"
-      <<: *errors
   user_profile:
     no_info_me: "<div class = 'missing-profile''> Mục nói về bản thân bạn trong hồ sơ của bạn hiện đang trống, <a href='/users/%{username_lower}/preferences/about-me'> bạn muốn điền vào nó? </ a> </ div>"
     no_info_other: "<div class = 'missing-profile'>%{name} đã không nhập bất cứ điều gì nói về bản thân của họ </ div>"
@@ -270,26 +266,18 @@ vi:
   assets_topic_body: "Chủ đề này tồn tại vĩnh viễn, chỉ xem được bởi nhân viên, dùng để chứa ảnh và file dành cho việc thiết kế. Vui lòng đừng xóa.\n\n\nHướng dẫn:\n\n\n1. Trả lời chủ đề này.\n2. Tải lên tất cả ảnh bạn cần cho logo, favicon, và các thứ khác. (Dùng nút tải lên trong công cụ viết bài, hoặc kéo-và-thả hoặc dán ảnh vào) \n3. Gửi trả lời của bạn.\n4. Bấm chuột phải lên ảnh trong bài đăng mới để chép đường dẫn của các ảnh đã được tải lên, hoặc sửa bài viết của bạn để lấy đường dẫn của ảnh. Sao chép các đường dẫn này.\n5. Dán các đường dẫn này vào [thiết lập chung](/admin/site_settings/category/required).\n\n\nNếu bạn cần tải lên các loại file khác, sửa `authorized_extensions` trong [thiết lập file](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Chào mừng bạn đến với Phòng khách"
-    body: |2
+    body: |
-
       Chúc mừng! :confetti_ball:
-
       Nếu bạn có thể xem chủ đề này, bạn đã được thăng lên bậc **thường xuyên** (bậc tin tưởng 3).
-
       Bạn có thể &hellip;
-
       * Sửa tiêu đề của bất kì chủ đề nào
       * Sửa chuyên mục của bất kì chủ đề nào
       * Tất cả liên kết ở trạng thái follow ([những liên kết nofollow](http://en.wikipedia.org/wiki/Nofollow) sẽ được loại bỏ)
       * Truy cập vào phòng khách dành riêng cho thành viên với bậc tin tưởng 3 hoặc cao hơn
       * Ẩn bài viết spam với 1 lần đánh dấu.
-
       Đây là danh sách [của các thành viên thường xuyên](/badges/3/regular). Hãy chào họ đi nào.
-
       Cảm ơn vì đã trở thành một phần không thể thiếu đối với cộng đồng.
-
       (Để biết thêm chi tiết về bậc tin tưởng, [xem chủ đề này][trust]. Hãy nhớ rằng bạn phải tiếp tục đạt được các yêu cầu để duy trì bậc tin tưởng của mình.)
-
       [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "Giới thiệu chuyên mục %{category}"
@@ -485,17 +473,10 @@ vi:
         make: "Chủ đề này trở thành một banner. Nó sẽ hiện ở đầu mọi trang tới khi nó được tắt bởi thành viên."
         remove: "Chủ đề này không còn là một banner. Nó sẽ không hiện ở đầu mọi trang nữa."
   unsubscribed:
-    title: 'Hủy bỏ đăng ký'
+    title: "Đã hủy đăng ký!"
-    description: "Bạn đã ngừng đăng. Chúng tôi sẽ không liên lạc bạn nữa!"
+  unsubscribe:
-    oops: "Trong trường hợp bạn không có ý thực hiện thao tác này, bấm vào bên dưới."
+    title: "Hủy đăng ký"
-    error: "Lỗi hủy đăng kí"
+    log_out: "Đăng Xuất"
-    preferences_link: "Bạn có thể hủy theo dõi bản tin tóm tắt tại  <a href='/my/preferences'>trang thiết lập</a>"
-    different_user_description: "Bạn đang đăng nhập như một người dùng khác, không phải là người dùng đã được gửi đến qua mail. Hãy thoát ra và thử lại."
-    not_found_description: "Xin lỗi, chúng tôi không thể ngừng đăng ký bạn. Có thể là do link trong email của bạn đã hết hạn."
-  resubscribe:
-    action: "Đăng ký lại"
-    title: "Đã đăng ký lại!"
-    description: "Bạn đã được đăng ký lại."
   reports:
     visits:
       title: "Các thành viên truy cập"
@@ -588,6 +569,7 @@ vi:
     page_view_total_reqs:
       title: "Tổng số"
       xaxis: "Ngày"
+      yaxis: "Tổng lượt xem trang"
     page_view_logged_in_mobile_reqs:
       xaxis: "Ngày"
     page_view_anon_mobile_reqs:
@@ -630,7 +612,6 @@ vi:
       yaxis: "Số lần truy cập"
   dashboard:
     rails_env_warning: "Máy chủ của bạn đang chạy trong chế độ %{env}."
-    ruby_version_warning: "Bạn đang dùng một phiên bản Ruby 2.0.0 được biết là có nhiều vấn đề. Hãy nâng cấp bản vá 247 hoặc mới hơn."
     host_names_warning: "Cài đặt của bạn config/database.yml đang sử dụng hostname mặc định. Cập nhật lại để sử dụng hostname của bạn"
     gc_warning: 'Máy chủ của bạn hiện tại sử dụng cơ chế dọn rác mặc định của ruby, điều này khiến cho hiệu năng của máy chủ không tốt lắm. Đọc chủ đề sau cho việc tối ưu hiệu năng <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Tối ưu Ruby and Rails cho Discourse</a>.'
     sidekiq_warning: ' Sidekiq đang không hoạt động. Rất nhiều tác vụ, như gửi email, là được thực thi không đồng bộ bởi sidekiq. Hãy chắc chắn rằng ít nhất một tiến trình sidekiq phải đang hoạt động. <a href="https://github.com/mperham/sidekiq" target="_blank">Đọc thêm về Sidekiq tại đây</a>.'
@@ -702,7 +683,6 @@ vi:
     post_onebox_maxlength: "Số ký tự tối đa của một bài onebox Discourse."
     onebox_domains_whitelist: "Danh sách các tên miền cho phép onebox, các tên miền này phải hỗ trợ OpenGraph hoặc oEmbed. Kiểm tra tại http://iframely.com/debug"
     logo_url: "Logo ở vị trí trên cùng của website nên là hình chữ nhật, nếu để trống thì tên website sẽ hiển thị."
-    digest_logo_url: "Logo thay thế sử dụng ở vị trí header của tập san email. Nên là hình chữ nhật, không nên dùng ảnh SVG. Nếu để trống thì `logo_url` sẽ được sử dụng."
     logo_small_url: "Logo nhỏ ở vị trí trên cùng của website hiển thị khi cuộn xuống nên là hình vuông, nếu để trống thì icon trang chủ sẽ hiển thị."
     favicon_url: "Favicon cho trang của bạn, xem tại http://en.wikipedia.org/wiki/Favicon, để chạy được với CDN ảnh phải là png"
     mobile_logo_url: "Cố định vị trí hình logo sử dụng tại phía trên bên trái trang mobile của bạn. Nên là hình vuông. Nếu để trống, sẽ sử dụng `logo_url`. Ví dụ: http://example.com/uploads/default/logo.png"
@@ -723,13 +703,9 @@ vi:
     background_polling_interval: "How often should the clients poll in milliseconds (when the window is in the background)"
     flags_required_to_hide_post: "Số lần đánh dấu làm cho bài viết sẽ được tự động ẩn và tin nhắn sẽ được gửi đến người dùng (0 là không giới hạn)"
     cooldown_minutes_after_hiding_posts: "Số phút một người dùng phải chờ trước khi họ có thể sửa một bài viết ẩn bởi gắn cờ cộng đồng"
-    max_topics_in_first_day: "Số chủ đề tối đa một thành viên được tạo trong ngày đầu tiên."
-    max_replies_in_first_day: "Số trả lời tối đa một thành viên được tạo trong ngày đầu tiên"
     tl2_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 2 (thành viên) bằng cách nhân với số này"
     tl3_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 3 (bình thường) bằng cách nhân với số này"
     tl4_additional_likes_per_day_multiplier: "Tăng giới hạn thích mỗi ngày cho mức độ tin tưởng 4 (dẫn đầu) bằng cách nhân với số này"
-    num_flags_to_block_new_user: "Nếu bài viết của thành viên mới nhận được nhiều đánh dấu spam từ num_users_to_block_new_user thành viên khác, ẩn tất cả các bài viết của họ và ngăn chặn gửi bài trong tương lai, điền 0 để tắt."
-    num_users_to_block_new_user: "Nếu bài viết của thành viên mới nhận được num_flags_to_block_new_user đánh dấu spam từ các thành viên khác, ẩn tất cả các bài viết của họ và ngăn chặn gửi bài trong tương lai, điền 0 để tắt."
     notify_mods_when_user_blocked: "Nếu một thành viên được khóa tự động, gửi tin nhắn đến tất cả các điều hành viên."
     flag_sockpuppets: "Nếu thành viên mới trả lời chủ đề có cùng địa chỉ IP với thành viên mới tạo chủ đề, đánh dấu các bài viết của họ là spam tiềm năng."
     traditional_markdown_linebreaks: "Sử dụng ngắt dòng truyền thống trong Markdown, đòi hỏi hai khoảng trống kế tiếp cho một ngắt dòng."
@@ -980,11 +956,6 @@ vi:
     allow_animated_thumbnails: "Tạo ảnh động thu nhỏ cho ảnh .gif"
     default_avatars: "URL avatar mặc định được sử dụng cho các thành viên mới cho đến khi họ tự sửa đổi."
     automatically_download_gravatars: "Download Gravatar cho thành viên khi họ tạo tài khoản hoặc thay đổi email."
-    digest_topics: "Số lượng tối đa chủ đề hiển thị trong tập san email."
-    digest_min_excerpt_length: "Số kí tự tối thiểu của tóm tắt bài viết trong bản tin tóm tắt gửi qua email"
-    delete_digest_email_after_days: "Ngăn chặn tập san email không cho thành viên xem trong hơn (n) ngày."
-    digest_suppress_categories: "Ngăn chặn các chuyên mục này khỏi tập san email."
-    disable_digest_emails: "Tắt tập san email với tất cả các thành viên."
     detect_custom_avatars: "Có kiểm tra hay không việc thành viên đã upload ảnh hồ sơ của họ."
     max_daily_gravatar_crawls: "Giới hạn số lần Discourse sẽ kiểm tra Gravatar mới trong một ngày"
     public_user_custom_fields: "Danh sách trắng các trường tùy biến cho thành viên có thể hiển thị công khai."
@@ -999,6 +970,7 @@ vi:
     enable_mobile_theme: "Thiết bị di động có thể sử dụng giao diện riêng, với khả năng chuyển sang chế độ xem đầy đủ. Tắt thiết lập này nếu bạn muốn sử dụng một style tùy biến hỗ trợ responsive."
     dominating_topic_minimum_percent: "Số phần trăm bài viết mà một thành viên có thể gửi trong một chủ đề trước khi được nhắc nhở về hành vi muốn tạo ưu thế trong chủ đề."
     disable_avatar_education_message: "Tắt thông điệp hướng dẫn khi đổi avatar."
+    daily_performance_report: "Phân tích nhật ký NGINX hàng ngày và gửi cho BQT thông tin chi tiết"
     suppress_uncategorized_badge: "Không hiển thị huy hiệu cho các chủ đề chưa phân loại trong danh sách chủ đề"
     permalink_normalizations: "Áp dụng regex sau trước khi khớp với permalink, ví dụ: /(topic.*)\\?.*/\\1 sẽ loại bỏ các chuỗi truy vấn từ đường dẫn chủ đề. Định dạng regex+string với \\1 ... để giữ truy cập"
     global_notice: "Hiển thị banner KHẨN CẤP, THÔNG BÁO KHẨN trên toàn website để thông báo cho tất cả các khách ghé thăm, bỏ trống để ẩn (hỗ trợ HTML)."
@@ -1037,8 +1009,6 @@ vi:
     approve_post_count: "Số lượng bài viết từ một thành viên mới hoặc thành viên cũ phải được duyệt"
     approve_unless_trust_level: "Bài viết của thành viên dưới cấp độ tin cậy này phải được duyệt"
     notify_about_queued_posts_after: "Nếu những bài viết đang chờ duyệt có thời gian cũ hơn số giờ thiết lập ở đây, một email sẽ được gửi đến contact_email. Đặt là 0 để vô hiệu hóa email này."
-    default_email_digest_frequency: "Bao lâu thành viên nhận được tập san email theo mặc định."
-    default_include_tl0_in_digests: "Kèm theo các bài viết từ thành viên mới trong tập san email theo mặc định. Thành viên có thể thay đổi trong thiết lập của họ."
     default_email_private_messages: "Gửi email khi ai đó nhắn tin cho thành viên theo mặc định."
     default_email_direct: "Gửi email khi ai đó trích dẫn/trả lời/đề cập hoặc mời thành viên theo mặc định."
     default_email_mailing_list_mode: "Mặc định gửi email cho mỗi bài viết mới."
@@ -1052,6 +1022,7 @@ vi:
     default_other_enable_quoting: "Bật trích dẫn trả lời để nổi bật nội dung theo mặc định."
     default_other_dynamic_favicon: "Hiện bộ đếm chủ đề mới/cập nhật trên icon trình duyệt theo mặc định."
     default_other_disable_jump_reply: "Không nhảy tới bài viết của thành viên sau khi họ trả lời theo mặc định."
+    default_other_edit_history_public: "Đặt sửa đổi bài viết công khai theo mặc định."
     default_other_like_notification_frequency: "Thông báo thành viên khi like theo mặc định"
     default_topics_automatic_unpin: "Tự động bỏ ghim chủ đề khi thành viên xuống cuối trang theo mặc định."
     default_categories_watching: "Hiển thị danh sách chuyên mục đang xem theo mặc định."
@@ -1078,21 +1049,6 @@ vi:
       reply_by_email_address_is_empty: "Bạn phải thiết lập 'reply by email address' trước khi kích hoạt trả lời bằng email."
       email_polling_disabled: "Bạn phải kích hoạt bằng tay hoặc POP3 polling trước khi kích hoạt trả lời bằng email."
       user_locale_not_enabled: "Bạn phải bật 'allow user locale' trước khi kích hoạt thiết lập này."
-  notification_types:
-    group_mentioned: "%{group_name} được đề cập trong %{link}"
-    mentioned: "%{display_username} đề cập bạn ở %{link}"
-    liked: "%{display_username} thích bài viết %{link} của bạn"
-    replied: "%{display_username} trả lời bài viết %{link} của bạn"
-    quoted: "%{display_username} trích dẫn bài viết %{link} của bạn"
-    edited: "%{display_username} sửa đổi bài viết %{link} của bạn"
-    posted: "%{display_username} viết bài ở %{link}"
-    moved_post: "%{display_username} di chuyển bài viết của bạn tới %{link}"
-    private_message: "%{display_username} gửi bạn một tin nhắn: %{link}"
-    invited_to_private_message: "%{display_username} mời bạn xem tin nhắn: %{link}"
-    invited_to_topic: "%{display_username} mời bạn tham gia %{link}"
-    invitee_accepted: "%{display_username} chấp nhận lời mời của bạn"
-    linked: "%{display_username} kết nối với bạn ở %{link}"
-    granted_badge: "Bạn kiếm được %{link}"
   search:
     within_post: "#%{post_number} bởi %{username}"
     types:
@@ -1199,51 +1155,28 @@ vi:
     text_body_template: |
       Ai đó (có thể là bạn?) đã yêu cầu không muốn nhận email cập nhật từ %{site_domain_name} tới địa chỉ này.
       Nếu bạn muốn xác nhận điều này, xin hãy click liên kết:
-
       %{confirm_unsubscribe_link}
-
-
       Nếu bạn vẫn muốn tiếp tục nhận email cập nhật, xin hãy bỏ qua email này.
   invite_mailer:
     subject_template: "%{invitee_name} mời bạn tham gia chủ đề '%{topic_title}' trên %{site_domain_name}"
     text_body_template: |
       %{invitee_name} đã mời bạn tham gia thảo luận
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       tại
-
       > %{site_title} -- %{site_description}
-
       Nếu bạn quan tâm, xin hãy click liên kết sau:
-
       %{invite_link}
-
       Lời mời này đến từ thành viên tin cậy nên bạn có thể tham gia thảo luận ngay.
   invite_forum_mailer:
     subject_template: "%{invitee_name} đã mời bạn gia nhập %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} đã mời bạn gia nhập
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      Nếu bạn không thích, nhấn vào link dưới đây:
-
-      %{invite_link}
-
-      Nó được mời từ một người dùng tin cập, bạn không cần đăng nhập.
   invite_password_instructions:
     subject_template: "Đặt mật khẩu cho tài khoản của bạn ở %{site_name}"
     text_body_template: |
       Cám ơn bạn đã chấp nhận lời mời tham gia %{site_name} -- chào mừng!
-
       Xin hãy click liên kết sau để đặt mật khẩu:
       %{base_url}/users/password-reset/%{email_token}
-
       (Nếu liên kết trên hết hạn, bạn hãy chọn "Quên mật khẩu" khi đăng nhập với email của bạn).
   test_mailer:
     subject_template: "[%{site_name}] Email Thử Nghiệm"
@@ -1254,10 +1187,6 @@ vi:
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} bài viết đang chờ duyệt"
-    text_body_template: |
-      Chào bạn,
-
-      Có bài mới gửi từ thành viên đang chờ duyệt. [Bạn có thể duyệt hoặc từ chối ở địa chỉ](%{base_url}/queued-posts).
   flag_reasons:
     off_topic: "Bài viết của bạn được đánh dấu là **off-topic**: cộng đồng cảm thấy nó không phù hợp cho chủ đề này, được xác định bởi tiêu đề và bài viết đầu tiên."
     inappropriate: "Bài viết của bạn được đánh dấu là **inappropriate**: cộng đồng cảm thấy đó là sự xúc phạm, lăng mạ, hoặc vi phạm [nội quy diễn đàn](/guidelines)."
@@ -1271,41 +1200,26 @@ vi:
     deferred_and_deleted: "Cảm ơn bạn đã cho chúng tôi biết, chúng tôi đã gỡ bỏ bài viết."
   temporarily_closed_due_to_flags: "Chủ đề này tạm thời đóng do có một lượng lớn đánh dấu từ cộng đồng."
   system_messages:
-    post_hidden:
-      subject_template: "Bài viết bị ẩn do cộng đồng đánh dấu"
     welcome_user:
       subject_template: "Chào mừng đến với %{site_name}!"
       text_body_template: |
         Chào mừng bạn gia nhập %{site_name}!
-
         %{new_user_tips}
-
         Chúng tôi tin rằng bạn sẽ cùng chúng tôi phát triển một cộng đồng văn minh [hành vi ứng xử](%{base_url}/guidelines).
-
         Chúc vui vẻ!
-
         (Nếu bạn cần giao tiếp với BQT [thành viên quản trị](%{base_url}/about), bạn có thể gửi trả lời email này).
     welcome_invite:
       subject_template: "Chào mừng đến với %{site_name}!"
       text_body_template: |
         Chào mừng bạn gia nhập %{site_name}!
-
         Chúng tôi đã tạo một tài khoản mới **%{username}** cho bạn, bạn có thể thay đổi tên của mình bằng cách truy cập [your user profile][prefs].
-
         Cho lần đăng nhập sau:
-
         1. Luôn **sử dụng cùng một địa chỉ email từ lời mời ban đầu của bạn** khi đăng nhập. Nếu không chúng ta sẽ không thể biết đó là bạn!
-
         2. Tạo một mật khẩu cho [your user profile][prefs], và sử dụng nó để đăng nhập.
-
         %{new_user_tips}
-
         Chúng tôi tin rằng bạn sẽ cùng chúng tôi phát triển một cộng đồng văn minh [hành vi ứng xử](%{base_url}/guidelines).
-
         Chúc vui vẻ!
-
         (Nếu bạn cần giao tiếp với BQT [thành viên quản trị](%{base_url}/about), bạn có thể gửi trả lời email này).
-
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Sản sao lưu hoàn tất thành công"
@@ -1314,9 +1228,7 @@ vi:
       subject_template: "Sao lưu lỗi."
       text_body_template: |
         Sao lưu lỗi.
-
         Đây là log:
-
         ```
         %{logs}
         ```
@@ -1327,9 +1239,7 @@ vi:
       subject_template: "Phục hồi thất bại."
       text_body_template: |
         Phục hồi thất bại.
-
         Đây là log:
-
         ```
         %{logs}
         ```
@@ -1340,9 +1250,7 @@ vi:
       subject_template: "Có lỗi khi thực hiện mời thành viên hàng loạt"
       text_body_template: |
         File mời thành viên hàng loạt của bạn đã được thực hiện, %{sent} lời mời đã được gửi kèm với %{failed} lỗi.
-
         Đây là nhật ký:
-
         ```
         %{logs}
         ```
@@ -1350,9 +1258,7 @@ vi:
       subject_template: "Xuất dữ liệu hoàn tất"
       text_body_template: |
         Dữ liệu của bạn đã được export thành công! :dvd:
-
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
-
         Liên kết download trên sẽ có hiệu lực trong 48 giờ.
     csv_export_failed:
       subject_template: "Xuất dữ liệu thất bại"
@@ -1361,156 +1267,124 @@ vi:
       subject_template: "[%{site_name}] Sự cố email -- Cấp độ tin cậy thiếu tin tưởng"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Tài khoản của bạn không đủ cấp độ tin cậy bắt buộc để gửi chủ đề mới tới địa chỉ email này. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_reject_user_not_found:
       subject_template: "[%{site_name}] Sự cố email -- Không tìm thấy tài khoản"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Trả lời của bạn đã được gửi từ một địa chỉ email chưa rõ. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT.
     email_reject_inactive_user:
       subject_template: "[%{site_name}] Sự cố email -- Thành viên không hoạt động"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Tài khoản của bạn liên kết với địa chỉ email này chưa được kích hoạt. Xin hãy kích hoạt tài khoản của bạn trước khi gửi email.
     email_reject_blocked_user:
       subject_template: "[%{site_name}] Sự cố -- Thành viên bị chặn"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Tài khoản của bạn liên kết với địa chỉ email này đã bị chặn.
     email_reject_reply_user_not_matching:
       subject_template: "[%{site_name}] Sự cố email -- Thành viên trả lời không khớp"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Trả lời của bạn đã được gửi từ một địa chỉ email khác với những gì chúng tôi mong đợi, chúng tôi nghĩ đây có thể là cùng một người. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT.
     email_reject_no_account:
       subject_template: "[%{site_name}] Vấn đề Email -- Không xác định tài khoản"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Chúng tôi không tìm thấy tài khoản nào khớp với địa chỉ email của bạn. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT.
     email_reject_empty:
       subject_template: "[%{site_name}] Vấn đề Email -- Không có nội dung"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Chúng tôi không tìm thấy nội dung trả lời trong email của bạn.
-
         Nếu bạn tin _đã_kèm_theo nội dung trả lời, xin hãy thử lại với định dạng đơn giản hơn.
     email_reject_parsing:
       subject_template: "[%{site_name}] Vấn đề Email-- Không nhận dạng được nội dung"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Chúng tôi không tìm thấy nội dung trả lời trong email của bạn. **Hãy đảm bảo rằng trả lời của bạn ở phía trên cùng của email** -- chúng tôi không thể xử lý các trả lời nội tuyến.
     email_reject_invalid_access:
       subject_template: "[%{site_name}] Vấn đề Email -- truy cập không phù hợp"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Tài khoản của bạn không có quyền tạo chủ đề mới trong chuyên mục đó. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_reject_strangers_not_allowed:
       subject_template: "[%{site_name}] Sự cố email -- Truy cập không phù hợp"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Chuyên mục bạn gửi email này tới chỉ chấp nhận trả lời từ các thành viên có tài khoản hợp lệ với các địa chỉ email rõ ràng. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_reject_invalid_post:
       subject_template: "[%{site_name}] Sự cố email -- Lỗi gửi bài"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Một số nguyên nhân có thể là: định dạng phức tạp, nội dung quá nhiều, hoặc nội dung quá ít... xin hãy thử lại, hoặc gửi thông qua website.
     email_reject_invalid_post_specified:
       subject_template: "[%{site_name}] Sự cố email -- Lỗi gửi bài"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Lý do:
-
         %{post_error}
-
         Nếu bạn có thể khắc phục sự cố, xin hãy thử lại.
     email_reject_rate_limit_specified:
       subject_template: "[%{site_name}] Sự cố email -- Tỷ lệ giới hạn"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Lý do: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] Sự cố email -- Hành động gửi bài không hợp lệ"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Hành động gửi bài không được công nhận, bạn hãy thử lại hoặc gửi thông qua website.
     email_reject_reply_key:
       subject_template: "[%{site_name}] Vấn đề Email -- Không xác định được key trả lời"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Khóa trả lời trong email là không hợp lệ hoặc không rõ, vì thế chúng tôi không thể hình dung ra email này gửi trả lời tới đâu. Xin hãy liên hệ với BQT.
     email_reject_bad_destination_address:
       subject_template: "[%{site_name}] Sự cố email -- Không rõ địa chỉ Tới:"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Không có địa chỉ email người nhận được xác định, hãy chắc chắn rằng địa chỉ email bạn gửi tới là chính xác.
     email_reject_topic_not_found:
       subject_template: "[%{site_name}] Vấn đề Email -- Không tìm thấy chủ đề"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Chủ đề bạn gửi trả lời không còn tồn tại -- có thể do đã được xóa? Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_reject_topic_closed:
       subject_template: "[%{site_name}] Vấn đề Email -- Chủ đề đóng"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Chủ đề bạn gửi trả lời hiện đang đóng và không nhận gửi trả lời. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_reject_auto_generated:
       subject_template: "[%{site_name}] Vấn đề Email -- Tự động tạo trả lời"
       text_body_template: |
         Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
         Email của bạn được đánh dấu là "tạo tự động", chúng tôi không chấp nhận các kiểu email này. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT.
     email_error_notification:
       subject_template: "[%{site_name}] Vấn đề Email -- chứng thực POP lỗi"
       text_body_template: |
         Thật không may, có một lỗi xác thực trong khi polling mail từ POP server.
-
         Hãy chắc chắn rằng bạn đã cấu hình đúng các thông tin POP trong [thiết lập website](%{base_url}/admin/site_settings/category/email).
-
         Nếu có một giao diện web cho các tài khoản email POP, bạn có thể cần phải đăng nhập vào website và kiểm tra các thiết lập này.
     user_automatically_blocked:
-      subject_template: "Tài khoản mới %{username} đã bị chặn do cộng đồng gắn cờ"
       text_body_template: |
         Đây là tin nhắn tự động.
-
         Tài khoản mới [%{username}](%{user_url}) đã được tự động chặn do nhiều thành viên đã gắn cờ các bài viết của %{username}.
-
         Hãy [xem lại các cờ](%{base_url}/admin/flags). Nếu %{username} không đáng bị chặn gửi bài, click nút gỡ bỏ trên [trang quản trị thành viên](%{user_url}).
-
         Ngưỡng này có thể thay đổi trong thiết lập `block_new_user` của website.
     spam_post_blocked:
       subject_template: "Các bài viết của tài khoản mới %{username} đã bị chặn do lặp đi lặp lại các liên kết"
       text_body_template: |
         Đây là tin nhắn tự động.
-
         Tài khoản mới [%{username}](%{user_url}) đã nhiều lần tạo bài viết chứa các liên kết tới %{domains}, nhưng những bài viết này đã bị chặn để tránh spam. Thành viên vẫn có thể tạo bài viết mới mà không liên kết tới %{domains}.
-
         Hãy [xem xét thành viên](%{user_url}).
-
         Có thể thay đổi điều này trong thiết lập `newuser_spam_host_threshold` và `white_listed_spam_host_domains` của website.
     pending_users_reminder:
       subject_template:
         other: "%{count} thành viên đang chờ duyệt"
       text_body_template: |
         Có tài khoản mới đăng ký đang chờ duyệt (hoặc từ chối) trước khi họ có thể truy cập diễn đàn.
-
         [Hãy xem xét họ trong khu vực admin](%{base_url}/admin/users/list/pending).
     download_remote_images_disabled:
       subject_template: "Download ảnh từ xa đã bị vô hiệu"
@@ -1519,7 +1393,6 @@ vi:
       subject_template: "Vấn đề đã được tìm thấy"
       text_body_template: |
         Một số vấn đề đang được báo cáo trên bảng điều khiển admin của bạn.
-
         [Hãy xem xét và sửa chữa](%{base_url}/admin).
   subject_re: "Re:"
   subject_pm: "[PM]"
@@ -1531,26 +1404,21 @@ vi:
     unsubscribe:
       title: "Bỏ theo dõi"
       description: "Bạn không thích nhận mail giống mail này? Nhấn vào bỏ theo dõi để bỏ đăng ký ngay lập tức:"
+    only_reply_by_email: "Trả lời email này để phản hồi."
     posted_by: "Đăng bởi %{{username} ngày %{post_date}"
     invited_to_private_message_body: |
       %{username} mời bạn xem
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       tại
-
       > %{site_title} -- %{site_description}
     invited_to_topic_body: |
       %{username} mời bạn thảo luận
-
       > **%{topic_title}**
       >
       > %{topic_excerpt}
-
       tại
-
       > %{site_title} -- %{site_description}
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} mời bạn trả lời thông điệp '%{topic_title}'"
@@ -1578,99 +1446,79 @@ vi:
       subject_template: "%{optional_re}%{topic_title}"
     digest:
       why: "Tóm tắt %{site_link} từ lần cuối truy cập %{last_seen_at}"
-      subject_template: "[%{site_name}] Tóm tắt"
       new_activity: "Hoạt động mới ở chủ đề và bài viết của bạn:"
       top_topics: "Bài viết phổ biến"
       other_new_topics: "Chủ đề phổ biến"
-      unsubscribe: "Tập san này được gửi từ %{site_link} khi chúng tôi đã không thấy bạn trong thời gian dài. Để hủy nhận tin xin hãy click %{unsubscribe_link}."
       click_here: "bấm vào đây"
-      from: "%{site_name} tóm tắt"
       read_more: "Đọc Tiếp"
       more_topics: "Đây là %{new_topics_since_seen} những chủ đề mới khác."
       more_topics_category: "Thêm chủ đề mới:"
+    mailing_list:
+      new_topics: "Chủ đề mới"
+      view_this_topic: "Xem chủ đề này"
+      back_to_top: "Trở lên trên"
     forgot_password:
       subject_template: "[%{site_name}] Đặt lại mật khẩu"
       text_body_template: |
         Có người đã yêu cầu được đặt lại mật khẩu của bạn trên [%{site_name}](%{base_url}).
-
         Nếu bạn không yêu cầu điều này, hãy bỏ qua email này.
-
         Click vào liên kết sau để chọn mật khẩu mới:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Đặt Mật khẩu"
       text_body_template: |
         Có người đã yêu cầu thêm mật khẩu vào tài khoản của bạn trên [%{site_name}](%{base_url}). Ngoài ra, bạn có thể đăng nhập sử dụng bất kỳ dịch vụ trực tuyến nào hỗ trợ (Google, Facebook,...) được liên kết với địa chỉ email này.
-
         Nếu bạn không yêu cầu điều này, hãy bỏ qua email này.
-
         Click vào liên kết sau để chọn mật khẩu mới:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Đăng nhập"
       text_body_template: |
         Có người đã yêu cầu đăng nhập vào tài khoản của bạn trên [%{site_name}](%{base_url}).
-
         Nếu bạn không yêu cầu điều này, hãy bỏ qua email này.
-
         Click liên kết sau để đăng nhập:
         %{base_url}/users/admin-login/%{email_token}
     account_created:
       subject_template: "[%{site_name}] Tài khoản mới"
       text_body_template: |
         Tài khoản mới cho bạn trên %{site_name} đã được tạo
-
         Click liên kết sau để chọn mật khẩu cho tài khoản của bạn:
         %{base_url}/users/password-reset/%{email_token}
     confirm_new_email:
       subject_template: "[%{site_name}] Xác nhận địa chỉ email mới của bạn"
       text_body_template: |
         Xác nhận địa chỉ email mới của bạn trên %{site_name} bằng cách click liên kết sau:
-
         %{base_url}/users/authorize-email/%{email_token}
     confirm_old_email:
       subject_template: "[%{site_name}] Xác nhận địa chỉ email hiện tại của bạn"
       text_body_template: |
         Trước khi thay đổi địa chỉ email của bạn, chúng tôi cần xác nhận rằng bạn kiểm soát địa chỉ email của tài khoản hiện tại. Sau khi hoàn thành bước này, bạn có thể xác nhận địa chỉ email mới.
-
         Xác nhận địa chỉ email hiện tại của bạn trên %{site_name} bằng cách click liên kết sau:
-
         %{base_url}/users/authorize-email/%{email_token}
     notify_old_email:
       subject_template: "[%{site_name}] Địa chỉ email của bạn đã được thay đổi"
       text_body_template: |
         Đây là tin nhắn tự động để thông báo rằng địa chỉ email của bạn trên %{site_name} đã được thay đổi. Nếu điều này là không đúng, xin hãy liên hệ với BQT.
-
         Địa chỉ email của bạn được đổi thành:
-
         %{new_email}
     signup_after_approval:
       subject_template: "Bạn đã được kiểm duyệt ở %{site_name}!"
       text_body_template: |
         Chào mừng bạn tham gia %{site_name}!
-
         BQT đã chấp nhận tài khoản của bạn trên %{site_name}.
-
         Click liên kết sau để xác nhận và kích hoạt tài khoản của bạn:
         %{base_url}/users/activate-account/%{email_token}
-
         Nếu bạn không thể click liên kết trên, hãy thử sao chép và dán vào thanh địa chỉ của trình duyệt web.
-
         %{new_user_tips}
-
         Chúng tôi tin rằng bạn sẽ cùng chúng tôi hướng tới một cộng đồng văn minh [quy tắc ứng xử văn minh](%{base_url}/guidelines).
-
         Chúc vui vẻ!
-
         (Nếu bạn cần liên hệ với BQT [nhân viên quản trị](%{base_url}/about), bạn có thể gửi trả lời tin nhắn này).
     signup:
       subject_template: "[%{site_name}] Xác nhận tài khoản mới của bạn"
       text_body_template: |
         Chào mừng bạn tham gia %{site_name}!
-
         Click liên kết sau để xác nhận và kích hoạt tài khoản của bạn:
         %{base_url}/users/activate-account/%{email_token}
-
         Nếu bạn không thể click liên kết trên, hãy thử sao chép và dán vào thanh địa chỉ của trình duyệt web.
   page_not_found:
     title: "Rất tiếc! Địa chỉ này không tồn tại hoặc riêng tư."
@@ -1681,7 +1529,6 @@ vi:
     search_google: "Goole"
   login_required:
     welcome_message: |
-      #[Chào mừng đến %{title}](#welcome)
       Trang này yêu cầu phải có tài khoản. Vui lòng tạo một tài khoản hoặc đăng nhập để tiếp tục.
   terms_of_service:
     title: "Điều khoản Dịch vụ"
@@ -1730,91 +1577,43 @@ vi:
     title: "FAQ/Hướng dẫn"
     body: |
       <a name="civilized"></a>
-
-      ## [Đây Là Một Cộng Đồng Thảo Luận Văn Minh](#civilized)
-
       Hãy thể hiện nếp sống văn minh ở cộng đồng này.  Đây là một cộng đồng chia sẻ &mdash; kỹ năng, sự hiểu biết và sở thích thông qua đối thoại.
-
       Đây không phải là những quy tắc cứng nhắc, mà chỉ là những quy tắc được dùng để đánh giá. Bạn hãy sử dụng các hướng dẫn này để giúp giữ vững một cộng đồng lành mạnh, văn minh.
-
       <a name="improve"></a>
-
-      ## [Nâng Cao Thảo Luận](#improve)
-
       Các chủ đề thảo luận ở đây là quan trọng với chúng tôi, và chúng tôi cũng muốn bạn coi đó là quan trọng. Hãy tôn trọng nội dung chủ đề và những người cùng tham gia thảo luận, ngay cả khi bạn không đồng ý với những gì đang thảo luận.
-
       Một cách để thảo luận là khám phá những gì đã xảy ra, hãy dành một chút thời gian duyệt xem các bài viết trước khi bạn gửi bài viết của mình.
-
       <a name="agreeable"></a>
-
-      ## [Hãy Thoải Mái, Ngay Cả Khi Bạn Không Đồng Ý](#agreeable)
-
       Bạn có thể muốn trả lời một cái gì đó bởi không đồng ý, đó là điều tốt. Nhưng hãy nhớ không được chỉ trích quan điểm của người khác. Hãy tránh:
-
       *   Chửi rủa.
       *   Chống đối nhau.
       *   Đối phó với giọng điệu của bài viết thay vì nội dung thực của bài viết.
       *   Sự mâu thuẫn.
-
       Thay vào đó, bạn hãy cung cấp lập luận để cải thiện cuộc trò chuyện.
-
       <a name="participate"></a>
-
-      ## [Đếm Sự Tham Gia Của Bạn](#participate)
-
       Discourse cung cấp các công cụ để giúp cộng đồng xác định đóng góp tốt nhất (cũng như tồi nhất): yêu thích, đánh dấu, gắn cờ, trả lời, sửa,... Các công cụ này được sử dụng để cải thiện kinh nghiệm của riêng bạn, và của mọi người khác.
-
       <a name="flag-problems"></a>
-
-      ## [Nếu Bạn Thấy Có Vấn Đề, Hãy Đánh Dấu](#flag-problems)
-
       Khi bạn nhìn thấy một hành vi xấu, đừng trả lời, hãy gắn cờ nó. Nếu đủ cờ tích luỹ, hành động sẽ được thực hiện, hoặc là tự động hoặc bằng cách can thiệp điều tiết.
-
       Để duy trì cộng đồng, BQT có quyền loại bỏ bất cứ nội dung nào cũng như bất kỳ tài khoản người dùng nào vì bất cứ lý do và bất cứ lúc nào. BQT không chịu trách nhiệm cho bất kỳ nội dung nào được đăng bởi cộng đồng.
-
       <a name="be-civil"></a>
-
-      ## [Tuân Thủ Pháp Luật](#be-civil)
-
       Không có gì phá hoại một cuộc trò chuyện mạnh bằng sự thô lỗ:
-
       *   Hãy lịch sự: không đăng bất cứ điều gì mà người khác coi là sự xúc phạm, lăng mạ, hay thù hận.
       *   Giữ sạch sẽ: không đăng bất cứ điều gì khiêu dâm hay đồi trụy.
       *   Tôn trọng lẫn nhau: không quấy rối hoặc làm người khác bực, mạo danh, hoặc lộ thông tin cá nhân của họ.
       *   Tôn trọng diễn đàn: không spam hoặc phá hoại diễn đàn.
-
       Đây là một diễn đàn công khai, các nội dung ở đây có thể được các công cụ tìm kiếm tìm thấy. Bạn hãy tự bảo vệ ngôn từ, liên kết, và hình ảnh an toàn cho gia đình và bạn bè của mình.
-
       <a name="keep-tidy"></a>
-
-      ## [Sạch Sẽ, Gọn Gàng](#keep-tidy)
-
       Hãy nỗ lực để đưa mọi thứ vào đúng chỗ để chúng ta có thể có nhiều thời gian thảo luận hơn, vì thế:
-
       *   Không tạo chủ đề sai chuyên mục.
       *   Không gửi cùng một bài trong nhiều chuyên mục khác nhau.
       *   Không gửi bài viết chưa có nội dung.
       *   Không chuyển hướng một chủ đề bằng cách thay đổi nó giữa dòng.
       *   Không ký vào bài viết của bạn &mdash; và tất cả các bài viết khác có chứa thông tin hồ sơ của bạn trong đó.
-
       Thay vì gửi bài viết có nội dung là “+1” hoặc “Đồng ý!”, hãy sử dụng nút Like.
-
       <a name="stealing"></a>
-
-      ## [Chỉ Gửi Những Gì Bạn Có](#stealing)
-
       Bạn không được gửi bất cứ nội dung nào thuộc về người khác mà không được phép. Bạn không được gửi thông tin mô tả, đường dẫn, hoặc các phương pháp để ăn cắp tài sản trí tuệ của một ai đó (phần mềm, video, âm thanh, hình ảnh...), hoặc vi phạm pháp luật khác.
-
       <a name="power"></a>
-
-      ## [Powered by You](#power)
-
       Website này được điều hành bởi [nhóm điều hành](/about) và *bạn*, trong một cộng đồng. Nếu bạn có bất kỳ thắc mắc nào, hãy tạo chủ đề mới trong [chuyên mục phản hồi](/c/site-feedback) và thảo luận với chúng tôi! Nếu có một vấn đề quan trọng, cấp bách cần xử lý ngay, hãy liên hệ với chúng tôi qua [trang nhân viên](/about).
-
       <a name="tos"></a>
-
-      ## [Quy Định Sử Dụng](#tos)
-
       Chúng tôi có mục [Quy Định Sử Dụng](/tos) mô tả hành vi bạn (và chúng tôi) phải thực hiện liên quan đến nội dung, bảo mật, quyền riêng tư, và pháp luật. Để sử dụng dịch vụ này, bạn phải đồng ý với các quy định của chúng tôi [TOS](/tos).
   tos_topic:
     title: "Điều khoản Dịch vụ"
@@ -2024,8 +1823,5 @@ vi:
     initial_topic_title: Báo cáo hiệu suất website
   topic_invite:
     user_exists: "Xin lỗi, thành viên này đã được mời. Bạn chỉ có thể mời một người dùng đến một chủ đề một lần."
-  time:
+  tags:
-    <<: *datetime_formats
+    title: "Thẻ"
-  activemodel:
-    errors:
-      <<: *errors

config/locales/server.zh_TW.yml

@@ -17,6 +17,8 @@ zh_TW:
   date:
     month_names: [null, 一月, 二月, 三月, 四月, 五月, 六月, 七月, 八月, 九月, 十月, 十一月, 十二月]
     <<: *datetime_formats
+  time:
+    <<: *datetime_formats
   title: "論壇"
   topics: "討論話題"
   posts: "文章"
@@ -72,6 +74,9 @@ zh_TW:
       min_username_length_range: "你不能設定「最小」大於「最大」。"
       max_username_length_exists: "您不能設置比現有用戶名短的「最大用戶名長度」。"
       max_username_length_range: "你不能設定「最大」小於「最小」。"
+  activemodel:
+    errors:
+      <<: *errors
   bulk_invite:
     file_should_be_csv: "上傳的文件應為 csv 或 txt 格式。"
   backup:
@@ -136,15 +141,11 @@ zh_TW:
   education:
     until_posts:
       other: "%{count} 篇文章"
-    new-reply: |
+    'new-reply': |
       歡迎來到%{site_name} &mdash; **感謝你的貢獻！**
-
       - 你的回覆是否以某種方式改善了討論？
-
       - 請尊重所有社群成員。
-
       - 歡迎有建設性的評論，但是評論的應該是觀點，而不是人身攻擊。
-
       欲查看更多，[請查看我們的社群准則](/guidelines)。此訊息面板只會在你發表前 %{education_posts_text} 時顯示。
   activerecord:
     attributes:
@@ -155,6 +156,7 @@ zh_TW:
       user_profile:
         bio_raw: "關於我"
     errors:
+      <<: *errors
       models:
         topic:
           attributes:
@@ -175,7 +177,6 @@ zh_TW:
           attributes:
             hex:
               invalid: "不是一個有效顏色"
-      <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>你的自我簡介中，“關於我” 部分目前還沒有內容，<a href='/users/%{username_lower}/preferences/about-me'>不如來自我介紹一下？</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} 尚未在他/她自我簡介中的“關於我”部分填寫任何資訊</div>"
@@ -342,18 +343,6 @@ zh_TW:
       message:
         make: "本主題現在是橫幅主題。它將出現在每頁的頂部，除非用戶將其隱藏。"
         remove: "本主題已經不再是橫幅主題。它將不在每個頁面的頂部顯示。"
-  unsubscribed:
-    title: '取消訂閱'
-    description: "你已經取消訂閱，我們不會再聯絡你。"
-    oops: "如果你不希望取消訂閱，請點擊下方的連結。"
-    error: "取消訂閱時發生錯誤"
-    preferences_link: "您也可以取消摘要訂閱，就在您的 <a href='/my/preferences'>參數設定頁面</a>"
-    different_user_description: "您正以另一個帳號的身份登入，而非摘要信件寄給的帳號，請登出再試一次"
-    not_found_description: "抱歉，我們無法替你取消訂閱。可能你郵件裡的連結已過期。"
-  resubscribe:
-    action: "重新訂閱"
-    title: "已重新訂閱！"
-    description: "你已經重新訂閱。"
   reports:
     visits:
       title: "用戶瀏覽量"
@@ -480,7 +469,6 @@ zh_TW:
       xaxis: "天"
   dashboard:
     rails_env_warning: "伺服器現在運行 %{env} 模式。"
-    ruby_version_warning: "如果你使用的 Ruby 版本是 2.0.0 ，這個版本有較多的問題，請升級至 p247 或以上的版本"
     host_names_warning: "伺服器上 config/database.yml 的主機名稱為 localhost 。請更改成你的網站主機名稱。"
     gc_warning: '伺服器正在使用的 ruby 可能僅啟用了預設的 垃圾回收設定 (garbage collection), 這個設定無法提供最佳效能。請瀏覽此效能設定的資訊: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>。'
     sidekiq_warning: 'Sidekiq 未有執行。很多程序, 如發送電子郵件, 需要 sidekiq 非同步 (asynchronous) 執行的。請確保至少運行一個 sidekiq 程序。<a href="https://github.com/mperham/sidekiq">瞭解 Sidekiq</a>。'
@@ -552,10 +540,6 @@ zh_TW:
     anon_polling_interval: "匿名使用者用戶端輪詢時間間隔（單位 毫秒）"
     background_polling_interval: "客戶端輪詢的間隔，以毫秒計（當視窗在後台時）"
     cooldown_minutes_after_hiding_posts: "如果一個文章因為標記而隱藏，用戶需要等待多少分鐘才能編輯該文章"
-    max_topics_in_first_day: "新用戶第一天在這個站最大能建立的話題數量"
-    max_replies_in_first_day: "新用戶第一天在這個站最大能建立的回覆數量"
-    num_flags_to_block_new_user: "如果一個新用戶的帖子被其他 num_users_to_block_new_user 個用戶標記為垃圾，隱藏他們的所有帖子並阻止其之後的發帖。0 表示禁用這個特性。"
-    num_users_to_block_new_user: "如果一個新用戶的帖子被許多其他用戶 num_flags_to_block_new_user 標記為垃圾，隱藏他們的所有帖子並阻止其之後發帖。0 表示禁用這個特性。"
     notify_mods_when_user_blocked: "若有用戶被自動封鎖，將發送訊息給所有板主。"
     flag_sockpuppets: "如果一個新用戶開始了一個主題，並且同時另一個新用戶以同一個 IP 在該主題回復，他們所有的帖子都將被自動標記為垃圾。"
     traditional_markdown_linebreaks: "在 Markdown 中使用傳統的換行符號，即用兩個行末空格來換行"
@@ -714,9 +698,6 @@ zh_TW:
     allow_animated_thumbnails: "為 gif 動畫生成動態縮略圖。"
     default_avatars: "新用戶將會使用的默認頭像的網址。"
     automatically_download_gravatars: "當用戶註冊或更改EMail時下載 Gravatars 圖片"
-    digest_topics: "EMail 摘要中顯示的最大話題數量"
-    digest_min_excerpt_length: "EMail 摘要中每篇文章最少顯示的字元數量"
-    disable_digest_emails: "禁用發送摘要郵件給所有用戶。"
     max_daily_gravatar_crawls: "一天內 Discourse 將自動檢查 Gravatar 自訂個人圖示的次數"
     public_user_custom_fields: "用戶可設定公開顯示的自定欄位白名單。"
     staff_user_custom_fields: "用戶可設定只給管理員顯示的自定欄位白名單。"
@@ -746,17 +727,6 @@ zh_TW:
       invalid_string_min_max: "必須介於 %{min} 到 %{max} 字之間。"
       invalid_string_min: "必須至少 %{min} 個字。"
       invalid_string_max: "不能超過 %{max} 個字。"
-  notification_types:
-    mentioned: "%{display_username} 在 %{link} @到了你"
-    liked: "%{display_username} 在 %{link} 按讚了你的文章 "
-    replied: "%{display_username} 在 %{link} 回覆了你的文章"
-    quoted: "%{display_username} 在 %{link} 引用了你的文章"
-    edited: "%{display_username} 在 %{link} 編輯了你的文章"
-    posted: "%{display_username} 發表了 %{link}"
-    moved_post: "%{display_username} 把你的文章移動到了 %{link}"
-    invitee_accepted: "%{display_username} 接受了你的邀請"
-    linked: "%{display_username} 在 %{link} 關連了你"
-    granted_badge: "你獲得了 %{link}"
   search:
     types:
       category: '分類'
@@ -808,18 +778,6 @@ zh_TW:
     subject_template: "%{invitee_name} 邀請你參與在 %{site_domain_name} 討論的話題 '%{topic_title}'"
   invite_forum_mailer:
     subject_template: "%{invitee_name} 邀請你加入 %{site_domain_name}"
-    text_body_template: |
-      %{invitee_name} 邀請你加入
-
-      > **%{site_title}**
-      >
-      > %{site_description}
-
-      如果你感興趣，請點擊以下連結：
-
-      %{invite_link}
-
-      此邀請是由一位受信任的用戶所發出，所以你不需要登入。
   invite_password_instructions:
     subject_template: "為 %{site_name} 的帳戶設置密碼"
   test_mailer:
@@ -832,8 +790,6 @@ zh_TW:
     disagreed: "感謝你讓我們知道。我們正在調查。"
     deferred: "感謝你讓我們知道。我們正在調查。"
   system_messages:
-    post_hidden:
-      subject_template: "因為社群投訴而被隱藏的文章"
     welcome_user:
       subject_template: "歡迎來到 %{site_name}！"
     welcome_invite:
@@ -855,8 +811,6 @@ zh_TW:
       subject_template: "資料匯出完成"
     csv_export_failed:
       subject_template: "資料匯出失敗"
-    user_automatically_blocked:
-      subject_template: "新用戶 %{username} 由於社群的投訴已被封鎖"
     spam_post_blocked:
       subject_template: "新用戶 %{username} 由於重複貼連結，文章已被封鎖"
     pending_users_reminder:
@@ -890,9 +844,7 @@ zh_TW:
       new_activity: "在你的討論話題和文章裡的動態："
       top_topics: "熱門文章"
       other_new_topics: "熱門討論話題"
-      unsubscribe: "這封來自 %{site_link} 的摘要郵件是你一段時間沒有訪問後發送給你的。點擊 %{unsubscribe_link} 取消訂閱。"
       click_here: "點擊此處"
-      from: "%{site_name} 摘要"
       read_more: "閱讀更多"
       more_topics: "有其他 %{new_topics_since_seen} 個新主題。"
       more_topics_category: "更多新主題："
@@ -900,9 +852,7 @@ zh_TW:
       subject_template: "[%{site_name}] 密碼重設"
       text_body_template: |
         有人請求重設你在 [%{site_name}](%{base_url}) 上的密碼。
-
         如果那不是你，你可以直接忽略本郵件。
-
         點擊下面的連結來選擇一個新密碼：
         %{base_url}/users/password-reset/%{email_token}
     set_password:
@@ -914,10 +864,8 @@ zh_TW:
     signup:
       text_body_template: |
         歡迎來到 %{site_name}！
-
         點擊以下連結來確認和啟用你的新帳號：
         %{base_url}/users/activate-account/%{email_token}
-
         如果上面的連結無法點擊，請拷貝該連結並粘貼到你的流覽器的地址欄裡。
   page_not_found:
     popular_topics: "熱門"
@@ -974,8 +922,3 @@ zh_TW:
     submit_button: "送出電子郵件"
   performance_report:
     initial_topic_title: 網站效能報表
-  time:
-    <<: *datetime_formats
-  activemodel:
-    errors:
-      <<: *errors

plugins/poll/config/locales/client.ar.yml

@@ -23,36 +23,12 @@ ar:
         many: "مجموع الأصوات الكثيرة."
         other: "مجموع الأصوات."
       average_rating: "متوسط التصنيف: <strong>%{average}</strong> "
-      multiple:
-        help:
-          at_least_min_options:
-            zero: "لا يجب عليك اختيار أي خيار."
-            one: "يجب عليك أن تختار خيار <strong> واحد </strong> على الأقل."
-            two: "يجب عليك أن تختار  <strong> خياران </strong> على الأقل."
-            few: "يجب عليك أن تختار <strong> %{count} </strong> بعض الخيارات على الأقل."
-            many: "يجب عليك أن تختار <strong> %{count} </strong> عدة خيارات على الأقل."
-            other: "يجب عليك الاختيار على الأقل."
-          up_to_max_options:
-            zero: "لا يمكنك اختيار أي خيار."
-            one: "يمكنك إختيار مايصل إلى خيار <strong> واحد </strong>فقط."
-            two: "يمكنك إختيار مايصل إلى <strong>خياران</strong>فقط."
-            few: "يمكنك إختيار بعض <strong> %{count} </strong> الخيارات ."
-            many: "يمكنك إختيار عدة <strong> %{count} </strong> خيارات ."
-            other: "يمكنك اختيار حتى <strong>%{count}</strong> خيارات."
-          x_options:
-            zero: "لا يجب عليك إختيار أي خيار."
-            one: "يجب عليك إختيار خيار<strong>واحد</strong فقط."
-            two: "يجب عليك إختيار <strong>خياران</strong> فقط."
-            few: "يجب عليك إختيار <strong> %{count} </strong> بعض الخيارات."
-            many: "يجب عليك إختيار <strong> %{count} </strong> عدة خيارات."
-            other: "يجب عليك إختيار <strong> %{count} </strong> خيارات."
-          between_min_and_max_options: "يجب عليك إختيار بين  <strong>%{min}</strong> و <strong>%{max}</strong> خيارات ."
       cast-votes:
         title: "إدراج صوتك."
         label: "صوت اﻵن!"
       show-results:
         title: "عرض نتائج التصويت."
-        label: "عرض النتائج."
+        label: "أظهر النّتائج"
       hide-results:
         title: "العودة إلى أصواتك."
         label: "إخفاء النتائج."
@@ -61,8 +37,12 @@ ar:
         label: "فتح."
         confirm: "هل أنت متأكد من فتح هذا التصويت؟"
       close:
-        title: "إغلاق التصويت."
+        title: "أغلق التّصويت"
         label: "إغلاق."
         confirm: "هل أنت متأكد من إغلاق هذا التصويت؟"
-      error_while_toggling_status: "حدث خطأ عند محاولتك لتبديل حالة التصويت."
+      error_while_fetching_voters: "آسفون، حصل خطأ في عرض المصوّتين."
-      error_while_casting_votes: "حدث خطأ عند محاولة إدراج صوتك."
+      ui_builder:
+        poll_public:
+          label: أظهر المصوّتون
+        poll_options:
+          label: أدخل خيارًا واحدًا في كلّ سطر

plugins/poll/config/locales/client.bs_BA.yml

@@ -20,5 +20,7 @@ bs_BA:
       cast-votes:
         title: "ukupno glasova"
         label: "Glasaj"
+      show-results: 
+      hide-results: 
       close:
         label: "Zatvori"

plugins/poll/config/locales/client.cs.yml

@@ -17,21 +17,58 @@ cs:
         few: "hlasy celkem"
         other: "hlasů celkem"
       average_rating: "Průměrné hodnocení: <strong>%{average}</strong>."
+      public:
+        title: "Hlasy jsou veřejné."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Zvolte alespoň <strong>1</strong> možnost."
+            few: "Zvolte alespoň <strong>%{count}</strong> možnosti."
+            other: "Zvolte alespoň <strong>%{count}</strong> možností."
+          up_to_max_options:
+            one: "Zvolte maximálně <strong>1</strong> možnost."
+            few: "Zvolte maximálně <strong>%{count}</strong> možnosti."
+            other: "Zvolte maximálně <strong>%{count}</strong> možností."
+          x_options:
+            one: "Zvolte <strong>1</strong> možnost."
+            few: "Zvolte <strong>%{count}</strong> možnosti."
+            other: "Zvolte <strong>%{count}</strong> možností."
+          between_min_and_max_options: "Zvolte mezi <strong>%{min}</strong> a <strong>%{max}</strong> možnostmi."
       cast-votes:
         title: "Hlasujte"
         label: "Hlasovat!"
       show-results:
-        title: "Zobraz výsledky hlasování."
+        title: "Zobraz výsledky hlasování"
-        label: "Ukaž výsledky."
+        label: "Ukaž výsledky"
       hide-results:
         title: "Zpět k hlasování"
-        label: "Schovej výsledky."
+        label: "Schovej výsledky"
       open:
         title: "Otevřít hlasování"
         label: "Otevři"
         confirm: "Opravdu chcete otevřít toto hlasování?"
       close:
-        title: "Zavřít hlasování."
+        title: "Zavřít hlasování"
         label: "Zavřít"
         confirm: "Opravdu chcete uzavřít toto hlasování?"
-      error_while_casting_votes: "Objevila se chyba při zpracování Vašeho hlasu."
+      error_while_toggling_status: "Došlo k chybě při změně statusu hlasování"
+      error_while_casting_votes: "Došlo k chybě při odesílání vašeho hlasu."
+      error_while_fetching_voters: "Došlo k chybě při zobrazování hlasujících."
+      ui_builder:
+        title: Vytvořit hlasování
+        insert: Vložit hlasování
+        help:
+          options_count: Zadejte alespoň 2 možnosti
+        poll_type:
+          label: Typ
+          regular: Jedna možnost
+          multiple: Více možností
+          number: Číselné hodnocení
+        poll_config:
+          max: Maximum
+          min: Minimum
+          step: Krok
+        poll_public:
+          label: Zobrazit kdo hlasoval
+        poll_options:
+          label: Na každý řádek zadejte jednu možnost hlasování

plugins/poll/config/locales/client.da.yml

@@ -15,18 +15,6 @@ da:
         one: "afgiven stemme"
         other: "afgivne stemmer"
       average_rating: "Gennemsnitlig rating: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Du skal mindst vælge <strong>1</strong> mulighed."
-            other: "Du skal mindst vælge <strong>%{count}</strong> muligheder."
-          up_to_max_options:
-            one: "Du kan vælge op til <strong>1</strong> mulighed."
-            other: "Du kan vælge op til <strong>%{count}</strong> muligheder."
-          x_options:
-            one: "Du skal vælge <strong>1</strong> mulighed."
-            other: "Du skal vælge <strong>%{count}</strong> muligheder."
-          between_min_and_max_options: "Du kan vælge mellem <strong>%{min}</strong> og <strong>%{max}</strong> muligheder."
       cast-votes:
         title: "Afgiv dine stemmer"
         label: "Stem nu!"
@@ -44,5 +32,3 @@ da:
         title: "Luk afstemningen"
         label: "Luk"
         confirm: "Er du sikker på, at du vil lukke denne afstemning?"
-      error_while_toggling_status: "Der opstod en fejl ved skift af status for afstemningen."
-      error_while_casting_votes: "Der opstod en fejl ved afgivelse af dine stemmer."

plugins/poll/config/locales/client.de.yml

@@ -16,19 +16,19 @@ de:
         other: "abgegebene Stimmen"
       average_rating: "Durchschnittliche Bewertung: <strong>%{average}</strong>"
       public:
-        title: "Abgegebene Stimmen dieser Umfrage werden veröffentlicht."
+        title: "Abgegebene Stimmen werden veröffentlicht."
       multiple:
         help:
           at_least_min_options:
-            one: "Du musst mindestens <strong>eine</strong> Option auswählen."
+            one: "Du musst mindestens <strong>1</strong> Option auswählen."
             other: "Du musst mindestens <strong>%{count}</strong> Optionen auswählen."
           up_to_max_options:
-            one: "Du kannst genau <strong>eine</strong> Option auswählen."
+            one: "Du kannst bis zu <strong>eine</strong> Option auswählen."
             other: "Du kannst bis zu <strong>%{count}</strong> Optionen auswählen."
           x_options:
-            one: "Du musst <strong>eine</strong> Option auswählen."
+            one: "Bitte wähle <strong>1</strong> Option"
-            other: "Du musst <strong>%{count}</strong> Optionen auswählen."
+            other: "Bitte wähle <strong>%{count}</strong> Optionen"
-          between_min_and_max_options: "Du kannst zwischen <strong>%{min}</strong> und <strong>%{max}</strong> Optionen auswählen."
+          between_min_and_max_options: "Bitte wähle zwischen <strong>%{min}</strong> und <strong>%{max}</strong> Optionen"
       cast-votes:
         title: "Gib deine Stimmen ab"
         label: "Jetzt abstimmen!"
@@ -46,6 +46,24 @@ de:
         title: "Umfrage beenden"
         label: "Beenden"
         confirm: "Möchtest du diese Umfrage wirklich beenden?"
-      error_while_toggling_status: "Beim Ändern des Status der Umfrage ist ein Fehler aufgetreten."
+      error_while_toggling_status: "Entschuldige, es gab einen Fehler beim Wechseln des Status dieser Umfrage."
-      error_while_casting_votes: "Beim Abstimmen ist ein Fehler aufgetreten."
+      error_while_casting_votes: "Entschuldige, es gab einen Fehler beim Abgeben deiner Stimme."
-      error_while_fetching_voters: "Beim Anzeigen der Teilnehmer ist ein Fehler aufgetreten"
+      error_while_fetching_voters: "Entschuldige, es gab einen Fehler beim Anzeigen der Teilnehmer."
+      ui_builder:
+        title: Umfrage erstellen
+        insert: Umfrage einfügen
+        help:
+          options_count: Gib mindestens 2 Optionen ein
+        poll_type:
+          label: Art
+          regular: Einfachauswahl
+          multiple: Mehrfachauswahl
+          number: Bewertung
+        poll_config:
+          max: max.
+          min: min.
+          step: Schrittweite
+        poll_public:
+          label: Anzeigen wer abgestimmt hat
+        poll_options:
+          label: Bitte gib eine Umfrageoption pro Zeile ein

plugins/poll/config/locales/client.es.yml

@@ -16,19 +16,19 @@ es:
         other: "votos totales"
       average_rating: "Puntuación media: <strong>%{average}</strong>."
       public:
-        title: "Los votos en esta encuesta serán públicos."
+        title: "Los votos son públicos."
       multiple:
         help:
           at_least_min_options:
-            one: "Debes elegir al menos <strong>1</strong> opción."
+            one: "Elige al menos <strong>1</strong> opción"
-            other: "Debes elegir al menos <strong>%{count}</strong> opciones."
+            other: "Elige al menos <strong>%{count}</strong> opciones"
           up_to_max_options:
-            one: "Puedes elegir hasta <strong>1</strong> opción."
+            one: "Elige <strong>1</strong> opción"
-            other: "Puedes elegir hasta <strong>%{count}</strong> opciones."
+            other: "Elige hasta <strong>%{count}</strong> opciones"
           x_options:
-            one: "Debes elegir <strong>1</strong> opción."
+            one: "Elige <strong>1</strong> opción"
-            other: "Debes elegir <strong>%{count}</strong> opciones."
+            other: "Elige <strong>%{count}</strong> opciones"
-          between_min_and_max_options: "Puedes escoger entre <strong>%{min}</strong> y <strong>%{max}</strong> opciones."
+          between_min_and_max_options: "Elige entre <strong>%{min}</strong> y <strong>%{max}</strong> opciones"
       cast-votes:
         title: "Votar"
         label: "¡Vota!"
@@ -46,6 +46,24 @@ es:
         title: "Cerrar la encuesta"
         label: "Cerrar"
         confirm: "¿Seguro que quieres cerrar esta encuesta?"
-      error_while_toggling_status: "Ha ocurrido un error mientras se cambiaba el estado de esta encuesta."
+      error_while_toggling_status: "Lo sentimos, hubo un error al cambiar el estado de esta encuesta."
-      error_while_casting_votes: "Ha ocurrido un error a la hora de enviar los votos."
+      error_while_casting_votes: "Lo sentimos, hubo un error al registrar tus votos."
-      error_while_fetching_voters: "Hubo un error al mostrar los votantes."
+      error_while_fetching_voters: "Lo sentimos, hubo un error al mostrar los votantes."
+      ui_builder:
+        title: Crear Encuesta
+        insert: Insertar Encuesta
+        help:
+          options_count: Introducir al menos 2 opciones
+        poll_type:
+          label: Tipo
+          regular: Una opción
+          multiple: Múltiples opciones
+          number: Valoración numérica
+        poll_config:
+          max: Máximo
+          min: Mínimo
+          step: Intervalo
+        poll_public:
+          label: Mostrar quién votó
+        poll_options:
+          label: Introducir una opción de la encuesta por línea

plugins/poll/config/locales/client.et.yml

@@ -15,18 +15,6 @@ et:
         one: "häält kokku"
         other: "hääli kokku"
       average_rating: "Keskmine hinnang: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Sa pead valima vähemalt <strong>1</strong> valiku."
-            other: "Sa võid valida vähemalt <strong>%{count}</strong> valikut."
-          up_to_max_options:
-            one: "Sa võid valida kuni <strong>1</strong> valiku."
-            other: "Sa võid valida kuni <strong>%{count}</strong> valikut."
-          x_options:
-            one: "Sa võid valima <strong>1</strong> valiku."
-            other: "Sa võid valida <strong>%{count}</strong> valikut."
-          between_min_and_max_options: "Sa võid valida vahemikus <strong>%{min}</strong> ja <strong>%{max}</strong>."
       cast-votes:
         title: "Anna oma hääl"
         label: "Hääleta nüüd!"
@@ -44,5 +32,3 @@ et:
         title: "Sulge hääletus"
         label: "Sulge"
         confirm: "Kas sa oled kindel, et sa tahad antud hääletuse sulgeda?"
-      error_while_toggling_status: "Hääletuse staatuse muutmisel esines viga."
-      error_while_casting_votes: "Esines veateade teie hääle edastamisel."

plugins/poll/config/locales/client.fa_IR.yml

@@ -13,15 +13,6 @@ fa_IR:
       total_votes:
         other: "مجموع آرا"
       average_rating: "میانگین امتیاز:  <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            other: "حداقل <strong>%{count}</strong> گزینه باید انتخاب شود."
-          up_to_max_options:
-            other: "می‌توانید تا <strong>%{count}</strong> گزینه را انتخاب کنید."
-          x_options:
-            other: "<strong>%{count}</strong> گزینه باید انتخاب شود"
-          between_min_and_max_options: "می‌توانید بین <strong>%{min}</strong> تا <strong>%{max}</strong> گزینه را انتخاب کنید."
       cast-votes:
         title: "انداختن رأی شما"
         label: "رای بدهید!"
@@ -39,5 +30,3 @@ fa_IR:
         title: "نظرسنجی را ببند"
         label: "بسته "
         confirm: "آیا از بستن این نظرسنجی اطمینان دارید ؟ "
-      error_while_toggling_status: "خطایی رخ داد در حالی که وضعیت این نظرسنجی روشن نیست."
-      error_while_casting_votes: "خطایی رخ داد در حالی که شما رای می دادید."

plugins/poll/config/locales/client.fi.yml

@@ -16,19 +16,19 @@ fi:
         other: "ääntä"
       average_rating: "Keskiarvo: <strong>%{average}</strong>"
       public:
-        title: "Tämän kyselyn äänet ovat julkisia."
+        title: "Äänet ovat julkisia."
       multiple:
         help:
           at_least_min_options:
-            one: "Sinun täytyy valita vähintään <strong>yksi</strong> vaihtoehto."
+            one: "Valitse vähintään <strong>1</strong> vaihtoehto"
-            other: "Sinun täytyy valita vähintään <strong>%{count}</strong> vaihtoehtoa."
+            other: "Valotse vähintään <strong>%{count}</strong> vaihtoehtoa"
           up_to_max_options:
-            one: "Voit valita enintään <strong>yhden</strong> vaihtoehdon."
+            one: "Valitse enintään <strong>1</strong> vaihtoehto"
-            other: "Voit valita enintään <strong>%{count}</strong> vaihtoehtoa."
+            other: "Valitse enintään <strong>%{count}</strong> vaihtoehtoa"
           x_options:
-            one: "Sinun täytyy valita <strong>yksi</strong> vaihtoehto."
+            one: "Valitse  <strong>1</strong> vaihtoehto"
-            other: "Sinun täytyy valita <strong>%{count}</strong> vaihtoehtoa."
+            other: "Valitse <strong>%{count}</strong> vaihtoehtoa"
-          between_min_and_max_options: "Voit valita <strong>%{min}</strong>-<strong>%{max}</strong vaihtoehtoa."
+          between_min_and_max_options: "Valitse <strong>%{min}</strong>-<strong>%{max}</strong> vaihtoehtoa"
       cast-votes:
         title: "Antakaa äänenne"
         label: "Äänestä nyt!"
@@ -46,6 +46,24 @@ fi:
         title: "Sulje äänestys"
         label: "Sulje"
         confirm: "Suljetaanko äänestys?"
-      error_while_toggling_status: "Äänestyksen tilaa muutettaessa tapahtui virhe."
+      error_while_toggling_status: "Pahoittelut, äänestyksen tilaa muutettaessa tapahtui virhe."
-      error_while_casting_votes: "Äänesi annettaessa tapahtui virhe."
+      error_while_casting_votes: "Pahoittelut, ääntä annettaessa tapahtui virhe."
-      error_while_fetching_voters: "Äänestäneiden näyttämisessä tapahtui virhe."
+      error_while_fetching_voters: "Pahoittelut, äänestäneiden näyttämisessä tapahtui virhe."
+      ui_builder:
+        title: Luo äänestys
+        insert: Lisää äänestys
+        help:
+          options_count: Valitse vähintään 2 vaihtoehtoa
+        poll_type:
+          label: Tyyppi
+          regular: Valitaan yksi
+          multiple: Valitaan useita
+          number: Numeroarviointi
+        poll_config:
+          max: Enint.
+          min: Väh.
+          step: Vaihe
+        poll_public:
+          label: Näytä äänestäneet
+        poll_options:
+          label: Syötä yksi äänestysvaihtoehto riviä kohden

plugins/poll/config/locales/client.fr.yml

@@ -16,19 +16,19 @@ fr:
         other: "votes au total"
       average_rating: "Notation moyenne : <strong>%{average}</strong>"
       public:
-        title: "Les votes sur ce sondage seront publics."
+        title: "Les votes sont publics."
       multiple:
         help:
           at_least_min_options:
-            one: "Vous devez choisir au moins <strong>une</strong> option."
+            one: "Choisissez au moins <strong>1</strong> option"
-            other: "Vous devez choisir au moins <strong>%{count}</strong> options."
+            other: "Choisissez au moins <strong>%{count}</strong> options"
           up_to_max_options:
-            one: "Vous pouvez choisir <strong>une</strong> option."
+            one: "Choisissez jusqu'à <strong>1</strong> option"
-            other: "Vous pouvez choisir jusqu’à <strong>%{count}</strong> options."
+            other: "Choisissez jusqu'à <strong>%{count}</strong> options"
           x_options:
-            one: "Vous devez choisir <strong>une</strong> option."
+            one: "Choisissez <strong>1</strong> option"
-            other: "Vous devez choisir <strong>%{count}</strong> options."
+            other: "Choisissez <strong>%{count}</strong> options"
-          between_min_and_max_options: "Vous devez choisir entre <strong>%{min}</strong> et <strong>%{max}</strong> options."
+          between_min_and_max_options: "Choisissez entre <strong>%{min}</strong> et <strong>%{max}</strong> options"
       cast-votes:
         title: "Distribuez vos votes"
         label: "Votez maintenant !"
@@ -46,6 +46,24 @@ fr:
         title: "Fermer le sondage"
         label: "Fermer"
         confirm: "Êtes-vous sûr de vouloir fermer ce sondage ?"
-      error_while_toggling_status: "Une erreur s'est produite lors du changement de statut de ce sondage."
+      error_while_toggling_status: "Désolé, il y a eu une erreur lors du changement de statut de ce sondage."
-      error_while_casting_votes: "Une erreur s'est produite lors de la distribution de vos votes."
+      error_while_casting_votes: "Désolé, il y a eu une erreur lors de l'envoi de vos votes."
-      error_while_fetching_voters: "Une erreur s'est produite lors de l'affichage des votants."
+      error_while_fetching_voters: "Désolé, il y a eu une erreur lors de l'affichage des votants."
+      ui_builder:
+        title: Construire Sondage
+        insert: Insérer Sondage
+        help:
+          options_count: Entrez au moins 2 options
+        poll_type:
+          label: Type
+          regular: Choix Unique
+          multiple: Choix Multiple
+          number: Nombre
+        poll_config:
+          max: Max
+          min: Min
+          step: Pas
+        poll_public:
+          label: Afficher les votants
+        poll_options:
+          label: Entrez une option de sondage par ligne

plugins/poll/config/locales/client.gl.yml

@@ -15,18 +15,6 @@ gl:
         one: "votos totais"
         other: "votos totais"
       average_rating: "Valoración media: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Debes seleccionar cando menos <strong>1</strong> opción."
-            other: "Debes seleccionar cando menos <strong>%{count}</strong> opcións."
-          up_to_max_options:
-            one: "Podes escoller <strong>1</strong> única opción."
-            other: "Podes escoller até <strong>%{count}</strong> opcións."
-          x_options:
-            one: "Debes escoller <strong>1</strong> opción."
-            other: "Debes escoller <strong>%{count}</strong> opcións."
-          between_min_and_max_options: "Debes escoller entre <strong>%{min}</strong> e <strong>%{max}</strong> opcións."
       cast-votes:
         title: "Vota"
         label: "Vota agora!"
@@ -44,5 +32,3 @@ gl:
         title: "Pechar a enquisa"
         label: "Pechar"
         confirm: "Confirmas o peche desta enquisa?"
-      error_while_toggling_status: "Produciuse un erro durante o cambio do estado da enquisa."
-      error_while_casting_votes: "Produciuse un erro durante a emisión do teu voto."

plugins/poll/config/locales/client.he.yml

@@ -15,18 +15,6 @@ he:
         one: "מספר הצבעות כולל"
         other: "מספר הצבעות כולל"
       average_rating: "דירוג ממוצע: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "עליך לבחור לפחות אפשרות <strong>1</strong>."
-            other: "עליך לבחור לפחות <strong>%{count}</strong> אפשרויות."
-          up_to_max_options:
-            one: "באפשרותך לבחור עד אפשרות <strong>%{count}</strong>."
-            other: "באפשרותך לבחור עד <strong>%{count}</strong> אפשרויות."
-          x_options:
-            one: "עליך לבחור אפשרות <strong>1</strong>."
-            other: "עליך לבחור <strong>%{count}</strong> אפשרויות."
-          between_min_and_max_options: "באפשרותך לבחור בין <strong>%{min}</strong> עד <strong>%{max}</strong> אפשרויות."
       cast-votes:
         title: "שליחת הצבעות"
         label: "הצביע/י עכשיו!"
@@ -44,5 +32,3 @@ he:
         title: "סגירת הסקר"
         label: "סגירה"
         confirm: "האם את/ה בטוח/ה שאת/ה רוצה לסגור סקר זה?"
-      error_while_toggling_status: "אירעה שגיאה במהלך החלפת מצב הסטטוס של הסקר"
-      error_while_casting_votes: "אירעה שגיאה במהלך שליחת ההצבעות שלך."

plugins/poll/config/locales/client.id.yml

@@ -13,15 +13,6 @@ id:
       total_votes:
         other: "jumlah suara"
       average_rating: "Rata-rata rating: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            other: "Anda harus memilih <strong>%{count}</strong> pilihan."
-          up_to_max_options:
-            other: "Anda dapat memilih maksimum <strong>%{count}</strong> pilihan."
-          x_options:
-            other: "Anda harus memilih <strong>%{count}</strong> pilihan."
-          between_min_and_max_options: "Anda hanya bisa memilih minimum <strong>%{min}</strong> pilihan dan maximum <strong>%{max}</strong> pilihan."
       cast-votes:
         title: "Gunakan suaramu"
         label: "Pilih sekarang!"
@@ -39,6 +30,3 @@ id:
         title: "Tutup polling"
         label: "Tutup"
         confirm: "Apakah Anda yakin  ingin menutup akun ini?"
-      error_while_toggling_status: "Terjadi kesalahan ketika merubah status polling ini."
-      error_while_casting_votes: "Terjadi kesalahan ketika merubah status."
-      error_while_fetching_voters: "terjadi kesalahan saat menampilkan pemilih"

plugins/poll/config/locales/client.it.yml

@@ -15,18 +15,6 @@ it:
         one: "voto totale"
         other: "voti totali"
       average_rating: "Voto medio: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Devi scegliere almeno <strong>una</strong> opzione."
-            other: "Devi scegliere almeno <strong>%{count}</strong> opzioni."
-          up_to_max_options:
-            one: "Puoi scegliere fino a <strong>una</strong> opzione."
-            other: "Puoi scegliere fino a <strong>%{count}</strong> opzioni."
-          x_options:
-            one: "Devi scegliere <strong>una</strong> opzione."
-            other: "Devi scegliere <strong>%{count}</strong> opzioni."
-          between_min_and_max_options: "Puoi scegliere tra <strong>%{min}</strong> e <strong>%{max}</strong> opzioni."
       cast-votes:
         title: "Vota"
         label: "Vota!"
@@ -44,5 +32,3 @@ it:
         title: "Chiudi il sondaggio"
         label: "Chiudi"
         confirm: "Sicuro di voler chiudere questo sondaggio?"
-      error_while_toggling_status: "Si è verificato un errore nel commutare lo stato di questo sondaggio."
-      error_while_casting_votes: "Si è verificato un errore nella votazione."

plugins/poll/config/locales/client.ja.yml

@@ -13,15 +13,6 @@ ja:
       total_votes:
         other: "合計得票数"
       average_rating: "平均評価: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            other: "少なくとも <strong>%{count}</strong> 個のオプションを選んでください。"
-          up_to_max_options:
-            other: "<strong>%{count}</strong> 個のオプションまで選択することができます。"
-          x_options:
-            other: "<strong>%{count}</strong> 個のオプションを選択してください。"
-          between_min_and_max_options: "<strong>%{min}</strong> と <strong>%{max}</strong> のオプションから選択することができます。"
       cast-votes:
         title: "投票する"
         label: "今すぐ投票！"
@@ -39,5 +30,3 @@ ja:
         title: "投票を終了"
         label: "閉じる"
         confirm: "この投票を終了してもよろしいですか？"
-      error_while_toggling_status: "投票の状態を切り替え中にエラーが発生しました。"
-      error_while_casting_votes: "投票中にエラーが発生しました。"

plugins/poll/config/locales/client.ko.yml

@@ -13,15 +13,6 @@ ko:
       total_votes:
         other: "전체 투표"
       average_rating: "평균: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            other: "적어도 <strong>%{count}</strong>개의 옵션은 선택해야 합니다."
-          up_to_max_options:
-            other: "옵션은 <strong>%{count}</strong> 개까지 선택할 수 있습니다."
-          x_options:
-            other: "옵션은 <strong>%{count}</strong> 개 선택해야 합니다."
-          between_min_and_max_options: "<strong>%{min}</strong>개에서 <strong>%{max}</strong>개까지 선택할 수 있습니다."
       cast-votes:
         title: "표 던지기"
         label: "지금 투표!"
@@ -39,5 +30,3 @@ ko:
         title: "투표 닫기"
         label: "닫기"
         confirm: "정말 이 투표를 닫으시겠어요?"
-      error_while_toggling_status: "투표의 상태를 변경하는데 오류가 발생했습니다."
-      error_while_casting_votes: "투표 중에 오류가 발생했습니다."

plugins/poll/config/locales/client.nb_NO.yml

@@ -15,9 +15,6 @@ nb_NO:
         one: "antall stemmer"
         other: "antall stemmer"
       average_rating: "Gjennomsnitt: <strong>%{average}</strong>."
-      multiple:
-        help:
-          between_min_and_max_options: "Du kan velge mellom <strong>%{min}</strong> og <strong>%{max}</strong> alternativer."
       cast-votes:
         title: "Stem nå"
         label: "Stem!"
@@ -35,5 +32,3 @@ nb_NO:
         title: "Lukk avstemming"
         label: "Lukk"
         confirm: "Er du sikker på at du vil lukke avstemmingen?"
-      error_while_toggling_status: "Det har oppstått en feil"
-      error_while_casting_votes: "Noe gikk galt"

plugins/poll/config/locales/client.nl.yml

@@ -9,26 +9,28 @@ nl:
   js:
     poll:
       voters:
-        one: "keer gestemd"
+        one: "stemmer"
-        other: "keer gestemd"
+        other: "stemmers"
       total_votes:
-        one: "stem"
+        one: "totale stem"
-        other: "stemmen"
+        other: "totale stemmen"
       average_rating: "Gemiddeld cijfer: <strong>%{average}</strong>."
+      public:
+        title: "Stemmen zijn openbaar."
       multiple:
         help:
           at_least_min_options:
-            one: "U dient tenminste <strong>1</strong> optie te kiezen."
+            one: "Kies tenminste <strong>1</strong> optie"
-            other: "Kies tenminste <strong>%{count}</strong> opties."
+            other: "Kies tenminste <strong>%{count}</strong> opties"
           up_to_max_options:
-            one: "U kunt maximaal <strong>1</strong> optie kiezen."
+            one: "Kies maximaal <strong>1</string> optie"
-            other: "Je kan maximaal <strong>%{count}</strong> opties kiezen."
+            other: "Kies maximaal <strong>%{count}</string> opties"
           x_options:
-            one: "Je moet <strong>1</strong> optie kiezen."
+            one: "Kies <strong>1</strong> optie"
-            other: "Je moet <strong>%{count}</strong> opties kiezen."
+            other: "Kies <strong>%{count}</strong> opties"
-          between_min_and_max_options: "Je kan tussen <strong>%{min}</strong> en <strong>%{max}</strong> opties kiezen."
+          between_min_and_max_options: "Kies <strong>%{min}</strong> tot <strong>%{max}</strong> opties"
       cast-votes:
-        title: "Geef je stem"
+        title: "Breng je stemmen uit"
         label: "Stem nu!"
       show-results:
         title: "Bekijk de resultaten van de poll"
@@ -44,5 +46,24 @@ nl:
         title: "Sluit de poll"
         label: "Sluit"
         confirm: "Weet je zeker dat je deze poll wil sluiten?"
-      error_while_toggling_status: "Er ging iets mis bij het in-/uitschakelen van deze poll."
+      error_while_toggling_status: "Sorry, er is iets misgegaan bij het aanpassen van de status van deze poll."
-      error_while_casting_votes: "Er ging iets mis bij het registreren van je stem."
+      error_while_casting_votes: "Sorry, er is iets misgegaan bij het uitbrengen van je stemmen."
+      error_while_fetching_voters: "Sorry, er is iets misgegaan bij het weergeven van de stemmers."
+      ui_builder:
+        title: Maak Poll
+        insert: Poll Invoegen
+        help:
+          options_count: Geef ten minste 2 opties
+        poll_type:
+          label: Type
+          regular: Eén Keuze
+          multiple: Multiple Choice
+          number: Numerieke Beoordeling
+        poll_config:
+          max: Max
+          min: Min
+          step: Stap
+        poll_public:
+          label: Laat zien wie gestemd heeft
+        poll_options:
+          label: Geef één polloptie per regel op

plugins/poll/config/locales/client.pl_PL.yml

@@ -17,21 +17,6 @@ pl_PL:
         few: "oddanych głosów"
         other: "oddanych głosów"
       average_rating: "Średnia ocena: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Musisz wybrać <strong>przynajmniej jedną</strong> pozycje."
-            few: "Musisz wybrać co najmniej <strong>%{count}</strong> pozycje."
-            other: "Musisz wybrać co najmniej <strong>%{count}</strong> pozycje."
-          up_to_max_options:
-            one: "Możesz wybrać maksymalnie <strong>1</strong> opcję."
-            few: "Możesz wybrać maksymalnie <strong>%{count}</strong> opcje."
-            other: "Możesz wybrać maksymalnie <strong>%{count}</strong> opcji."
-          x_options:
-            one: "Musisz wybrać <strong>jedną</strong> opcję."
-            few: "Musisz wybrać <strong>%{count}</strong> opcje."
-            other: "Musisz wybrać <strong>%{count}</strong> opcji."
-          between_min_and_max_options: "Możesz wybrać pomiędzy <strong>%{min}</strong> a <strong>%{max}</strong> pozycjami."
       cast-votes:
         title: "Oddaj głos"
         label: "Oddaj głos!"
@@ -49,5 +34,3 @@ pl_PL:
         title: "Zamknij ankietę"
         label: "Zamknij"
         confirm: "Czy na pewno chcesz zamknąć tę ankietę?"
-      error_while_toggling_status: "Wystąpił błąd podczas zmiany statusu tej ankiety."
-      error_while_casting_votes: "Wystąpił błąd podczas oddawania twoich głosów."

plugins/poll/config/locales/client.pt.yml

@@ -15,18 +15,6 @@ pt:
         one: "total da votação"
         other: "total de votos"
       average_rating: "Classificação média: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Deve escolher pelo menos <strong>1</strong> opção."
-            other: "Deve escolher pelo menos <strong>%{count}</strong> opções."
-          up_to_max_options:
-            one: "Pode escolher até <strong>1</strong> opção."
-            other: "Pode escolher até <strong>%{count}</strong> opções."
-          x_options:
-            one: "Deve escolher <strong>1</strong> opção."
-            other: "Deve escolher <strong>%{count}</strong> opções."
-          between_min_and_max_options: "Pode escolher entre  <strong>%{min}</strong> e <strong>%{max}</strong> opções."
       cast-votes:
         title: "Votar"
         label: "Vote agora!"
@@ -44,5 +32,3 @@ pt:
         title: "Fechar a votação"
         label: "Fechar"
         confirm: "Tem a certeza que quer fechar esta votação?"
-      error_while_toggling_status: "Ocorreu um erro ao alternar o estado desta votação."
-      error_while_casting_votes: "Ocorreu um erro enquanto os seus votos eram enviados."

plugins/poll/config/locales/client.pt_BR.yml

@@ -15,18 +15,6 @@ pt_BR:
         one: "voto total"
         other: "votos totais"
       average_rating: "Resultado médio: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Você deve escolher pelo menos <strong>1</strong> opção."
-            other: "Você deve escolher pelo menos <strong>%{count}</strong> opções."
-          up_to_max_options:
-            one: "Você deve escolher até <strong>1</strong> opção."
-            other: "Você deve escolher até <strong>%{count}</strong> opções."
-          x_options:
-            one: "Você deve escolher <strong>1</strong> opção."
-            other: "Você deve escolher <strong>%{count}</strong> opções."
-          between_min_and_max_options: "Você pode escolher entre <strong>%{min}</strong> e <strong>%{max}</strong> opções."
       cast-votes:
         title: "Seus votos"
         label: "Votar agora!"
@@ -44,5 +32,3 @@ pt_BR:
         title: "Fechar a enquete"
         label: "Fechar"
         confirm: "Você tem certeza que deseja fechar essa enquete?"
-      error_while_toggling_status: "Houve um erro ao alternar o status dessa enquete."
-      error_while_casting_votes: "Houve um erro ao coletar seus votos."

plugins/poll/config/locales/client.ro.yml

@@ -17,21 +17,6 @@ ro:
         few: "total voturi"
         other: "total voturi"
       average_rating: "Media: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Trebuie să selectați cel puțin <strong>1</strong> opțiune."
-            few: "Trebuie să selectați cel puțin <strong>%{count}</strong> opțiuni."
-            other: "Trebuie să selectați cel puțin <strong>%{count}</strong> opțiuni."
-          up_to_max_options:
-            one: "Puteţi alege cel mult o <strong>%{count}</strong> opţiune."
-            few: "Puteţi selecta cel mult <strong>1</strong> opţiune."
-            other: "Puteți selecta până la <strong>%{count}</strong> opțiuni."
-          x_options:
-            one: "Trebuie să selectați <strong>1</strong> opțiune."
-            few: "Trebuie să selectați <strong>%{count}</strong> opțiuni."
-            other: "Trebuie să alegeți <strong>%{count}</strong> opțiuni."
-          between_min_and_max_options: "Puteţi alege între <strong>%{min}</strong> şi <strong>%{max}</strong> opţiuni."
       cast-votes:
         title: "Exprimaţi-vă votul"
         label: "Votează acum!"
@@ -49,5 +34,3 @@ ro:
         title: "Închideți sondajul"
         label: "Închideți"
         confirm: "Sunteţi sigur că vreţi să închideţi acest sondaj?"
-      error_while_toggling_status: "A apărut o eroare în timpul schimbării stării acestui sondaj."
-      error_while_casting_votes: "A apărut o eroare în timpul exprimării votului dvs."

plugins/poll/config/locales/client.ru.yml

@@ -19,26 +19,6 @@ ru:
         many: "голосов"
         other: "голосов"
       average_rating: "Средний рейтинг: <strong>%{average}</strong>."
-      public:
-        title: "Ваш голос в этом опросе будет публичным (в отличие от анонимных опросов)."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Необходимо выбрать хотя бы <strong>1</strong> ответ."
-            few: "Необходимо выбрать хотя бы <strong>%{count}</strong> ответа."
-            many: "Необходимо выбрать хотя бы <strong>%{count}</strong> ответов."
-            other: "Необходимо выбрать хотя бы <strong>%{count}</strong> ответов."
-          up_to_max_options:
-            one: "Можно выбрать только <strong>1</strong> ответ."
-            few: "Можно выбрать до <strong>%{count}</strong> ответов."
-            many: "Можно выбрать до <strong>%{count}</strong> ответов."
-            other: "Можно выбрать до <strong>%{count}</strong> ответов."
-          x_options:
-            one: "Необходимо выбрать <strong>1</strong> ответ."
-            few: "Необходимо выбрать <strong>%{count}</strong> ответа."
-            many: "Необходимо выбрать <strong>%{count}</strong> ответов."
-            other: "Необходимо выбрать <strong>%{count}</strong> ответов."
-          between_min_and_max_options: "Можно выбрать от <strong>%{min}</strong> до <strong>%{max}</strong> ответов."
       cast-votes:
         title: "Проголосуйте"
         label: "Проголосовать!"
@@ -56,6 +36,7 @@ ru:
         title: "Завершить этот опрос, не принимать новые голоса"
         label: "Завершить"
         confirm: "Вы уверены, что хотите завершить этот опрос и больше не принимать голоса?"
-      error_while_toggling_status: "Произошла ошибка при смене статуса опроса."
+      ui_builder:
-      error_while_casting_votes: "Произошла ошибка во время обработки вашего голоса."
+        poll_type:
-      error_while_fetching_voters: "Произошла ошибка во время отображения респондентов."
+          regular: Одиночный выбор
+          multiple: Множественный выбор

plugins/poll/config/locales/client.sk.yml

@@ -17,21 +17,6 @@ sk:
         few: "hlasy celkom"
         other: "hlasov celkom"
       average_rating: "Priemerné hodnotenie: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Musíte si vybrať minimálne <strong>%{count}</strong> možnosť."
-            few: "Musíte si vybrať minimálne <strong>%{count}</strong> možnosti."
-            other: "Musíte si vybrať minimálne <strong>%{count}</strong> možností."
-          up_to_max_options:
-            one: "Môžete si vybrať maximálne <strong>%{count}</strong> možnosť."
-            few: "Môžete si vybrať maximálne <strong>%{count}</strong> možnosti."
-            other: "Môžete si vybrať maximálne <strong>%{count}</strong> možností."
-          x_options:
-            one: "Musíte si vybrať <strong>%{count}</strong> možnosť."
-            few: "Musíte si vybrať <strong>%{count}</strong> možnosti."
-            other: "Musíte si vybrať <strong>%{count}</strong> možností."
-          between_min_and_max_options: "Môžete si vybrať medzi možnosťami <strong>%{min}</strong> až <strong>%{max}</strong>."
       cast-votes:
         title: "Hlasovať"
         label: "Hlasuj teraz!"
@@ -49,5 +34,3 @@ sk:
         title: "Zatvoriť hlasovanie"
         label: "Zatvoriť"
         confirm: "Ste si istý, že chcete zatvoriť toto hlasovanie?"
-      error_while_toggling_status: "Pri zmene stavu hlasovania sa vyskytla chyba."
-      error_while_casting_votes: "Pri hlasovaní sa vyskytla chyba."

plugins/poll/config/locales/client.sq.yml

@@ -15,18 +15,6 @@ sq:
         one: "total vota"
         other: "totali votave"
       average_rating: "Vlerësimi mesatar: <strong>%{average}</strong>."
-      multiple:
-        help:
-          at_least_min_options:
-            one: "Ju duhet të zgjidhni të paktën <strong>1</strong> opsion."
-            other: "Ju duhet të zgjidhni të paktën <strong>%{count}</strong> opsione."
-          up_to_max_options:
-            one: "Ju mund të zgjidhni <strong>1</strong> opsion."
-            other: "Ju mund të zgjidhni <strong>%{count}</strong> opsione."
-          x_options:
-            one: "Ju duhet të zgjidhni <strong>1</strong> opsion."
-            other: "Ju duhet të zgjidhni <strong>%{count}</strong> opsione."
-          between_min_and_max_options: "You may choose between <strong>%{min}</strong> and <strong>%{max}</strong> options."
       cast-votes:
         title: "Jepni votën tuaj"
         label: "Voto Tani"
@@ -44,5 +32,3 @@ sq:
         title: "Mbyll sondazhin"
         label: "Mbyll"
         confirm: "Jeni të sigurt për të mbyllur këtë sondazh?"
-      error_while_toggling_status: "Ndodhi një gabim gjatë ndryshimit të statusit të këtij sondazhi."
-      error_while_casting_votes: "Ndodhi një gabim gjatë votimit!"

plugins/poll/config/locales/client.sv.yml

@@ -15,18 +15,20 @@ sv:
         one: "totalt antal röst"
         other: "totalt antal röster"
       average_rating: "Medelbetyg: <strong>%{average}</strong>."
+      public:
+        title: "Omröstningar är allmänna."
       multiple:
         help:
           at_least_min_options:
-            one: "Du måste välja minst <strong>1</strong> alternativ."
+            one: "Välj minst <strong>1</strong> alternativ"
-            other: "Du måste välja minst <strong>%{count}</strong> alternativ."
+            other: "Välj minst <strong>%{count}</strong> alternativ"
           up_to_max_options:
-            one: "Du kan välja upp till <strong>1</strong> alternativ"
+            one: "Välj upp till <strong>1</strong> alternativ"
-            other: "Du kan välja upp till <strong>%{count}</strong> alternativ."
+            other: "Välj upp till <strong>%{count}</strong> alternativ"
           x_options:
-            one: "Du måste välja <strong>1</strong> alternativ."
+            one: "Välj <strong>1</strong> alternativ"
-            other: "Du måste välja <strong>%{count}</strong> alternativ."
+            other: "Välj <strong>%{count}</strong> alternativ"
-          between_min_and_max_options: "Du kan välja mellan <strong>%{min}</strong> och <strong>%{max}</strong> alternativ."
+          between_min_and_max_options: "Välj mellan <strong>%{min}</strong> och <strong>%{max}</strong> alternativ"
       cast-votes:
         title: "Lägg dina röster"
         label: "Rösta nu!"
@@ -44,5 +46,24 @@ sv:
         title: "Stäng omröstningen"
         label: "Stäng"
         confirm: "Är du säker på att du vill stänga denna omröstning?"
-      error_while_toggling_status: "Ett fel uppstod vid ändring av status för denna omröstning."
+      error_while_toggling_status: "Tyvärr, ett fel uppstod vid ändring av status för den här omröstningen."
-      error_while_casting_votes: "Ett fel uppstod vid röstningen."
+      error_while_casting_votes: "Tyvärr, ett fel uppstod vid röstningen."
+      error_while_fetching_voters: "Tyvärr, ett fel uppstod vid visningen av röster."
+      ui_builder:
+        title: Skapa omröstning
+        insert: Lägg till omröstning
+        help:
+          options_count: Ange minst 2 alternativ
+        poll_type:
+          label: Typ
+          regular: Ett val
+          multiple: Flera val
+          number: Sifferbetyg
+        poll_config:
+          max: Max
+          min: Min
+          step: Steg
+        poll_public:
+          label: Visa vilka som röstat
+        poll_options:
+          label: Ange ett omröstningsalternativ per rad

plugins/poll/config/locales/client.te.yml

@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-te: {}
+te:
+  js:
+    poll:
+      cast-votes: 
+      show-results: 
+      hide-results: 

plugins/poll/config/locales/client.tr_TR.yml

@@ -13,15 +13,17 @@ tr_TR:
       total_votes:
         other: "toplam oy"
       average_rating: "Ortalama oran: <strong>%{average}</strong>."
+      public:
+        title: "Oylar Genel"
       multiple:
         help:
           at_least_min_options:
-            other: "En az <strong>%{count}</strong> seçim yapmalısınız."
+            other: "En az <strong>%{count}</strong> seçecek seçiniz"
           up_to_max_options:
-            other: "En fazla <strong>%{count}</strong> seçim yapabilirsiniz."
+            other: "<strong>%{count}</strong> seçeneğe kadar seçebilirsiniz"
           x_options:
-            other: "<strong>%{count}</strong> seçim yapmalısınız."
+            other: "<strong>%{count}</strong>  seçenek seçiniz"
-          between_min_and_max_options: "<strong>%{min}</strong> ve <strong>%{max}</strong> seçenekleri arasında seçim yapabilirsiniz."
+          between_min_and_max_options: "<strong>%{min}</strong> ve <strong>%{max}</strong> arasında seçenek seçiniz"
       cast-votes:
         title: "Oyunuzu kullanın"
         label: "Şimdi oylayın!"
@@ -39,5 +41,24 @@ tr_TR:
         title: "Anketi bitir"
         label: "Bitir"
         confirm: "Bu anketi bitirmek istediğinize emin misiniz?"
-      error_while_toggling_status: "Bu anketin statüsü değiştirilirken bir hata oluştu."
+      error_while_toggling_status: "Üzgünüz, anket durumunu değiştirme sırasında hata meydana geldi."
-      error_while_casting_votes: "Oylama esnasında hata oluştu."
+      error_while_casting_votes: "Üzgünüz, oylarınızı dönüştürme sırasında hata meydana geldi"
+      error_while_fetching_voters: "Üzgünüz, oy verenleri görüntüleme sırasında hata meydana geldi"
+      ui_builder:
+        title: Anket Oluştur
+        insert: Anket Ekle
+        help:
+          options_count: En az 2 özellik ekleyin
+        poll_type:
+          label: Tür
+          regular: Tekli seçim
+          multiple: Çoklu Seçim
+          number: Sayısal Değerlendirme
+        poll_config:
+          max: Max
+          min: Min
+          step: Basamak
+        poll_public:
+          label: Oyverenleri görüntüle
+        poll_options:
+          label: Her satıra bir anket seçeneği girin

plugins/poll/config/locales/client.uk.yml

@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-uk: {}
+uk:
+  js:
+    poll:
+      cast-votes: 
+      show-results: 
+      hide-results: 

plugins/poll/config/locales/client.vi.yml

@@ -9,19 +9,20 @@ vi:
   js:
     poll:
       voters:
-        other: "Người bầu chọn"
+        other: "người bình chọn"
       total_votes:
         other: "tổng số bình chọn"
       average_rating: "Đánh giá trung bình: <strong>%{average}</strong>."
+      public:
+        title: "Bình chọn công khai."
       multiple:
         help:
           at_least_min_options:
-            other: "Bạn phải chọn ít nhất <strong>%{count}</strong> tùy chọn."
+            other: "Chọn ít nhất <strong>%{count}</strong> tùy chọn"
           up_to_max_options:
-            other: "Bạn có thể chọn lên tới <strong>%{count}</strong> tùy chọn."
+            other: "Chọn tối đa <strong>%{count}</strong> tùy chọn"
           x_options:
-            other: "Bạn phải chọn <strong>%{count}</strong> tùy chọn."
+            other: "Chọn <strong>%{count}</strong> tùy chọn"
-          between_min_and_max_options: "Bạn có thể chọn giữa <strong>%{min}</strong> và <strong>%{max}</strong>."
       cast-votes:
         title: "Bỏ phiếu của bạn"
         label: "Bình chọn ngay!"
@@ -29,15 +30,24 @@ vi:
         title: "Hiển thị kết quả cuộc thăm dò"
         label: "Hiện kết quả"
       hide-results:
-        title: "Trở lại bầu chọn của bạn"
+        title: "Trở lại bình chọn của bạn"
         label: "Ẩn kết quả"
       open:
         title: "Mở bình chọn"
         label: "Mở"
-        confirm: "Bạn có chắc mở bình chọn này?"
+        confirm: "Bạn có chắc bạn muốn mở bình chọn này?"
       close:
         title: "Đóng bình chọn"
         label: "Đóng lại"
         confirm: "Bạn có chắc chắn muốn đóng bình chọn này?"
-      error_while_toggling_status: "Có lỗi trong khi chuyển đổi qua lại các trạng thái của bình chọn này."
+      ui_builder:
-      error_while_casting_votes: "Có lỗi trong khi tạo mãu bầu chọn của bạn"
+        help:
+          options_count: Nhập vào ít nhất 2 tùy chọn
+        poll_type:
+          label: Loại
+        poll_config:
+          max: Tối đa
+          min: Tối thiểu
+          step: Bước
+        poll_public:
+          label: Hiển thị ai đã bình chọn

plugins/poll/config/locales/client.zh_CN.yml

@@ -12,18 +12,18 @@ zh_CN:
         other: "投票者"
       total_votes:
         other: "总票数"
-      average_rating: "平均排名：<strong>%{average}</strong>。"
+      average_rating: "平均评分：<strong>%{average}</strong>。"
       public:
-        title: "提交此投票调查将被公开。"
+        title: "投票是公开的。"
       multiple:
         help:
           at_least_min_options:
-            other: "你必须选择至少 <strong>%{count}</strong> 个选项。"
+            other: "至少选择 <strong>%{count}</strong> 个选项"
           up_to_max_options:
-            other: "你可以选择最多 <strong>%{count}</strong> 个选项。"
+            other: "最多选择 <strong>%{count}</strong> 个选项"
           x_options:
-            other: "你必须选择 <strong>%{count}</strong> 个选项。"
+            other: "选择 <strong>%{count}</strong> 个选项"
-          between_min_and_max_options: "你可以选择 <strong>%{min}</strong> 至 <strong>%{max}</strong> 个选项。"
+          between_min_and_max_options: "在 <strong>%{min}</strong> 和 <strong>%{max}</strong> 选项之间选择"
       cast-votes:
         title: "投你的票"
         label: "现在投票！"
@@ -41,6 +41,24 @@ zh_CN:
         title: "关闭投票"
         label: "关闭"
         confirm: "你确定要关闭这个投票？"
-      error_while_toggling_status: "改变投票状态时出错。"
+      error_while_toggling_status: "对不起，本次调查状态发生错误切换。"
-      error_while_casting_votes: "执行投票时发生了错误。"
+      error_while_casting_votes: "对不起，在投你的票时发生错误。"
-      error_while_fetching_voters: "当显示选民时发生错误。"
+      error_while_fetching_voters: "对不起，显示选民时发生错误。"
+      ui_builder:
+        title: 建立调查
+        insert: 插入投票
+        help:
+          options_count: 输入至少 2 个选项
+        poll_type:
+          label: 类型
+          regular: 单选
+          multiple: 多选
+          number: 评分
+        poll_config:
+          max: 最大
+          min: 最小
+          step: 梯级
+        poll_public:
+          label: 显示谁投票
+        poll_options:
+          label: 每行输入一个调查选项

plugins/poll/config/locales/client.zh_TW.yml

@@ -5,4 +5,9 @@
 # To work with us on translations, join this project:
 # https://www.transifex.com/projects/p/discourse-org/
 
-zh_TW: {}
+zh_TW:
+  js:
+    poll:
+      cast-votes: 
+      show-results: 
+      hide-results: 

plugins/poll/config/locales/server.cs.yml

@@ -14,9 +14,30 @@ cs:
     multiple_polls_with_same_name: "Víc hlasování má stejné jméno: <strong>%{name}</strong>.  Použijte atribut '<code>name</code>' pro jednoznačnou identifikaci vašich hlasování."
     default_poll_must_have_at_least_2_options: "Hlasování musí mít alespoň 2 odpovědi."
     named_poll_must_have_at_least_2_options: "Hlasování <strong>%{name}</strong> musí mít alespoň 2 odpovědi."
+    default_poll_must_have_less_options:
+      one: "Hlasování nesmí mít více než 1 možnost."
+      few: "Hlasování nesmí mít více než %{count} možnosti."
+      other: "Hlasování nesmí mít více než %{count} možností."
+    named_poll_must_have_less_options:
+      one: "Hlasování <strong>%{name}</strong> nesmí mít více než 1 možnost."
+      few: "Hlasování <strong>%{name}</strong> nesmí mít více než %{count} možnosti."
+      other: "Hlasování <strong>%{name}</strong> nesmí mít více než %{count} možností."
     default_poll_must_have_different_options: "Hlasování musí mít různé odpovědi."
     named_poll_must_have_different_options: "Hlasování <strong>%{name}</strong> musí mít různé odpovědi."
+    default_poll_with_multiple_choices_has_invalid_parameters: "Hlasování s více možnostmi nemá validní parametry."
+    named_poll_with_multiple_choices_has_invalid_parameters: "Hlasování <strong>%{name}</strong> s více možnostmi nemá validní parametry."
     requires_at_least_1_valid_option: "Musíte vybrat alespoň jednu platnou odpověď."
+    default_cannot_be_made_public: "Hlasování s hlasy nemůže být zveřejněno."
+    named_cannot_be_made_public: "Hlasování <strong>%{name}</strong> s hlasy nemůže být zveřejněno."
     cannot_change_polls_after_5_minutes: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních 5 minutách."
     op_cannot_edit_options_after_5_minutes: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních 5 minutách. Prosím kontaktujte moderátora pokud potřebujete upravit odpověď v hlasování."
     staff_cannot_add_or_remove_options_after_5_minutes: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních 5 minutách. Zavřete toto téma a místo něj vytvořte nové."
+    no_polls_associated_with_this_post: "Tento příspěvek nemá žádné hlasování. "
+    no_poll_with_this_name: "Tento příspěvek nemá žádné hlasování se jménem <strong>%{name}</strong>. "
+    post_is_deleted: "Operaci na smazaném příspěvku nelze provést."
+    topic_must_be_open_to_vote: "Téma musí být otevřené, aby bylo možné hlasovat."
+    poll_must_be_open_to_vote: "Hlasování musí být otevřené, aby bylo možné hlasovat."
+    topic_must_be_open_to_toggle_status: "Téma musí být otevřené, aby bylo možné změnit status."
+    only_staff_or_op_can_toggle_status: "Pouze moderátor nebo přispěvatel může změnit status hlasování."
+    email:
+      link_to_poll: "Klikněte pro zobrazení hlasování."

plugins/poll/config/locales/server.fi.yml

@@ -16,7 +16,7 @@ fi:
     named_poll_must_have_at_least_2_options: "Äänestyksessä nimeltään <strong>%{name}</strong> pitää olla vähintään 2 vaihtoehtoa."
     default_poll_must_have_less_options:
       one: "Äänestyksessä pitää olla vähemmän, kuin yksi vaihtoehto."
-      other: "Äänestyksessä pitää olla vähemmän, kuin %{count} vaihtoehtoa."
+      other: "Äänestyksessä pitää olla vähemmän kuin %{count} vaihtoehtoa."
     named_poll_must_have_less_options:
       one: "Äänestyksessä <strong>%{name}</strong> pitää olla vähemmän kuin yksi vaihtoehto."
       other: "Äänestyksessä <strong>%{name}</strong> pitää olla vähemmän kuin %{count} vaihtoehtoa."

plugins/poll/config/locales/server.nl.yml

@@ -15,7 +15,7 @@ nl:
     default_poll_must_have_at_least_2_options: "De poll moet minimaal 2 opties hebben."
     named_poll_must_have_at_least_2_options: "De poll genaamd <strong>%{name}</strong> moet minimaal 2 opties hebben."
     default_poll_must_have_less_options:
-      one: "Poll dient minder dan een optie te hebben."
+      one: "Poll dient minder dan 1 optie te hebben."
       other: "Poll dient minder dan %{count} opties te hebben."
     named_poll_must_have_less_options:
       one: "De poll genaamd <strong>%{name}</strong> moet minder dan 1 optie hebben."
@@ -25,6 +25,8 @@ nl:
     default_poll_with_multiple_choices_has_invalid_parameters: "De poll met meerdere keuzes heeft ongeldige parameters."
     named_poll_with_multiple_choices_has_invalid_parameters: "De poll met de naam <strong>%{name}</strong> met meerdere keuzes heeft ongeldige parameters."
     requires_at_least_1_valid_option: "Kies ten minste 1 geldige optie."
+    default_cannot_be_made_public: "Poll met stemmen kan niet openbaar gemaakt worden."
+    named_cannot_be_made_public: "De poll genaamd <strong>%{name}</strong> heeft stemmen die niet openbaar gemaakt kunnen worden"
     cannot_change_polls_after_5_minutes: "Je kunt polls niet toevoegen, verwijderen of hernoemen na de eerste 5 minuten."
     op_cannot_edit_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. Neem a.u.b. contact op met een moderator als u een poll optie moet wijzigen."
     staff_cannot_add_or_remove_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. In plaats daarvan kun je dit topic sluiten en een nieuwe maken."

plugins/poll/config/locales/server.sv.yml

@@ -25,6 +25,8 @@ sv:
     default_poll_with_multiple_choices_has_invalid_parameters: "Omröstning med flera val har ogiltiga parametrar."
     named_poll_with_multiple_choices_has_invalid_parameters: "Omröstning med namnet <strong>%{name}</strong> med flera val har ogiltiga parametrar."
     requires_at_least_1_valid_option: "Du måste välja minst 1 giltigt alternativ."
+    default_cannot_be_made_public: "Omröstning med röster kan inte offentliggöras."
+    named_cannot_be_made_public: "Omröstning med namnet <strong>%{name}</strong> har röster och kan inte offentliggöras."
     cannot_change_polls_after_5_minutes: "Du kan inte lägga till, ta bort eller byta namn på omröstningar efter de första 5 minutrarna."
     op_cannot_edit_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter det första 5 minutrarna. Vänligen kontakta en moderator om du behöver redigera ett omröstningsalternativ."
     staff_cannot_add_or_remove_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter de första 5 minutrarna. Du får stänga detta ämne och skapa ett nytt i sådana fall."