diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index e449ef12d26..9d4e88120ef 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -60,13 +60,6 @@ ar:
           few: "%{count}ث"
           many: "%{count}ث"
           other: "%{count}ث"
-        less_than_x_minutes:
-          zero: "< %{count}دق"
-          one: "< %{count}دق"
-          two: "< %{count}دق"
-          few: "< %{count}دق"
-          many: "< %{count}دق"
-          other: "< %{count}دق"
         x_minutes:
           zero: "%{count}دق"
           one: "%{count}دق"
@@ -514,7 +507,6 @@ ar:
       latest_by: "الاحدث بـ"
       toggle_ordering: "تبديل التحكم في الترتيب"
       subcategories: "تصنيفات فرعية"
-      topic_stats: "عدد المواضيع الجديدة."
       topic_stat_sentence:
         zero: "لا مواضيع جديدة في ال%{unit} الماضي."
         one: "موضوع واحد جديد في ال%{unit} الماضي."
@@ -522,14 +514,6 @@ ar:
         few: "%{count} مواضيع جديدة في ال%{unit} الماضي."
         many: "%{count} موضوعًا جديدًا في ال%{unit} الماضي."
         other: "%{count} موضوع جديد في ال%{unit} الماضي."
-      post_stats: "عدد المشاركات الجديدة."
-      post_stat_sentence:
-        zero: "لا مشاركات جديدة في ال%{unit} الماضي."
-        one: "مشاركة واحدة جديدة في ال%{unit} الماضي."
-        two: "مشاركتان جديدتان في ال%{unit} الماضي."
-        few: "%{count} مشاركات جديدة في ال%{unit} الماضي."
-        many: "%{count} مشاركة جديدة في ال%{unit} الماضي."
-        other: "%{count} مشاركة جديدة في ال%{unit} الماضي."
     ip_lookup:
       title: 'جدول العناوين '
       hostname: اسم المضيف
@@ -1028,7 +1012,6 @@ ar:
       saved_local_draft_tip: "حُفظ محليا"
       similar_topics: "موضوعك يشابه..."
       drafts_offline: "مسودات محفوظة "
-      group_mentioned: "بذكرك  {{group}}, انت على وشك تنبيه <a href='{{group_link}}'>{{count}} اشخاص</a> – هل انت متأكد؟"
       duplicate_link: "يبدو أن الرابط المشير إلى <b>{{domain}}</b> قد نشره <b>@{{username}}</b> في الموضوع في <a href='{{post_url}}'>رد له {{ago}}</a> – أمتأكد من نشره مجددا؟"
       error:
         title_missing: "العنوان مطلوب"
@@ -1246,7 +1229,6 @@ ar:
       unsubscribe:
         stop_notifications: "ستستقبل الأن إشعارات أقل لـ<strong>{{title}}</strong>"
         change_notification_state: "حالة إشعارك الحالي هي "
-      filter_to: "{{post_count}} مشاركات/مشاركة في الموضوع"
       create: 'موضوع جديد'
       create_long: 'كتابة موضوع جديد'
       private_message: 'أرسل رسالة خاصة'
@@ -1329,7 +1311,6 @@ ar:
       auto_close_title: 'إعدادات الإغلاق الآلي'
       auto_close_save: "احفظ"
       auto_close_remove: "لا تغلق هذا الموضوع آليا"
-      auto_close_immediate: "احر منشور في الموضيع كان قبل %{hours} ساعه , لذلك فان الموضوع يتم اغلاقه حالاَ ."
       timeline:
         back: "الرجوع"
         back_description: "عُد إلى آخر مشاركة غير مقروءة"
@@ -1345,11 +1326,10 @@ ar:
         jump_bottom_with_number: "انتقل إلى المشاركة %{post_number}"
         total: مجموع المشاركات
         current: المشاركة الحالية
-        position: "المشاركة %{current} من أصل %{total}"
       notifications:
         title: غير عدد مرات اشعارك عن هذا الموضوع
         reasons:
-          mailing_list_mode: "لقد قمت بتمكين وضعية قائمة المراسلات, لذا سيتم اخطارك بالردود على هذا الموضوع عبر البريد الالكتروني."
+          mailing_list_mode: "وضع القائمة البريدية لديك مفعّل، لذلك ستصلك إشعارات الردود على هذا الموضوع عبر البريد الإلكتروني."
           '3_10': 'ستصلك إشعارات لأنك تراقب وسما وُسم به هذا الموضوع.'
           '3_6': 'ستصلك إشعارات لأنك تراقب هذه الفئة.'
           '3_5': 'ستصلك إشعارات لأنك بدأت بمراقبة هذا الموضوع آليا.'
@@ -1360,23 +1340,23 @@ ar:
           '2_4': 'ستصلك إشعارات لأنك نشرت ردا في هذا الموضوع.'
           '2_2': 'ستصلك إشعارات لأنك تتابع هذا الموضوع.'
           '2': 'ستصلك إشعارات لأنك <a href="/users/{{username}}/preferences">قرأت هذا الموضوع</a>.'
-          '1_2': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك'
-          '1': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك'
+          '1_2': 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
+          '1': 'سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك.'
           '0_7': 'أنت تتجاهل إشعارات هذه الفئة.'
           '0_2': 'أنت تتجاهل إشعارات هذا الموضوع.'
           '0': 'أنت تتجاهل إشعارات هذا الموضوع.'
         watching_pm:
           title: "مُراقب"
-          description: "سيتم إشعارك بأية رد على هذه الرسالة، وبعدد الردود الجديدة التي ستظهر ."
+          description: "سيصلك إشعار لكل رد جديد لهذه الرسالة، وسيظهر عدد الردود الجديدة."
         watching:
           title: "مُراقب"
-          description: "سيتم إشعارك بأية رد على هذا الموضوع، وبعدد الردود الجديدة التي ستظهر."
+          description: "سيصلك إشعار لكل رد جديد لهذا الموضوع، وسيظهر عدد الردود الجديدة."
         tracking_pm:
           title: "مُتابع"
-          description: "سيتم عرض عدد الردود الجديدة لهذه الرسالة. سيتم إعلامك إذا ذكر أحد اسمك@  أو ردود لك."
+          description: "سيظهر عدد الردود الجديدة لهذه الرسالة. سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
         tracking:
           title: "مُتابع"
-          description: "سيتم عرض عدد الردود جديدة لهذا الموضوع. سيتم إعلامك إذا ذكر أحد name@  أو ردود لك."
+          description: "سيظهر عدد الردود الجديدة لهذا الموضوع. سيصلك إشعار إن أشار أحد إلى @اسمك أو رد عليك."
         regular:
           title: "منتظم"
           description: "سيصلك إشعارا إن أشار أحد إلى @اسمك أو رد عليك."
@@ -1385,10 +1365,10 @@ ar:
           description: "سيصلك إشعارا إن أشار أحد إلى @اسمك أو رد عليك."
         muted_pm:
           title: "كتم"
-          description: "لن يتم إشعارك بأي جديد يخص هذه الرسالة الخاصة."
+          description: "لن تصلك أية إشعارات لهذه الرسالة."
         muted:
           title: "مكتوم"
-          description: "لن يتم إشعارك بأي جديد يخص هذا الموضوع ولن يظهرهذا الموضوع في قائمة المواضيع المنشورة مؤخراً."
+          description: "لن تصلك أية إشعارات لهذا الموضوع، ولن يظهر في المواضيع الأخيرة."
       actions:
         recover: "استرجاع الموضوع"
         delete: "حذف الموضوع"
@@ -1585,7 +1565,6 @@ ar:
         few: "اعرض ال‍{{count}} ردود المخفية"
         many: "اعرض ال‍{{count}} ردا المخفية"
         other: "اعرض ال‍{{count}} رد المخفية"
-      more_links: "{{count}}  أكثر .."
       unread: "المشاركة غير مقروءة"
       has_replies:
         zero: "لا ردود"
@@ -1678,14 +1657,6 @@ ar:
           few: "أجّل الإعلامات"
           many: "أجّل الإعلامات"
           other: "أجّل الإعلامات"
-        it_too:
-          off_topic: "أبلغ عنها أيضا"
-          spam: "أبلغ عنها أيضا"
-          inappropriate: "أبلغ عنها أيضا"
-          custom_flag: "أبلغ عنها أيضا"
-          bookmark: "أضفها للمفضلة"
-          like: "أبدِ إعجابك بها :)"
-          vote: "صوت لها أيضاً"
         undo:
           off_topic: "تراجع عن التبليغ"
           spam: "تراجع عن التبليغ"
@@ -1943,7 +1914,6 @@ ar:
       notify_action: 'رسالة'
       official_warning: 'تحذير رسمي'
       delete_spammer: "احذف ناشر السخام"
-      delete_confirm: "أنت على وشك حذف  <b>%{posts}</b> المشاركات و<b>%{topics}</b> المواضيع من هذا المستخدم , حذف حساباتهم منهم من التسجيل وحجب الاي بي  <b>%{ip_address}</b>, واضافة بريدهم الالكتروني  <b>%{email}</b> لقائمة المحجوبين  . هل أنت متأكد أن هذا المستخدم سبام ?"
       yes_delete_spammer: "نعم، احذف ناشر السخام"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفي)"
@@ -1957,10 +1927,6 @@ ar:
         spam: "هذا سبام"
       custom_placeholder_notify_user: "كن محدد, استدلالي ودائما حسن الاخلاق"
       custom_placeholder_notify_moderators: "ممكن تزودنا بمعلومات أكثر عن سبب عدم ارتياحك حول هذه المشاركة؟ زودنا ببعض الروابط و الأمثلة قدر الإمكان."
-      custom_message:
-        at_least: "ادخل على الاقل  {{n}} حرف"
-        more: "{{n}} الذهاب الى"
-        left: "{{n}} باقي"
     flagging_topic:
       title: "شكرا لمساعدتنا في ابقاء مجتمعنا نضيفا"
       action: "التبليغ عن الموضوع"
@@ -2009,7 +1975,6 @@ ar:
       invisible:
         help: "هذا الموضوع غير مصنف لن يظهر في قائمة التصانيف ولايمكن الدخول عليه الابرابط مباشر."
     posts: "مشاركات"
-    posts_lowercase: "مشاركات"
     posts_long: "هناك {{number}} مشاركات في هذا الموضوع"
     posts_likes_MF: |
       {count, plural, zero {ليس في هذا الموضوع أي رد} one {في هذا الموضوع رد واحد} two {في هذا الموضوع ردان} few {في هذا الموضوع # ردود} many {في هذا الموضوع # ردا}} other {في هذا الموضوع # رد}} {ratio, select,
@@ -2888,7 +2853,6 @@ ar:
         suspend_reason: "سبب"
         suspended_by: "محظور من قبل"
         delete_all_posts: "حذف جميع المشاركات"
-        delete_all_posts_confirm: "هل أنت متأكد من أنك تريد حذف %{posts}  مشاركات و  %{topics}  مواضيع ؟"
         suspend: "علّق"
         unsuspend: "إلقاء التعليق"
         suspended: "معلّق؟"
@@ -2996,7 +2960,6 @@ ar:
         unlock_trust_level: "فتح مستوى الثقة "
         tl3_requirements:
           title: "المتطلبات لمستوى الثقة 3."
-          table_title: "في أخر %{time_period} أيام:"
           value_heading: "تصويت"
           requirement_heading: "متطلبات"
           visits: "الزيارات"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 1c9079a90e2..ad29dabdb52 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -49,10 +49,6 @@ bs_BA:
           one: "1 sekunda"
           few: "%{count} sekundi"
           other: "%{count} sekundi"
-        less_than_x_minutes:
-          one: "<1 minuta"
-          few: "%{count} minuta"
-          other: "%{count} minuta"
         date_month: "MMM D"
         date_year: "MMM 'YY"
       medium:
@@ -368,8 +364,6 @@ bs_BA:
       latest_by: "zadnje od"
       toggle_ordering: "toggle ordering control"
       subcategories: "Podkategorije"
-      topic_stats: "Broj novih tema."
-      post_stats: "Broj novih postova."
     ip_lookup:
       title: IP Address Lookup
       hostname: Hostname
@@ -911,7 +905,6 @@ bs_BA:
         category: "Nema više tema na kategoriji {{category}}."
         top: "Nema više popularnih tema."
     topic:
-      filter_to: "{{post_count}} odgovora u temi"
       create: 'Započni Temu'
       create_long: 'Započni novu Temu'
       private_message: 'Započni privatnu konverzaciju'
@@ -955,7 +948,6 @@ bs_BA:
         jump_bottom_with_number: "skoči na post %{post_number}"
         total: ukupan broj
         current: trenutni post
-        position: "post %{current} od %{total}"
       notifications:
         reasons:
           '3_6': 'Dobijat ćete notifikacije zato što motrite ovu temu.'
@@ -1078,7 +1070,6 @@ bs_BA:
       show_full: "Pogledaj Cijeli Post"
       show_hidden: 'Pogledaj sakriven sadržaj.'
       expand_collapse: "digni/spusti"
-      more_links: "{{count}} više..."
       unread: "Post je nepročitan"
       errors:
         create: "Sorry, there was an error creating your post. Please try again."
@@ -1120,14 +1111,6 @@ bs_BA:
         unhide: "Unhide"
       actions:
         flag: 'Opomena'
-        it_too:
-          off_topic: "Opomeni i ti"
-          spam: "Opomeni i ti"
-          inappropriate: "Opomeni i ti"
-          custom_flag: "Opomeni i ti"
-          bookmark: "Bookmark it too"
-          like: "Lajkuj i ti"
-          vote: "Glasaj i ti"
         undo:
           off_topic: "Otkaži opomenu"
           spam: "Otkaži opomenu"
@@ -1225,7 +1208,6 @@ bs_BA:
       take_action: "Poduzmi Akciju"
       notify_action: 'Privatna Poruka'
       delete_spammer: "Obriši Spamera"
-      delete_confirm: "You are about to delete <b>%{posts}</b> posts and <b>%{topics}</b> topics from this user, remove their account, block signups from their IP address <b>%{ip_address}</b>, and add their email address <b>%{email}</b> to a permanent block list. Are you sure this user is really a spammer?"
       yes_delete_spammer: "Da, Obriši Spamera"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(hidden)"
@@ -1234,10 +1216,6 @@ bs_BA:
       cant: "Nažalost, ne možete opomenuti ovaj post trenutno."
       custom_placeholder_notify_user: "Zašto ovaj post nalaže da kontaktirate korisnika privatno. Budite detaljni, pristojni i korektni."
       custom_placeholder_notify_moderators: "Zašto ovaj post zaslužuje pažnju moderatora. Navedite vaš razlog po mogućnosti ostavite link ako je nužno."
-      custom_message:
-        at_least: "enter at least {{n}} characters"
-        more: "{{n}} to go..."
-        left: "{{n}} remaining"
     flagging_topic:
       title: "Zašto privatno opominjete ovu temu?"
       action: "Opomeni Temu"
@@ -1262,7 +1240,6 @@ bs_BA:
       invisible:
         help: "Ovu temu sajt ne lista među najnovijim temama. Neće biti prisutna ni među listama tema unutar kategorija. Jedini način da se dođe do ove teme je direktan link"
     posts: "Odgovori"
-    posts_lowercase: "odgovori"
     posts_long: "postoji {{number}} odgovora u ovoj temi"
     posts_likes_MF: |
       This topic has {count, plural, one {1 post} other {# posts}} {ratio, select,
@@ -1688,7 +1665,6 @@ bs_BA:
         suspend_reason: "Reason"
         suspended_by: "Suspended by"
         delete_all_posts: "Delete all posts"
-        delete_all_posts_confirm: "You are about to delete %{posts} posts and %{topics} topics. Are you sure?"
         suspend: "Suspend"
         unsuspend: "Unsuspend"
         suspended: "Suspended?"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index b44e32bdd11..67ae08d3e53 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -51,10 +51,6 @@ cs:
           one: "1s"
           few: "%{count}s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          few: "< %{count}m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           few: "%{count}m"
@@ -423,16 +419,10 @@ cs:
       latest_by: "latest by"
       toggle_ordering: "Přepnout editaci pořadí"
       subcategories: "Podkategorie"
-      topic_stats: "Počet nových témat."
       topic_stat_sentence:
         one: "%{count} nové téma za posledních %{unit}."
         few: "%{count} nová témata za posledních %{unit}."
         other: "%{count} nových témat za posledních %{unit}."
-      post_stats: "Počet nových příspěvků."
-      post_stat_sentence:
-        one: "%{count} nový příspěvěk za posledních %{unit}."
-        few: "%{count} nové příspěvky za posledních %{unit}."
-        other: "%{count} nových příspěvků za posledních %{unit}."
     ip_lookup:
       title: Vyhledávání podle IP adresy
       hostname: Hostname
@@ -1133,7 +1123,6 @@ cs:
       unsubscribe:
         stop_notifications: "Budete dostávat méně upozornění pro <strong>{{title}}</strong>"
         change_notification_state: "Váš momentální stav oznámení je"
-      filter_to: "{{post_count}} příspěvků v tématu"
       create: 'Nové téma'
       create_long: 'Vytvořit nové téma'
       private_message: 'Vytvořit zprávu'
@@ -1210,7 +1199,6 @@ cs:
         jump_bottom_with_number: "Skočit na příspěvěk %{post_number}"
         total: celkem příspěvků
         current: aktuální příspěvek
-        position: "příspěvek %{current} z %{total}"
       notifications:
         reasons:
           '3_6': 'Budete dostávat oznámení, protože hlídáte tuhle kategorii.'
@@ -1409,7 +1397,6 @@ cs:
         one: "zobrazit 1 skrytou odpověď"
         few: "zobrazit {{count}} skryté odpovědi"
         other: "zobrazit {{count}} skrytých odpovědí"
-      more_links: "{{count}} dalších..."
       unread: "Příspěvek je nepřečtený."
       has_replies:
         one: "{{count}} odpověď"
@@ -1478,14 +1465,6 @@ cs:
           one: "Odložit nahlášení"
           few: "Odložit nahlášení"
           other: "Odložit nahlášení"
-        it_too:
-          off_topic: "Také nahlásit"
-          spam: "Také nahlásit"
-          inappropriate: "Také nahlásit"
-          custom_flag: "Také nahlásit"
-          bookmark: "Také přidat do záložek"
-          like: "To se mi také líbí"
-          vote: "Hlasovat také"
         undo:
           off_topic: "Zrušit nahlášení"
           spam: "Zrušit nahlášení"
@@ -1662,7 +1641,6 @@ cs:
       take_action: "Zakročit"
       notify_action: 'Zpráva'
       delete_spammer: "Odstranit spamera"
-      delete_confirm: "Chystáte se odstranit <b>%{posts}</b> příspěvků a <b>%{topics}</b> témat od tohoto uživatele, smazat jeho účet, a vložit jeho emailovou adresu <b>%{email}</b> na seznam permanentně blokovaných. Jste si jistí, že je tento uživatel opravdu spamer?"
       yes_delete_spammer: "Ano, odstranit spamera"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(skrytý)"
@@ -1675,10 +1653,6 @@ cs:
         spam: "Je to spam"
       custom_placeholder_notify_user: "Buďte věcný, konstruktivní a vždy zdvořilý."
       custom_placeholder_notify_moderators: "Sdělte nám, co vás přesně trápí a kde to bude možné, tak nám poskytněte související odkazy a příklady."
-      custom_message:
-        at_least: "zadejte alespoň {{n}} znaků"
-        more: "ještě {{n}}..."
-        left: "{{n}} zbývá"
     flagging_topic:
       title: "Děkujeme, že pomáháte udržovat komunitu zdvořilou!"
       action: "Nahlásit téma"
@@ -1714,7 +1688,6 @@ cs:
       invisible:
         help: "Toto téma je neviditelné; nebude se zobrazovat v seznamu témat a lze ho navštívit pouze přes přímý odkaz"
     posts: "Příspěvků"
-    posts_lowercase: "příspěvky"
     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,
@@ -2354,7 +2327,6 @@ cs:
         suspend_reason: "Reason"
         suspended_by: "Suspended by"
         delete_all_posts: "Smazat všechny příspěvky"
-        delete_all_posts_confirm: "You are about to delete %{posts} posts and %{topics} topics. Are you sure?"
         suspend: "Zakázat"
         unsuspend: "Povolit"
         suspended: "Zakázán?"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 2e491384a73..e430e3edc78 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -48,9 +48,6 @@ da:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -385,14 +382,9 @@ da:
       latest_by: "seneste af"
       toggle_ordering: "vis/skjul rækkefølgeskifter"
       subcategories: "Underkategorier:"
-      topic_stats: "Antallet af nye emner."
       topic_stat_sentence:
         one: "%{count} nyt emne i den/det seneste %{unit}."
         other: "%{count} nye emner i den/det seneste %{unit}."
-      post_stats: "Antallet af nye indlæg."
-      post_stat_sentence:
-        one: "%{count} nyt indlæg i den seneste %{unit}."
-        other: "%{count} nye indlæg i den seneste %{unit}."
     ip_lookup:
       title: IP-adresse opslag
       hostname: Værtsnavn
@@ -1038,7 +1030,6 @@ da:
       unsubscribe:
         stop_notifications: "Du vil nu modtage færre notifikationer for <strong>{{title}}</strong>"
         change_notification_state: "Din nuværende notifikationstilstand er"
-      filter_to: "Vis {{post_count}} indlæg i emnet"
       create: 'Nyt emne'
       create_long: 'Opret et nyt emne i debatten'
       private_message: 'Start en besked'
@@ -1098,7 +1089,6 @@ da:
       auto_close_title: 'Indstillinger for automatisk lukning'
       auto_close_save: "Gem"
       auto_close_remove: "Luk ikke dette emne automatisk"
-      auto_close_immediate: "Seneste indlæg i emnet er allerede %{hours} timer gammelt så emnet bliver lukket med det samme."
       progress:
         title: emnestatus
         go_top: "top"
@@ -1108,7 +1098,6 @@ da:
         jump_bottom_with_number: "hop til indlæg %{post_number}"
         total: antal indlæg
         current: nuværende indlæg
-        position: "indlæg %{current} af %{total}"
       notifications:
         reasons:
           '3_6': 'Du får notifikationer fordi du overvåger denne kategori.'
@@ -1301,7 +1290,6 @@ da:
       gap:
         one: "se 1 udeladt indlæg "
         other: "se {{count}} udeladte indlæg "
-      more_links: "{{count}} endnu..."
       unread: "Indlæg er ulæst"
       has_replies:
         one: "{{count}} svar"
@@ -1367,14 +1355,6 @@ da:
         defer_flags:
           one: "Udsæt markering"
           other: "Udsæt markeringer"
-        it_too:
-          off_topic: "Flag det også"
-          spam: "Flag det også"
-          inappropriate: "Flag det også"
-          custom_flag: "Flag det også"
-          bookmark: "Bogmærk det også"
-          like: "Like det også"
-          vote: "Stem på det også"
         undo:
           off_topic: "Undo flag"
           spam: "Undo flag"
@@ -1547,7 +1527,6 @@ da:
       take_action: "Reagér"
       notify_action: 'Besked'
       delete_spammer: "Slet spammer"
-      delete_confirm: "Du er ved at slette <b>%{posts}</b> indlæg og <b>%{topics}</b> emner oprettet af denne bruger, fjerne deres konto, blokere tilmeldinger fra deres IP-adresse <b>%{ip_address}</b> og tilføje deres e-mail-adresse <b>%{email}</b> til en permanent blokeringsliste. Er du sikker på, at denne bruger virkelig er en spammer?"
       yes_delete_spammer: "Ja, slet spammer"
       ip_address_missing: "(Ikke tilgængelig)"
       hidden_email_address: "(skjult)"
@@ -1561,10 +1540,6 @@ da:
         spam: "Det er spam"
       custom_placeholder_notify_user: "Vær præcis, vær kontruktiv og vær altid venlig."
       custom_placeholder_notify_moderators: "Lad os vide præcis hvad du er bekymret over og giv relevante links og eksempler hvor det er muligt."
-      custom_message:
-        at_least: "indtast mindst {{n}} tegn"
-        more: "{{n}} flere..."
-        left: "{{n}} tilbage"
     flagging_topic:
       title: "Tak fordi du hjælper med at holde vores forum civiliseret!"
       action: "Rapporter emne"
@@ -1599,7 +1574,6 @@ da:
       invisible:
         help: "Dette emne er ulistet; det vil ikke blive vist i listen over emner og kan kun tilgås med et direkte link"
     posts: "Indlæg"
-    posts_lowercase: "indlæg"
     posts_long: "{{number}} indlæg i dette emne"
     posts_likes_MF: |
       Dette emne har {count, plural, one {1 svar} other {# svar}} {ratio, select,
@@ -2337,7 +2311,6 @@ da:
         suspend_reason: "Begrundelse"
         suspended_by: "Suspenderet af"
         delete_all_posts: "Slet alle indlæg"
-        delete_all_posts_confirm: "Du er ved at slette %{posts} indlæg og %{topics} emner. Er du sikker?"
         suspend: "Suspendér"
         unsuspend: "Ophæv suspendering"
         suspended: "Suspenderet?"
@@ -2423,7 +2396,6 @@ da:
         unlock_trust_level: "Lås tillidsniveau op"
         tl3_requirements:
           title: "Krav for fortrolighedsniveau 3"
-          table_title: "I de sidste %{time_period} dage:"
           value_heading: "værdi"
           requirement_heading: "Obligatoriske"
           visits: "Besøg"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 621e8196cf4..5cb1e8f0a10 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -48,9 +48,6 @@ de:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1min"
-          other: "< %{count}min"
         x_minutes:
           one: "1min"
           other: "%{count}min"
@@ -246,11 +243,11 @@ de:
     preview: "Vorschau"
     cancel: "Abbrechen"
     save: "Änderungen speichern"
-    saving: "Speichere..."
+    saving: "Speichere…"
     saved: "Gespeichert!"
     upload: "Hochladen"
-    uploading: "Wird hochgeladen..."
-    uploading_filename: "{{filename}} wird hochgeladen..."
+    uploading: "Wird hochgeladen…"
+    uploading_filename: "{{filename}} wird hochgeladen…"
     uploaded: "Hochgeladen!"
     enable: "Aktivieren"
     disable: "Deaktivieren"
@@ -402,14 +399,12 @@ de:
       latest_by: "neuester Beitrag von"
       toggle_ordering: "Reihenfolge ändern"
       subcategories: "Unterkategorien"
-      topic_stats: "Die Anzahl der neuen Themen."
+      topic_sentence:
+        one: "1 Thema"
+        other: "%{count} Themen"
       topic_stat_sentence:
         one: "1 neues Thema seit 1 %{unit}."
         other: "%{count} neue Themen seit 1 %{unit}."
-      post_stats: "Die Anzahl der neuen Beiträge."
-      post_stat_sentence:
-        one: "1 neuer Beitrag seit 1 %{unit}."
-        other: "%{count} neue Beiträge seit 1 %{unit}."
     ip_lookup:
       title: IP-Adressen-Abfrage
       hostname: Hostname
@@ -509,6 +504,9 @@ de:
       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."
+      api_permissions: "Berechtigungen:"
+      api_read: "Lesen"
+      api_read_write: "Lesen und Schreiben"
       staff_counters:
         flags_given: "hilfreiche Meldungen"
         flagged_posts: "gemeldete Beiträge"
@@ -590,7 +588,7 @@ de:
         not_available: "Nicht verfügbar. Wie wäre es mit {{suggestion}}?"
         too_short: "Dein Benutzername ist zu kurz"
         too_long: "Dein Benutzername ist zu lang"
-        checking: "Verfügbarkeit wird geprüft..."
+        checking: "Verfügbarkeit wird geprüft…"
         enter_email: 'Benutzername gefunden; gib die zugehörige E-Mail-Adresse ein'
         prefilled: "E-Mail-Adresse entspricht diesem registrierten Benutzernamen"
       locale:
@@ -655,7 +653,7 @@ de:
         after_5_minutes: "nach 5 Minuten"
         after_10_minutes: "nach 10 Minuten"
       invited:
-        search: "zum Suchen nach Einladungen hier eingeben..."
+        search: "zum Suchen nach Einladungen hier eingeben…"
         title: "Einladungen"
         user: "Eingeladener Benutzer"
         sent: "Gesendet"
@@ -688,7 +686,7 @@ de:
         bulk_invite:
           none: "Du hast noch niemanden hierher eingeladen. Du kannst individuelle Einladungen verschicken oder eine Masseneinladung an eine Gruppe von Leuten verschicken indem du <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>eine Datei für Masseneinladung</a> hochlädst."
           text: "Masseneinladung aus Datei"
-          uploading: "Wird hochgeladen..."
+          uploading: "Wird hochgeladen…"
           success: "Die Datei wurde erfolgreich hochgeladen. Du erhältst eine Nachricht, sobald der Vorgang abgeschlossen ist."
           error: "Beim Hochladen der Datei '{{filename}}' ist ein Fehler aufgetreten: {{message}}"
       password:
@@ -756,7 +754,7 @@ de:
         sent_by: "Gesendet von"
         private_message: "Nachricht"
         the_topic: "das Thema"
-    loading: "Wird geladen..."
+    loading: "Wird geladen…"
     errors:
       prev_page: "während des Ladens"
       reasons:
@@ -793,7 +791,7 @@ de:
       rate:
         one: "ein Fehler/%{duration}"
         other: "%{count} Fehler/%{duration}"
-    learn_more: "mehr erfahren..."
+    learn_more: "mehr erfahren…"
     year: 'Jahr'
     year_desc: 'Themen, die in den letzten 365 Tagen erstellt wurden'
     month: 'Monat'
@@ -829,7 +827,7 @@ de:
       disable: "Gelöschte Beiträge anzeigen"
     private_message_info:
       title: "Nachricht"
-      invite: "Andere einladen..."
+      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'
@@ -863,9 +861,9 @@ de:
       rate_limit: "Warte bitte ein wenig, bevor du erneut versuchst dich anzumelden."
       blank_username_or_password: "Bitte gib deine E-Mail-Adresse oder deinen Benutzernamen und dein Passwort ein."
       reset_password: 'Passwort zurücksetzen'
-      logging_in: "Anmeldung läuft..."
+      logging_in: "Anmeldung läuft…"
       or: "Oder"
-      authenticating: "Authentifiziere..."
+      authenticating: "Authentifiziere…"
       awaiting_confirmation: "Dein Konto ist noch nicht aktiviert. Verwende den 'Passwort vergessen'-Link, um eine weitere E-Mail mit Anweisungen zur Aktivierung zu erhalten."
       awaiting_approval: "Dein Konto wurde noch nicht von einem Mitarbeiter genehmigt. Du bekommst eine E-Mail, sobald das geschehen ist."
       requires_invite: "Entschuldige, der Zugriff auf dieses Forum ist nur mit einer Einladung möglich."
@@ -904,13 +902,16 @@ de:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Windows 10"
+    category_page_style:
+      categories_only: "nur Kategorien"
+      categories_and_latest_topics: "Kategorien und aktuelle Themen"
     shortcut_modifier_key:
       shift: 'Umschalt'
       ctrl: 'Strg'
       alt: 'Alt'
     composer:
       emoji: "Emoji :)"
-      more_emoji: "mehr..."
+      more_emoji: "mehr…"
       options: "Optionen"
       whisper: "flüstern"
       unlist: "unsichtbar"
@@ -918,12 +919,11 @@ de:
       toggle_whisper: "Flüstermodus umschalten"
       toggle_unlisted: "Unsichtbar umschalten"
       posting_not_on_topic: "Auf welches Thema möchtest du antworten?"
-      saving_draft_tip: "wird gespeichert..."
+      saving_draft_tip: "wird gespeichert…"
       saved_draft_tip: "gespeichert"
       saved_local_draft_tip: "lokal gespeichert"
-      similar_topics: "Dein Thema hat Ähnlichkeit mit..."
+      similar_topics: "Dein Thema hat Ähnlichkeit mit…"
       drafts_offline: "Entwürfe offline"
-      group_mentioned: "Indem du {{group}} erwähnst, bist du dabei, <a href='{{group_link}}'>{{count}} Personen</a> zu benachrichtigen – bist du dir sicher?"
       duplicate_link: "Es sieht so aus als wäre dein Link zu <b>{{domain}}</b> in dem Thema bereits von <b>@{{username}}</b> in <a href='{{post_url}}'>einer Antwort vor {{ago}}</a> geteilt worden – möchtest du ihn wirklich erneut teilen? "
       error:
         title_missing: "Titel ist erforderlich"
@@ -950,12 +950,14 @@ de:
       saving: "Wird gespeichert"
       saved: "Gespeichert!"
       saved_draft: "Ein Beitrag ist in Arbeit. Zum Fortsetzen hier klicken."
-      uploading: "Wird hochgeladen..."
+      uploading: "Wird hochgeladen…"
       show_preview: 'Vorschau anzeigen &raquo;'
       hide_preview: '&laquo; Vorschau ausblenden'
       quote_post_title: "Ganzen Beitrag zitieren"
+      bold_label: "F"
       bold_title: "Fettgedruckt"
       bold_text: "Fettgedruckter Text"
+      italic_label: "K"
       italic_title: "Betonung"
       italic_text: "Betonter Text"
       link_title: "Hyperlink"
@@ -973,6 +975,7 @@ de:
       olist_title: "Nummerierte Liste"
       ulist_title: "Liste mit Aufzählungszeichen"
       list_item: "Listenelement"
+      heading_label: "Ü"
       heading_title: "Überschrift"
       heading_text: "Überschrift"
       hr_title: "Horizontale Linie"
@@ -1075,7 +1078,7 @@ de:
       no_results: "Keine Ergebnisse gefunden."
       no_more_results: "Es wurde keine weiteren Ergebnisse gefunden."
       search_help: Hilfe zur Suche
-      searching: "Suche ..."
+      searching: "Suche …"
       post_format: "#{{post_number}} von {{username}}"
       context:
         user: "Beiträge von @{{username}} durchsuchen"
@@ -1140,7 +1143,9 @@ de:
       unsubscribe:
         stop_notifications: "Du wirst in Zukunft weniger Benachrichtigungen für <strong>{{title}}</strong> erhalten"
         change_notification_state: "Dein aktueller Benachrichtigungsstatus ist"
-      filter_to: "{{post_count}} Beiträge im Thema"
+      filter_to:
+        one: "1 Beitrag im Thema"
+        other: "{{count}} Beiträge im Thema"
       create: 'Neues Thema'
       create_long: 'Ein neues Thema erstellen'
       private_message: 'Eine Unterhaltung beginnen'
@@ -1200,11 +1205,9 @@ de:
       auto_close_title: 'Automatisches Schließen'
       auto_close_save: "Speichern"
       auto_close_remove: "Dieses Thema nicht automatisch schließen"
-      auto_close_immediate: "Der letzte Beitrag in diesem Thema ist bereits %{hours} Stunden alt. Das Thema wird daher sofort geschlossen."
       timeline:
         back: "Zurück"
         back_description: "Gehe zurück zum letzten ungelesenen Beitrag"
-        replies: "%{current} / %{total} Antworten"
         replies_short: "%{current} / %{total}"
       progress:
         title: Themen-Fortschritt
@@ -1217,7 +1220,6 @@ de:
         jump_bottom_with_number: "springe zu Beitrag %{post_number}"
         total: Beiträge insgesamt
         current: aktueller Beitrag
-        position: "Beitrag %{current} von %{total}"
       notifications:
         title: Ändere wie häufig du zu diesem Thema benachrichtigt wirst
         reasons:
@@ -1322,7 +1324,7 @@ de:
         banner_note: "Benutzer können das Ankündigungsbanner schließen und so für sich selbst dauerhaft ausblenden. Es kann zu jeder Zeit höchstens ein Thema ein Banner sein."
         no_banner_exists: "Es gibt kein Ankündigungsbanner."
         banner_exists: "Es <strong class='badge badge-notification unread'>gibt bereits</strong> ein anderes Ankündigungsbanner."
-      inviting: "Einladungen werden gesendet..."
+      inviting: "Einladungen werden gesendet…"
       automatically_add_to_groups: "Diese Einladung beinhaltet auch Zugang zu den folgenden Gruppen:"
       invite_private:
         title: 'Zu einer Unterhaltung einladen'
@@ -1421,7 +1423,6 @@ de:
       gap:
         one: "einen versteckten Beitrag anzeigen"
         other: "{{count}} versteckte Beiträge anzeigen"
-      more_links: "{{count}} weitere..."
       unread: "Beitrag ist ungelesen"
       has_replies:
         one: "{{count}} Antwort"
@@ -1490,14 +1491,6 @@ de:
         defer_flags:
           one: "Meldung ignorieren"
           other: "Meldungen ignorieren"
-        it_too:
-          off_topic: "Melde es auch"
-          spam: "Melde es auch"
-          inappropriate: "Melde es auch"
-          custom_flag: "Melde es auch"
-          bookmark: "Setze auch ein Lesezeichen"
-          like: "Gefällt mir auch"
-          vote: "Stimme auch dafür"
         undo:
           off_topic: "Meldung widerrufen"
           spam: "Meldung widerrufen"
@@ -1683,7 +1676,6 @@ de:
       notify_action: 'Nachricht'
       official_warning: 'Offizielle Warnung'
       delete_spammer: "Spammer löschen"
-      delete_confirm: "Du wirst <b>%{posts}</b> Beiträge und <b>%{topics}</b> Themen von diesem Benutzer löschen, sein Konto entfernen, seine IP-Adresse <b>%{ip_address}</b> für Neuanmeldungen sperren und die E-Mail-Adresse <b>%{ip_address}</b> auf eine permanente Sperrliste setzen. Bist du dir sicher, dass dieser Benutzer wirklich ein Spammer ist?"
       yes_delete_spammer: "Ja, lösche den Spammer"
       ip_address_missing: "(nicht verfügbar)"
       hidden_email_address: "(versteckt)"
@@ -1698,9 +1690,12 @@ de:
       custom_placeholder_notify_user: "Sei konkret, konstruktiv und immer freundlich."
       custom_placeholder_notify_moderators: "Bitte lass uns wissen, was genau dich beunruhigt. Verweise, wenn möglich, auf relevante Links und Beispiele."
       custom_message:
-        at_least: "gib mindestens {{n}} Zeichen ein"
-        more: "{{n}} weitere..."
-        left: "{{n}} übrig"
+        at_least:
+          one: "gib mindestens ein Zeichen ein"
+          other: "gib mindestens {{count}} Zeichen ein"
+        more:
+          one: "eine weitere…"
+          other: "{{count}} weitere…"
     flagging_topic:
       title: "Danke für deine Mithilfe!"
       action: "Thema melden"
@@ -1709,7 +1704,7 @@ de:
       title: "Zusammenfassung des Themas"
       participants_title: "Autoren vieler Beiträge"
       links_title: "Beliebte Links"
-      links_shown: "mehr Links anzeigen..."
+      links_shown: "mehr Links anzeigen…"
       clicks:
         one: "1 Klick"
         other: "%{count} Klicks"
@@ -1741,7 +1736,6 @@ de:
       invisible:
         help: "Dieses Thema ist unsichtbar. Es wird in keiner Themenliste angezeigt und kann nur mit einem direkten Link betrachtet werden."
     posts: "Beiträge"
-    posts_lowercase: "Beiträge"
     posts_long: "dieses Thema enthält {{number}} Beiträge"
     posts_likes_MF: |
       Dieses Thema hat {count, plural, one {1 Antwort} other {# Antworten}} {ratio, select, low {mit einem hohen Verhältnis von Likes zu Beiträgen} med {mit einem sehr hohen Verhältnis von Likes zu Beiträgen} high {mit einem extrem hohen Verhältnis von Likes zu Beiträgen} other {}}
@@ -2022,7 +2016,7 @@ de:
       custom_message_template_forum: "Hey, du solltest diesem Forum beitreten!"
       custom_message_template_topic: "Hey, ich dachte, dir könnte dieses Thema gefallen!"
   admin_js:
-    type_to_filter: "zum Filtern hier eingeben..."
+    type_to_filter: "zum Filtern hier eingeben…"
     admin:
       title: 'Discourse-Administrator'
       moderator: 'Moderator'
@@ -2082,7 +2076,7 @@ de:
         active: "Aktiv"
         agree: "Zustimmen"
         agree_title: "Meldung bestätigen, weil diese gültig und richtig ist"
-        agree_flag_modal_title: "Zustimmen und..."
+        agree_flag_modal_title: "Zustimmen und…"
         agree_flag_hide_post: "Zustimmen (Beitrag ausblenden + PN senden)"
         agree_flag_hide_post_title: "Diesen Beitrag ausblenden und den Benutzer mit einer automatisch gesendeten Nachricht zum Bearbeiten des Beitrags auffordern."
         agree_flag_restore_post: "Zustimmen (Beitrag wiederherstellen)"
@@ -2097,7 +2091,7 @@ de:
         delete_post_defer_flag_title: "Beitrag löschen; das Thema löschen, wenn es sich um den ersten Beitrag handelt"
         delete_post_agree_flag: "Beitrag löschen und der Meldung zustimmen"
         delete_post_agree_flag_title: "Beitrag löschen; das Thema löschen, wenn es sich um den ersten Beitrag handelt"
-        delete_flag_modal_title: "Löschen und..."
+        delete_flag_modal_title: "Löschen und…"
         delete_spammer: "Spammer löschen"
         delete_spammer_title: "Lösche den Benutzer und alle seine Beiträge und Themen."
         disagree_flag_unhide_post: "Ablehnen (Beitrag einblenden)"
@@ -2106,7 +2100,7 @@ de:
         disagree_flag_title: "Meldung ablehnen, weil diese ungültig oder falsch ist"
         clear_topic_flags: "Erledigt"
         clear_topic_flags_title: "Das Thema wurde untersucht und Probleme wurden beseitigt. Klicke auf „Erledigt“, um die Meldungen zu entfernen."
-        more: "(weitere Antworten...)"
+        more: "(weitere Antworten…)"
         dispositions:
           agreed: "zugestimmt"
           disagreed: "abgelehnt"
@@ -2171,6 +2165,7 @@ de:
         add_owners: Eigentümer hinzufügen
         incoming_email: "Benutzerdefinierte Adresse für eingehende E-Mails"
         incoming_email_placeholder: "E-Mail-Adresse eingeben"
+        flair_preview: "Vorschau"
       api:
         generate_master: "Master API Key erzeugen"
         none: "Es gibt momentan keine aktiven API-Keys"
@@ -2212,18 +2207,18 @@ de:
             title: "Nur-Lesen-Modus deaktivieren"
             label: "Nur-Lesen-Modus deaktivieren"
         logs:
-          none: "Noch keine Protokolleinträge verfügbar..."
+          none: "Noch keine Protokolleinträge verfügbar…"
         columns:
           filename: "Dateiname"
           size: "Größe"
         upload:
           label: "Hochladen"
           title: "Eine Sicherung zu dieser Instanz hochladen"
-          uploading: "Wird hochgeladen..."
+          uploading: "Wird hochgeladen…"
           success: "'{{filename}}' wurde erfolgreich hochgeladen."
           error: "Beim Hochladen der Datei '{{filename}}' ist ein Fehler aufgetreten: {{message}}"
         operations:
-          is_running: "Ein Vorgang läuft gerade..."
+          is_running: "Ein Vorgang läuft gerade…"
           failed: "Der Vorgang '{{operation}}' ist fehlgeschlagen. Bitte überprüfe die Logs."
           cancel:
             label: "Abbrechen"
@@ -2356,7 +2351,7 @@ de:
         settings: "Einstellungen"
         templates: "Vorlagen"
         preview_digest: "Vorschau auf Neuigkeiten anzeigen"
-        sending_test: "Versende Test-E-Mail..."
+        sending_test: "Versende Test-E-Mail…"
         error: "<b>FEHLER</b> - %{server_error}"
         test_error: "Es gab ein Problem beim Senden der Test-E-Mail. Bitte überprüfe nochmals deine E-Mail-Einstellungen, stelle sicher dass dein Anbieter keine E-Mail-Verbindungen blockiert und probiere es erneut."
         sent: "Gesendet"
@@ -2399,7 +2394,7 @@ de:
             from_placeholder: "von@example.com"
             to_placeholder: "an@example.com"
             cc_placeholder: "cc@example.com"
-            subject_placeholder: "Betreff..."
+            subject_placeholder: "Betreff…"
             error_placeholder: "Fehler"
         logs:
           none: "Keine Protokolleinträge gefunden."
@@ -2407,7 +2402,7 @@ de:
             title: "Filter"
             user_placeholder: "Benutzername"
             address_placeholder: "name@example.com"
-            type_placeholder: "zusammenfassen, registrieren..."
+            type_placeholder: "zusammenfassen, registrieren…"
             reply_key_placeholder: "Antwort-Schlüssel"
             skipped_reason_placeholder: "Grund"
       logs:
@@ -2568,7 +2563,6 @@ de:
         suspend_reason: "Grund"
         suspended_by: "Gesperrt von"
         delete_all_posts: "Lösche alle Beiträge"
-        delete_all_posts_confirm: "Du wirst %{posts} Beiträge und %{topics} Themen löschen. Bist du dir sicher?"
         suspend: "Sperren"
         unsuspend: "Entsperren"
         suspended: "Gesperrt?"
@@ -2664,7 +2658,9 @@ de:
         unlock_trust_level: "Vertrauensstufe entsperren"
         tl3_requirements:
           title: "Anforderungen für Vertrauensstufe 3"
-          table_title: "In den letzten %{time_period} Tagen:"
+          table_title:
+            one: "Innerhalb des letzten Tages:"
+            other: "In den letzten %{count} Tagen:"
           value_heading: "Wert"
           requirement_heading: "Anforderung"
           visits: "Aufrufe"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 03a00680387..d47ba18db4c 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -48,9 +48,6 @@ es:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -402,14 +399,12 @@ es:
       latest_by: "recientes por"
       toggle_ordering: "activar orden"
       subcategories: "Subcategorías"
-      topic_stats: "El número de temas nuevos."
+      topic_sentence:
+        one: "1 tema"
+        other: "%{count} temas"
       topic_stat_sentence:
         one: "%{count} tema nuevo en los últimos %{unit}."
         other: "%{count} temas nuevos en los últimos %{unit}."
-      post_stats: "El número de posts nuevos."
-      post_stat_sentence:
-        one: "%{count} nuevo comentario en los pasados %{unit}"
-        other: "%{count} nuevos comentarios en los pasados %{unit}"
     ip_lookup:
       title: Búsqueda de Direcciones IP
       hostname: Nombre del host
@@ -509,6 +504,13 @@ es:
       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."
+      apps: "Apps"
+      revoke_access: "Revocar acceso"
+      undo_revoke_access: "Deshacer revocación de acceso"
+      api_permissions: "Permisos:"
+      api_approved: "Aprobado:"
+      api_read: "leer"
+      api_read_write: "leer y escribir"
       staff_counters:
         flags_given: "reportes útiles"
         flagged_posts: "posts reportados"
@@ -904,6 +906,10 @@ es:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+    category_page_style:
+      categories_only: "Sólo categorías"
+      categories_with_featured_topics: "Categorías y temas destacados"
+      categories_and_latest_topics: "Categorías y temas recientes"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -923,7 +929,9 @@ es:
       saved_local_draft_tip: "guardado localmente"
       similar_topics: "Tu tema es similar a..."
       drafts_offline: "borradores offline"
-      group_mentioned: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>{{count}} personas</a> – ¿seguro que quieres hacerlo?"
+      group_mentioned:
+        one: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>1 persona</a> – ¿seguro que quieres hacerlo?"
+        other: "Al mencionar a {{group}}, estás a punto de notificar a <a href='{{group_link}}'>{{count}} personas</a> – ¿seguro que quieres hacerlo?"
       duplicate_link: "Parece que tu enlace a <b>{{domain}}</b> ha sido ya publicado en el tema por <b>@{{username}}</b> en <a href='{{post_url}}'>un post {{ago}}</a> – ¿seguro que quieres publicarlo de nuevo?"
       error:
         title_missing: "Es necesario un título"
@@ -954,8 +962,10 @@ es:
       show_preview: 'mostrar vista previa &raquo;'
       hide_preview: '&laquo; ocultar vista previa'
       quote_post_title: "Citar todo el post"
+      bold_label: "B"
       bold_title: "Negrita"
       bold_text: "Texto en negrita"
+      italic_label: "I"
       italic_title: "Cursiva"
       italic_text: "Texto en cursiva"
       link_title: "Hipervínculo"
@@ -973,6 +983,7 @@ es:
       olist_title: "Lista numerada"
       ulist_title: "Lista con viñetas"
       list_item: "Lista de ítems"
+      heading_label: "H"
       heading_title: "Encabezado"
       heading_text: "Encabezado"
       hr_title: "Linea Horizontal"
@@ -1140,7 +1151,9 @@ es:
       unsubscribe:
         stop_notifications: "Ahora recibirás menos notificaciones desde <strong>{{title}}</strong>"
         change_notification_state: "El estado actual de notificación para ti es"
-      filter_to: "{{post_count}} posts en este tema"
+      filter_to:
+        one: "1 post en el tema"
+        other: "{{count}} posts en el tema"
       create: 'Crear tema'
       create_long: 'Crear un nuevo tema'
       private_message: 'Empezar un mensaje'
@@ -1200,11 +1213,12 @@ es:
       auto_close_title: 'Configuración de auto-cerrado'
       auto_close_save: "Guardar"
       auto_close_remove: "No Auto-Cerrar Este Tema"
-      auto_close_immediate: "El último mensaje tiene %{hours} horas de antigüedad, por lo que será cerrado inmediatamente."
+      auto_close_immediate:
+        one: "El último post se publicó hace 1 hora, por lo que el tema se cerrará inmediatamente."
+        other: "El último post se publicó hace %{count} horas, por lo que el tema se cerrará inmediatamente."
       timeline:
         back: "Volver"
         back_description: "Volver al último post sin leer"
-        replies: "%{current} / %{total} respuestas"
         replies_short: "%{current} / %{total}"
       progress:
         title: avances
@@ -1217,7 +1231,6 @@ es:
         jump_bottom_with_number: "saltar al post %{post_number}"
         total: posts totales
         current: post actual
-        position: "post %{current} de %{total}"
       notifications:
         title: cambiar con qué frecuencia se te notifica de este tema
         reasons:
@@ -1421,7 +1434,6 @@ es:
       gap:
         one: "ver 1 post oculto"
         other: "ver {{count}} posts ocultos"
-      more_links: "{{count}} más..."
       unread: "Post sin leer"
       has_replies:
         one: "{{count}} Respuesta"
@@ -1490,14 +1502,6 @@ es:
         defer_flags:
           one: "Aplazar reporte"
           other: "Aplazar reportes"
-        it_too:
-          off_topic: "Reportar de esto también"
-          spam: "Reportar de esto también"
-          inappropriate: "Reportar de esto también"
-          custom_flag: "Reportar de esto también"
-          bookmark: "Guardarlo también como favorito"
-          like: "Dale también un Me gusta"
-          vote: "Vota por esto también"
         undo:
           off_topic: "Deshacer reporte"
           spam: "Deshacer reporte"
@@ -1683,7 +1687,6 @@ es:
       notify_action: 'Mensaje'
       official_warning: 'Advertencia oficial'
       delete_spammer: "Borrar spammer"
-      delete_confirm: "Estás a punto de eliminar <b>%{posts}</b> publicaciones y <b>%{topics}</b> temas de este usuario, borrar su cuenta, bloquear sus inicios de sesión desde su dirección IP <b>%{ip_address}</b>, y añadir su dirección de email <b>%{email}</b> a una lista de bloqueo permanente. ¿Estás seguro de que este usuario es realmente un spammer?"
       yes_delete_spammer: "Sí, borrar spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(oculto)"
@@ -1698,9 +1701,15 @@ es:
       custom_placeholder_notify_user: "Sé específico, constructivo y siempre amable."
       custom_placeholder_notify_moderators: "Haznos saber qué te preocupa específicamente y, siempre que sea posible, añade enlaces y ejemplos relevantes."
       custom_message:
-        at_least: "introduce al menos {{n}} caracteres"
-        more: "{{n}} para ir..."
-        left: "{{n}} restantes"
+        at_least:
+          one: "introduce al menos un carácter"
+          other: "introduce al menos {{count}} caracteres"
+        more:
+          one: "1 más..."
+          other: "{{count}} más..."
+        left:
+          one: "1 restante"
+          other: "{{count}} restantes"
     flagging_topic:
       title: "¡Gracias por ayudar a mantener una comunidad civilizada!"
       action: "Reportar tema"
@@ -1741,7 +1750,6 @@ es:
       invisible:
         help: "Este tema es invisible; no se mostrará en la lista de temas y solo puede acceder a él a través de su enlace directo."
     posts: "Posts"
-    posts_lowercase: "posts"
     posts_long: "{{number}} posts en este tema"
     posts_likes_MF: |
       Este tema tiene {count, plural, one {1 respuesta} other {# respuestas}} {ratio, select,
@@ -2175,6 +2183,11 @@ es:
         add_owners: Añadir propietarios
         incoming_email: "Correos electrónicos entrantes personalizados"
         incoming_email_placeholder: "introducir dirección de email"
+        flair_url: "URL de imagen distintiva"
+        flair_url_placeholder: "(Opcional) URL de imagen"
+        flair_bg_color: "Color de fondo de imagen distintiva"
+        flair_bg_color_placeholder: "(Optional) Valor hexadecimal del color"
+        flair_preview: "Vista previa"
       api:
         generate_master: "Generar clave maestra de API"
         none: "No hay ninguna clave de API activa en este momento."
@@ -2572,7 +2585,6 @@ es:
         suspend_reason: "Causa"
         suspended_by: "Suspendido por"
         delete_all_posts: "Eliminar todos los posts"
-        delete_all_posts_confirm: "Estás a punto de borrar %{posts} posts y %{topics} temas. ¿Estás seguro?"
         suspend: "Suspender"
         unsuspend: "Quitar suspensión"
         suspended: "¿Suspendido?"
@@ -2668,7 +2680,9 @@ es:
         unlock_trust_level: "Desbloquear Nivel de Confianza"
         tl3_requirements:
           title: "Requerimientos para el nivel de confianza 3"
-          table_title: "En los últimos %{time_period} días:"
+          table_title:
+            one: "En el último día:"
+            other: "En los últimos %{count} días:"
           value_heading: "Valor"
           requirement_heading: "Requerimiento"
           visits: "Visitas"
@@ -2768,12 +2782,14 @@ es:
           developer: 'Desarrollador'
           embedding: "Embebido"
           legal: "Legal"
+          user_api: 'API de usuario'
           uncategorized: 'Otros'
           backups: "Copias de seguridad"
           login: "Login"
           plugins: "Plugins"
           user_preferences: "Preferencias de los Usuarios"
           tags: "Etiquetas"
+          search: "Búsqueda"
       badges:
         title: Distintivos
         new_badge: Nuevo distintivo
@@ -2866,6 +2882,7 @@ es:
         embed_by_username: "Usuario para la creación de temas"
         embed_post_limit: "Máximo número de posts a incluir"
         embed_username_key_from_feed: "Clave para extraer usuario de discourse del feed"
+        embed_title_scrubber: "Expresión regular utilizada para depurar el título de los posts"
         embed_truncate: "Truncar los posts insertados"
         embed_whitelist_selector: "Selector CSS para permitir elementos a embeber"
         embed_blacklist_selector: "Selector CSS para restringir elementos a embeber"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 5f25c3235e5..59fc970bb6a 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -48,9 +48,6 @@ et:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -402,14 +399,9 @@ et:
       latest_by: "viimased kasutajalt"
       toggle_ordering: "lülita järjestus"
       subcategories: "Alamliigid"
-      topic_stats: "Uute teemade arv."
       topic_stat_sentence:
         one: "%{count} uus teema viimase %{unit} jooksul."
         other: "%{count} uut teemat viimase %{unit} jooksul."
-      post_stats: "Uute postituste arv."
-      post_stat_sentence:
-        one: "%{count} uus postitus viimase %{unit} jooksul."
-        other: "%{count} uut postitust viimase %{unit} jooksul."
     ip_lookup:
       title: IP-aadressi Otsing
       hostname: Hostinimi
@@ -923,7 +915,6 @@ et:
       saved_local_draft_tip: "salvestatud lokaalselt"
       similar_topics: "Sinu teema sarnaneb..."
       drafts_offline: "mustandid vallasrežiimis"
-      group_mentioned: "Mainides {{group}}, oled teavitamas <a href='{{group_link}}'>{{count}} inimest</a> – oled selles kindel?"
       duplicate_link: "Näib, et sinu viide <b>{{domain}}</b> oli juba postitatud teemasse kasutaja <b>@{{username}}</b> poolt postituse <a href='{{post_url}}'>vastuses {{ago}}</a> – oled kindel, et soovid selle uuesti postitada?"
       error:
         title_missing: "Pealkiri on kohustuslik"
@@ -1140,7 +1131,6 @@ et:
       unsubscribe:
         stop_notifications: "Sulle saabub nüüd <strong>{{title}}</strong> kohta vähem teavitusi"
         change_notification_state: "Sinu teavituste olek on"
-      filter_to: "{{post_count}} postitust teemas"
       create: 'Uus Teema'
       create_long: 'Loo uus Teema'
       private_message: 'Alusta sõnumit'
@@ -1200,11 +1190,9 @@ et:
       auto_close_title: 'Automaatse sulgumise sätted'
       auto_close_save: "Salvesta"
       auto_close_remove: "Ära lase sel teemal automaatselt sulguda"
-      auto_close_immediate: "Viimane postitus selles teemas on juba %{hours} tundi vana, seega sulgub see teema nüüd."
       timeline:
         back: "Tagasi"
         back_description: "Mine tagasi oma viimase lugemata postituse juurde"
-        replies: "%{current} / %{total} vastust"
         replies_short: "%{current} / %{total}"
       progress:
         title: teema edenemine
@@ -1217,7 +1205,6 @@ et:
         jump_bottom_with_number: "hüppa postituse %{post_number} juurde"
         total: postitusi kokku
         current: käesolev postitus
-        position: "postitus %{current} koguarvust %{total}"
       notifications:
         title: muuda kui tihti sind sellest teemast teavitatakse
         reasons:
@@ -1421,7 +1408,6 @@ et:
       gap:
         one: "vaata 1 peidetud vastust"
         other: "vaata {{count}} peidetud vastust"
-      more_links: "{{count}} veel..."
       unread: "Postitus on lugemata"
       has_replies:
         one: "{{count}} vastus"
@@ -1490,14 +1476,6 @@ et:
         defer_flags:
           one: "Lükka tähis edasi"
           other: "Lükka tähised edasi"
-        it_too:
-          off_topic: "Tähista see ka"
-          spam: "Tähista see ka"
-          inappropriate: "Tähista see ka"
-          custom_flag: "Tähista see ka"
-          bookmark: "Lisa siia ka järjehoidja"
-          like: "Lisa siia ka meeldimine"
-          vote: "Hääleta selle poolt ka"
         undo:
           off_topic: "Tühista tähise andmine"
           spam: "Tühista tähise andmine"
@@ -1683,7 +1661,6 @@ et:
       notify_action: 'Sõnum'
       official_warning: 'Ametlik hoiatus'
       delete_spammer: "Kustuta spämmija"
-      delete_confirm: "Oled kustutamas <b>%{posts}</b> postitust ja <b>%{topics}</b> teemat sellelt kasutajalt, eemaldamas tema kontot, blokeerimas registreerumisi tema IP-aadressilt <b>%{ip_address}</b>, ja lisamas tema meiliaddressi <b>%{email}</b> püsiva blokeeringu loetellu. Oled kindel, et see kasutaja on tõesti spämmija?"
       yes_delete_spammer: "Jah, kustuta spämmija"
       ip_address_missing: "(asjassepuutumatu)"
       hidden_email_address: "(peidetud)"
@@ -1697,10 +1674,6 @@ et:
         spam: "See on spämm"
       custom_placeholder_notify_user: "Ole täpne, konstruktiivne ja alati lahke."
       custom_placeholder_notify_moderators: "Anna meile teada, mis Sulle täpsemalt muret teeb ja võimalusel lisa asjassepuutuvaid viiteid ning näiteid."
-      custom_message:
-        at_least: "sisesta vähemalt {{n}} sümbolit"
-        more: "{{n}} veel jäänud..."
-        left: "{{n}} järele jäänud"
     flagging_topic:
       title: "Täname, et aitad meie kogukonna viisakust säilitada!"
       action: "Tähista teema"
@@ -1741,7 +1714,6 @@ et:
       invisible:
         help: "See teema on salastatud; teda ei kuvata teemade loendites ning on kättesaadav vaid otseviite kaudu"
     posts: "Postitused"
-    posts_lowercase: "postitused"
     posts_long: "selles teemas on {{number}} postitust"
     posts_likes_MF: |
       Selles teemas on {count, plural, one {1 vastus} other {# vastust}} {ratio, select,
@@ -2574,7 +2546,6 @@ et:
         suspend_reason: "Põhjus"
         suspended_by: "Peatati kasutaja poolt"
         delete_all_posts: "Kustuta kõik postitused"
-        delete_all_posts_confirm: "Sa oled kustutamas %{posts} postitust ja %{topics} teemat. Oled Sa kindel?"
         suspend: "Peata"
         unsuspend: "Taasluba"
         suspended: "Peatatud?"
@@ -2670,7 +2641,6 @@ et:
         unlock_trust_level: "Eemalda usaldustaseme lukustus"
         tl3_requirements:
           title: "Usaldustaseme 3 nõuded"
-          table_title: "Viimasel %{time_period} päeval:"
           value_heading: "Väärtus"
           requirement_heading: "Nõue"
           visits: "Külastusi"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 9ddb06aa75f..9736e4313ae 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -45,8 +45,6 @@ fa_IR:
           other: "< %{count} ثانیه"
         x_seconds:
           other: "%{count} ثانیه"
-        less_than_x_minutes:
-          other: "< %{count} دقیقه"
         x_minutes:
           other: "%{count} دقیقه"
         about_x_hours:
@@ -336,12 +334,8 @@ fa_IR:
       latest_by: "آخرین توسط"
       toggle_ordering: "ضامن کنترل مرتب سازی"
       subcategories: "زیر دسته‌ بندی ها"
-      topic_stats: "شمار موضوعات تازه."
       topic_stat_sentence:
         other: "%{count} موضوعات تازه در %{unit} گذشته."
-      post_stats: "تعداد نوشته های جدید."
-      post_stat_sentence:
-        other: "%{count} نوشته تازه در %{unit} گذشته."
     ip_lookup:
       title: جستجوی نشانی IP
       hostname: نام میزبان
@@ -928,7 +922,6 @@ fa_IR:
       unsubscribe:
         stop_notifications: "حالا شما اعلانات کمتری برای <strong>{{title}}</strong> دریافت میکنید"
         change_notification_state: "وضعیت فعلی اعلانات شما این هست"
-      filter_to: "نوشته در موضوع {{post_count}}  "
       create: 'موضوع جدید'
       create_long: 'ساخت یک موضوع جدید'
       private_message: 'شروع یک پیام'
@@ -976,7 +969,6 @@ fa_IR:
       auto_close_title: 'تنضیمات قفل خوکار'
       auto_close_save: "‌ذخیره"
       auto_close_remove: "این موضوع را خوکار قفل نکن"
-      auto_close_immediate: "زمان ارسال آخرین پست در موضوع برای %{hours} ساعت پیش است، بنابر این موضوع بلافاصله بسته می‌شود."
       progress:
         title: نوشته ی در حال اجرا
         go_top: "بالا"
@@ -986,7 +978,6 @@ fa_IR:
         jump_bottom_with_number: "رفتن به نوشته ی %{post_number}"
         total: همهٔ نوشته‌ها
         current: نوشته کنونی
-        position: "نوشته %{current} از %{total}"
       notifications:
         reasons:
           '3_6': 'شما آگاه‌سازی‌ها را دریافت خواهید کرد، زیرا شما در حال مشاهده ی این  دسته بندی هستید.'
@@ -1170,7 +1161,6 @@ fa_IR:
       expand_collapse: "باز کردن/گستردن"
       gap:
         other: "{{count}} پاسخ پنهان را مشاهده کنید"
-      more_links: "{{count}} مورد دیگر..."
       unread: "نوشته خوانده نشده است"
       has_replies:
         other: "{{count}} پاسخ"
@@ -1227,14 +1217,6 @@ fa_IR:
         flag: 'پرچم'
         defer_flags:
           other: "پرچم تسلیم"
-        it_too:
-          off_topic: "هم‌چنین آن یکی را پرچم بزنید"
-          spam: "هم‌چنین آن یکی را پرچم بزنید"
-          inappropriate: "هم‌چنین آن یکی را پرچم بزنید"
-          custom_flag: "هم‌چنین آن یکی را پرچم بزنید"
-          bookmark: "هم‌چنین نشانک‌گذاری آن یکی"
-          like: "همچنین آن یکی را پسند کنید"
-          vote: "هم‌چنین به آن یکی رأی دهید"
         undo:
           off_topic: "برداشتن پرچم"
           spam: "برداشتن پرچم"
@@ -1378,7 +1360,6 @@ fa_IR:
       take_action: "اقدام"
       notify_action: 'پیام'
       delete_spammer: "پاک کردن هرزنگار"
-      delete_confirm: "شما در مورد حذف <b>%{posts}</b> نوشته ها و  <b>%{topics}</b> موضوغات این کاربر،و حذف حساب کاربری وی، مسدود شدن ثبت نام از این آدرس آی پی<b>%{ip_address}</b> و اضافه شدن ایمیل <b>%{email}</b> به لیست مسدودیت دائمی.\nآیا اطمینان دارید که این کاربر یک اسپمر است ؟"
       yes_delete_spammer: "بله، پاک‌کردن هرزنگار"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(مخفی)"
@@ -1391,10 +1372,6 @@ fa_IR:
         spam: "آن هرزنامه است"
       custom_placeholder_notify_user: "خاص، سودمند باشید و همیشه مهربان."
       custom_placeholder_notify_moderators: "به ما اجازه دهید بدانیم  شما در مورد چه چیز آن نگران هستید، و ارائه لینک مربوطه و نمونه آن امکان پذیر است."
-      custom_message:
-        at_least: "دست‌کم {{n}} نویسه بنویسید"
-        more: "{{n}} نویسهٔ دیگر تا..."
-        left: "{{n}} مانده"
     flagging_topic:
       title: "تشکر برای کمک به جامعه مدنی انجمن ما!"
       action: "پرچم‌گذاری موضوع"
@@ -1428,7 +1405,6 @@ fa_IR:
       invisible:
         help: "این موضوع از لیست خارج شد: آن درلیست موضوعات نمایش داده نخواهد شد، و فقط از طریق لینک مستقیم در دسترس خواهد بود. "
     posts: "نوشته‌ها"
-    posts_lowercase: "نوشته ها"
     posts_long: "این موضوع {{number}} نوشته دارد"
     posts_likes_MF: |
       این موضوع است {count, plural, one {1 reply} other {# replies}} {ratio, select,
@@ -2022,7 +1998,6 @@ fa_IR:
         suspend_reason: "دلیل"
         suspended_by: "تعلیق شده توسط"
         delete_all_posts: "پاک کردن همهٔ نوشته‌ها"
-        delete_all_posts_confirm: "شما می خواهید تعداد %{posts}  نوشته و تعداد %{topics} موضوع خذف کنید،آیا مطمئن هستید؟"
         suspend: "تعلیق"
         unsuspend: "خارج کردن از تعلیق"
         suspended: "تعلیق شد ؟"
@@ -2103,7 +2078,6 @@ fa_IR:
         unlock_trust_level: "باز کردن سطح اعتماد"
         tl3_requirements:
           title: "شرایط لازم برای سطح اعتماد 3."
-          table_title: "در %{time_period} روز گذشته:"
           value_heading: "مقدار"
           requirement_heading: "نیازمندی‌ها"
           visits: "بازدیدها"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 866b6107b99..df3e166943c 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -48,9 +48,6 @@ fi:
         x_seconds:
           one: "1 s"
           other: "%{count} s"
-        less_than_x_minutes:
-          one: "< 1 min"
-          other: "< %{count} min"
         x_minutes:
           one: "1 min"
           other: "%{count} min"
@@ -402,14 +399,12 @@ fi:
       latest_by: "tuorein"
       toggle_ordering: "vaihda järjestystä"
       subcategories: "Tytäralueet"
-      topic_stats: "Uusien ketjujen lukumäärä."
+      topic_sentence:
+        one: "1 ketju"
+        other: "%{count} ketjua"
       topic_stat_sentence:
         one: "%{count} uusi ketju viimeisen %{unit} aikana."
         other: "%{count} uutta ketjua viimeisen %{unit} aikana."
-      post_stats: "Uusien viestien lukumäärä."
-      post_stat_sentence:
-        one: "%{count} uusi viesti viimeisen %{unit} aikana."
-        other: "%{count} uutta viestiä viimeisen %{unit} aikana."
     ip_lookup:
       title: IP osoitteen haku
       hostname: Isäntänimi
@@ -473,7 +468,7 @@ 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.
 
@@ -922,7 +917,6 @@ fi:
       saved_local_draft_tip: "tallennettu omalla koneella"
       similar_topics: "Tämä ketju vaikuttaa samalta kuin.."
       drafts_offline: "offline luonnokset"
-      group_mentioned: "Jos viittaat ryhmään {{group}}, <a href='{{group_link}}'>{{count}} käyttäjää</a> saa ilmoituksen – oletko varma?"
       duplicate_link: "Näyttää siltä, että <b>@{{username}}</b> on jo lähettänyt saman linkin kohteeseen <b>{{domain}}</b> ketjun <a href='{{post_url}}'>aiemmassa viestissä {{ago}}</a> – oletko varma, että haluat lähettää sen uudestaan?"
       error:
         title_missing: "Otsikko on pakollinen"
@@ -1139,7 +1133,6 @@ fi:
       unsubscribe:
         stop_notifications: "Saat tästä lähtien vähemmän ilmoituksia aiheesta <strong>{{title}}</strong>"
         change_notification_state: "Nykyinen ilmoitusasetuksesti on"
-      filter_to: "{{post_count}} viestiä ketjussa"
       create: 'Uusi ketju'
       create_long: 'Luo uusi ketju'
       private_message: 'Luo viesti'
@@ -1199,11 +1192,9 @@ fi:
       auto_close_title: 'Automaattisen sulkemisen asetukset'
       auto_close_save: "Tallenna"
       auto_close_remove: "Älä sulje tätä ketjua automaattisesti"
-      auto_close_immediate: "Viimeisin viesti tässä ketjussa on jo %{hours} tuntia vanha, joten ketju suljetaan heti."
       timeline:
         back: "Takaisin"
         back_description: "Siirry takaisin viimeisimpään lukemattomaan viestiin"
-        replies: "%{current} / %{total} vastausta"
         replies_short: "%{current} / %{total}"
       progress:
         title: ketjun edistyminen
@@ -1216,7 +1207,6 @@ fi:
         jump_bottom_with_number: "hyppää viestiin %{post_number}"
         total: yhteensä viestejä
         current: tämänhetkinen viesti
-        position: "viesti %{current} / %{total}"
       notifications:
         title: muuta sitä, kuinka usein saat muistutuksia tästä ketjusta
         reasons:
@@ -1420,7 +1410,6 @@ fi:
       gap:
         one: "näytä 1 piilotettu vastaus"
         other: "näytä {{count}} piilotettua vastausta"
-      more_links: "{{count}} lisää..."
       unread: "Viesti on lukematta"
       has_replies:
         one: "{{count}} vastaus"
@@ -1489,14 +1478,6 @@ fi:
         defer_flags:
           one: "Lykkää lippua"
           other: "Lykkää lippuja"
-        it_too:
-          off_topic: "Liputa sinäkin"
-          spam: "Liputa sinäkin"
-          inappropriate: "Liputa sinäkin"
-          custom_flag: "Liputa sinäkin"
-          bookmark: "Lisää oma kirjanmerkki"
-          like: "Tykkää sinäkin"
-          vote: "Äänestä sinäkin"
         undo:
           off_topic: "Peru lippu"
           spam: "Peru lippu"
@@ -1682,7 +1663,6 @@ fi:
       notify_action: 'Viesti'
       official_warning: 'Virallinen varoitus'
       delete_spammer: "Poista roskapostittaja"
-      delete_confirm: "Olet aikeissa poistaa <b>%{posts}</b> viestiä ja <b>%{topics}</b> ketjua tältä käyttäjältä, sekä käyttäjätilin, estää tunnuksen luomisen tästä IP osoitteesta <b>%{ip_address}</b>, ja lisätä sähköpostiosoitteen <b>%{email}</b> pysyvästi estolistalle. Oletko varma, että tämä käyttäjä todella on roskapostittaja?"
       yes_delete_spammer: "Kyllä, poista roskapostittaja"
       ip_address_missing: "-"
       hidden_email_address: "(piilotettu)"
@@ -1696,10 +1676,6 @@ fi:
         spam: "Se on roskapostia"
       custom_placeholder_notify_user: "Esitä asiasi ymmärrettäväsi, ole rakentava ja kohtelias."
       custom_placeholder_notify_moderators: "Kerro ymmärrettävästi ja selvästi, mistä olet huolestunut ja lisää viestiin oleelliset esimerkit ja linkit, jos mahdollista."
-      custom_message:
-        at_least: "kirjoita vähintään {{n}} merkkiä"
-        more: "vielä {{n}}..."
-        left: "{{n}} jäljellä"
     flagging_topic:
       title: "Kiitos avustasi yhteisön hyväksi!"
       action: "Liputa ketju"
@@ -1740,7 +1716,6 @@ fi:
       invisible:
         help: "Tämä ketju on poistettu listauksista; sitä ei näytetä ketjujen listauksissa ja siihen pääsee vain suoralla linkillä"
     posts: "Viestejä"
-    posts_lowercase: "viestejä"
     posts_long: "tässä ketjussa on {{number}} viestiä"
     posts_likes_MF: |
       Tässä ketjussa on {count, plural, one {1 vastaus} other {# vastausta}} {ratio, select,
@@ -2571,7 +2546,6 @@ fi:
         suspend_reason: "Syy"
         suspended_by: "Käyttäjän hyllytti"
         delete_all_posts: "Poista kaikki viestit"
-        delete_all_posts_confirm: "Olet poistamassa %{posts} viestiä ja %{topics} ketjua. Oletko varma? "
         suspend: "Hyllytä"
         unsuspend: "Poista hyllytys"
         suspended: "Hyllytetty?"
@@ -2667,7 +2641,6 @@ fi:
         unlock_trust_level: "Avaa luottamustason lukitus"
         tl3_requirements:
           title: "Vaatimukset luottamustasolle 3."
-          table_title: "Edellisen %{time_period} päivän aikana:"
           value_heading: "Arvo"
           requirement_heading: "Vaatimus"
           visits: "Vierailua"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 0db2336f810..c3938c9212a 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -48,9 +48,6 @@ fr:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -201,8 +198,8 @@ fr:
       one: "{{count}} caractère"
       other: "{{count}} caractères"
     suggested_topics:
-      title: "Sujets similaires"
-      pm_title: "Messages similaires"
+      title: "Sujets suggérés"
+      pm_title: "Messages suggérés"
     about:
       simple_title: "À propos"
       title: "À propos de %{title}"
@@ -402,14 +399,12 @@ fr:
       latest_by: "dernier sujet de"
       toggle_ordering: "modifier le mode du tri"
       subcategories: "Sous-catégories"
-      topic_stats: "Le nombre de nouveaux sujets."
+      topic_sentence:
+        one: "1 sujet"
+        other: "%{count} sujets"
       topic_stat_sentence:
         one: "%{count} nouveau sujet par %{unit}."
         other: "%{count} nouveaux sujets par %{unit}."
-      post_stats: "Le nombre de nouveaux messages."
-      post_stat_sentence:
-        one: "%{count} nouveau message depuis %{unit}."
-        other: "%{count} nouveaux messages depuis %{unit}."
     ip_lookup:
       title: Rechercher l'adresse IP
       hostname: Nom de l'hôte
@@ -509,6 +504,13 @@ fr:
       muted_topics_link: "Afficher les sujets en sourdine"
       watched_topics_link: "Afficher les sujets surveillés"
       automatically_unpin_topics: "Désépingler automatiquement les sujets quand j'arrive à la fin."
+      apps: "Applications"
+      revoke_access: "Révoquer l'accès"
+      undo_revoke_access: "Annuler la révocation d'accès"
+      api_permissions: "Permissions :"
+      api_approved: "Approuvé :"
+      api_read: "lecture"
+      api_read_write: "lecture et écriture"
       staff_counters:
         flags_given: "signalements utiles"
         flagged_posts: "messages signalés"
@@ -904,6 +906,10 @@ fr:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+    category_page_style:
+      categories_only: "Catégories seules"
+      categories_with_featured_topics: "Catégories et sujets sélectionnés"
+      categories_and_latest_topics: "Catégories et sujets récents"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -923,7 +929,9 @@ fr:
       saved_local_draft_tip: "sauvegardé en local"
       similar_topics: "Votre message est similaire à..."
       drafts_offline: "sauvegardé hors ligne"
-      group_mentioned: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>{{count}} personnes</a> – êtes-vous sûr ?"
+      group_mentioned:
+        one: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>1 personne</a> – êtes-vous sûr ?"
+        other: "En mentionnant {{group}}, vous êtes sur le point de notifier <a href='{{group_link}}'>{{count}} personnes</a> – êtes-vous sûr ?"
       duplicate_link: "Il semblerait que votre lien vers <b>{{domain}}</b> a déjà été partagé par <b>@{{username}}</b> dans <a href='{{post_url}}'>une réponse {{ago}}</a> – êtes vous sûr de vouloir le partager à nouveau ?"
       error:
         title_missing: "Le titre est obligatoire."
@@ -954,8 +962,10 @@ fr:
       show_preview: 'afficher la prévisualisation &raquo;'
       hide_preview: '&laquo; cacher la prévisualisation'
       quote_post_title: "Citer le message en entier"
+      bold_label: "G"
       bold_title: "Gras"
       bold_text: "texte en gras"
+      italic_label: "I"
       italic_title: "Italique"
       italic_text: "texte en italique"
       link_title: "Lien"
@@ -973,6 +983,7 @@ fr:
       olist_title: "Liste numérotée"
       ulist_title: "Liste à puces"
       list_item: "Élément"
+      heading_label: "T"
       heading_title: "Titre"
       heading_text: "Titre"
       hr_title: "Barre horizontale"
@@ -1140,7 +1151,9 @@ fr:
       unsubscribe:
         stop_notifications: "Vous recevrez moins de notifications pour <strong>{{title}}</strong>"
         change_notification_state: "Votre statut de notification est"
-      filter_to: "{{post_count}} messages sur ce sujet"
+      filter_to:
+        one: "1 message dans le sujet"
+        other: "{{count}} messages dans le sujet"
       create: 'Créer votre sujet'
       create_long: 'Créer un nouveau sujet'
       private_message: 'Écrire un message'
@@ -1200,11 +1213,12 @@ fr:
       auto_close_title: 'Paramètres de fermeture automatique'
       auto_close_save: "Sauvegarder"
       auto_close_remove: "Ne pas fermer automatiquement ce sujet"
-      auto_close_immediate: "Le dernier message dans ce sujet a déjà %{hours} heures, alors le sujet sera fermé immédiatement."
+      auto_close_immediate:
+        one: "Le dernier message dans ce sujet est déjà vieux de 1 heure donc le sujet sera immédiatement fermé."
+        other: "Le dernier message dans ce sujet est déjà vieux de %{count} heures donc le sujet sera immédiatement fermé."
       timeline:
         back: "Retour"
         back_description: "Revenir sur le dernier message non lu"
-        replies: "%{current} / %{total} réponses"
         replies_short: "%{current} / %{total}"
       progress:
         title: progression dans le sujet
@@ -1217,7 +1231,6 @@ fr:
         jump_bottom_with_number: "aller au message %{post_number}"
         total: total messages
         current: message courant
-        position: "message %{current} sur %{total}"
       notifications:
         title: modifier la fréquence des notifications concernant ce sujet
         reasons:
@@ -1275,7 +1288,7 @@ fr:
         invisible: "Retirer de la liste des sujets"
         visible: "Afficher dans la liste des sujets"
         reset_read: "Réinitialiser les lectures"
-        make_public: "Rendre sujet publique"
+        make_public: "Rendre le sujet public"
         make_private: "Rendre le sujet privé"
       feature:
         pin: "Épingler la discussion"
@@ -1421,7 +1434,6 @@ fr:
       gap:
         one: "voir 1 réponse cachée"
         other: "voir {{count}} réponses cachées"
-      more_links: "{{count}} de plus..."
       unread: "Ce message est non lu"
       has_replies:
         one: "{{count}} Réponse"
@@ -1490,14 +1502,6 @@ fr:
         defer_flags:
           one: "Reporter le signalement"
           other: "Reporter les signalements"
-        it_too:
-          off_topic: "Le signaler également"
-          spam: "Le signaler également"
-          inappropriate: "Le signaler également"
-          custom_flag: "Le signaler également"
-          bookmark: "L'ajouter également en signet"
-          like: "L'aimer également"
-          vote: "Votez pour lui également"
         undo:
           off_topic: "Annuler le signalement"
           spam: "Annuler le signalement"
@@ -1683,7 +1687,6 @@ fr:
       notify_action: 'Message'
       official_warning: 'Avertissement officiel'
       delete_spammer: "Supprimer le spammeur"
-      delete_confirm: "Vous vous apprêtez à supprimer <b>%{posts}</b> messages et  <b>%{topics}</b> sujets de cet utilisateur, supprimer son compte, bloquer les inscriptions depuis son adresse IP <b>%{ip_address}</b> et à ajouter son adresse de courriel <b>%{email}</b> à la liste des utilisateurs bloqués. Etes-vous sûr que cet utilisateur est un spammeur ?"
       yes_delete_spammer: "Oui, supprimer le spammeur"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(masqué)"
@@ -1698,9 +1701,15 @@ fr:
       custom_placeholder_notify_user: "Soyez précis, constructif, et toujours respectueux."
       custom_placeholder_notify_moderators: "Dites-nous ce qui vous dérange spécifiquement, et fournissez des liens pertinents et exemples si possible."
       custom_message:
-        at_least: "saisir au moins {{n}} caractères"
-        more: "{{n}} restants..."
-        left: "{{n}} restants"
+        at_least:
+          one: "saisir au moins 1 caractère"
+          other: "saisir au moins {{count}} caractères"
+        more:
+          one: "1 restant..."
+          other: "{{count}} restants..."
+        left:
+          one: "1 restant"
+          other: "{{count}} restants"
     flagging_topic:
       title: "Merci de nous aider à garder notre communauté civilisé !"
       action: "Signaler Sujet"
@@ -1741,7 +1750,6 @@ fr:
       invisible:
         help: "Ce sujet n'apparait plus dans la liste des sujets et sera seulement accessible via un lien direct"
     posts: "Messages"
-    posts_lowercase: "messages"
     posts_long: "il y a {{number}} messages dans ce sujet"
     posts_likes_MF: |
       Ce sujet a {count, plural, one {1 réponse} other {# réponses}}  {ratio, select,
@@ -1798,8 +1806,8 @@ fr:
       unread:
         title: "Non lus"
         title_with_count:
-          one: "1 non lu"
-          other: " ({{count}}) non lus"
+          one: "Non lu (1)"
+          other: "Non lus ({{count}})"
         help: "sujets avec des messages non lus que vous suivez ou surveillez"
         lower_title_with_count:
           one: "1 non lu"
@@ -2175,6 +2183,11 @@ fr:
         add_owners: Ajouter des propriétaires
         incoming_email: "Adresse e-mail d'expédition personnalisée"
         incoming_email_placeholder: "Entrer une adresse e-mail"
+        flair_url: "URL de la vignette d'avatar"
+        flair_url_placeholder: "(Facultatif) URL de l'image"
+        flair_bg_color: "Couleur de l'arrière-plan de la vignette d'avatar"
+        flair_bg_color_placeholder: "(Facultatif) Couleur en héxadécimal"
+        flair_preview: "Prévisualiser"
       api:
         generate_master: "Générer une clé Maître pour l'API"
         none: "Il n'y a pas de clés API actives en ce moment."
@@ -2572,7 +2585,6 @@ fr:
         suspend_reason: "Raison"
         suspended_by: "Suspendu par"
         delete_all_posts: "Supprimer tous les messages"
-        delete_all_posts_confirm: "Vous allez supprimer %{posts} messages et %{topics} sujets. Êtes-vous sûr ?"
         suspend: "Suspendre"
         unsuspend: "Retirer la suspension"
         suspended: "Suspendu ?"
@@ -2668,7 +2680,9 @@ fr:
         unlock_trust_level: "Déverrouiller le niveau de confiance"
         tl3_requirements:
           title: "Pré-requis pour le niveau de confiance 3"
-          table_title: "Dans les %{time_period} derniers jours:"
+          table_title:
+            one: "Lors du dernier jour :"
+            other: "Lors des %{count} derniers jours :"
           value_heading: "Valeur"
           requirement_heading: "Pré-requis"
           visits: "Visites"
@@ -2768,12 +2782,14 @@ fr:
           developer: 'Développeur'
           embedding: "Externe"
           legal: "Légal"
+          user_api: 'API utilisateur'
           uncategorized: 'Autre'
           backups: "Sauvegardes"
           login: "Connexion"
           plugins: "Plugins"
           user_preferences: "Préférences"
           tags: "Tags"
+          search: "Rechercher"
       badges:
         title: Badges
         new_badge: Nouveau Badge
@@ -2866,6 +2882,7 @@ fr:
         embed_by_username: "Pseudo pour création de sujet"
         embed_post_limit: "Le nombre maximum de messages à intégrer"
         embed_username_key_from_feed: "Clé pour extraire le pseudo du flux."
+        embed_title_scrubber: "Expression régulière utilisée pour nettoyer le titre des messages"
         embed_truncate: "Tronquer les messages intégrés"
         embed_whitelist_selector: "Sélecteur CSS pour les éléments qui seront autorisés dans les contenus intégrés"
         embed_blacklist_selector: "Sélecteur CSS pour les éléments qui seront interdits dans les contenus intégrés"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index d0034dfd31b..1d589073f06 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -46,9 +46,6 @@ gl:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -384,14 +381,9 @@ gl:
       latest_by: "últimos de"
       toggle_ordering: "trocar o control de ordenación"
       subcategories: "Subcategorías"
-      topic_stats: "Número de temas novos."
       topic_stat_sentence:
         one: "%{count} tema novo no último %{unit}."
         other: "%{count} temas novos no último %{unit}."
-      post_stats: "O número de publicacións novas."
-      post_stat_sentence:
-        one: "%{count} nova publicación na última %{unit}."
-        other: "%{count} novas publicacións na última %{unit}."
     ip_lookup:
       title: Busca do enderezo IP
       hostname: Nome do servidor
@@ -1029,7 +1021,6 @@ gl:
       unsubscribe:
         stop_notifications: "Agora recibirás menos notificacións sobre <strong>{{title}}</strong>"
         change_notification_state: "O estado actual das túas notificacións é"
-      filter_to: "{{post_count}} publicacións no tema"
       create: 'Novo tema'
       create_long: 'Crear un novo tema'
       private_message: 'Iniciar unha mensaxe'
@@ -1089,7 +1080,6 @@ gl:
       auto_close_title: 'Axustes do peche automático'
       auto_close_save: "Gardar"
       auto_close_remove: "arriba"
-      auto_close_immediate: "A última publicación deste tema xa ten %{hours} horas. O tema pecharase inmediatamente."
       progress:
         title: progreso do tema
         go_top: "principio"
@@ -1099,7 +1089,6 @@ gl:
         jump_bottom_with_number: "ir á publicación %{post_number}"
         total: publicacións totais
         current: publicación actual
-        position: "publicación %{current} de %{total}"
       notifications:
         reasons:
           '3_6': 'Recibirás notificacións porque estás vendo esta categoría.'
@@ -1292,7 +1281,6 @@ gl:
       gap:
         one: "ver unha resposta oculta"
         other: "ver {{count}} respostas ocultas"
-      more_links: "{{count}} máis..."
       unread: "Publicación sen ler"
       has_replies:
         one: "{{count}} resposta"
@@ -1357,14 +1345,6 @@ gl:
         defer_flags:
           one: "Pospor denuncia"
           other: "Pospor denuncias"
-        it_too:
-          off_topic: "Denuncialo tamén"
-          spam: "Denuncialo tamén"
-          inappropriate: "Denuncialo tamén"
-          custom_flag: "Denuncialo tamén"
-          bookmark: "Marcalo tamén"
-          like: "Gústame tamén"
-          vote: "Votalo tamén"
         undo:
           off_topic: "Desfacer denuncia"
           spam: "Desfacer denuncia"
@@ -1535,7 +1515,6 @@ gl:
       take_action: "Tomar medidas"
       notify_action: 'Mensaxe'
       delete_spammer: "Eliminar spammer"
-      delete_confirm: "Vas borrar <b>%{posts}</b> publicacións e <b>%{topics}</b> temas deste usuario, eliminar a súa conta, bloquear o rexistro desde os seus enderezos IP <b>%{ip_address}</b> e engadir o seu correo-e <b>%{email}</b> a unha lista de bloqueos permanentes. Confirmas que este usuario é un spammer?"
       yes_delete_spammer: "Si, eliminar o spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(oculto)"
@@ -1549,10 +1528,6 @@ gl:
         spam: "É spam"
       custom_placeholder_notify_user: "Se específico, construtivo e sempre amábel."
       custom_placeholder_notify_moderators: "Especifícanos sobre o que estás preocupado e proporciónanos ligazóns relevantes e exemplos cando sexa posíbel."
-      custom_message:
-        at_least: "introduce cando menos {{n}} caracteres"
-        more: "{{n}} restantes..."
-        left: "{{n}} restantes"
     flagging_topic:
       title: "Grazas por axudar a manter a nosa comunidade."
       action: "Denunciar tema"
@@ -1587,7 +1562,6 @@ gl:
       invisible:
         help: "Este tema non está listado. Non se presentará nas listas de temas e só estará accesíbel vía ligazón directa"
     posts: "Publicacións"
-    posts_lowercase: "publicacións"
     posts_long: "hai {{number}} publicacións neste tema"
     posts_likes_MF: |
       Este tema ten {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
@@ -2232,7 +2206,6 @@ gl:
         suspend_reason: "Razón"
         suspended_by: "Suspendido por"
         delete_all_posts: "Eliminar todas as publicacións"
-        delete_all_posts_confirm: "Confirmas a eliminación de %{posts} publicacións e %{topics} temas?"
         suspend: "Suspender"
         unsuspend: "Non suspender"
         suspended: "Suspendido?"
@@ -2319,7 +2292,6 @@ gl:
         unlock_trust_level: "Desbloquear o nivel de confianza"
         tl3_requirements:
           title: "Requerimentos para o nivel 3 de confianza"
-          table_title: "Nos últimos %{time_period} días:"
           value_heading: "Valor"
           requirement_heading: "Requirimento"
           visits: "Visitas"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index cac99bc4b4a..0e2062e3002 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -48,9 +48,6 @@ he:
         x_seconds:
           one: "שנייה אחת"
           other: "%{count} שניות"
-        less_than_x_minutes:
-          one: "פחות מדקה"
-          other: "פחות מ-%{count} דקות"
         x_minutes:
           one: "דקה אחת"
           other: "%{count} דקות"
@@ -402,14 +399,12 @@ he:
       latest_by: "לאחרונה על ידי"
       toggle_ordering: "שנה בקר סדר"
       subcategories: "תתי קטגוריות"
-      topic_stats: "מספר הפוסטים החדשים."
+      topic_sentence:
+        one: "נושא אחד"
+        other: "%{count} נושאים"
       topic_stat_sentence:
         one: "נושא חדש אחד ב-%{unit}."
         other: "%{count} נושאים חדשים ב-%{unit}."
-      post_stats: "מספר ההודעות החדשות."
-      post_stat_sentence:
-        one: "פוסט חדש אחד ב-%{unit}."
-        other: "%{count} פוסטים חדשים ב-%{unit}."
     ip_lookup:
       title: חיפוש כתובת IP
       hostname: שם מארח (Hostname)
@@ -509,6 +504,13 @@ he:
       muted_topics_link: "הצג פוסטים שהוסתרו"
       watched_topics_link: "הצגת נושאים נצפים"
       automatically_unpin_topics: "בטל נעיצת נושאים באופן אוטומטי כאשר אני מגיע/ה לתחתית ההודעות בנושא."
+      apps: "אפליקציות"
+      revoke_access: "שלילת גישה"
+      undo_revoke_access: "ביטול שלילת גישה"
+      api_permissions: "הרשאות:"
+      api_approved: "אושרו:"
+      api_read: "קריאה"
+      api_read_write: "קריאה וכתיבה"
       staff_counters:
         flags_given: "דגלים שעוזרים"
         flagged_posts: "הודעות מדוגלות"
@@ -904,6 +906,10 @@ he:
       twitter: "טוויטר"
       emoji_one: "Emoji One"
       win10: "חלונות 10"
+    category_page_style:
+      categories_only: "קטגוריות בלבד"
+      categories_with_featured_topics: "קטגוריות עם נושאים מומלצים"
+      categories_and_latest_topics: "קטגוריות ונושאים אחרונים"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -922,7 +928,9 @@ he:
       saved_local_draft_tip: "נשמר מקומית"
       similar_topics: "הפוסט שלך דומה ל..."
       drafts_offline: "טיוטות מנותקות"
-      group_mentioned: "על ידי איזכור {{group}}, אתם הולכים להודיע ל <a href='{{group_link}}'>{{count}} אנשים</a> – האתם אתם בטוחים?"
+      group_mentioned:
+        one: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>אדם אחד</a> – אתם בטוחים?"
+        other: "על ידי אזכור {{group}}, אתם עומדים ליידע <a href='{{group_link}}'>{{count}} אנשים</a> – אתם בטוחים?"
       duplicate_link: "נראה שהקישור שלכם ל <b>{{domain}}</b> כבר פורסם בנושא זה על ידי <b>@{{username}}</b> ב <a href='{{post_url}}'>תגובה {{ago}}</a> - האם אתם בטוחים שאתם מעוניינים לפרסם אותו שוב?"
       error:
         title_missing: "יש להזין כותרת."
@@ -953,8 +961,10 @@ he:
       show_preview: 'הראה תצוגה מקדימה &raquo;'
       hide_preview: '&laquo; הסתר תצוגה מקדימה'
       quote_post_title: "ציטוט הודעה בשלמותה"
+      bold_label: "B"
       bold_title: "מודגש"
       bold_text: "טקסט מודגש"
+      italic_label: "I"
       italic_title: "נטוי"
       italic_text: "טקסט נטוי"
       link_title: "קישור"
@@ -972,6 +982,7 @@ he:
       olist_title: "רשימה ממוספרת"
       ulist_title: "רשימת נקודות"
       list_item: "פריט ברשימה"
+      heading_label: "H"
       heading_title: "כותרת"
       heading_text: "כותרת"
       hr_title: "קו אופקי"
@@ -1141,7 +1152,9 @@ he:
       unsubscribe:
         stop_notifications: "תקבלו פחות התראות עבור <strong>{{title}}</strong>"
         change_notification_state: "מצב ההתראות הנוכחי שלך הוא"
-      filter_to: "{{post_count}} הודעות בפוסט"
+      filter_to:
+        one: "פוסט אחד בנושא"
+        other: "{{count}} פוסטים בנושא"
       create: 'פוסט חדש'
       create_long: 'יצירת פוסט חדש'
       private_message: 'תחילת הודעה'
@@ -1201,11 +1214,12 @@ he:
       auto_close_title: 'הגדרות נעילה אוטומטית'
       auto_close_save: "שמור"
       auto_close_remove: "אל תנעל פוסט זה אוטומטית"
-      auto_close_immediate: "הפוסט האחרון בנושא כבר בן %{hours} שעות, אז הנושא ייסגר מיידית."
+      auto_close_immediate:
+        one: "הפוסט האחרון בנושא הוא כבר בן שעה, אז הנושא ייסגר מיידית."
+        other: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית."
       timeline:
         back: "חזרה"
         back_description: "חיזרו לפוסט האחרון שלא-נקרא על-ידיכם"
-        replies: "%{current} / %{total} תגובות"
         replies_short: "%{current} / %{total}"
       progress:
         title: התקדמות פוסט
@@ -1218,7 +1232,6 @@ he:
         jump_bottom_with_number: "קפיצה להודעה %{post_number}"
         total: סך הכל הודעות
         current: הודעה נוכחית
-        position: "הודעה %{current} מתוך %{total}"
       notifications:
         title: שנו את תדירות ההתראות על הנושא הזה
         reasons:
@@ -1422,7 +1435,6 @@ he:
       gap:
         one: "הצג הודעה אחת שהוסתרה"
         other: "הצג {{count}} הודעות שהוסתרו"
-      more_links: "עוד {{count}}..."
       unread: "הפוסט טרם נקרא"
       has_replies:
         one: "תגובה אחת"
@@ -1491,14 +1503,6 @@ he:
         defer_flags:
           one: "דחיית סימון"
           other: "דחיית דגלים"
-        it_too:
-          off_topic: "דגלו גם אתם"
-          spam: "דגלו גם אתם"
-          inappropriate: "דגלו גם אתם"
-          custom_flag: "דגלו גם אתם"
-          bookmark: "העדף גם את זה"
-          like: "תן לייק גם לזה"
-          vote: "הצבע גם לזה"
         undo:
           off_topic: "ביטול דיגול"
           spam: "ביטול דיגול"
@@ -1684,7 +1688,6 @@ he:
       notify_action: 'הודעה'
       official_warning: 'אזהרה רשמית'
       delete_spammer: "מחק ספאמר"
-      delete_confirm: "אתה עומד למחוק <b>%{posts}</b> הודעות ו-<b>%{topics}</b> פוסטים של המשתמש הזה, להסיר את החשבון שלהם, לחסור הרשמה מכתובת ה-IP שלהם <b>%{ip_address}</b>, ולהוסיף את כתובת הדואר האלקטרוני <b>%{email}</b> לרשימה שחורה. אתה בטוח שזה באמת ספאמר?"
       yes_delete_spammer: "כן, מחק ספאמר"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(מוסתר)"
@@ -1699,9 +1702,15 @@ he:
       custom_placeholder_notify_user: "היה ממוקד, חיובי ואדיב תמיד."
       custom_placeholder_notify_moderators: "ספר לנו מה בדיוק מטריד אותך וצרף קישורים רלוונטיים ודוגמאות במידת האפשר."
       custom_message:
-        at_least: "הזן לפחות {{n}} תווים"
-        more: "{{n}} נשארו..."
-        left: "{{n}} נותרו"
+        at_least:
+          one: "הכניסו לפחות תו אחד"
+          other: "הכניסו לפחות {{count}} תווים"
+        more:
+          one: "נשאר אחד"
+          other: "{{count}} נשארו..."
+        left:
+          one: "נותר אחד"
+          other: "{{count}} נותרו"
     flagging_topic:
       title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!"
       action: "דגלו נושא"
@@ -1742,7 +1751,6 @@ he:
       invisible:
         help: "פוסט זה מוסתר; הוא לא יוצג ברשימות הפוסטים, וזמין רק באמצעות קישור ישיר."
     posts: "הודעות"
-    posts_lowercase: "פרסומים"
     posts_long: "יש {{number}} הודעות בפוסט הזה"
     posts_likes_MF: |
       לנושא זה יש  {count, plural, one {פרסום אחד} other {# פרסומים}}
@@ -1920,6 +1928,9 @@ he:
       badge_count:
         one: "1 עיטורים"
         other: "%{count} עיטורים"
+      more_badges:
+        one: "+1 נוסף"
+        other: "+%{count} נוספים"
       granted:
         one: "הוענק"
         other: "%{count} הוענקו"
@@ -2170,6 +2181,9 @@ he:
         add_owners: הוספת מנהלים
         incoming_email: "התאימו אישית כתובת מייל נכנס"
         incoming_email_placeholder: "הכניסו כתובת מייל"
+        flair_url_placeholder: "(אופציונלי) URL של תמונה"
+        flair_bg_color_placeholder: "(אופציונלי) ערך צבע ב Hex"
+        flair_preview: "תצוגה מקדימה"
       api:
         generate_master: "ייצר מפתח מאסטר ל-API"
         none: "אין מפתחות API פעילים כרגע."
@@ -2567,7 +2581,6 @@ he:
         suspend_reason: "סיבה"
         suspended_by: "הושעה על ידי"
         delete_all_posts: "מחק את כל ההודעות"
-        delete_all_posts_confirm: "אתם עומדים למחוק %{posts} פוסטים ו-%{topics} נושאים. אתם בטוחים?"
         suspend: "השעה"
         unsuspend: "בטל השעייה"
         suspended: "מושעה?"
@@ -2661,7 +2674,9 @@ he:
         unlock_trust_level: "שחרור רמת אמון מנעילה"
         tl3_requirements:
           title: "דרישות עבור רמת אמון 3"
-          table_title: "ב %{time_period} הימים האחרונים:"
+          table_title:
+            one: "ביום האחרון:"
+            other: "ב %{count} הימים האחרונים:"
           value_heading: "ערך"
           requirement_heading: "דרישה"
           visits: "ביקורים"
@@ -2734,6 +2749,7 @@ he:
         revert_confirm: "האם אתם בטוחים שאתם מעוניינים לבטל את השינויים שלכם?"
         go_back: "חזרה לחיפוש"
         recommended: "אנחנו ממליצים להתאים את הטקסט הבא כדי להתאימו לצרכים שלכם:"
+        show_overriden: 'הציגו רק דרוסים'
       site_settings:
         show_overriden: 'הצג רק הגדרות ששונו'
         title: 'הגדרות'
@@ -2760,12 +2776,14 @@ he:
           developer: 'מפתח'
           embedding: "הטמעה"
           legal: "משפטי"
+          user_api: 'API של משתמש'
           uncategorized: 'אחר'
           backups: "גיבויים"
           login: "התחברות"
           plugins: "הרחבות"
           user_preferences: "הגדרות משתמש"
           tags: "תגיות"
+          search: "חיפוש"
       badges:
         title: עיטורים
         new_badge: עיטור חדש
@@ -2858,6 +2876,7 @@ he:
         embed_by_username: "שם משתמש ליצירת פוסט"
         embed_post_limit: "מספר מקסימלי של פרסומים להטמעה."
         embed_username_key_from_feed: "מפתח למשיכת שם המשתמש ב-discourse מהפיד."
+        embed_title_scrubber: "ביטוי רגולרי שמשמש כדי לנקות את הכותרת של פוסטים"
         embed_truncate: "חיתוך הפרסומים המוטמעים."
         embed_whitelist_selector: "בוררי CSS לאלמנטים שיותר להטמיע."
         embed_blacklist_selector: "בוררי CSS לאלמנטים שיוסרו מן ההטמעות."
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 993b1f09d15..0a3527911b7 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -45,8 +45,6 @@ id:
           other: "< %{count}s"
         x_seconds:
           other: "%{count}s"
-        less_than_x_minutes:
-          other: "< %{count}m"
         x_minutes:
           other: "%{count}m"
         about_x_hours:
@@ -362,12 +360,8 @@ id:
       latest_by: "Terbaru oleh"
       toggle_ordering: "beralih memesan kontrol"
       subcategories: "Subkategori"
-      topic_stats: "Banyaknya topik baru."
       topic_stat_sentence:
         other: "%{count} topik baru dalam %{unit} terakhir."
-      post_stats: "Banyaknya pos baru."
-      post_stat_sentence:
-        other: "%{count} pos baru dalam %{unit} terakhir."
     ip_lookup:
       title: Pencarian Alamat IP
       hostname: nama host
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 3d6b045ae2b..1ced42da373 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -48,9 +48,6 @@ it:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -402,14 +399,12 @@ it:
       latest_by: "i più recenti di"
       toggle_ordering: "inverti l'ordinamento"
       subcategories: "Sottocategorie"
-      topic_stats: "Numero di nuovi argomenti."
+      topic_sentence:
+        one: "1 argomento"
+        other: "%{count} argomenti"
       topic_stat_sentence:
         one: "%{count} nuovo argomento nell'ultimo %{unit}."
         other: "%{count} nuovi argomenti nell'ultimo %{unit}."
-      post_stats: "Numero di nuovi messaggi."
-      post_stat_sentence:
-        one: "%{count} nuovo messaggio nell'ultimo %{unit}."
-        other: "%{count} nuovi messaggi nell'ultimo %{unit}."
     ip_lookup:
       title: Ricerca Indirizzo IP
       hostname: Hostname
@@ -454,6 +449,7 @@ it:
         disable: "Disabilita Notifiche"
         enable: "Abilita Notifiche"
         each_browser_note: "Nota: devi modificare questa impostazione per ogni browser che utilizzi."
+      dismiss_notifications: "Chiudi Tutti"
       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"
@@ -469,6 +465,7 @@ it:
       suspended_reason: "Motivo: "
       github_profile: "Github"
       tag_settings: "Etichette"
+      watched_tags: "Osservate"
       muted_tags: "Silenziati"
       watched_categories: "Osservate"
       tracked_categories: "Seguite"
@@ -581,7 +578,7 @@ it:
       log_out: "Esci"
       location: "Località"
       card_badge:
-        title: "Targhetta Scheda Utente"
+        title: "Distintivo Scheda Utente"
       website: "Sito Web"
       email_settings: "Email"
       like_notification_frequency:
@@ -701,9 +698,9 @@ it:
         top_topics: "Migliori Argomenti"
         no_topics: "Ancora nessun argomento."
         more_topics: "Altri Argomenti"
-        top_badges: "Migliori Targhette"
-        no_badges: "Ancora nessuna targhetta."
-        more_badges: "Altre Targhette"
+        top_badges: "Migliori Distintivi"
+        no_badges: "Ancora nessun distintivo."
+        more_badges: "Altri Distintivi"
         top_links: "Migliori Collegamenti"
         no_links: "Ancora nessun collegamento."
         no_likes: "Ancora nessun \"Mi piace\"."
@@ -972,7 +969,7 @@ it:
         invitee_accepted: "Invito accettato da"
         moved_post: "Il tuo messaggio è stato spostato da"
         linked: "Collegamento al tuo messaggio"
-        granted_badge: "Targhetta assegnata"
+        granted_badge: "Distintivo assegnato"
         group_message_summary: "Messaggi nel gruppo in arrivo"
       popup:
         mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}'
@@ -1043,6 +1040,9 @@ it:
         selected:
           one: "Hai selezionato <b>1</b> argomento."
           other: "Hai selezionato <b>{{count}}</b> argomenti."
+        change_tags: "Cambia Etichette"
+        choose_new_tags: "Scegli nuove etichette per i seguenti argomenti:"
+        changed_tags: "Le etichette per quegli argomenti sono state cambiate."
       none:
         unread: "Non ci sono argomenti non letti."
         new: "Non ci sono nuovi argomenti."
@@ -1072,7 +1072,6 @@ it:
       unsubscribe:
         stop_notifications: "Da ora riceverai meno notifiche per <strong>{{title}}</strong>"
         change_notification_state: "Lo stato delle tue notifiche è"
-      filter_to: "{{post_count}} suoi messaggi"
       create: 'Nuovo Argomento'
       create_long: 'Crea un nuovo Argomento'
       private_message: 'Inizia a scrivere un messaggio'
@@ -1132,7 +1131,6 @@ it:
       auto_close_title: 'Impostazioni di auto-chiusura'
       auto_close_save: "Salva"
       auto_close_remove: "Non chiudere automaticamente questo argomento"
-      auto_close_immediate: "L'ultimo messaggio in questo argomento ha già %{hours}, pertanto l'argomento verrà chiuso immediatamente."
       progress:
         title: Avanzamento dell'argomento
         go_top: "alto"
@@ -1142,7 +1140,6 @@ it:
         jump_bottom_with_number: "Passa al messaggio %{post_number}"
         total: totale messaggi
         current: messaggio corrente
-        position: "messaggio %{current} di %{total}"
       notifications:
         reasons:
           '3_6': 'Riceverai notifiche perché stai osservando questa categoria.'
@@ -1335,7 +1332,6 @@ it:
       gap:
         one: "visualizza 1 risposta nascosta"
         other: "visualizza {{count}} riposte nascoste"
-      more_links: "{{count}} altri..."
       unread: "Messaggio non letto"
       has_replies:
         one: "{{count}} Risposta"
@@ -1402,14 +1398,6 @@ it:
         defer_flags:
           one: "Ignora segnalazione"
           other: "Annulla segnalazioni"
-        it_too:
-          off_topic: "Segnalalo anche tu"
-          spam: "Segnalalo anche tu"
-          inappropriate: "Segnalalo anche tu"
-          custom_flag: "Segnalalo anche tu"
-          bookmark: "Aggiungi un segnalibro anche tu"
-          like: "Assegnagli un \"Mi piace\" anche tu"
-          vote: "Votalo anche tu"
         undo:
           off_topic: "Rimuovi segnalazione"
           spam: "Rimuovi segnalazione"
@@ -1521,6 +1509,7 @@ it:
       settings: 'Impostazioni'
       topic_template: "Modello di Argomento"
       tags: "Etichette"
+      tags_allowed_tags: "Etichette che si possono usare soltanto in questa categoria:"
       delete: 'Elimina Categoria'
       create: 'Crea Categoria'
       create_long: 'Crea una nuova categoria'
@@ -1534,7 +1523,7 @@ it:
       topic: "argomento della categoria"
       logo: "Immagine Categoria"
       background_image: "Immagine di sfondo della categoria"
-      badge_colors: "Colori delle targhette"
+      badge_colors: "Colori dei distintivi"
       background_color: "Colore di sfondo"
       foreground_color: "Colore in primo piano"
       name_placeholder: "Una o due parole al massimo"
@@ -1555,7 +1544,7 @@ it:
       email_in_disabled: "Le Impostazioni Sito non permettono di creare nuovi argomenti via email. Per abilitare la creazione di argomenti via email,"
       email_in_disabled_click: 'abilita l''impostazione "email entrante".'
       suppress_from_homepage: "Elimina questa categoria dalla homepage."
-      allow_badges_label: "Permetti che le targhette vengano assegnate in questa categoria"
+      allow_badges_label: "Permetti l'assegnazione di distintivi in questa categoria"
       edit_permissions: "Modifica Permessi"
       add_permission: "Aggiungi Permesso"
       this_year: "quest'anno"
@@ -1581,7 +1570,6 @@ it:
       take_action: "Procedi"
       notify_action: 'Messaggio'
       delete_spammer: "Cancella Spammer"
-      delete_confirm: "Stai per eliminare <b>%{posts}</b> messaggi e <b>%{topics}</b> argomenti di questo utente, rimuovere il suo account, bloccare le iscrizioni da questo indirizzo IP <b>%{ip_address}</b>, e aggiungere il suo indirizzo email <b>%{email}</b> all'elenco di quelli bloccati. Sei sicuro che questo utente sia davvero uno spammer?"
       yes_delete_spammer: "Sì, cancella lo spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(nascosto)"
@@ -1595,10 +1583,6 @@ it:
         spam: "E' Spam"
       custom_placeholder_notify_user: "Sii dettagliato, costruttivo e sempre gentile."
       custom_placeholder_notify_moderators: "Facci sapere esattamente cosa ti preoccupa, fornendo collegamenti pertinenti ed esempi ove possibile."
-      custom_message:
-        at_least: "inserisci almeno {{n}} caratteri"
-        more: "{{n}} alla fine..."
-        left: "{{n}} rimanenti"
     flagging_topic:
       title: "Grazie per aiutarci a mantenere la nostra comunità civile!"
       action: "Segnala Argomento"
@@ -1633,7 +1617,6 @@ it:
       invisible:
         help: "Questo argomento è invisibile; non verrà mostrato nella liste di argomenti ed è possibile accedervi solo tramite collegamento diretto"
     posts: "Messaggi"
-    posts_lowercase: "messaggi"
     posts_long: "ci sono {{number}} messaggi in questo argomento"
     posts_likes_MF: |
       Questo argomento ha {count, plural, one {1 risposta} other {# risposte}} {ratio, select, low {con un alto rapporto "mi piace" / messaggi} med {con un altissimo rapporto "mi piace" / messaggi} high {con un estremamente alto rapporto "mi piace" / messaggi} other {}}
@@ -1780,15 +1763,43 @@ it:
         title: 'Azioni'
     badges:
       earned_n_times:
-        one: "Guadagnato questa targhetta 1 volta"
-        other: "Guadagnato questa targhetta %{count} volte"
+        one: "Guadagnato questo distintivo 1 volta"
+        other: "Guadagnato questo distintivo %{count} volte"
       granted_on: "Assegnata %{date}"
-      others_count: "Altri con questa targhetta (%{count})"
-      title: Targhette
+      others_count: "Altri utenti con questo distintivo (%{count})"
+      title: Distintivi
       allow_title: "titolo disponibile"
       badge_count:
-        one: "1 Targhetta"
-        other: "%{count} Targhette"
+        one: "1 Distintivo"
+        other: "%{count} Distintivi"
+      select_badge_for_title: Seleziona un distintivo da usare come tuo titolo
+    tagging:
+      all_tags: "Etichette"
+      selector_all_tags: "tutte le etichette"
+      selector_no_tags: "nessuna etichetta"
+      changed: "etichette cambiate:"
+      tags: "Etichette"
+      choose_for_topic: "scegli delle etichette opzionali per questo argomento"
+      delete_tag: "Cancella Etichetta"
+      delete_confirm: "Sicuro di voler cancellare questa etichetta?"
+      rename_tag: "Rinomina Etichetta"
+      rename_instructions: "Scegli un altro nome per l'etichetta:"
+      manage_groups: "Gestisci Gruppi Etichette"
+      manage_groups_description: "Definisci gruppi per organizzare le etichette"
+      filters:
+        without_category: "%{filter} %{tag} argomenti"
+        with_category: "%{filter} %{tag} argomenti in %{category}"
+        untagged_without_category: "%{filter} argomenti non etichettati"
+        untagged_with_category: "%{filter} argomenti non etichettati in %{category}"
+      groups:
+        title: "Gruppi Etichette"
+        about: "Aggiungi etichette a gruppi per poterle gestire più facilmente."
+        tags_label: "Etichette in questo gruppo:"
+        parent_tag_label: "Etichetta padre:"
+        parent_tag_description: "Le etichette di questo gruppo non possono essere usate finché è presente l'etichetta padre."
+        one_per_topic_label: "Limita ad una sola etichetta per argomento in questo gruppo"
+        new_name: "Nuovo Gruppo Etichette"
+        confirm_delete: "Sicuro di voler cancellare questo gruppo di etichette?"
   admin_js:
     type_to_filter: "digita per filtrare..."
     admin:
@@ -2219,8 +2230,8 @@ it:
             change_site_text: "cambia il testo del sito"
             suspend_user: "utente sospeso"
             unsuspend_user: "utente riattivato"
-            grant_badge: "assegna targhetta"
-            revoke_badge: "revoca targhetta"
+            grant_badge: "assegna distintivo"
+            revoke_badge: "revoca distintivo"
             check_email: "controlla email"
             delete_topic: "cancella argomento"
             delete_post: "cancella messaggio"
@@ -2333,7 +2344,6 @@ it:
         suspend_reason: "Motivo"
         suspended_by: "Sospeso da"
         delete_all_posts: "Cancella tutti i messaggi"
-        delete_all_posts_confirm: "Stai per cancellare %{posts} messaggi e %{topics} argomenti. Sei sicuro?"
         suspend: "Sospendi"
         unsuspend: "Riabilita"
         suspended: "Sospeso?"
@@ -2420,7 +2430,6 @@ it:
         unlock_trust_level: "Sblocca Livello Esperienza"
         tl3_requirements:
           title: "Requisiti per Livello Esperienza 3"
-          table_title: "Negli ultimi %{time_period} giorni:"
           value_heading: "Valore"
           requirement_heading: "Requisito"
           visits: "Visite"
@@ -2527,46 +2536,46 @@ it:
           user_preferences: "Preferenze Utente"
           tags: "Etichette"
       badges:
-        title: Targhette
-        new_badge: Nuova Targhetta
+        title: Distintivi
+        new_badge: Nuovo Distintivo
         new: Nuovo
         name: Nome
-        badge: Targhetta
+        badge: Distintivo
         display_name: Nome Visualizzato
         description: Descrizione
         long_description: Descrizione Lunga
-        badge_type: Tipo Targhetta
+        badge_type: Tipo Distintivo
         badge_grouping: Gruppo
         badge_groupings:
-          modal_title: Raggruppamento Targhette
+          modal_title: Raggruppamento Distintivi
         granted_by: Assegnata Da
         granted_at: Assegnata in data
         reason_help: (Un collegamento a un messaggio o argomento)
         save: Salva
         delete: Cancella
-        delete_confirm: Sei sicuro di voler cancellare questa targhetta?
+        delete_confirm: Sei sicuro di voler cancellare questo distintivo?
         revoke: Revoca
         reason: Motivazione
         expand: Espandi &hellip;
-        revoke_confirm: Sei sicuro di voler revocare questa targhetta?
-        edit_badges: Modifica Targhette
-        grant_badge: Assegna Targhetta
-        granted_badges: Targhette Assegnate
+        revoke_confirm: Sei sicuro di voler revocare questo distintivo?
+        edit_badges: Modifica Distintivi
+        grant_badge: Assegna Distintivo
+        granted_badges: Distintivi Assegnati
         grant: Assegna
-        no_user_badges: "%{name} non ha ricevuto alcuna targhetta."
-        no_badges: Non ci sono targhette da assegnare.
-        none_selected: "Seleziona una targhetta per iniziare"
-        allow_title: Permetti di utilizzare le targhette come titoli
+        no_user_badges: "%{name} non ha ricevuto alcun distintivo."
+        no_badges: Non ci sono distintivi da assegnare.
+        none_selected: "Seleziona un distintivo per iniziare"
+        allow_title: Permetti di utilizzare un distintivo come titolo
         multiple_grant: Può essere assegnata più volte
-        listable: Mostra targhetta sulla pagina pubblica delle targhette
-        enabled: Attiva targhetta
+        listable: Mostra distintivo sulla pagina pubblica dei distintivi
+        enabled: Attiva distintivo
         icon: Icona
         image: Immagine
         icon_help: "Usa una classe Font Awesome o la URL di un'immagine"
-        query: Badge Query (SQL)
+        query: Query Distintivo (SQL)
         target_posts: Interroga i messaggi destinazione
         auto_revoke: Avvia l'istruzione di revoca giornalmente
-        show_posts: Visualizza i messaggi che assegnano le targhette sulla pagina delle targhette
+        show_posts: Visualizza i messaggi che assegnano distintivi sulla pagina dei distintivi
         trigger: Trigger
         trigger_type:
           none: "Aggiorna giornalmente"
@@ -2576,18 +2585,18 @@ it:
           user_change: "Quando un utente viene modificato o creato"
           post_processed: "Dopo che un messaggio viene elaborato"
         preview:
-          link_text: "Anteprima targhette guadagnate"
+          link_text: "Anteprima distintivi guadagnati"
           plan_text: "Anteprima con query plan"
-          modal_title: "Anteprima Query Targhetta"
+          modal_title: "Anteprima Query Distintivo"
           sql_error_header: "Si è verificato un errore con la query."
-          error_help: "Visita i seguenti collegamenti per un aiuto con le query delle targhette."
+          error_help: "Visita i seguenti collegamenti per un aiuto con le query dei distintivi."
           bad_count_warning:
             header: "ATTENZIONE!"
-            text: "Ci sono esempi di grant mancanti. Ciò accade quando la query delle targhette ritorna ID utenti o ID messaggi inesistenti. Successivamente ciò può causare risultati inattesi - controlla bene la tua query."
-          no_grant_count: "Nessuna targhetta da assegnare."
+            text: "Ci sono esempi di grant mancanti. Ciò accade quando la query dei distintivi ritorna ID utenti o ID messaggi inesistenti. Successivamente ciò può causare risultati inattesi - controlla bene la tua query."
+          no_grant_count: "Nessun distintivo da assegnare."
           grant_count:
-            one: "<b>1</b> targhetta da assegnare."
-            other: "<b>%{count}</b> targhette da assegnare."
+            one: "<b>1</b> distintivo da assegnare."
+            other: "<b>%{count}</b> distintivi da assegnare."
           sample: "Esempio:"
           grant:
             with: <span class="username">%{username}</span>
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 2e5c2cdb930..801d953f880 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -45,8 +45,6 @@ ja:
           other: "%{count}秒前"
         x_seconds:
           other: "%{count}秒"
-        less_than_x_minutes:
-          other: "%{count}分以内"
         x_minutes:
           other: "%{count}分前"
         about_x_hours:
@@ -356,12 +354,8 @@ ja:
       latest_by: "最新投稿: "
       toggle_ordering: "カテゴリの並び替えモードを切り替え"
       subcategories: "サブカテゴリ:"
-      topic_stats: "新しいトピックの数"
       topic_stat_sentence:
         other: "過去 %{unit} 間 %{count} 個の新着トピック。"
-      post_stats: "新しい投稿の数"
-      post_stat_sentence:
-        other: "過去 %{unit} 間 %{count} 個の新しい投稿。"
     ip_lookup:
       title: IPアドレスを検索
       hostname: ホスト名
@@ -984,7 +978,6 @@ ja:
         bookmarks: "ブックマーク済みのトピックはこれ以上ありません。"
         search: "検索結果は以上です。"
     topic:
-      filter_to: "トピック内の{{post_count}}個のポストを表示"
       create: '新規トピック'
       create_long: '新しいトピックの作成'
       private_message: 'メッセージを書く'
@@ -1049,7 +1042,6 @@ ja:
         jump_bottom_with_number: "%{post_number}番へジャンプ"
         total: 投稿の合計
         current: 現在の投稿
-        position: "投稿: %{current}/%{total}"
       notifications:
         reasons:
           '3_6': 'このカテゴリに参加中のため通知されます'
@@ -1225,7 +1217,6 @@ ja:
       expand_collapse: "開く/折りたたみ"
       gap:
         other: "{{count}}個の返信をすべて表示する"
-      more_links: "{{count}} つのリンク..."
       unread: "未読の投稿"
       has_replies:
         other: "{{count}} 件の返信"
@@ -1280,14 +1271,6 @@ ja:
         flag: '通報'
         defer_flags:
           other: "取り下げた通報"
-        it_too:
-          off_topic: "通報する"
-          spam: "通報する"
-          inappropriate: "通報する"
-          custom_flag: "通報する"
-          bookmark: "ブックマークする"
-          like: "あなたも「いいね！」する"
-          vote: "投票する"
         undo:
           off_topic: "通報を取り消す"
           spam: "通報を取り消す"
@@ -1432,7 +1415,6 @@ ja:
       take_action: "アクションをする"
       notify_action: 'メッセージ'
       delete_spammer: "スパムの削除"
-      delete_confirm: "このユーザのアカウントと、<b>%{posts}</b>個の投稿、<b>%{topics}</b>個のトピックを削除し、メールアドレス <b>%{email}</b> をブロックリストに追加しようとしています。本当にこのユーザをスパムユーザーとして認識してもよろしいですか?"
       yes_delete_spammer: "はい、スパムを削除する"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(hidden)"
@@ -1445,10 +1427,6 @@ ja:
         spam: "スパム"
       custom_placeholder_notify_user: "具体的に、建設的に、そして常に親切にしましょう。"
       custom_placeholder_notify_moderators: "特にどのような問題が発生しているか記入して下さい。可能なら、関連するリンクなどを教えて下さい。"
-      custom_message:
-        at_least: "少なくとも{{n}}文字入力してください"
-        more: "あと{{n}}文字..."
-        left: "残り{{n}}文字"
     flagging_topic:
       title: "報告していただきありがとうございます。"
       action: "トピックを通報"
@@ -1481,7 +1459,6 @@ ja:
       invisible:
         help: "このトピックはリストされていません。トピックリストには表示されません。直接リンクでのみアクセス可能です"
     posts: "投稿"
-    posts_lowercase: "投稿"
     posts_long: "このトピックには{{number}}個の投稿があります"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
@@ -2146,7 +2123,6 @@ ja:
         suspend_reason: "理由"
         suspended_by: "凍結したユーザ"
         delete_all_posts: "全ての投稿を削除"
-        delete_all_posts_confirm: "%{posts}件の投稿と%{topics}個のトピックが削除されます。よろしいですか?"
         suspend: "凍結"
         unsuspend: "凍結解除"
         suspended: "凍結状態"
@@ -2230,7 +2206,6 @@ ja:
         unlock_trust_level: "トラストレベルをアンロック"
         tl3_requirements:
           title: "トラストレベル3の条件"
-          table_title: "過去%{time_period} 日間に"
           value_heading: "値"
           requirement_heading: "条件"
           visits: "訪問"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 830df0a19fb..d3e2714cbfb 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -44,8 +44,6 @@ ko:
           other: "< %{count}초"
         x_seconds:
           other: "%{count}초 전"
-        less_than_x_minutes:
-          other: "< %{count}분"
         x_minutes:
           other: "%{count}분 전"
         about_x_hours:
@@ -359,12 +357,8 @@ ko:
       latest_by: "가장 최근"
       toggle_ordering: "정렬 컨트롤 토글"
       subcategories: "하위 카테고리"
-      topic_stats: "새로운 주제 수"
       topic_stat_sentence:
         other: "지난 %{unit} 동안 %{count}개의 새로운 주제가 있습니다."
-      post_stats: "새 게시글 수"
-      post_stat_sentence:
-        other: "지난 %{unit} 동안 %{count}개의 새로운 게시글이 있습니다."
     ip_lookup:
       title: IP Address Lookup
       hostname: Hostname
@@ -997,7 +991,6 @@ ko:
       unsubscribe:
         stop_notifications: "<strong>{{title}}</strong>에 대한 알림은 이제 덜 받게 됩니다."
         change_notification_state: "현재 당신의 알림 설정 : "
-      filter_to: "이 주제에 {{post_count}}개의 글이 있습니다"
       create: '새 주제 만들기'
       create_long: '새로운 주제 만들기'
       private_message: '메시지 시작'
@@ -1051,7 +1044,6 @@ ko:
       auto_close_title: '자동으로 닫기 설정'
       auto_close_save: "저장"
       auto_close_remove: "이 주제를 자동으로 닫지 않기"
-      auto_close_immediate: "주제에 마지막 글이 올라온 지 %{hours} 시간 지났기 때문에 이 주제는 즉시 닫힐 예정입니다."
       progress:
         title: 진행 중인 주제
         go_top: "맨위"
@@ -1061,7 +1053,6 @@ ko:
         jump_bottom_with_number: "jump to post %{post_number}"
         total: 총 글
         current: 현재 글
-        position: "post %{current} of %{total}"
       notifications:
         reasons:
           '3_6': '이 카테고리를 보고 있어서 알림을 받게 됩니다.'
@@ -1243,7 +1234,6 @@ ko:
       expand_collapse: "확장/축소"
       gap:
         other: "{{count}}개의 숨겨진 답글 보기"
-      more_links: "{{count}}개 더..."
       unread: "읽지 않은 포스트"
       has_replies:
         other: "{{count}} 답글"
@@ -1302,14 +1292,6 @@ ko:
         flag: '신고하기'
         defer_flags:
           other: "신고 보류하기"
-        it_too:
-          off_topic: "나도 신고하기"
-          spam: "나도 신고하기"
-          inappropriate: "나도 신고하기"
-          custom_flag: "나도 신고하기"
-          bookmark: "나도 북마크하기"
-          like: "나도 좋아해요"
-          vote: "나도 투표하기"
         undo:
           off_topic: "신고 취소"
           spam: "신고 취소"
@@ -1460,7 +1442,6 @@ ko:
       take_action: "조치하기"
       notify_action: '메시지 보내기'
       delete_spammer: "네, 스패머 회원을 삭제합니다"
-      delete_confirm: "이 회원의 글 %{posts}개 및 주제 %{topics}개를 삭제하고 IP주소 %{ip_address}와 이메일 %{email}을 영구 차단하려고 합니다. 이 회원이 정말 스패머가 확실합니까?"
       yes_delete_spammer: "예, 스팸 회원을 삭제합니다"
       ip_address_missing: "(알 수 없음)"
       hidden_email_address: "(숨김)"
@@ -1473,10 +1454,6 @@ ko:
         spam: "스팸입니다"
       custom_placeholder_notify_user: "구체적이고, 건설적이며, 항상 친절하세요."
       custom_placeholder_notify_moderators: "구체적으로 회원님이 걱정하는 내용과 가능한 모든 관련된 링크를 제공해주세요."
-      custom_message:
-        at_least: "최소한 {{n}}자를 입력하세요"
-        more: "{{n}} 이동합니다"
-        left: "{{n}} 나머지"
     flagging_topic:
       title: "우리 커뮤니티 질서를 지키는데 도와주셔서 감사합니다!"
       action: "주제 신고하기"
@@ -1507,7 +1484,6 @@ ko:
       invisible:
         help: "이 주제는 목록에서 제외됩니다. 주제 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다."
     posts: "글"
-    posts_lowercase: "글"
     posts_long: "이 주제의 글 수는 {{number}}개 입니다."
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
@@ -2138,7 +2114,6 @@ ko:
         suspend_reason: "Reason"
         suspended_by: "접근 금지자"
         delete_all_posts: "모든 글을 삭제합니다"
-        delete_all_posts_confirm: "%{posts}개의 글과 %{topics}개의 주제를 지우려고 합니다. 확실합니까?"
         suspend: "접근 금지"
         unsuspend: "접근 허용"
         suspended: "접근 금지?"
@@ -2222,7 +2197,6 @@ ko:
         unlock_trust_level: "회원등급 고정 해제"
         tl3_requirements:
           title: "3등급 회원이 되기 위한 자격"
-          table_title: "지난 %{time_period} 일간"
           value_heading: "값"
           requirement_heading: "자격요건"
           visits: "방문횟수"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 50c70993cac..fd95d1a3704 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -46,9 +46,6 @@ nb_NO:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -354,14 +351,9 @@ nb_NO:
       latest_by: "siste av"
       toggle_ordering: "veksle rekkefølge"
       subcategories: "Underkategorier"
-      topic_stats: "Antall nye emner."
       topic_stat_sentence:
         one: "%{count} nytt emner de siste %{unit}."
         other: "%{count} nye emner de siste %{unit}."
-      post_stats: "Antall nye innlegg."
-      post_stat_sentence:
-        one: "%{count} nye innlegg den siste %{unit}."
-        other: "%{count} nye innlegg de siste %{unit}."
     ip_lookup:
       title: Slå opp IP-adresse
       hostname: Vertsnavn
@@ -919,7 +911,6 @@ nb_NO:
         bookmarks: "Det er ingen bokmerkede emner."
         search: "Det er ingen flere søkeresultater"
     topic:
-      filter_to: "{{post_count}} innlegg i dette emnet."
       create: 'Nytt emne'
       create_long: 'Opprett et nytt emne'
       private_message: 'Begynn en melding'
@@ -987,7 +978,6 @@ nb_NO:
         jump_bottom_with_number: "hopp til innlegg %{post_number}"
         total: innlegg totalt
         current: gjeldende innlegg
-        position: "innlegg %{current} av %{total}"
       notifications:
         reasons:
           '3_6': 'Du vil motta varsler fordi du følger denne kategorien'
@@ -1156,7 +1146,6 @@ nb_NO:
       gap:
         one: "vis 1 skjult svar"
         other: "vis {{count}} skjulte svar"
-      more_links: "{{count}} flere..."
       unread: "Innlegget er ulest"
       has_replies:
         one: "{{count}} Svar"
@@ -1217,14 +1206,6 @@ nb_NO:
         defer_flags:
           one: "Utsett rapportering"
           other: "Utsett rapporteringer"
-        it_too:
-          off_topic: "Rapporter det også"
-          spam: "Rapporter det også"
-          inappropriate: "Rapporter det også"
-          custom_flag: "Rapporter det også"
-          bookmark: "Bokmerk det også"
-          like: "Lik det også"
-          vote: "Stem for det også"
         undo:
           off_topic: "Angre rapportering"
           spam: "Angre rapportering"
@@ -1390,7 +1371,6 @@ nb_NO:
       notify_action: 'Melding'
       official_warning: 'Offisiell Advarsel'
       delete_spammer: "Slett spammer"
-      delete_confirm: "Du er i ferd med å slette <b>%{posts}</b> innlegg og <b>%{topics}</b> emner av denne brukeren, slette brukerens konto, blokkere registrering fra brukerens IP-adresse <b>%{ip_address}</b>, og legge brukerens e-postadresse <b>%{email}</b> i en permanent svarteliste. Er du sikker på at denne brukeren virkelig er en spammer?"
       yes_delete_spammer: "Ja, slett spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(skjult)"
@@ -1403,10 +1383,6 @@ nb_NO:
         spam: "Det er reklame"
       custom_placeholder_notify_user: "Vær spesifikk, konstruktiv og snill."
       custom_placeholder_notify_moderators: "La oss vite nøyaktig hva problemet er, og del relevante lenker og eksempler hvorvidt det er mulig."
-      custom_message:
-        at_least: "skriv minst {{n}} bokstaver"
-        more: "{{n}} igjen..."
-        left: "{{n}} gjenstående"
     flagging_topic:
       title: "Takk for at du hjelper med å vedlikeholde god skikk i samfundet vårt!"
       action: "Rapporter emne"
@@ -1438,7 +1414,6 @@ nb_NO:
       invisible:
         help: "Dette emnet er ikke listet; det vil ikke vises i emnelister, og kan kun leses via en direktelenke"
     posts: "Innlegg"
-    posts_lowercase: "innlegg"
     posts_long: "{{number}} innlegg i dette emnet"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
@@ -2041,7 +2016,6 @@ nb_NO:
         suspend_reason: "Begrunnelse"
         suspended_by: "Bannlyst av"
         delete_all_posts: "Slett alle innlegg"
-        delete_all_posts_confirm: "Du skal til å slette %{posts} innlegg og %{topics} emner. Er du sikker?"
         suspend: "Bannlyst"
         unsuspend: "Gjeninnsett\""
         suspended: "Bannlyst?"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index e5abbd34dd5..50de3bd2088 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -48,9 +48,6 @@ nl:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -402,14 +399,9 @@ nl:
       latest_by: "Laatste door"
       toggle_ordering: "schakel sorteermethode"
       subcategories: "Subcategorieën"
-      topic_stats: "Het aantal nieuwe topics."
       topic_stat_sentence:
         one: "%{count} nieuw topic in de afgelopen %{unit}."
         other: "%{count} nieuwe topics in de afgelopen %{unit}."
-      post_stats: "Het aantal nieuwe berichten."
-      post_stat_sentence:
-        one: "%{count} nieuw bericht in de afgelopen %{unit}."
-        other: "%{count} nieuwe berichten in de afgelopen %{unit}."
     ip_lookup:
       title: IP-adres lookup
       hostname: Hostname
@@ -919,7 +911,6 @@ nl:
       saved_local_draft_tip: "lokaal opgeslagen"
       similar_topics: "Jouw topic lijkt op..."
       drafts_offline: "concepten offline"
-      group_mentioned: "Door het noemen van {{group}}, sta je op het punt om <a href='{{group_link}}'>{{count}} mensen</a> op de hoogte te brengen - weet je dit zeker?"
       duplicate_link: "Het ziet er naar uit dat je link naar <b>{{domain}}</b> al genoemd is in deze topic door <b>@{{username}}</b> in <a href='{{post_url}}'>een bericht {{ago}}</a> – weet je zeker dat je dit opnieuw wilt posten?"
       error:
         title_missing: "Titel is verplicht"
@@ -1136,7 +1127,6 @@ nl:
       unsubscribe:
         stop_notifications: "Je zal nu minder notificaties ontvangen voor <strong>{{title}}</strong>"
         change_notification_state: "Je huidige notificatiestatus is"
-      filter_to: "{{post_count}} berichten in topic"
       create: 'Nieuw topic'
       create_long: 'Maak een nieuw topic'
       private_message: 'Stuur een bericht'
@@ -1196,11 +1186,9 @@ nl:
       auto_close_title: 'Instellingen voor automatisch sluiten'
       auto_close_save: "Opslaan"
       auto_close_remove: "Sluit deze topic niet automatisch"
-      auto_close_immediate: "De laatste post in deze topic is al %{hours} uur oud, dus deze topic wordt meteen gesloten."
       timeline:
         back: "Terug"
         back_description: "Keer terug naar je laatste ongelezen bericht"
-        replies: "%{current} / %{total} antwoorden"
         replies_short: "%{current} / %{total}"
       progress:
         title: topicvoortgang
@@ -1213,7 +1201,6 @@ nl:
         jump_bottom_with_number: "spring naar bericht %{post_number}"
         total: totaal aantal berichten
         current: huidige bericht
-        position: "bericht %{current} van %{total}"
       notifications:
         title: verander de frequentie van notificaties over deze topic
         reasons:
@@ -1416,7 +1403,6 @@ nl:
       gap:
         one: "bekijk 1 verborgen reactie"
         other: "bekijk {{count}} verborgen reacties"
-      more_links: "{{count}} meer..."
       unread: "Bericht is ongelezen"
       has_replies:
         one: "{{count}} Reactie"
@@ -1485,14 +1471,6 @@ nl:
         defer_flags:
           one: "Markering negeren"
           other: "Markeringen negeren"
-        it_too:
-          off_topic: "Markeer het ook"
-          spam: "Markeer het ook"
-          inappropriate: "Markeer deze ook"
-          custom_flag: "Markeer het ook"
-          bookmark: "Voeg ook toe aan favorieten"
-          like: "Like het ook"
-          vote: "Stem ook"
         undo:
           off_topic: "Verwijder markering"
           spam: "Verwijder markering"
@@ -1678,7 +1656,6 @@ nl:
       notify_action: 'Bericht'
       official_warning: 'Officiële waarschuwing'
       delete_spammer: "Verwijder spammer"
-      delete_confirm: "Je gaat nu <b>%{posts}</b> berichten en <b>%{topics}</b> topics van deze gebruiker verwijderen, het account verwijderen, nieuwe aanmeldingen vanaf het IP-adres <b>%{ip_address}</b> blokkeren en het e-mailadres <b>%{email}</b> op een permanente blokkeerlijst zetten. Weet je zeker dat dit een spammer is?"
       yes_delete_spammer: "Ja, verwijder spammer"
       ip_address_missing: "(N.V.T.)"
       hidden_email_address: "(verborgen)"
@@ -1692,10 +1669,6 @@ nl:
         spam: "Dit is spam"
       custom_placeholder_notify_user: "Wees specifiek, opbouwend en blijf altijd beleefd."
       custom_placeholder_notify_moderators: "Laat ons specifiek weten waar je je zorgen om maakt en stuur relevante links en voorbeelden mee waar mogelijk."
-      custom_message:
-        at_least: "Gebruik ten minste {{n}} tekens"
-        more: "Nog {{n}} te gaan..."
-        left: "Nog {{n}}"
     flagging_topic:
       title: "Bedankt voor het helpen beleefd houden van onze gemeenschap!"
       action: "Markeer topic"
@@ -1736,7 +1709,6 @@ nl:
       invisible:
         help: "Dit topic is niet zichtbaar; het zal niet verschijnen in de topiclijst en kan alleen bekeken worden met een directe link"
     posts: "Berichten"
-    posts_lowercase: "berichten"
     posts_long: "er zijn {{number}} berichten in deze topic"
     posts_likes_MF: |
       Dit topic heeft {count, plural, one {1 antwoord} other {# antwoorden}} {ratio, select,
@@ -2567,7 +2539,6 @@ nl:
         suspend_reason: "Reden"
         suspended_by: "Geschorst door"
         delete_all_posts: "Verwijder alle berichten"
-        delete_all_posts_confirm: "Je staat op het punt om %{posts} berichten en %{topics} topics verwijderen. Weet je het zeker?"
         suspend: "Schors"
         unsuspend: "Herstel schorsing"
         suspended: "Geschorst?"
@@ -2663,7 +2634,6 @@ nl:
         unlock_trust_level: "Geef trustlevel vrij"
         tl3_requirements:
           title: "Vereisten voor trustlevel 3"
-          table_title: "In de laatste %{time_period} dagen:"
           value_heading: "Waarde"
           requirement_heading: "Vereiste"
           visits: "Bezoeken"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index aaff301ca30..93833cd1944 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -51,10 +51,6 @@ pl_PL:
           one: "1s"
           few: "%{count}s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          few: "< %{count}m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           few: "%{count}m"
@@ -427,16 +423,10 @@ pl_PL:
       latest_by: "najnowszy wpis: "
       toggle_ordering: "przełącz kolejność kontroli"
       subcategories: "Podkategorie"
-      topic_stats: "Liczba nowych tematów."
       topic_stat_sentence:
         one: "ostatni %{unit}: %{count} nowy temat."
         few: "ostatni %{unit}: %{count} nowe tematy."
         other: "ostatni %{unit}: %{count} nowych tematów."
-      post_stats: "Liczba nowych wpisów."
-      post_stat_sentence:
-        one: "ostatni %{unit}: %{count} nowy wpis."
-        few: "ostatni %{unit}: %{count} nowe wpisy."
-        other: "ostatni %{unit}: %{count} nowych wpisów."
     ip_lookup:
       title: Wyszukiwanie adresu IP
       hostname: Nazwa hosta
@@ -527,6 +517,13 @@ pl_PL:
       muted_topics_link: "Pokaż wyciszone tematy"
       watched_topics_link: "Pokaż obserwowane tematy"
       automatically_unpin_topics: "Automatycznie odpinaj tematy kiedy dotrę do końca strony."
+      apps: "Aplikacje"
+      revoke_access: "Zablokuj dostęp"
+      undo_revoke_access: "Cofnij zablokowanie dostępu"
+      api_permissions: "Uprawnienia:"
+      api_approved: "Zatwierdzony:"
+      api_read: "odczyt"
+      api_read_write: "odczyt i zapis"
       staff_counters:
         flags_given: "uczynnych oflagowań"
         flagged_posts: "oflagowane wpisy"
@@ -911,6 +908,9 @@ pl_PL:
       twitter: "Twitter"
       emoji_one: "Emoji One"
       win10: "Win10"
+    category_page_style:
+      categories_only: "Tylko kategorie"
+      categories_and_latest_topics: "Kategorie i ostatnie tematy"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -1142,7 +1142,6 @@ pl_PL:
       unsubscribe:
         stop_notifications: "Będziesz otrzymywać mniej powiadomień o <strong>{{title}}</strong>"
         change_notification_state: "Twój aktualny stan powiadomień to"
-      filter_to: "{{post_count}} wpisów w temacie"
       create: 'Nowy temat'
       create_long: 'Utwórz nowy temat'
       private_message: 'Napisz wiadomość'
@@ -1207,11 +1206,9 @@ pl_PL:
       auto_close_title: 'Ustawienia automatycznego zamykania'
       auto_close_save: "Zapisz"
       auto_close_remove: "Nie zamykaj automatycznie tego tematu"
-      auto_close_immediate: "Ostatni wpis w tym temacie został zamieszczony %{hours} godzin temu, więc zostanie on natychmiastowo zamknięty."
       timeline:
         back: "Wstecz"
         back_description: "Wróć do ostatniego nieprzeczytanego postu"
-        replies: "%{current} / %{total} odpowiedzi"
         replies_short: "%{current} / %{total}"
       progress:
         title: postęp tematu
@@ -1223,7 +1220,6 @@ pl_PL:
         jump_bottom_with_number: "przeskocz do wpisu %{post_number}"
         total: w sumie wpisów
         current: obecny wpis
-        position: "wpis %{current} z %{total}"
       notifications:
         reasons:
           '3_6': 'Będziesz otrzymywać powiadomienia o każdym nowym wpisie i temacie, ponieważ obserwujesz tę kategorię.'
@@ -1430,7 +1426,6 @@ pl_PL:
         one: "pokaż 1 ukrytą odpowiedź"
         few: "pokaż {{count}} ukryte odpowiedzi"
         other: "pokaż {{count}} ukrytych odpowiedzi"
-      more_links: "{{count}} więcej…"
       unread: "Nieprzeczytany wpis"
       has_replies:
         one: "{{count}} odpowiedź"
@@ -1503,14 +1498,6 @@ pl_PL:
           one: "Odrocz flagę"
           few: "Odrocz flagi"
           other: "Odrocz flagi"
-        it_too:
-          off_topic: "Oflaguj też to"
-          spam: "Oflaguj też to"
-          inappropriate: "Oflaguj też to"
-          custom_flag: "Oflaguj też to"
-          bookmark: "Utwórz zakładkę"
-          like: "Lajkuj"
-          vote: "Zagłosuj za tym"
         undo:
           off_topic: "Cofnij flagę"
           spam: "Cofnij flagę"
@@ -1704,7 +1691,6 @@ pl_PL:
       notify_action: 'Wiadomość'
       official_warning: 'Oficjalne ostrzeżenie'
       delete_spammer: "Usuń spamera"
-      delete_confirm: "Zamierzasz usunąć<b>%{posts}</b> wpisów i <b>%{topics}</b> tematów użytkownika, usunąć jest konto, zablokować możliwość zakładania kont z jego adresu IP <b>%{ip_address}</b> i dodać jego email <b>%{email}</b> do listy trwale zablokowanych. Czy na pewno ten użytkownik jest spamerem?"
       yes_delete_spammer: "Tak, usuń spamera"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(ukryto)"
@@ -1717,10 +1703,6 @@ pl_PL:
         spam: "Jest odebrane jako spam"
       custom_placeholder_notify_user: "Napisz konkretnie, konstuktywnie i kulturalnie."
       custom_placeholder_notify_moderators: "Dlaczego ten wpis wymaga uwagi moderatora? Opisz co konkretnie Cię zaniepokoiło i jeśli to możliwe umieść odpowiednie odnośniki."
-      custom_message:
-        at_least: "wprowadź co najmniej {{n}} znaków"
-        more: "{{n}} aby wysłać…"
-        left: "{{n}} pozostało"
     flagging_topic:
       title: "Dziękujemy za pomoc w utrzymaniu porządku w naszej społeczności!"
       action: "Zgłoś temat"
@@ -1757,7 +1739,6 @@ pl_PL:
       invisible:
         help: "Temat jest niewidoczny: nie będzie wyświetlany na listach tematów a dostęp do niego można uzyskać jedynie poprzez link bezpośredni"
     posts: "Wpisy"
-    posts_lowercase: "wpisy"
     posts_long: "jest {{number}} wpisów w tym temacie"
     original_post: "Oryginalny wpis"
     views: "Odsłony"
@@ -2551,7 +2532,6 @@ pl_PL:
         suspend_reason: "Powód"
         suspended_by: "Zawieszony przez"
         delete_all_posts: "Usuń wszystkie wpisy"
-        delete_all_posts_confirm: "Zamierzasz usunąć %{posts} wpisów i %{topics} tematów. Czy na pewno?"
         suspend: "Zawieś"
         unsuspend: "Odwieś"
         suspended: "Zawieszony?"
@@ -2641,7 +2621,6 @@ pl_PL:
         unlock_trust_level: "Odblokuj poziom zaufania"
         tl3_requirements:
           title: "Wymagania dla osiągnięcia 3. poziomu zaufania"
-          table_title: "W ciągu ostatnich %{time_period} dni:"
           value_heading: "Wartość"
           requirement_heading: "Wymaganie"
           visits: "Odwiedziny"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index ec587e5f1f0..de3fae1aa10 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -48,9 +48,6 @@ pt:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -402,14 +399,9 @@ pt:
       latest_by: "recentes por"
       toggle_ordering: "alternar o controlo de ordenação"
       subcategories: "Subcategorias"
-      topic_stats: "Número de tópicos novos."
       topic_stat_sentence:
         one: "%{count} novo tópico no passado %{unit}."
         other: "%{count} novos tópicos no passado %{unit}."
-      post_stats: "Número de mensagens novas."
-      post_stat_sentence:
-        one: "%{count} nova mensagem no passado %{unit}."
-        other: "%{count} novas mensagens no passado %{unit}."
     ip_lookup:
       title: Pesquisa de Endereço IP
       hostname: Nome do Servidor
@@ -1100,7 +1092,6 @@ pt:
       unsubscribe:
         stop_notifications: "Irá passar a receber menos notificações para <strong>{{title}}</strong>"
         change_notification_state: "O seu estado de notificação atual é"
-      filter_to: "{{post_count}} mensagens no tópico"
       create: 'Novo Tópico'
       create_long: 'Criar um novo Tópico'
       private_message: 'Iniciar uma mensagem'
@@ -1160,7 +1151,6 @@ pt:
       auto_close_title: 'Configurações para Fechar Automaticamente'
       auto_close_save: "Guardar"
       auto_close_remove: "Não Fechar Este Tópico Automaticamente"
-      auto_close_immediate: "A última mensagem neste tópico já tem %{hours} horas, por isso o tópico será fechado imediatamente."
       progress:
         title: progresso do tópico
         go_top: "topo"
@@ -1170,7 +1160,6 @@ pt:
         jump_bottom_with_number: "avançar para a mensagem %{post_number}"
         total: total de mensagens
         current: mensagem atual
-        position: "mensagem %{current} de %{total}"
       notifications:
         reasons:
           '3_6': 'Receberá notificações porque está a vigiar esta categoria.'
@@ -1365,7 +1354,6 @@ pt:
       gap:
         one: "ver 1 resposta oculta"
         other: "ver {{count}} respostas ocultas"
-      more_links: "{{count}} mais..."
       unread: "Mensagem não lida"
       has_replies:
         one: "{{count}} Resposta"
@@ -1434,14 +1422,6 @@ pt:
         defer_flags:
           one: "Diferir sinalização"
           other: "Diferir sinalizações"
-        it_too:
-          off_topic: "Sinalizar também"
-          spam: "Sinalizar também"
-          inappropriate: "Sinalizar também"
-          custom_flag: "Sinalizar também"
-          bookmark: "Também adicionar marcador"
-          like: "Também adicionar um Gosto"
-          vote: "Também adicionar um voto"
         undo:
           off_topic: "Retirar sinalização"
           spam: "Retirar sinalização"
@@ -1613,7 +1593,6 @@ pt:
       notify_action: 'Mensagem'
       official_warning: 'Aviso Oficial'
       delete_spammer: "Eliminar Spammer"
-      delete_confirm: "Está prestes a apagar <b>%{posts}</b> mensagens e <b>%{topics}</b> tópicos deste utilizador, remover a sua conta, bloquear acessos do seu endereço IP <b>%{ip_address}</b>, e adicionar o seu endereço de email <b>%{email}</b> a uma lista negra. Tem a certeza que este utilizador é de facto um spammer?"
       yes_delete_spammer: "Sim, Eliminar Spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(escondido)"
@@ -1627,10 +1606,6 @@ pt:
         spam: "É Spam"
       custom_placeholder_notify_user: "Seja específico, seja construtivo e seja sempre amável."
       custom_placeholder_notify_moderators: "Diga-nos especificamente quais são as suas preocupações, e forneça-nos hiperligações relevantes e exemplo se possível."
-      custom_message:
-        at_least: "insira pelo menos {{n}} caracteres"
-        more: "{{n}} em falta..."
-        left: "{{n}} remanescentes"
     flagging_topic:
       title: "Obrigado por ajudar a manter a nossa comunidade cívica!"
       action: "Sinalizar Tópico"
@@ -1665,7 +1640,6 @@ pt:
       invisible:
         help: "Este tópico não está listado; não será apresentado na lista de tópicos e poderá ser acedido apenas através de uma hiperligação direta"
     posts: "Mensagens"
-    posts_lowercase: "mensagens"
     posts_long: "existem {{number}} mensagens neste tópico"
     posts_likes_MF: |
       Este tópico tem {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
@@ -2323,7 +2297,6 @@ pt:
         suspend_reason: "Motivo"
         suspended_by: "Suspendido por"
         delete_all_posts: "Eliminar todas as mensagens"
-        delete_all_posts_confirm: "Está prestes a eliminar %{posts} mensagens e %{topics} tópicos. Tem a certeza de que quer continuar?"
         suspend: "Suspender"
         unsuspend: "Retirar a suspensão"
         suspended: "Suspendido?"
@@ -2410,7 +2383,6 @@ pt:
         unlock_trust_level: "Desbloquear Nível de Confiança"
         tl3_requirements:
           title: "Requisitos para o Nível de Confiança 3"
-          table_title: "Nos últimos %{time_period} dias:"
           value_heading: "Valor"
           requirement_heading: "Requisito"
           visits: "Visitas"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 2b23775889f..22f040dee63 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -48,9 +48,6 @@ pt_BR:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -402,14 +399,9 @@ pt_BR:
       latest_by: "recentes por"
       toggle_ordering: "alternar controle de ordenação"
       subcategories: "Subcategorias"
-      topic_stats: "O número de novos tópicos."
       topic_stat_sentence:
         one: "%{count} novo tópico nos últimos %{unit}."
         other: "%{count} novos tópicos nos últimos %{unit}."
-      post_stats: "O número de mensagens novas."
-      post_stat_sentence:
-        one: "%{count} nova mensagem nos últimos %{unit}."
-        other: "%{count} novas mensagens nos últimos %{unit}."
     ip_lookup:
       title: Pesquisa do endereço de IP
       hostname: Nome do host
@@ -923,7 +915,6 @@ pt_BR:
       saved_local_draft_tip: "salvo localmente"
       similar_topics: "Seu tópico é parecido com..."
       drafts_offline: "rascunhos offline"
-      group_mentioned: "Ao mencionar {{group}}, você irá notificar <a href='{{group_link}}'>{{count}} pessoas</a> – tem certeza?"
       duplicate_link: "Parece que o seu link para <b>{{domain}}</b> já foi postado no tópico por <b>@{{username}}</b> em <a href='{{post_url}}'>uma resposta {{ago}}</a> – tem certeza que deseja postá-lo novamente?"
       error:
         title_missing: "Título é obrigatório"
@@ -1140,7 +1131,6 @@ pt_BR:
       unsubscribe:
         stop_notifications: "Você agora vai receber menos notificações de <strong>{{title}}</strong>"
         change_notification_state: "Seu estado de notificação atual é"
-      filter_to: "{{post_count}} mensagens no tópico"
       create: 'Novo tópico'
       create_long: 'Criar um novo tópico'
       private_message: 'Iniciar uma mensagem'
@@ -1200,11 +1190,9 @@ pt_BR:
       auto_close_title: 'Configurações para fechar automaticamente'
       auto_close_save: "Salvar"
       auto_close_remove: "Não fechar automaticamente este tópico"
-      auto_close_immediate: "O último tópico postado foi há %{hours} horas, então o tópico será fechado imadiatamente.."
       timeline:
         back: "Voltar"
         back_description: "Volte para a sua última postagem não lida"
-        replies: "%{current} / %{total} respostas"
         replies_short: "%{current} / %{total}"
       progress:
         title: progresso do tópico
@@ -1217,7 +1205,6 @@ pt_BR:
         jump_bottom_with_number: "ir para a mensagem %{post_number}"
         total: total de mensagens
         current: resposta atual
-        position: "mensagem %{current} de %{total}"
       notifications:
         title: altere a frequência de notificações deste tópico
         reasons:
@@ -1421,7 +1408,6 @@ pt_BR:
       gap:
         one: "ver 1 resposta oculta"
         other: "ver {{count}} respostas ocultas"
-      more_links: "{{count}} mais..."
       unread: "Resposta não lida"
       has_replies:
         one: "{{count}} Resposta"
@@ -1490,14 +1476,6 @@ pt_BR:
         defer_flags:
           one: "Delegar denuncia"
           other: "Delegar denúncias"
-        it_too:
-          off_topic: "Sinalizar também"
-          spam: "Sinalizar também"
-          inappropriate: "Sinalizar também"
-          custom_flag: "Sinalizar também"
-          bookmark: "Favoritar também"
-          like: "Curtir também"
-          vote: "Vote neste também"
         undo:
           off_topic: "Desfazer sinalização"
           spam: "Desfazer sinalização"
@@ -1683,7 +1661,6 @@ pt_BR:
       notify_action: 'Mensagem'
       official_warning: 'Aviso Oficial'
       delete_spammer: "Apagar Spammer"
-      delete_confirm: "Você está prestes a excluir <b>%{posts}</b> mensagens e <b>%{topics}</b> tópicos deste usuário, removendo a conta, bloqueando cadastro a partir do endereço IP <b>%{ip_address}</b> e adicionando o e-mail dele <b>%{email}</b> em uma lista de bloqueio permanente. Você tem certeza que este usuário é realmente um spammer?"
       yes_delete_spammer: "Sim, Apagar Spammer"
       ip_address_missing: "(N/D)"
       hidden_email_address: "(escondido)"
@@ -1697,10 +1674,6 @@ pt_BR:
         spam: "É spam"
       custom_placeholder_notify_user: "Seja específico, construtivo e sempre seja gentil."
       custom_placeholder_notify_moderators: "Deixe-nos saber especificamente com o que você está preocupado, e nos forneça links relevantes e exemplos quando possível."
-      custom_message:
-        at_least: "insira pelo menos {{n}} caracteres"
-        more: "{{n}} em falta..."
-        left: "{{n}} restantes"
     flagging_topic:
       title: "Obrigado por ajudar a manter a civilidade da nossa comunidade!"
       action: "Sinalizar Tópico"
@@ -1741,7 +1714,6 @@ pt_BR:
       invisible:
         help: "Este tópico está invisível; não aparecerá na listagem dos tópicos, e pode apenas ser acessado por link direto"
     posts: "Postagens"
-    posts_lowercase: "postagens"
     posts_long: "há {{number}} mensagens neste tópico"
     posts_likes_MF: |
       Este tópico tem {count, plural, one {1 resposta} other {# respostas}} {ratio, select,
@@ -2572,7 +2544,6 @@ pt_BR:
         suspend_reason: "Motivo"
         suspended_by: "Suspenso por"
         delete_all_posts: "Apagar todas mensagens"
-        delete_all_posts_confirm: "Você está prestes a apagar %{posts} mensagens e %{topics} tópicos. Tem certeza que quer continuar?"
         suspend: "Suspender"
         unsuspend: "Readmitir"
         suspended: "Suspenso?"
@@ -2668,7 +2639,6 @@ pt_BR:
         unlock_trust_level: "Destravar Nível de Confiança"
         tl3_requirements:
           title: "Requisitos para o Nível de Confiança 3"
-          table_title: "Nos últimos %{time_period} dias:"
           value_heading: "Valor"
           requirement_heading: "Requisito"
           visits: "Visitas"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index e28d430911b..c010c4dff5b 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -49,10 +49,6 @@ ro:
           one: "1s"
           few: "%{count}s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          few: "< %{count}m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           few: "%{count}m"
@@ -403,16 +399,10 @@ ro:
       latest_by: "recente dupa"
       toggle_ordering: "Control comandă comutare"
       subcategories: "Subcategorie"
-      topic_stats: "Numărul de discuții noi."
       topic_stat_sentence:
         one: "%{count} subiect în %{unit}."
         few: "%{count} subiecte noi în %{unit}."
         other: "%{count} subiecte noi în %{unit}."
-      post_stats: "Numărul de postări noi."
-      post_stat_sentence:
-        one: "%{count} mesaj nou in ultimele %{unit}."
-        few: "%{count} mesaje noi in ultimele %{unit}."
-        other: "%{count} mesaje noi in ultimele %{unit}."
     ip_lookup:
       title: Căutare adresă IP
       hostname: Nume gazdă
@@ -1040,7 +1030,6 @@ ro:
     topic:
       unsubscribe:
         stop_notifications: "Vei primi mai puține notificări pentru <strong>{{title}}</strong>"
-      filter_to: "{{post_count}} postări în discuție"
       create: 'Discuție Nouă'
       create_long: 'Creează discuție nouă'
       private_message: 'Scrie un mesaj.'
@@ -1102,7 +1091,7 @@ ro:
       jump_reply_down: sări la un răspuns mai nou
       deleted: "Discuția a fost ștearsă"
       auto_close_notice: "Această discuție va fi inchisă în %{timeLeft}."
-      auto_close_notice_based_on_last_post: "Această discuţie se va închide %{duration} după ultimul răspuns."
+      auto_close_notice_based_on_last_post: "Această discuţie se va închide după %{duration} de la ultimul răspuns."
       auto_close_title: 'Setările de auto-închidere'
       auto_close_save: "Salvează"
       auto_close_remove: "nu închide automat această discuție"
@@ -1115,7 +1104,6 @@ ro:
         jump_bottom_with_number: "sări la mesajul %{post_number}"
         total: toate postările
         current: Postarea curentă
-        position: "postarea %{current} din %{total}"
       notifications:
         reasons:
           '3_6': 'Vei primi notificări deoarece urmărești activ această categorie.'
@@ -1297,7 +1285,6 @@ ro:
         one: "vezi un răspuns ascuns"
         few: "vezi {{count}} răspunsuri ascunse"
         other: "vezi {{count}} de răspunsuri ascunse"
-      more_links: "{{count}} mai multe..."
       unread: "postarea nu a fost citită"
       has_replies:
         one: "Un răspuns"
@@ -1364,14 +1351,6 @@ ro:
           one: "Amână marcarea"
           few: "Amână marcările"
           other: "Amână marcările"
-        it_too:
-          off_topic: "Semnalează și tu"
-          spam: "Semnalează și tu"
-          inappropriate: "Semnalează și tu"
-          custom_flag: "Semnalează și tu"
-          bookmark: "Adaugă-l și tu la favorite"
-          like: "Apreciază și tu"
-          vote: "Votează și tu"
         undo:
           off_topic: "Retrage semnalare"
           spam: "Retrage semnalare"
@@ -1549,7 +1528,6 @@ ro:
       notify_action: 'Mesaj'
       official_warning: 'Avertismen Oficial'
       delete_spammer: "Șterge spammer"
-      delete_confirm: "Sunteți pe punctul de a șterge postarea <b>%{posts}</b> și postările <b>%{topics}</b> ale acestui uitilizator, de a-i anula contul, de a-i bloca autentificarea de la adresa IP <b>%{ip_address}</b>, adresa de email <b>%{email}</b> și de a bloca listarea permanent. Sunteți sigur ca acest utilizator este un spammer?"
       yes_delete_spammer: "Da, Șterge spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(ascuns)"
@@ -1563,10 +1541,6 @@ ro:
         spam: "Este Spam"
       custom_placeholder_notify_user: "De ce această postare necesită comunicarea cu utilizatorul directă sau privată? Fiți specific, constructiv și intotdeauna amabil."
       custom_placeholder_notify_moderators: "De ce această postare necesită atenția moderatorului? Spuneți-ne exact ceea ce vă nelamurește, și oferiți adrese relevante de câte ori e posibil."
-      custom_message:
-        at_least: "introduce-ți cel puțin {{n}} de caractere"
-        more: "încă...{{n}} caractere"
-        left: "au mai rămas {{n}} caractere"
     flagging_topic:
       title: "De ce marcați privat această discuție?"
       action: "Marchează discuție"
@@ -1599,7 +1573,6 @@ ro:
       invisible:
         help: "Această discuție este invizibilă; nu va fi afișată în listele de discuții și va fi accesată numai prin adresa directă"
     posts: "Postări"
-    posts_lowercase: "postări"
     posts_long: "sunt {{number}} de postări în această discuție"
     original_post: "Postări originale"
     views: "Vizualizări"
@@ -2231,7 +2204,6 @@ ro:
         suspend_reason: "Motiv"
         suspended_by: "Suspendat de"
         delete_all_posts: "Șterge toate postările"
-        delete_all_posts_confirm: "Sunteți pe cale să ștergeți %{posts} de postări și %{topics} de discuții. Sunteți sigur?"
         suspend: "Suspendat"
         unsuspend: "Activat"
         suspended: "Suspendat?"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index dc1ead92d33..53fd062b316 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -54,16 +54,11 @@ ru:
           few: "%{count}с"
           many: "%{count}с"
           other: "%{count}с"
-        less_than_x_minutes:
-          one: "< 1мин"
-          few: "< %{count}мин"
-          many: "< %{count}мин"
-          other: "< %{count}мин"
         x_minutes:
           one: "1мин"
-          few: "< %{count}мин"
-          many: "< %{count}мин"
-          other: "< %{count}мин"
+          few: "%{count}мин"
+          many: "%{count}мин"
+          other: "%{count}мин"
         about_x_hours:
           one: "1ч"
           few: "%{count}ч"
@@ -455,18 +450,11 @@ ru:
       latest_by: "последние по"
       toggle_ordering: "изменить сортировку"
       subcategories: "Подразделы"
-      topic_stats: "Количество новых тем."
       topic_stat_sentence:
         one: "%{count} новая тема за предыдущий %{unit}."
         few: "%{count} новые темы за предыдущий %{unit}."
         many: "%{count} новых тем за предыдущий %{unit}."
         other: "%{count} новых тем за предыдущий %{unit}."
-      post_stats: "Количество новых сообщений."
-      post_stat_sentence:
-        one: "%{count} новое сообщение за предыдущий %{unit}."
-        few: "%{count} новых сообщения за предыдущий %{unit}."
-        many: "%{count} новых сообщений за предыдущий %{unit}."
-        other: "%{count} новых сообщений за предыдущий %{unit}."
     ip_lookup:
       title: Поиск IP адреса
       hostname: Название хоста
@@ -1165,7 +1153,6 @@ ru:
     topic:
       unsubscribe:
         change_notification_state: "Ваше текущее состояние уведомлений"
-      filter_to: "{{post_count}} сообщений в теме"
       create: 'Создать Тему'
       create_long: 'Создать новую тему'
       private_message: 'Написать сообщение'
@@ -1246,7 +1233,6 @@ ru:
         jump_bottom_with_number: "перейти к сообщению %{post_number}"
         total: всего сообщений
         current: текущее сообщение
-        position: "%{current} сообщение из %{total}"
       notifications:
         reasons:
           '3_6': 'Вы будете получать уведомления, т.к. наблюдаете за этим разделом.'
@@ -1461,7 +1447,6 @@ ru:
         few: "просмотреть {{count}} скрытых ответов"
         many: "просмотреть {{count}} скрытых ответов"
         other: "просмотреть {{count}} скрытых ответов"
-      more_links: "еще {{count}}..."
       unread: "Сообщение не прочитано"
       has_replies:
         one: "{{count}} Ответ"
@@ -1531,14 +1516,6 @@ ru:
           few: "Отложить жалобы"
           many: "Отложить жалобы"
           other: "Отложить жалобы"
-        it_too:
-          off_topic: "Пожаловаться"
-          spam: "Пожаловаться"
-          inappropriate: "Пожаловаться"
-          custom_flag: "Пожаловаться"
-          bookmark: "Добавить в закладки"
-          like: "Мне тоже нравится"
-          vote: "Проголосовать"
         undo:
           off_topic: "Отозвать жалобу"
           spam: "Отозвать жалобу"
@@ -1739,7 +1716,6 @@ ru:
       notify_action: 'Сообщение'
       official_warning: 'Официальное предупреждение'
       delete_spammer: "Удалить спамера"
-      delete_confirm: "Вы собираетесь удалить <b>%{posts}</b> сообщений и <b>%{topics}</b> тем этого пользователя, а так же удалить его учетную запись, добавить его IP адрес <b>%{ip_address}</b> и его почтовый адрес <b>%{email}</b> в черный список. Вы действительно уверены, что ваши помыслы чисты и действия не продиктованы гневом?"
       yes_delete_spammer: "Да, удалить спамера"
       ip_address_missing: "(не доступно)"
       hidden_email_address: "(скрыто)"
@@ -1752,10 +1728,6 @@ ru:
         spam: "Это спам"
       custom_placeholder_notify_user: "Будьте точны, конструктивны и всегда доброжелательны."
       custom_placeholder_notify_moderators: "Сообщите нам, чем конкретно вы обеспокоены и предоставьте соответствующие ссылки, если это возможно."
-      custom_message:
-        at_least: "введите как минимум {{n}} символов"
-        more: "Нужно ещё {{n}} cимволов..."
-        left: "Осталось {{n}} символов"
     flagging_topic:
       title: "Спасибо за вашу помощь!"
       action: "Пометить тему"
@@ -1792,7 +1764,6 @@ ru:
       invisible:
         help: "Тема исключена из всех списков тем и доступна только по прямой ссылке"
     posts: "Сообщ."
-    posts_lowercase: "сообщения"
     posts_long: "{{number}} сообщений в теме"
     posts_likes_MF: |
       В этой теме {count, plural, one {1 сообщение} other {# сообщений}} {ratio, select,
@@ -2582,7 +2553,6 @@ ru:
         suspend_reason: "Причина"
         suspended_by: "Заморожен"
         delete_all_posts: "Удалить все сообщения"
-        delete_all_posts_confirm: "Вы собираетесь удалить %{posts} сообщений и %{topics} тем. Вы уверены?"
         suspend: "Заморозить"
         unsuspend: "Разморозить"
         suspended: "Заморожен?"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index a9a547c5c25..a7b16ddbfc8 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -49,10 +49,6 @@ sk:
           one: "1s"
           few: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          few: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           few: "%{count}m"
@@ -409,16 +405,10 @@ sk:
       latest_by: "najnovšie podľa"
       toggle_ordering: "zmeniť radenie"
       subcategories: "Podkategórie"
-      topic_stats: "Počet nových tém."
       topic_stat_sentence:
         one: "%{count} nová téma za posledných %{unit}."
         few: "%{count} nové témy za posledných %{unit}."
         other: "%{count} nových tém za posledných %{unit}."
-      post_stats: "Počet nových príspevkov."
-      post_stat_sentence:
-        one: "%{count} nový príspevok za posledných %{unit}."
-        few: "%{count} nové príspevky za posledných %{unit}."
-        other: "%{count} nových príspevkov za posledných %{unit}."
     ip_lookup:
       title: Vyhľadávanie podľa IP adresy
       hostname: Hostname
@@ -1046,7 +1036,6 @@ sk:
       unsubscribe:
         stop_notifications: "Teraz budete dostávať menej upozornení na <strong>{{title}}</strong>"
         change_notification_state: "Váš súčasný stav upozornení je"
-      filter_to: "{{post_count}} príspevkov k téme"
       create: 'Nová téma'
       create_long: 'Vytvoriť novú tému'
       private_message: 'Vytvoríť správu'
@@ -1112,7 +1101,6 @@ sk:
       auto_close_title: 'Nastavenia automatického zatvárania'
       auto_close_save: "Uložiť"
       auto_close_remove: "Neuzatvárať túto tému automaticky"
-      auto_close_immediate: "Posledný príspevok k téme je starý už %{hours} hodín, takže téma bude okamžite uzavretá. "
       progress:
         title: pozícia v téme
         go_top: "na začiatok"
@@ -1122,7 +1110,6 @@ sk:
         jump_bottom_with_number: "choď na príspevok číslo %{post_number}"
         total: Všetkých príspevkov
         current: tento príspevok
-        position: "%{current}  príspevok z %{total}"
       notifications:
         reasons:
           '3_6': 'Budete dostávať upozornenia, pretože sa pozeráte na túto kategóriu.'
@@ -1324,7 +1311,6 @@ sk:
         one: "zobraziť skrytú odpoveď"
         few: "zobraziť {{count}} skryté odpovede"
         other: "zobraziť {{count}} skrytých odpovedí"
-      more_links: "ešte {{count}} "
       unread: "Príspevok je neprečítaný."
       has_replies:
         one: "{{count}} Odpoveď"
@@ -1395,14 +1381,6 @@ sk:
           one: "Zrušiť označenie"
           few: "Zrušiť označenia"
           other: "Zrušiť označenia"
-        it_too:
-          off_topic: "Tiež označ"
-          spam: "Tiež označ"
-          inappropriate: "Tiež označ"
-          custom_flag: "Tiež označ"
-          bookmark: "Tiež vytvoriť záložku"
-          like: "Tiež sa mi páči"
-          vote: "Tiež hlasujem za"
         undo:
           off_topic: "Zruš označenie"
           spam: "Zruš označenie"
@@ -1582,7 +1560,6 @@ sk:
       take_action: "Vykonať akciu"
       notify_action: 'Správa'
       delete_spammer: "Zmazať spammera"
-      delete_confirm: "Idete vymazať <b>%{posts}</b> príspevky a <b>%{topics}</b> témy tohto užívateľa, zmazať jeho účet, zakázať prihlásenia z jeho IP adresy <b>%{ip_address}</b>, a pridať jeho email <b>%{email}</b> na zoznam trvalo zakázaných. Ste si istý, že tento užívateľ je skutočne spamer?"
       yes_delete_spammer: "Áno, zmazať spammera"
       ip_address_missing: "(nedostupné)"
       hidden_email_address: "(skryté)"
@@ -1595,10 +1572,6 @@ sk:
         spam: "Je to spam"
       custom_placeholder_notify_user: "Buďte konkrétny, buďte konštruktívny a buďte vždy milý."
       custom_placeholder_notify_moderators: "Dajte nám vedieť, z čoho konkrétne máte obavy, a priložte príslušné odkazy a príklady, ak je to možné."
-      custom_message:
-        at_least: "zadajte aspoň {{n}} znakov"
-        more: "zostáva ešte {{n}} ..."
-        left: "{{n}} zostáva"
     flagging_topic:
       title: "Ďakujeme, že pomáhate udržiavať slušnosť v našej komunite!"
       action: "Označ príspevok"
@@ -1634,7 +1607,6 @@ sk:
       invisible:
         help: "Táto téma je skrytá. Nebude zobrazená v zozname tém a prístup k nej bude možný len prostrednictvom priameho odkazu na ňu"
     posts: "Príspevky"
-    posts_lowercase: "príspevky"
     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,
@@ -2290,7 +2262,6 @@ sk:
         suspend_reason: "Dôvod"
         suspended_by: "Práva odobraté"
         delete_all_posts: "Zmazať všetky príspevky"
-        delete_all_posts_confirm: "Chystáte sa zmazať %{posts} príspevkov a %{topics} tém. Ste si istý?"
         suspend: "Odobrať"
         unsuspend: "Obnoviť"
         suspended: "Odobrate práva?"
@@ -2380,7 +2351,6 @@ sk:
         unlock_trust_level: "Odomknúť stupeň dôvery"
         tl3_requirements:
           title: "Požiadavky pre stupeň dôvery 3"
-          table_title: "Za posledných %{time_period} dní:"
           value_heading: "Hodnota"
           requirement_heading: "Požiadavka"
           visits: "Návštev"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 8a9a7c8b8ad..7fba973eee4 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -48,9 +48,6 @@ sq:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -400,14 +397,9 @@ sq:
       latest: "Të fundit"
       latest_by: "të fundit sipas"
       subcategories: "Nënkategori"
-      topic_stats: "Numri i temave të reja."
       topic_stat_sentence:
         one: "%{count} temë e re gjatë %{unit} të fundit."
         other: "%{count} tema të reja gjatë %{unit} të fundit."
-      post_stats: "Numri i postimeve të reja."
-      post_stat_sentence:
-        one: "%{count} postim i ri këto %{unit}."
-        other: "%{count} postime të reja këto %{unit}."
     ip_lookup:
       title: Shiko adresën IP
       hostname: Hostname
@@ -881,7 +873,6 @@ sq:
       saved_local_draft_tip: "ruajtur lokalisht"
       similar_topics: "Tema juaj është e ngjashme me..."
       drafts_offline: "draftet offline"
-      group_mentioned: "Ju përmendët grupin {{group}}, që do të thotë se do të njoftoni <a href='{{group_link}}'>{{count}} persona</a> – a jeni të sigurtë?"
       duplicate_link: "Lidhja drejt <b>{{domain}}</b> duket sikur u postua më par¨´nga <b>@{{username}}</b> në <a href='{{post_url}}'>këtë përgjigje {{ago}}</a> – a doni ta postoni sërish?"
       error:
         title_missing: "Titulli është i nevojshëm"
@@ -1072,7 +1063,6 @@ sq:
     topic:
       unsubscribe:
         stop_notifications: "Tani ju do të merrni më pak njoftime për <strong>{{title}}</strong>"
-      filter_to: "{{post_count}} postime në temë"
       create: 'Temë e re'
       create_long: 'Hap një temë të re'
       private_message: 'Fillo një mesazh'
@@ -1131,7 +1121,6 @@ sq:
       timeline:
         back: "Kthehu mbrapa"
         back_description: "Kthehu mbrapa tek postimi i fundit i palexuar"
-        replies: "%{current} / %{total} përgjigje"
         replies_short: "%{current} / %{total}"
       progress:
         title: progresi i temës
@@ -1142,7 +1131,6 @@ sq:
         jump_prompt_long: "Tek cila temë doni të shkoni?"
         total: totali i postimeve
         current: postimi aktual
-        position: "tema %{current} nga %{total}"
       notifications:
         title: ndryshoni sa shpesh njoftoheni mbi këtë temë
         reasons:
@@ -1301,7 +1289,6 @@ sq:
       gap:
         one: "shiko 1 përgjigje të fshehur"
         other: "shiko {{count}} përgjigje të fshehura"
-      more_links: "{{count}} më shumë..."
       unread: "Postimi është i palexuar"
       has_replies:
         one: "{{count}} Përgjigje"
@@ -1356,9 +1343,6 @@ sq:
         change_owner: "Ndrysho zotëruesin"
       actions:
         flag: 'Sinjalizoni'
-        it_too:
-          bookmark: "Shtoje edhe tek Të preferuarat"
-          like: "E pëlqejnë"
         undo:
           bookmark: "Hiqe nga të preferuarat"
           like: "Anulo pëlqimin"
@@ -1441,7 +1425,6 @@ sq:
       notify_action: 'Mesazh'
       official_warning: 'Paralajmërim zyrtar'
       delete_spammer: "Elimino Spammer"
-      delete_confirm: "Jeni duke fshirë <b>%{posts}</b> postime dhe <b>%{topics}</b> tema nga ky anëtar. Gjithashtu, po fshini llogarinë e tij/saj, po bllokoni regjistrime të reja nga adresa IP <b>%{ip_address}</b>, dhe po shtoni adresën email <b>%{email}</b> në një listë adresash të bllokuara. A jeni të sigurtë që ky anëtar është spammer?"
       yes_delete_spammer: "Po, Elimino Spammer"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(fshehur)"
@@ -1455,10 +1438,6 @@ sq:
         spam: "Është Spam"
       custom_placeholder_notify_user: "Jini specifikë, konstruktiv dhe gjithmonë të sjellshëm."
       custom_placeholder_notify_moderators: "Na thoni specifikisht se çfarë ju shqetëson dhe na jepni lidhje dhe shembuj konkretë brenda mundësive. "
-      custom_message:
-        at_least: "shkruaj të pakën {{n}} karaktere "
-        more: "{{n}} shko tek..."
-        left: "mund të shkruani edhe {{n}} shkronja"
     flagging_topic:
       title: "Faleminderit për ndihmën që i jepni këtij komuniteti!"
       action: "Raporto Temën"
@@ -1496,7 +1475,6 @@ sq:
       invisible:
         help: "Kjo temë nuk është e listuar, pra nuk do të paraqitet nue listat e temave të faqes dhe mund të shikohet vetëm me lidhje direkte"
     posts: "Postime"
-    posts_lowercase: "postime"
     posts_long: "ka {{number}} postime në temë"
     original_post: "Postimi Origjinal"
     views: "Shikimet"
@@ -2010,7 +1988,6 @@ sq:
         block_accept: 'Po, blloko anëtarin'
         trust_level_change_failed: "Nuk e ndryshuam dot nivelin e këtij anëtari. "
         tl3_requirements:
-          table_title: "Në %{time_period} ditët e fundit:"
           value_heading: "Vlera"
           visits: "Vizita"
           days: "ditë"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index f2c4d969000..0fb8abb39f5 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -48,9 +48,6 @@ sv:
         x_seconds:
           one: "1s"
           other: "%{count}s"
-        less_than_x_minutes:
-          one: "< 1m"
-          other: "< %{count}m"
         x_minutes:
           one: "1m"
           other: "%{count}m"
@@ -399,14 +396,9 @@ sv:
       latest_by: "senast av"
       toggle_ordering: "slå av/på sorteringskontroll"
       subcategories: "Underkategorier"
-      topic_stats: "Antalet nya ämnen."
       topic_stat_sentence:
         one: "%{count} nytt ämne under den senaste %{unit}."
         other: "%{count} nya ämnen under den senaste %{unit}."
-      post_stats: "Antalet nya inlägg."
-      post_stat_sentence:
-        one: "%{count} nytt inlägg under den senaste %{unit}."
-        other: "%{count} nya inlägg under den senaste %{unit}."
     ip_lookup:
       title: Kolla upp IP-adress
       hostname: Värdnamn
@@ -906,7 +898,6 @@ sv:
       saved_local_draft_tip: "sparat lokalt"
       similar_topics: "Ditt ämne liknar..."
       drafts_offline: "utkast offline"
-      group_mentioned: "Genom att nämna {{group}}, så kommer du att notifiera <a href='{{group_link}}'>{{count}} medlemmar</a> – är du säker?"
       duplicate_link: "Det ser ut som att din länk till <b>{{domain}}</b> redan har delats i ämnet av <b>@{{username}}</b> i <a href='{{post_url}}'>ett svar {{ago}} sedan</a> – är du säker på att du vill dela den igen?"
       error:
         title_missing: "Du måste ange en rubrik"
@@ -1119,7 +1110,6 @@ sv:
       unsubscribe:
         stop_notifications: "Du kommer du att motta färre notifieringar från <strong>{{title}}</strong>"
         change_notification_state: "Ditt aktuella notifieringstillstånd är "
-      filter_to: "{{post_count}} inlägg i ämne"
       create: 'Nytt ämne'
       create_long: 'Skapa ett nytt ämne'
       private_message: 'Skriv meddelande'
@@ -1179,11 +1169,9 @@ sv:
       auto_close_title: 'Inställningar för automatisk stängning'
       auto_close_save: "Spara"
       auto_close_remove: "Stäng inte det här ämnet automatiskt"
-      auto_close_immediate: "Senaste inlägget i det här ämnet är redan %{hours} timmar gammal, så ämnet kommer att stängas omedelbart. "
       timeline:
         back: "Tillbaka"
         back_description: "Gå tillbaka till det senaste olästa meddelandet"
-        replies: "%{current} / %{total} svar"
         replies_short: "%{current} / %{total}"
       progress:
         title: ämnesframsteg
@@ -1194,7 +1182,6 @@ sv:
         jump_bottom_with_number: "hoppa till inlägg %{post_number}"
         total: antal inlägg
         current: nuvarande inlägg
-        position: "inlägg %{current} av %{total}"
       notifications:
         title: ändra hur ofta du får notifieringar om det här ämnet
         reasons:
@@ -1393,7 +1380,6 @@ sv:
       gap:
         one: "visa 1 dolt svar"
         other: "visa {{count}} dolda svar"
-      more_links: "{{count}} till..."
       unread: "Inlägget är oläst"
       has_replies:
         one: "{{count}} svar"
@@ -1462,14 +1448,6 @@ sv:
         defer_flags:
           one: "Skjut upp"
           other: "Skjut upp"
-        it_too:
-          off_topic: "Flagga det också"
-          spam: "Flagga det också"
-          inappropriate: "Flagga det också"
-          custom_flag: "Flagga det också"
-          bookmark: "Bokmärk det också"
-          like: "Gilla det också"
-          vote: "Rösta för det också"
         undo:
           off_topic: "Ångra flaggning"
           spam: "Ångra flaggning"
@@ -1649,7 +1627,6 @@ sv:
       notify_action: 'Meddelande'
       official_warning: 'Officiell varning'
       delete_spammer: "Radera spammare"
-      delete_confirm: "Du håller på att radera <b>%{posts}</b> inlägg och <b>%{topics}</b> ämnen från denna användare, radera hans/hennes konto, blockera IP-adressen <b>%{ip_address}</b>, och lägga till e-postadressen <b>%{email}</b> till en permanent blockeringslista. Är du säker på att denna användare verkligen är en spammare?"
       yes_delete_spammer: "Ja, radera spammare"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(gömd)"
@@ -1663,10 +1640,6 @@ sv:
         spam: "Det är spam"
       custom_placeholder_notify_user: "Var specifik, var konstruktiv och var alltid trevlig."
       custom_placeholder_notify_moderators: "Låt oss veta i detalj vad du är bekymrad över, och skicka med relevanta länkar och exempel om möjligt."
-      custom_message:
-        at_least: "skriv åtminstone {{n}} tecken"
-        more: "{{n}} fler..."
-        left: "{{n}} kvar"
     flagging_topic:
       title: "Tack för att du hjälper oss hålla forumet civiliserat!"
       action: "Flagga ämne"
@@ -1706,7 +1679,6 @@ sv:
       invisible:
         help: "Det här ämnet är olistat; det kommer inte visas i ämneslistorna och kan bara nås via en direktlänk"
     posts: "Inlägg"
-    posts_lowercase: "inlägg"
     posts_long: "det finns {{number}} inlägg i detta ämne"
     posts_likes_MF: |
       Detta ämne har {count, plural, one {1 svar} other {# svar}} {ratio, select,
@@ -2532,7 +2504,6 @@ sv:
         suspend_reason: "Anledning"
         suspended_by: "Avstängd av"
         delete_all_posts: "Radera alla inlägg"
-        delete_all_posts_confirm: "Du är påväg att radera %{posts} inlägg och %{topics} ämnen. Är du säker?"
         suspend: "Stäng av användare"
         unsuspend: "Lås upp användare"
         suspended: "Avstängd?"
@@ -2628,7 +2599,6 @@ sv:
         unlock_trust_level: "Lås upp förtroendenivå"
         tl3_requirements:
           title: "Krav för förtroendenivå 3"
-          table_title: "Under de senaste %{time_period} dagarna:"
           value_heading: "Värde"
           requirement_heading: "Krav"
           visits: "Besök"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index ecb75588257..46695b0f565 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -38,9 +38,6 @@ te:
         x_seconds:
           one: "1సె"
           other: "%{count}సె"
-        less_than_x_minutes:
-          one: "< 1ని"
-          other: "< %{count}ని"
         x_minutes:
           one: "1ని"
           other: "%{count}ని"
@@ -246,14 +243,9 @@ te:
       latest_by: "నుండి తాజా"
       toggle_ordering: "వరుస నియంత్రణను అటుఇటుచేయి"
       subcategories: "ఉప వర్గాలు"
-      topic_stats: "కొత్త విషయాల సంఖ్య"
       topic_stat_sentence:
         one: "%{unit} కాలంలో %{count} ఒక కొత్త టపా."
         other: " %{unit} గతంలో %{count} కొత్త విషయాలు."
-      post_stats: "కొత్త టపాల సంఖ్య"
-      post_stat_sentence:
-        one: " %{unit} గతంలో %{count} కొత్త విషయం"
-        other: " %{unit} గతంలో %{count} కొత్త విషయాలు."
     ip_lookup:
       title: ఐపీ చిరునామా లుకప్
       hostname: అతిథిపేరు
@@ -683,7 +675,6 @@ te:
         top: "ఇంకా అగ్ర విషయాలు లేవు."
         bookmarks: "ఇంకా పేజీక విషయాలు లేవు."
     topic:
-      filter_to: "విషయంలో {{post_count}} టపాలున్నాయి"
       create: 'కొత్త విషయం'
       create_long: 'కొత్త విషయం సృష్టించు'
       list: 'విషయాలు'
@@ -743,7 +734,6 @@ te:
         jump_bottom_with_number: "%{post_number} టపాకు వళ్లు"
         total: అన్ని టపాలు
         current: ప్రస్తుత టపా
-        position: "%{total} లో %{current} టపా"
       notifications:
         reasons:
           '3_6': 'మీకు ప్రకటనలు వస్తాయి, ఎందుకంటే మీరు ఈ వర్గాంపై కన్నేసారు'
@@ -861,7 +851,6 @@ te:
         one: " (టపా రచయిత ద్వారా తొలగింపబడింది , స్వతస్సిధ్దంగా తొలగింపబ[ది %{count} కాకపోతే సమయం కేతనించలేదు)"
         other: "(టపా రచయిత ద్వారా ఉపసంహరించబడింది , స్వతసిధ్ధంగా తొలగించబడతాయి %{count} కాకపోతే సమయం కేతనించలేదు)"
       expand_collapse: "పెంచు/తుంచు"
-      more_links: "{{count}} ఇంకా..."
       unread: "టపా చదవనిది"
       errors:
         create: "క్షమించాలి. మీ టపా సృష్టించుటలో దోషం. దయచేసి మరలా ప్రయత్నించండి. "
@@ -909,14 +898,6 @@ te:
         defer_flags:
           one: "కేతనం వాయిదావేయి"
           other: "కేతనాలు వాయిదావేయి"
-        it_too:
-          off_topic: "దీన్ని కూడా కేతనించు"
-          spam: "దీన్ని కూడా కేతనించు"
-          inappropriate: "దీన్ని కూడా కేతనించు"
-          custom_flag: "దీన్ని కూడా కేతనించు"
-          bookmark: "దీన్ని కూడా పేజీకించు"
-          like: "దీన్ని కూడా ఇష్టపడు"
-          vote: "దీనికి కూడా ఓటు వేయి"
         undo:
           off_topic: "కేతనం రద్దు"
           spam: "కేతనం రద్దు"
@@ -1059,7 +1040,6 @@ te:
       action: 'టపాను కేతనించు'
       take_action: "చర్య తీసుకో"
       delete_spammer: "స్పామరును తొలగించు"
-      delete_confirm: "మీరు ఈ వినియోగదారుని <b>%{టపాలు}</b> టపాలు మరియు <b>%{విషయాలు}</b> విషయాలు తొలగించబోతున్నారు, వారి ఖాతా తొలగించి,వారి IP అడ్రస్ నుండి సైన్‌అప్‌లు మూసివేయండి<b>%{ip_అడ్రస్}</b>, మరియు శాశ్వత మూసివేత జాబితాకి వారి ఈ-మెయిల్ అడ్రస్ <b>%{ఈ-మెయిల్}</b> ని కలపండి.మీరు నిజంగా ఈ వినియోగదారుని స్పామర్ గా భావిస్తున్నారా ?"
       yes_delete_spammer: "అవులు, స్పామరును తొలగించు"
       ip_address_missing: "వర్తించదు"
       hidden_email_address: "(దాయబడింది)"
@@ -1072,10 +1052,6 @@ te:
         spam: "ఇది స్పాము"
       custom_placeholder_notify_user: "నిక్కచ్చిగా ఉండు, నిర్మాణాత్మకంగా ఉండు మరియు ఎల్లప్పుడూ దయతో ఉండు"
       custom_placeholder_notify_moderators: "మీరు ఏ విషయంలో ఇబ్బందిపడుతున్నారో మాకు తెలియజేయండి. ఉదాహరణలు, లంకెలు మరియు సంబంధిత సమాచారం పొందుపరచండి. "
-      custom_message:
-        at_least: "కనీసం {{n}} అక్షరాలు రాయండి"
-        more: "{{n}} కావాలి..."
-        left: "{{n}} ఉన్నాయి"
     flagging_topic:
       title: "మా కమ్యునిటీని నాగరికంగా ఉంచుటలో సహాయానికి ధన్యవాదములు!"
       action: "విషయాన్ని కేతనించు"
@@ -1104,7 +1080,6 @@ te:
       invisible:
         help: "ఈ విషయం జాబితాలనుండి తొలగించబడింది. ఇహ కేవలం నేరు లంకె ద్వారా మాత్రమే చూడగలరు."
     posts: "టపాలు"
-    posts_lowercase: "టపాలు"
     posts_long: "ఈ విషయానికి {{number}}  టపాలు ఉన్నాయి. "
     original_post: "మూల టపా"
     views: "చూపులు"
@@ -1600,7 +1575,6 @@ te:
         suspend_reason: "కారణం"
         suspended_by: "సస్పెండు చేసినవారు"
         delete_all_posts: "అన్ని టపాలూ తొలగించు"
-        delete_all_posts_confirm: "మీరు తొలగించబడిన %{టపాలు} టపాలు మరియు %{విషయాలు} విషయాలు గురించి మాట్లాడుతున్నారు. ఖచ్చితమా ?"
         suspend: "సస్పెండు"
         unsuspend: "సస్పెండు తొలగించు"
         suspended: "సస్పెండయ్యాడా? "
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index d1c481ad426..14a39bcf071 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -45,8 +45,6 @@ tr_TR:
           other: "< %{count}s"
         x_seconds:
           other: "%{count}s"
-        less_than_x_minutes:
-          other: "< %{count}d"
         x_minutes:
           other: "%{count}d"
         about_x_hours:
@@ -374,12 +372,8 @@ tr_TR:
       latest_by: "son gönderen"
       toggle_ordering: "sıralama kontrolünü aç/kapa"
       subcategories: "Alt kategoriler"
-      topic_stats: "Yeni konuların sayısı."
       topic_stat_sentence:
         other: "%{unit} beri %{count} yeni konu."
-      post_stats: "Yeni gönderilerin sayısı."
-      post_stat_sentence:
-        other: "%{unit} beri %{count} yeni gönderi."
     ip_lookup:
       title: IP Adresi Ara
       hostname: Sunucu ismi
@@ -882,7 +876,6 @@ tr_TR:
       saved_local_draft_tip: "yerele kaydedildi"
       similar_topics: "Konunuz şunlara çok benziyor..."
       drafts_offline: "çevrimdışı taslaklar"
-      group_mentioned: "{{grup}} hakkında konuşarak <a href='{{grup_linki}}'>{{sayı}} kişilerini bilgilendirmek üzeresin </a> – bunu yapmak istediğine emin misin?"
       duplicate_link: "It looks like your link to <b>{{etki_alanı}}</b> 'nına bağlanan linkiniz <b>@{{kullanıcı_adı}}</b> tarafından <a href='{{post_url}}'>a yanıtı içerisinde çoktan yayınlanmış görünüyor. {{önce}}</a> – tekrar yayınlamak istediğinize emin misiniz?"
       error:
         title_missing: "Başlık gerekli"
@@ -1095,7 +1088,6 @@ tr_TR:
       unsubscribe:
         stop_notifications: "Artık <strong>{{title}}</strong> için daha az bildirim alacaksınız."
         change_notification_state: "Geçerli bildirim durumunuz"
-      filter_to: "Bu konuda {{post_count}} gönderi"
       create: 'Yeni Konu'
       create_long: 'Yeni bir konu oluştur'
       private_message: 'Mesajlaşma başlat'
@@ -1149,11 +1141,9 @@ tr_TR:
       auto_close_title: 'Otomatik Kapatma Ayarları'
       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"
         back_description: "Okunmamış son gönderine dön"
-        replies: "%{current} / %{total} Cevap"
         replies_short: "%{current} / %{total}"
       progress:
         title: konu gidişatı
@@ -1166,7 +1156,6 @@ tr_TR:
         jump_bottom_with_number: "%{post_number} numaralı gönderiye geç"
         total: tüm gönderiler
         current: şu anki gönderi
-        position: "%{total} gönderi arasından %{current}."
       notifications:
         title: bu konu hakkında ne sıklıkla bildirim almak istediğini değiştir
         reasons:
@@ -1361,7 +1350,6 @@ tr_TR:
       expand_collapse: "aç/kapat"
       gap:
         other: "gizlenen {{count}} yorumu gör"
-      more_links: "{{count}} tane daha..."
       unread: "Gönderi okunmamış"
       has_replies:
         other: "{{count}} Yanıt"
@@ -1424,14 +1412,6 @@ tr_TR:
         flag: 'Bayrakla'
         defer_flags:
           other: "Bayrağı ertele"
-        it_too:
-          off_topic: "Bir de bayrakla"
-          spam: "Bir de rapor et"
-          inappropriate: "Bir de rapor et"
-          custom_flag: "Bir de bayrakla"
-          bookmark: "Bir de işaretle"
-          like: "Sen de beğen"
-          vote: "Bir de oyla"
         undo:
           off_topic: "Bayrağı geri al"
           spam: "Bayrağı geri al"
@@ -1599,7 +1579,6 @@ tr_TR:
       notify_action: 'Mesaj'
       official_warning: 'Resmi uyarı'
       delete_spammer: "Spamcıyı Sil"
-      delete_confirm: "Bu kullanıcının <b>%{posts}</b> gönderisini ve <b>%{topics}</b> konusunu silmek, hesabını kapatmak, kullandığı IP Adresi <b>%{ip_address}</b> üzerinden hesap açılmasını engellemek, ve  <b>%{email}</b> e-posta adresini kalıcı engellenenler listesine eklemek üzeresiniz. Bu kullanıcının gerçekten spamci olduğuna emin misiniz?"
       yes_delete_spammer: "Evet, spamcıyı sil"
       ip_address_missing: "(uygulanamaz)"
       hidden_email_address: "(gizli)"
@@ -1613,10 +1592,6 @@ tr_TR:
         spam: "Spam"
       custom_placeholder_notify_user: "Açıklayıcı, yapıcı ve her zaman nazik olun."
       custom_placeholder_notify_moderators: "Sizi neyin endişelendirdiğini açıklayıcı bir dille bize bildirin ve mümkün olan yerlerde konu ile alakalı bağlantıları paylaşın."
-      custom_message:
-        at_least: "en az {{n}} karakter girin"
-        more: "{{n}} tane daha var.."
-        left: "{{n}} kaldı"
     flagging_topic:
       title: "Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!"
       action: "Konuyu Bayrakla"
@@ -1655,7 +1630,6 @@ tr_TR:
       invisible:
         help: "Bu konu gizli; konu listelerinde görünmeyecek, ve sadece doğrudan bağlantı aracılığıyla erişilebilecek"
     posts: "Gönderi"
-    posts_lowercase: "gönderi"
     posts_long: "bu konuda {{number}} gönderi var"
     posts_likes_MF: |
       Bu konuda {count, plural, one {1} other {#}} {ratio, select,
@@ -2464,7 +2438,6 @@ tr_TR:
         suspend_reason: "Neden"
         suspended_by: "Uzaklaştıran"
         delete_all_posts: "Tüm gönderileri sil"
-        delete_all_posts_confirm: "%{posts} gönderi ve %{topics} konu silmek üzeresiniz. Emin misiniz?"
         suspend: "Uzaklaştır"
         unsuspend: "Uzaklaştırmayı geri al"
         suspended: "Uzaklaştırıldı mı?"
@@ -2557,7 +2530,6 @@ tr_TR:
         unlock_trust_level: "Güvenlik Seviyesi Kilidini Aç"
         tl3_requirements:
           title: "Güven Seviyesi 3 için Gerekenler"
-          table_title: "Son %{time_period} günde"
           value_heading: "Değer"
           requirement_heading: "Gereksinim"
           visits: "Ziyaretler"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 70d691b1f3d..d280cb0f7c8 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -238,8 +238,6 @@ uk:
       latest_by: "Останні від"
       toggle_ordering: "показати/сховати елемент керування для впорядкування"
       subcategories: "Підкатегорії"
-      topic_stats: "Кількість нових тем."
-      post_stats: "Кількість нових дописів."
     ip_lookup:
       title: Пошук IP адреси
       hostname: Ім'я хоста
@@ -610,7 +608,6 @@ uk:
         category: "Більше немає тем в категорії {{category}}."
         top: "There are no more top topics."
     topic:
-      filter_to: "Показати {{post_count}} дописів в темі"
       create: 'Нова тема'
       create_long: 'Створити нову тему'
       list: 'Теми'
@@ -647,7 +644,6 @@ uk:
         jump_bottom_with_number: "перейти до допису %{post_number}"
         total: всього дописів
         current: поточний допис
-        position: "допис %{current} із %{total}"
       notifications:
         reasons:
           '3_6': 'Ви будете отримувати сповіщення, бо Ви слідкуєте за цією категорією.'
@@ -745,7 +741,6 @@ uk:
       show_full: "Показати Увесь Допис"
       show_hidden: 'Показати схований зміст.'
       expand_collapse: "розгорнути/згорнути"
-      more_links: "{{count}} ще..."
       unread: "Допис не прочитаний"
       errors:
         create: "Даруйте, під час створення допису трапилася помилка. Будь ласка, спробуйте ще раз."
@@ -777,14 +772,6 @@ uk:
           no_value: "Ні, тільки цей допис"
       actions:
         flag: 'Поскаржитися'
-        it_too:
-          off_topic: "Також поскаржитися"
-          spam: "Також поскаржитися"
-          inappropriate: "Також поскаржитися"
-          custom_flag: "Також поскаржитися"
-          bookmark: "Також лишити закладку"
-          like: "Також вподобати"
-          vote: "Також проголосувати за"
         undo:
           off_topic: "Відкликати скаргу"
           spam: "Відкликати скаргу"
@@ -867,13 +854,8 @@ uk:
       action: 'Поскаржитися на допис'
       take_action: "Вжити заходів"
       delete_spammer: "Видалити спамера"
-      delete_confirm: "Ви збираєтеся видалити <b>%{posts}</b> дописів і <b>%{topics}</b> тем цього користувача, видалити його обліковий запис, заблокувати реєстрації з його IP-адреси <b>%{ip_address}</b> та додати його електронну скриньку <b>%{email}</b> до чорного списку заблокованих адрес. Ви впевнені, що цей користувач дійсно спамер?"
       yes_delete_spammer: "Так, видалити спамера"
       cant: "Даруйте, зараз Ви не можете поскаржитися на цей допис."
-      custom_message:
-        at_least: "введіть принаймні {{n}} символів"
-        more: "ще {{n}}..."
-        left: "залишилось {{n}}"
     flagging_topic:
       action: "Flag Topic"
     topic_map:
@@ -888,7 +870,6 @@ uk:
       pinned:
         title: "Закріплені"
     posts: "Дописи"
-    posts_lowercase: "дописи"
     posts_long: "тема містить {{number}} дописів"
     original_post: "Перший допис"
     views: "Перегляди"
@@ -1222,7 +1203,6 @@ uk:
         suspend_reason: "Причина"
         suspended_by: "Призупинено"
         delete_all_posts: "Видалити всі дописи"
-        delete_all_posts_confirm: "Ви збираєтеся видалити %{posts} дописів і %{topics} тем. Ви впевнені?"
         suspend: "Призупинити"
         unsuspend: "Скасувати призупинення"
         suspended: "Призупинено?"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 4b175162c88..3a4a237599e 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -43,8 +43,6 @@ vi:
           other: "< %{count}s"
         x_seconds:
           other: "%{count}s"
-        less_than_x_minutes:
-          other: "< %{count}m"
         x_minutes:
           other: "%{count}m"
         about_x_hours:
@@ -356,12 +354,8 @@ vi:
       latest_by: "mới nhất bởi"
       toggle_ordering: "chuyển lệnh kiểm soát"
       subcategories: "Phân loại phụ"
-      topic_stats: "Số lượng chủ đề mới"
       topic_stat_sentence:
         other: "%{count} số lượng chủ đề mới tỏng quá khứ %{unit}."
-      post_stats: "Số lượng bài viết mới"
-      post_stat_sentence:
-        other: "%{count} số lượng bài viết mới trong quá khứ %{unit}."
     ip_lookup:
       title: Tìm kiếm địa chỉ IP
       hostname: Hostname
@@ -1009,7 +1003,6 @@ vi:
       unsubscribe:
         stop_notifications: "Từ bây giờ bạn sẽ không nhận thông báo từ <strong>{{title}}</strong>"
         change_notification_state: "Tình trạn thông báo của bạn là"
-      filter_to: "{{post_count}} bài đăng trong chủ đề"
       create: 'Chủ đề Mới'
       create_long: 'Tạo một Chủ đề mới'
       private_message: 'Bắt đầu một thông điệp'
@@ -1063,7 +1056,6 @@ vi:
       auto_close_title: 'Tự động-Đóng các Cài đặt'
       auto_close_save: "Lưu"
       auto_close_remove: "Đừng Tự Động-Đóng Chủ Đề Này"
-      auto_close_immediate: "Bài viết cuối cùng trong chủ đề đã xảy ra %{hours} giờ qua, vì vậy chủ đề sẽ tự động đóng."
       progress:
         title: tiến trình của chủ đề
         go_top: "trên cùng"
@@ -1073,7 +1065,6 @@ vi:
         jump_bottom_with_number: "nhảy tới bài viết %{post_number}"
         total: tổng số bài viết
         current: bài viết hiện tại
-        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'
@@ -1257,7 +1248,6 @@ vi:
       expand_collapse: "mở/đóng"
       gap:
         other: "xem {{count}} trả lời bị ẩn"
-      more_links: "hơn {{count}}..."
       unread: "Bài viết chưa đọc"
       has_replies:
         other: "{{count}} Trả lời"
@@ -1317,14 +1307,6 @@ vi:
         flag: 'Gắn cờ'
         defer_flags:
           other: "Đánh dấu hoãn"
-        it_too:
-          off_topic: "Gắn cờ nó"
-          spam: "Gắn cờ nó"
-          inappropriate: "Gắn cờ nó"
-          custom_flag: "Gắn cờ nó"
-          bookmark: "Đánh dấu nó"
-          like: "Thích nó"
-          vote: "Bịnh chọn nó"
         undo:
           off_topic: "Hủy gắn cờ"
           spam: "Hủy gắn cờ"
@@ -1478,7 +1460,6 @@ vi:
       take_action: "Thực hiện"
       notify_action: 'Tin nhắn'
       delete_spammer: "Xóa người Spam"
-      delete_confirm: "Bạn đang định xóa <b>%{posts}</b> bài đăng và <b>%{topics}</b> chủ đề từ người dùng này,  loại tài khoản, ngăn đăng ký từ địa chỉ IP <b>%{ip_address}</b> của họ, và thêm địa chỉ email <b>%{email}</b> vào danh sách chặn vĩnh viễn. Bạn có chắc người dùng này thật sự là một spammer?"
       yes_delete_spammer: "Có, xóa người spam"
       ip_address_missing: "(N/A)"
       hidden_email_address: "(ẩn)"
@@ -1492,10 +1473,6 @@ vi:
         spam: "Nó là rác"
       custom_placeholder_notify_user: "Phải hảo tâm và mang tính xây dựng."
       custom_placeholder_notify_moderators: "Hãy cho chúng tôi biết cụ thể những gì bạn quan tâm, và cung cấp các liên kết hoặc ví dụ liên quan nếu có thể."
-      custom_message:
-        at_least: "điền ít nhất {{n}} ký tự"
-        more: "còn {{n}}"
-        left: "{{n}} còn lại"
     flagging_topic:
       title: "Cám ơn bạn đã giúp phát triển cộng đồng!"
       action: "Gắn cờ Chủ đề"
@@ -1529,7 +1506,6 @@ vi:
       invisible:
         help: "Chủ đề này ẩn, nó sẽ không hiển thị trong danh sách chủ đề, và chỉ có thể truy cập thông qua liên kết trực tiếp"
     posts: "Bài viết"
-    posts_lowercase: "bài viết"
     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,
@@ -2165,7 +2141,6 @@ vi:
         suspend_reason: "Lý do"
         suspended_by: "Tạm khóa bởi"
         delete_all_posts: "Xóa tất cả bài viết"
-        delete_all_posts_confirm: "Bạn có chắc chắn muốn xóa %{posts} bài viết và %{topics} chủ đề?"
         suspend: "Tạm khóa"
         unsuspend: "Đã mở khóa"
         suspended: "Đã tạm khóa?"
@@ -2249,7 +2224,6 @@ vi:
         unlock_trust_level: "Mở khóa độ tin cậy"
         tl3_requirements:
           title: "Yêu cầu Cấp độ tin tưởng 3"
-          table_title: "Trong %{time_period} ngày qua:"
           value_heading: "Giá trị"
           requirement_heading: "Yêu cầu"
           visits: "Lượt xem"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 90e9b2483cf..eb2a8e0f540 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -45,8 +45,6 @@ zh_CN:
           other: "%{count}秒内"
         x_seconds:
           other: "%{count}秒前"
-        less_than_x_minutes:
-          other: "%{count}分钟内"
         x_minutes:
           other: "%{count}分钟前"
         about_x_hours:
@@ -280,8 +278,8 @@ zh_CN:
     directory:
       filter_name: "按用户名检索"
       title: "用户"
-      likes_given: "给赞"
-      likes_received: "获赞"
+      likes_given: "送出赞"
+      likes_received: "获得赞"
       topics_entered: "浏览"
       topics_entered_long: "浏览过的主题"
       time_read: "阅读时长"
@@ -337,13 +335,13 @@ zh_CN:
           description: "你会在别人@你或回复你时收到通知，并且新帖数量也将在这些主题后显示。"
         regular:
           title: "常规"
-          description: "如果有人@名字提及你或回复你，你将会收到通知。"
+          description: "如果有人@名字提及你或回复你，将通知你。"
         muted:
           title: "静音"
           description: "你不会收到组内关于新主题中的任何通知。"
     user_action_groups:
-      '1': "送出的赞"
-      '2': "收到的赞"
+      '1': "送出赞"
+      '2': "获得赞"
       '3': "收藏"
       '4': "主题"
       '5': "回复"
@@ -374,12 +372,10 @@ zh_CN:
       latest_by: "最新发表："
       toggle_ordering: "排序控制"
       subcategories: "子分类"
-      topic_stats: "近期主题的数量。"
+      topic_sentence:
+        other: "%{count} 主题"
       topic_stat_sentence:
         other: "在过去一%{unit}中有 %{count} 个新主题。"
-      post_stats: "新帖子的数量。"
-      post_stat_sentence:
-        other: "在过去一%{unit}中有 %{count} 个新帖子。"
     ip_lookup:
       title: IP 地址查询
       hostname: 主机名
@@ -403,14 +399,14 @@ zh_CN:
       mute: "防打扰"
       edit: "修改设置"
       download_archive: "下载我的帖子"
-      new_private_message: "新消息"
-      private_message: "消息"
-      private_messages: "消息"
+      new_private_message: "发新私信"
+      private_message: "私信"
+      private_messages: "私信"
       activity_stream: "活动"
       preferences: "设置"
       expand_profile: "展开"
       bookmarks: "收藏"
-      bio: "个人简介"
+      bio: "个人信息"
       invited_by: "邀请人"
       trust_level: "信任等级"
       notifications: "通知"
@@ -452,21 +448,21 @@ zh_CN:
         few_per_day: "为每个新帖给我发送邮件 (大约每天 2 封 )"
       tag_settings: "标签"
       watched_tags: "监看"
-      watched_tags_instructions: "你将自动监看有了这些标签的所有主题。你将会收到所有新的帖子和主题通知，并且新帖数量也将出现在主题旁边。"
+      watched_tags_instructions: "你将自动监看有这些标签的所有主题。你将会收到所有新的帖子和主题的通知，新帖数量也会显示在主题旁边。"
       tracked_tags: "跟踪"
-      tracked_tags_instructions: "你将自动跟踪有了这些标签的所有主题，新帖的数量将出现在主题旁边。"
+      tracked_tags_instructions: "你将自动跟踪这些标签的所有主题，新帖数量将会显示在主题旁边。"
       muted_tags: "静音"
-      muted_tags_instructions: "你将不会收到任何关于这些标签的新主题通知，他们也不会出现在最新主题列表。"
+      muted_tags_instructions: "你将不会收到有这些标签的任何新主题通知，它们也不会出现在最新主题列表。"
       watched_categories: "监看"
-      watched_categories_instructions: "你将自动监看这些分类中的所有主题。你将会收到所有新的帖子和主题通知，并且新帖数量也将出现在主题旁边。"
+      watched_categories_instructions: "你将自动监看这些分类中的所有主题。你将会收到所有新的帖子和主题通知，新帖数量也将显示在主题旁边。"
       tracked_categories: "跟踪"
-      tracked_categories_instructions: "你将自动跟踪这些分类中的所有主题。新帖的数量将出现在主题旁边。"
+      tracked_categories_instructions: "你将自动跟踪这些分类中的所有主题。新帖数量将会显示在主题旁边。"
       watched_first_post_categories: "监看头一帖"
-      watched_first_post_categories_instructions: "在这些分类中的每一个新主题，你将会收到头一帖通知。"
+      watched_first_post_categories_instructions: "在这些分类里面，每一个新主题的头一帖，将通知你。"
       watched_first_post_tags: "监看头一帖"
       watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，你将会收到头一帖通知。"
       muted_categories: "静音"
-      muted_categories_instructions: "在这些分类里面，你将不会收到任何新主题通知，他们也不会出现在最新主题列表。"
+      muted_categories_instructions: "在这些分类里面，你将不会收到任何新主题通知，它们也不会出现在最新主题列表。"
       delete_account: "删除我的帐号"
       delete_account_confirm: "你真的要永久删除自己的账号吗？删除之后无法恢复！"
       deleted_yourself: "你的帐号已被删除。"
@@ -503,7 +499,7 @@ zh_CN:
         action: "发送密码重置邮件"
         set_password: "设置密码"
       change_about:
-        title: "更改个人简介"
+        title: "更改个人信息"
         error: "提交修改时出错了"
       change_username:
         title: "更换用户名"
@@ -573,7 +569,7 @@ zh_CN:
       last_seen: "最后活动"
       created: "加入时间"
       log_out: "登出"
-      location: "地址"
+      location: "地点"
       card_badge:
         title: "用户卡片徽章"
       website: "网站"
@@ -676,9 +672,9 @@ zh_CN:
         post_count:
           other: "发表的帖子"
         likes_given:
-          other: "<i class='fa fa-heart'></i> 给赞"
+          other: "<i class='fa fa-heart'></i> 送出赞"
         likes_received:
-          other: "<i class='fa fa-heart'></i> 获赞"
+          other: "<i class='fa fa-heart'></i> 获得赞"
         days_visited:
           other: "访问天数"
         posts_read:
@@ -715,7 +711,7 @@ zh_CN:
       stream:
         posted_by: "发送人"
         sent_by: "发送时间"
-        private_message: "消息"
+        private_message: "私信"
         the_topic: "本主题"
     loading: "载入中..."
     errors:
@@ -785,7 +781,7 @@ zh_CN:
       enable: "隐藏已删除的帖子"
       disable: "显示已删除的帖子"
     private_message_info:
-      title: "消息"
+      title: "私信"
       invite: "邀请其他..."
       remove_allowed_user: "确定将 {{name}} 从本条消息中移除？"
       remove_allowed_group: "确定将 {{name}} 从本条消息中移除？"
@@ -878,7 +874,6 @@ zh_CN:
       saved_local_draft_tip: "已本地保存"
       similar_topics: "你的主题有点类似于..."
       drafts_offline: "离线草稿"
-      group_mentioned: "提及 {{group}} 时，你将通知 <a href='{{group_link}}'>{{count}} 人</a> － 确定吗？"
       duplicate_link: "似乎你的链接 <b>{{domain}}</b> 在<a href='{{post_url}}'>{{ago}}</a>已经由<b>@{{username}}</b>回复了 － 确定再次提交吗？"
       error:
         title_missing: "标题为空"
@@ -894,7 +889,7 @@ zh_CN:
       reply: "回复"
       cancel: "取消"
       create_topic: "创建主题"
-      create_pm: "消息"
+      create_pm: "私信"
       title: "或 Ctrl + 回车"
       users_placeholder: "添加用户"
       title_placeholder: "一句话告诉讨论什么..."
@@ -935,7 +930,7 @@ zh_CN:
       toggler: "隐藏或显示编辑面板"
       modal_ok: "确认"
       modal_cancel: "取消"
-      cant_send_pm: "抱歉，你不能向 %{username} 发送私信。"
+      cant_send_pm: "抱歉，你不能向 %{username} 发送消息。"
       admin_options_title: "本主题可选设置"
       auto_close:
         label: "自动关闭主题时间："
@@ -950,7 +945,7 @@ zh_CN:
       title: "使用@提到你，回复你的内容、消息以及其他的通知"
       none: "现在无法载入通知"
       empty: "未发现通知"
-      more: "历史通知"
+      more: "看历史通知"
       total_flagged: "被标记帖子的总数"
       mentioned: "<i title='被提及' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
       group_mentioned: "<i title='小组被提及' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -993,7 +988,7 @@ zh_CN:
         quoted: '{{username}}在“{{topic}}”引用了你的帖子 - {{site_title}}'
         replied: '{{username}}在“{{topic}}”回复了你 - {{site_title}}'
         posted: '{{username}}在“{{topic}}”中发布了帖子 - {{site_title}}'
-        private_message: '{{username}}在“{{topic}}”中给你发送了一个消息 - {{site_title}}'
+        private_message: '{{username}}在“{{topic}}”中给你发送了一个私信 - {{site_title}}'
         linked: '{{username}}在“{{topic}}”中链接了你的帖子 - {{site_title}}'
     upload_selector:
       title: "插入图片"
@@ -1031,7 +1026,7 @@ zh_CN:
         category: "搜索 #{{category}} 分类"
         topic: "只搜索本主题"
         private_messages: "搜索消息"
-    hamburger_menu: "转到另一列表或分类"
+    hamburger_menu: "转到另一个主题列表或分类"
     new_item: "新"
     go_back: '返回'
     not_logged_in_user: '显示当前活动和设置的用户页面'
@@ -1088,10 +1083,11 @@ zh_CN:
       unsubscribe:
         stop_notifications: "你将收到更少的关于<strong>{{title}}</strong>的通知"
         change_notification_state: "你现在的通知状态是"
-      filter_to: "本主题中的 {{post_count}} 帖"
+      filter_to:
+        other: "本主题中的 {{count}} 帖"
       create: '发新主题'
       create_long: '创建新的主题'
-      private_message: '发送消息'
+      private_message: '开始发私信'
       archive_message:
         help: '移动消息到存档'
         title: '存档'
@@ -1128,10 +1124,10 @@ zh_CN:
       options: "主题选项"
       show_links: "显示此主题中的链接"
       toggle_information: "切换主题详情"
-      read_more_in_category: "想阅读更多？浏览{{catLink}}的其他主题或者{{latestLink}}。"
-      read_more: "想阅读更多？{{catLink}} 或 {{latestLink}}。"
-      read_more_MF: "还有 { UNREAD, plural, =0 {} one { <a href='/unread'>1 个未读主题</a>} other { <a href='/unread'># 个未读主题</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} <a href='/new'>1 个新</a>主题} other { {BOTH, select, true{和 } false {} other{}} <a href='/new'># 个新</a>主题} }可以阅读，或者{CATEGORY, select, true {浏览{catLink}中的其他主题} false {{latestLink}} other {}}"
-      browse_all_categories: 查看所有分类
+      read_more_in_category: "想阅读更多？浏览{{catLink}}中的其他主题，或{{latestLink}}。"
+      read_more: "想阅读更多？{{catLink}}或{{latestLink}}。"
+      read_more_MF: "还有 { UNREAD, plural, =0 {} one { <a href='/unread'>1 个未读主题</a>} other { <a href='/unread'># 个未读主题</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{和 } false {} other{}} <a href='/new'>1 个新</a>主题} other { {BOTH, select, true{和 } false {} other{}} <a href='/new'># 个近期</a>主题} }可以阅读，或者{CATEGORY, select, true {浏览{catLink}中的其他主题} false {{latestLink}} other {}}"
+      browse_all_categories: 浏览所有分类
       view_latest_topics: 查阅最新主题
       suggest_create_topic: 创建一个新的主题吧！
       jump_reply_up: 转到更早的回复
@@ -1142,11 +1138,9 @@ zh_CN:
       auto_close_title: '自动关闭设置'
       auto_close_save: "保存"
       auto_close_remove: "不要自动关闭该主题"
-      auto_close_immediate: "主题中的上个帖子是 %{hours} 小时前发出的，所以主题将会立即关闭。"
       timeline:
         back: "返回"
         back_description: "回到最后一个未读帖子"
-        replies: "%{current} / %{total} 回复"
         replies_short: "%{current} / %{total}"
       progress:
         title: 主题进度
@@ -1159,23 +1153,22 @@ zh_CN:
         jump_bottom_with_number: "跳至第 %{post_number} 帖"
         total: 全部帖子
         current: 当前帖子
-        position: "%{current} / %{total}"
       notifications:
-        title: 改变你收到本主题通知的频率
+        title: 改变你收到该主题通知的频率
         reasons:
           mailing_list_mode: "邮件列表模式已启用，将以邮件通知你关于该主题的回复。"
           '3_10': '因为你正监看该主题上的标签，你将会收到通知。'
-          '3_6': '因为你正在监看该分类，你将收到通知。'
-          '3_5': '因为你开始自动监看该主题，你将收到通知。'
-          '3_2': '因为你正在监看该主题，你将收到通知。'
-          '3_1': '因为你创建了该主题，所以你将收到相关通知。'
-          '3': '因为你正在监看该主题，你将收到通知。'
+          '3_6': '因为你正在监看该分类，你将会收到通知。'
+          '3_5': '因为你开始自动监看该主题，你将会收到通知。'
+          '3_2': '因为你正在监看该主题，你将会收到通知。'
+          '3_1': '因为你创建了这个主题，你将会收到通知。'
+          '3': '因为你正在监看该主题，你将会收到通知。'
           '2_8': '因为你正在跟踪该分类，你将收到通知。'
           '2_4': '因为你在该主题内发表了回复，所以你将收到相关通知。'
           '2_2': '因为你正在跟踪该主题，你将收到通知。'
           '2': '因为你<a href="/users/{{username}}/preferences">阅读了该主题</a>，所以你将收到相关通知。'
-          '1_2': '如果有人@名字提及你或回复你，你将会收到通知。'
-          '1': '如果有人@名字提及你或回复你，你将会收到通知。'
+          '1_2': '如果有人提及你的 @名字或回复你，将通知你。'
+          '1': '如果有人提及你的 @名字或回复你，将通知你。'
           '0_7': '你将忽略关于该分类的所有通知。'
           '0_2': '你将忽略关于该主题的所有通知。'
           '0': '你将忽略关于该主题的所有通知。'
@@ -1184,25 +1177,25 @@ zh_CN:
           description: "消息有新回复时提醒我，并显示新回复数量。"
         watching:
           title: "监看"
-          description: "主题有新回复时提醒我，并显示新回复数量。"
+          description: "在此主题里，每一个新回复将通知你，还将显示新回复的数量。"
         tracking_pm:
           title: "跟踪"
           description: "在消息标题后显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。"
         tracking:
           title: "跟踪"
-          description: "在主题标题后显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。"
+          description: "将为该主题显示新回复的数量。如果有人提及你的 @名字或回复你，将通知你。"
         regular:
           title: "普通"
-          description: "如果有人@名字提及你或回复你，你将会收到通知。"
+          description: "如果有人提及你的 @名字或回复你，将通知你。"
         regular_pm:
           title: "普通"
-          description: "如果有人@名字提及你或回复你，你将会收到通知。"
+          description: "如果有人提及你的 @名字或回复你，将通知你。"
         muted_pm:
           title: "静音"
           description: "不会收到该消息的任何通知。"
         muted:
           title: "静音"
-          description: "不会收到该主题的任何通知，也不会出现在最新主题中。"
+          description: "你不会收到此主题的任何通知，它也不会出现在最新主题列表。"
       actions:
         recover: "撤销删除主题"
         delete: "删除主题"
@@ -1227,7 +1220,7 @@ zh_CN:
         remove_banner: "取消横幅主题"
       reply:
         title: '回复'
-        help: '开始给本主题撰写回复'
+        help: '开始为该主题撰写回复'
       clear_pin:
         title: "取消置顶"
         help: "取消本主题的置顶状态，将不再固定显示在主题列表顶部。"
@@ -1354,7 +1347,6 @@ zh_CN:
       expand_collapse: "展开/折叠"
       gap:
         other: "查看 {{count}} 个隐藏回复"
-      more_links: "{{count}} 更多..."
       unread: "未读帖子"
       has_replies:
         other: "{{count}} 回复"
@@ -1417,14 +1409,6 @@ zh_CN:
         flag: '标记'
         defer_flags:
           other: "推迟处理标记"
-        it_too:
-          off_topic: "同时标记"
-          spam: "同时标记"
-          inappropriate: "同时标记"
-          custom_flag: "同时标记"
-          bookmark: "同时收藏"
-          like: "同时赞"
-          vote: "同时投票"
         undo:
           off_topic: "撤回标记"
           spam: "撤回标记"
@@ -1437,7 +1421,7 @@ zh_CN:
           spam: "标记为垃圾信息"
           inappropriate: "不恰当的言辞"
           notify_moderators: "通知版主"
-          notify_user: "发送消息"
+          notify_user: "发送私信"
           bookmark: "收藏"
           like: "赞了它"
           vote: "已投票"
@@ -1572,19 +1556,19 @@ zh_CN:
       notifications:
         watching:
           title: "监看"
-          description: "你将自动监看这些分类中的所有主题。你将会收到每一个主题的每一个新帖子的通知，并且将显示新回复的数量。"
+          description: "你将自动监看这些分类中的所有主题。每一个主题中的每一个新帖子，将通知你，还将显示新回复的数量。"
         watching_first_post:
           title: "监看头一帖"
-          description: "在这些分类里面，你将仅会收到每一个新主题的头一帖的通知。"
+          description: "在这些分类里面，只有每一个新主题的头一个帖子，将通知你。"
         tracking:
           title: "跟踪"
-          description: "你将自动跟踪这些分类中的所有主题。如果有人@名字提及你或回复你，你将会收到通知，并且将显示新回复的数量。"
+          description: "你将自动跟踪这些分类中的所有主题。如果有人提及你的 @名字或回复你，将通知你，还将显示新回复的数量。"
         regular:
           title: "普通"
-          description: "如果有人@名字提及你或回复你，你将会收到通知。"
+          description: "如果有人提及你的 @名字或回复你，将通知你。"
         muted:
           title: "静音"
-          description: "在这些分类里面，你将永远不会收到任何有关新主题的通知，他们也不会出现在最新主题列表。"
+          description: "在这些分类里面，你将不会收到任何新主题通知，它们也不会出现在最新主题列表。"
     flagging:
       title: '感谢你帮助我们建设文明社群！'
       action: '标记帖子'
@@ -1592,7 +1576,6 @@ zh_CN:
       notify_action: '消息'
       official_warning: '正式警告'
       delete_spammer: "删除垃圾发布者"
-      delete_confirm: "你将删除该用户的 <b>%{posts}</b> 个帖子和 <b>%{topics}</b> 个主题，删除该账户，阻止其IP地址 <b>%{ip_address}</b> 再次注册，并将其邮件地址 <b>%{email}</b> 加入黑名单。确定吗？"
       yes_delete_spammer: "确定"
       ip_address_missing: "（N/A）"
       hidden_email_address: "（隐藏）"
@@ -1607,9 +1590,10 @@ zh_CN:
       custom_placeholder_notify_user: "请具体说明，有建设性的，再友好一些。"
       custom_placeholder_notify_moderators: "让我们知道你关心地是什么，并尽可能地提供相关链接和例子。"
       custom_message:
-        at_least: "输入至少 {{n}} 个字符"
-        more: "还差 {{n}} 个..."
-        left: "还剩下 {{n}}"
+        more:
+          other: "还差 {{count}} 个..."
+        left:
+          other: "剩余 {{count}}"
     flagging_topic:
       title: "感谢你帮助我们建设文明社群！"
       action: "标记帖子"
@@ -1648,7 +1632,6 @@ zh_CN:
       invisible:
         help: "本主题被设置为不显示在主题列表中，并且只能通过直达链接来访问"
     posts: "帖子"
-    posts_lowercase: "帖子"
     posts_long: "本主题有 {{number}} 个帖子"
     posts_likes_MF: |
       这个主题有 {count, plural, other {# 个帖子}}{ratio, select,
@@ -1745,7 +1728,7 @@ zh_CN:
         this_month: "月"
         this_week: "周"
         today: "今天"
-        other_periods: "跳转到顶部"
+        other_periods: "跳至顶部"
     browser_update: '抱歉，<a href="http://www.discourse.com/faq/#browser">你的浏览器版本太低，无法正常访问该站点。</a>。请<a href="http://browsehappy.com">升级你的浏览器</a>。'
     permission_types:
       full: "创建 / 回复 / 阅读"
@@ -1767,7 +1750,7 @@ zh_CN:
         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> 消息'
+        messages: '<b>g</b>, <b>m</b> 私信'
       navigation:
         title: '导航'
         jump: '<b>#</b> 前往帖子 #'
@@ -1848,7 +1831,7 @@ zh_CN:
       selector_no_tags: "无标签"
       changed: "标签被修改："
       tags: "标签"
-      choose_for_topic: "为本主题选择可选标签"
+      choose_for_topic: "为此主题选择可选标签"
       delete_tag: "删除标签"
       delete_confirm: "确定要删除这个标签吗？"
       rename_tag: "重命名标签"
@@ -1860,25 +1843,25 @@ zh_CN:
       manage_groups_description: "管理标签的小组"
       filters:
         without_category: "%{tag}的%{filter}主题"
-        with_category: "%{filter} %{tag} 主题 在 %{category}"
+        with_category: "%{filter} %{tag}主题在%{category}"
         untagged_without_category: "无标签的%{filter}主题"
         untagged_with_category: "%{category}无标签的%{filter}主题"
       notifications:
         watching:
           title: "监看"
-          description: "你将自动监看该标签中的所有主题。你会收到新的帖子和主题的通知，外加未读和新帖的数量也将出现在主题旁边。"
+          description: "你将自动监看该标签中的所有主题。新的帖子和主题将会通知你，未读和新帖的数量也将出现在主题旁边。"
         watching_first_post:
           title: "监看头一帖"
-          description: "在该标签里的每一个新主题，你仅会收到头一帖通知。"
+          description: "在这个标签中，只有每一个新主题的头一个帖子，将通知你。"
         tracking:
           title: "跟踪"
-          description: "你将自动跟踪该标签中的所有主题。未读和新帖的数量将会出现在主题旁边。"
+          description: "你将自动跟踪这个标签里的所有主题。未读和新帖的数量将显示在主题旁边。"
         regular:
           title: "普通"
-          description: "当有人@你或者回复你的帖子时，你才会收到通知。"
+          description: "如果有人提及你的 @名字或给你回帖，将通知你。"
         muted:
           title: "静音"
-          description: "不会收到有该标签的主题的提醒，并且他们将不会出现在未读主题中。"
+          description: "在这个标签中，你将不会收到任何新主题通知，它们也不会出现在你的未读列表上面。"
       groups:
         title: "标签组"
         about: "将标签分组以便管理。"
@@ -1945,8 +1928,8 @@ zh_CN:
         admins: '管理员：'
         blocked: '禁止参与讨论:'
         suspended: '禁止登录'
-        private_messages_short: "消息"
-        private_messages_title: "消息"
+        private_messages_short: "私信"
+        private_messages_title: "私信"
         mobile_title: "移动"
         space_free: "{{size}} 空闲"
         uploads: "上传"
@@ -2457,7 +2440,6 @@ zh_CN:
         suspend_reason: "封禁的理由"
         suspended_by: "封禁操作者："
         delete_all_posts: "删除所有帖子"
-        delete_all_posts_confirm: "你将删除 %{posts} 个帖子和 %{topics} 个主题，确认吗？"
         suspend: "禁止"
         unsuspend: "解禁"
         suspended: "已禁止？"
@@ -2484,7 +2466,7 @@ zh_CN:
         reputation: 声誉
         permissions: 权限
         activity: 活动
-        like_count: 送出的赞 / 收到的赞
+        like_count: 送出赞 / 获得赞
         last_100_days: '在最近 100 天'
         private_topics_count: 私有主题数量
         posts_read_count: 已阅帖子数量
@@ -2550,7 +2532,8 @@ zh_CN:
         unlock_trust_level: "解锁信任等级"
         tl3_requirements:
           title: "信任等级3的要求"
-          table_title: "在最近%{time_period}天："
+          table_title:
+            other: "这最近 %{count} 天："
           value_heading: "当前"
           requirement_heading: "要求"
           visits: "访问"
@@ -2562,10 +2545,10 @@ zh_CN:
           posts_read_all_time: "已读的帖子 (全部)"
           flagged_posts: "被标记的帖子"
           flagged_by_users: "标记其的用户"
-          likes_given: "送出的赞"
-          likes_received: "收到的赞"
-          likes_received_days: "收到的赞：独立天数"
-          likes_received_users: "收到的赞：每用户"
+          likes_given: "送出赞"
+          likes_received: "获得赞"
+          likes_received_days: "获得赞：独立天数"
+          likes_received_users: "获得赞：每用户"
           qualifies: "符合信任等级3要求"
           does_not_qualify: "不符合信任等级3要求"
           will_be_promoted: "将在近期被提升。"
@@ -2656,6 +2639,7 @@ zh_CN:
           plugins: "插件"
           user_preferences: "用户设置"
           tags: "标签"
+          search: "搜索"
       badges:
         title: 徽章
         new_badge: 新徽章
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index e1074c2d2c2..c3f984e88da 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -43,8 +43,6 @@ zh_TW:
           other: "< %{count} 秒"
         x_seconds:
           other: "%{count} 秒"
-        less_than_x_minutes:
-          other: "< %{count} 分鐘"
         x_minutes:
           other: "%{count} 分鐘"
         about_x_hours:
@@ -339,12 +337,8 @@ zh_TW:
       latest_by: "最近由"
       toggle_ordering: "顯示/隱藏排序控制"
       subcategories: "次分類"
-      topic_stats: "新討論話題的數目。"
       topic_stat_sentence:
         other: "在過去一%{unit}內有 %{count} 個新討論話題。"
-      post_stats: "新文章的數目。"
-      post_stat_sentence:
-        other: "在過去一%{unit}內有 %{count} 篇新文章。"
     ip_lookup:
       title: 最近的 IP 位址
       hostname: 伺服器名稱
@@ -850,7 +844,6 @@ zh_TW:
         top: "沒有更多精選討論話題。"
         bookmarks: "書籤裡沒有更多的討論話題了。"
     topic:
-      filter_to: "在討論話題裡顯示 {{post_count}} 文章"
       create: '新討論話題'
       create_long: '建立新討論話題'
       private_message: '發送訊息'
@@ -908,7 +901,6 @@ zh_TW:
         jump_bottom_with_number: "跳至第 %{post_number} 篇文章"
         total: 所有文章
         current: 目前的文章
-        position: "第 %{current}/%{total} 篇文章"
       notifications:
         reasons:
           '3_6': '你將會收到通知，因為你正在關注此分類。'
@@ -1050,7 +1042,6 @@ zh_TW:
       expand_collapse: "展開/收合"
       gap:
         other: "檢視 {{count}} 則隱藏回應"
-      more_links: "{{count}} 更多..."
       unread: "文章未讀"
       has_replies:
         other: "{{count}} 個回覆"
@@ -1104,14 +1095,6 @@ zh_TW:
         flag: '投訴'
         defer_flags:
           other: "暫緩投訴"
-        it_too:
-          off_topic: "一起投訴"
-          spam: "一起投訴"
-          inappropriate: "一起投訴"
-          custom_flag: "一起投訴"
-          bookmark: "一起加上書籤"
-          like: "一起按讚"
-          vote: "一起投票支持"
         undo:
           off_topic: "撤回投訴"
           spam: "撤回投訴"
@@ -1258,7 +1241,6 @@ zh_TW:
       take_action: "執行動作"
       notify_action: '訊息'
       delete_spammer: "刪除垃圾文章發送者"
-      delete_confirm: "您將刪除此用戶的 <b>%{posts}</b> 則文章與 <b>%{topics}</b> 個討論話題、移除他的帳號、封鎖從他使用的 IP <b>%{ip_address}</b> 登入、將他的電子郵件地址 <b>%{email}</b> 加入永久封鎖名稱，你確定此人真的發送垃圾文章嗎?"
       yes_delete_spammer: "是的，刪除垃圾文章發送者"
       ip_address_missing: "(N/A)"
       hidden_email_address: "( 隱藏) "
@@ -1271,10 +1253,6 @@ zh_TW:
         spam: "垃圾內容"
       custom_placeholder_notify_user: "請具體說明出有建設性且溫和的意見。"
       custom_placeholder_notify_moderators: "讓我們知道您的意見，並請盡可能地提供相關連結和例子。"
-      custom_message:
-        at_least: "請至少輸入 {{n}} 個字"
-        more: "還需要 {{n}} 個字..."
-        left: "還剩下 {{n}} 個字"
     flagging_topic:
       title: "感謝幫助社群遠離邪惡！"
       action: "投訴討論話題"
@@ -1305,7 +1283,6 @@ zh_TW:
       invisible:
         help: "此討論話題已隱藏，將不會出現在討論話題列表，只能以直接連結開啟。"
     posts: "文章"
-    posts_lowercase: "文章"
     posts_long: "此討論話題有 {{number}} 篇文章"
     posts_likes_MF: |
       This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select,
@@ -1891,7 +1868,6 @@ zh_TW:
         suspend_reason: "原因"
         suspended_by: "將其停權者"
         delete_all_posts: "刪除所有文章"
-        delete_all_posts_confirm: "你確定要刪除 %{posts} 篇文章與 %{topics} 個討論話題嗎?"
         suspend: "停權"
         unsuspend: "恢復權限"
         suspended: "已停權?"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 9e3252aee67..b803f31b89a 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -362,7 +362,7 @@ ar:
   assets_topic_body: "هذا الموضوع مشاهد بشكل دائم للأعضاء فقط . ولحفظ الصورة والملف استخدم موقع التصميم. لا تقوم بحذفها\n\n\nكيف يكون العمل هنا.\n\n1. الرد على الموضوع.\n\n2. رفع كل الصور التي تود أن تستخدمها في الشعار."
   lounge_welcome:
     title: "مرحبا بك في الاستراحة"
-    body: |
+    body: |2
 
       تهانينا! :confetti_ball:
 
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index f05b05207ec..e60f7521536 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -152,7 +152,7 @@ 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: |
+    body: |2
 
       Congratulations! :confetti_ball:
 
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index e519edf3024..c534a5c9718 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -310,7 +310,7 @@ de:
   assets_topic_body: "Dies ist ein fester Beitrag, der nur für Mitarbeiter sichtbar ist, um Bilder und Dateien, die im Forum benutzt werden zu speichern. Lösche diese nicht!\n\n\nAnleitung:\n\n\n1. Antworte auf dieses Thema.\n2. Lade alle Bilder, die du für Logos, Favicons und usw. nutzen willst, hier hoch. (Nutze dazu das Symbol für Lade-Symbolleiste im Beitrags-Editor oder ziehe und lasse die Bilder hier fallen oder füge sie eins.)\n3. Sende deine Antwort. \n4. Klicke mit der rechten Maustaste auf die Bilder in deinem neuen Beitrag, um die den Pfad zu bekommen oder klicke das Editier-Symbol, um deinen Beitrag zu editieren und dadurch den Pfad zu den Bildern zu bekommen. Kopiere die Bild-Pfade.\n5. Füge die Bild-Pfade in [basic settings](/admin/site_settings/category/required) ein.\n\n\nWenn du andere Dateityp-Uploads aktivieren willst, editiere `authorized_extensions` in [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Willkommen in der Lounge"
-    body: |
+    body: |2
 
       Gratuliere! :confetti_ball:
 
@@ -1188,7 +1188,6 @@ de:
     tag_style: "Visueller Stil für Schlagwort-Abzeichen."
     staff_tags: "Eine Liste von Schlagwörtern, die nur von Mitarbeitern angewendet werden können."
     min_trust_level_to_tag_topics: "Minimale Vertrauensstufe, um Schlagwörter zu Themen hinzuzufügen."
-    suppress_overlapping_tags_in_list: "Schlagwörter in Listen verstecken, wenn sie mit dem Titel überlappen."
     remove_muted_tags_from_latest: "Zeige in der Liste der neusten Beiträge keine Themen mit stummgeschalteten Schlagwörtern."
     errors:
       invalid_email: "Ungültige E-Mail-Ad­res­se"
@@ -1666,16 +1665,6 @@ de:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Sicherung erfolgreich abgeschlossen"
-      text_body_template: |
-        Backup erfolgreich erstellt.
-
-        Besuche [admin > backup section](%{base_url}/admin/backups) um das neue Backup herunterzuladen.
-
-        Hier ist das Protokoll:
-
-        ```text
-        %{logs}
-        ```
     backup_failed:
       subject_template: "Sicherung fehlgeschlagen"
       text_body_template: |
@@ -1929,7 +1918,7 @@ de:
       text_body_template: "Die `download_remote_images_to_local` Einstellung wurde deaktiviert, da das Speicherplatz Limit von `download_remote_images_threshold` erreicht wurde."
     dashboard_problems:
       subject_template: "Probleme wurden festgestellt"
-      text_body_template: |
+      text_body_template: |+
         Es wurden Probleme in deinem Admin-Dashboard gemeldet.
 
         [Bitte überprüfe und behebe sie](%{base_url}/admin).
@@ -2095,7 +2084,7 @@ de:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
@@ -2819,7 +2808,7 @@ de:
     first_mention:
       name: Erste Erwähnung
       description: Hat einen Benutzer in einem Beitrag erwähnt
-      long_description: Das Abzeichen wird verliehen, wenn du das erste Mal den @Benutzernamen von jemandem in deinem Beitrag erwähnst. Jede Erwähnung erzeugt eine Benachrichtigung an die Person, sodass sie über deinen Beitrag informiert wird. Gib einfach ein @ (At-Zeichien) ein und erwähne einen beliebigen Benutzer oder, sofern erlaubt, eine Gruppe – es ist ein komfortabler Weg, die Aufmerksamkeit von jemandem auf etwas zu lenken.
+      long_description: Das Abzeichen wird verliehen, wenn du das erste Mal den @Benutzernamen von jemandem in deinem Beitrag erwähnst. Jede Erwähnung erzeugt eine Benachrichtigung an die Person, sodass sie über deinen Beitrag informiert wird. Gib einfach ein @ (At-Zeichen) ein und erwähne einen beliebigen Benutzer oder, sofern erlaubt, eine Gruppe – es ist ein komfortabler Weg, die Aufmerksamkeit von jemandem auf etwas zu lenken.
     first_onebox:
       name: Erste Onebox
       description: Hat einen Link geteilt, der in eine Onebox umgewandelt wurde
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index c612549cb88..d55753c5b91 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -310,7 +310,7 @@ es:
   assets_topic_body: "Este es un tema permanente, visible únicamente para miembros del staff, con el fin de almacenar las imágenes y archivos utilizados en el diseño del sitio. ¡No lo elimines!\n\n\nCómo hacerlo:\n\n\n1. Responde a este tema.\n2. Sube todas las imágenes que desees para los logos, favicons y demás aquí. (Usa el icono de la barra de herramientas en el editor o arrastra y suelta las imágenes o pégalas). \n3. Publica tu respuesta.\n4. Haz clic con el botón derecho en las imágenes de tu nuevo post para obtener la ruta donde están subidas, o haz clic en el icono de editar para ver estas rutas en el panel de edición. Copia las rutas.\n5. Pega las rutas a las imágenes en [ajustes básicos](/admin/site_settings/category/required).\n\n\nSi necesitas habilitar la subida de diferentes tipos de archivo, edita `authorized_extensions` en las opciones de [archivos](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Bienvenido a la Sala VIP"
-    body: |
+    body: |2
 
       ¡Enhorabuena! :confetti_ball:
 
@@ -1168,7 +1168,6 @@ es:
     tag_style: "Estilo visual de las etiquetas."
     staff_tags: "Una lista de etiquetas que sólo pueden ser aplicadas por administradores o moderadores"
     min_trust_level_to_tag_topics: "Nivel mínimo requerido para etiquetar temas"
-    suppress_overlapping_tags_in_list: "Ocultar etiquetas de la vista de lista si se solapan con el título"
     remove_muted_tags_from_latest: "No mostrar temas con etiquetas silenciadas en la lista de temas recientes."
     errors:
       invalid_email: "Dirección de correo electrónico inválida. "
@@ -1773,7 +1772,7 @@ es:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 7bd0580ea33..ffd3579a24e 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -298,7 +298,7 @@ et:
   assets_topic_body: "See on püsiteema, nähtav vaid meeskonnale, selle saidi kujunduses kasutatavate piltide ja failide talletamiseks. Ära seda kustuta!\n\n\nTee nii:\n\n\n1. Vasta siia teemasse.\n2. Lae üles kõik pildid, mida soovida kasutada logodena, ikoonidena, vms. (Kasuta üleslaadimise ikooni postituse redaktori tööriistaribal, võid pildid siia ka lohistada või kleepida.)\n3. Postita oma vastus.\n4. Tee üleslaetud pildifailini leiad kas oma uues postituses oleval pildil paremklikates, või postituse muutmise ikooni klikkides ja kopeerides postitusest redaktoris. Kopeeri teed pildifailideni.\n5. Kleebi need teed sättesse [basic settings](/admin/site_settings/category/required).\n\n\nKui soovid lubada einevate failitüüpide üleslaadimist, muuda `authorized_extensions` sättes [file settings](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Teretulemast Lounge'i"
-    body: |
+    body: |2
 
       Õnnitlused! :confetti_ball:
 
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index e696d1de01d..50f020d2c22 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -241,7 +241,7 @@ fa_IR:
   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: "به انجمن خوش آمدید"
-    body: |
+    body: |2
 
       Congratulations! :confetti_ball:
 
@@ -1094,7 +1094,7 @@ fa_IR:
         ```
     csv_export_succeeded:
       subject_template: "خارج کردن اطلاعات کامل شد"
-      text_body_template: |
+      text_body_template: |+
         خارج کردن فایل ها با موفقیت انجام شد! :dvd:
 
 
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index 6f892c42bd9..c7826500b77 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -241,7 +241,7 @@ fi:
       Voit muokata edellistä viestiäsi ja lisätä siihen lainauksen korostamalla osan lainattavan viestin tekstiä ja klikkaamalla näkyviin ilmestyvää <b>lainaa</b>-painiketta.
 
       On kaikille helpompaa lukea ketjua, jossa on vähemmän pidempiä vastauksia, kuin paljon lyhyitä yksittäisiä vastauksia.
-    dominating_topic: |
+    dominating_topic: |+
       ### Anna muidenkin osallistua keskusteluun
 
       Tämä ketju on selvästikin tärkeä sinulle &ndash; olet kirjoittanut yli %{percent}% vastauksista.
@@ -308,7 +308,7 @@ fi:
   assets_topic_body: "Tämä on pysyvä ketju, joka näkyy ainoastaan henkilökunnalle. Se on tarkoitettu sivuston käyttämien kuvien ja muiden tiedostojen tallentamiseen. Älä poista sitä!\n\n\nTässä ova ohjeet sen käyttämiseen:\n\n\n1. Vastaa tähän ketjuun.\n2. Lataa kaikki kuvat, joita haluat käyttää logoina, faviconina jne tänne. (Käytä viestieditorin työkalupalkin painiketta, tai raahaa tai liitä kuvat).\n3. Lähetä viesti\n4. Klikkaa hiiren oikealla näppäimellä, tai klikkaa muokkaa-näppäintä muokataksesi viestiäsi, jotta saat kuvien polun näkyviin. Kopioi talteen polut kuviin.\n5. Liitä kuvien polut [perusasetuksiin](/admin/site_settings/category/required).\n\n\nLisäksi, jos sinun täytyy sallia uusia tiedostomuotoja, muokkaa `sallitut tiedostopäätteet` listaa [tiedostojen asetuksissa](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Tervetuloa Loungeen"
-    body: |
+    body: |2
 
       Onnittelut! :confetti_ball:
 
@@ -1176,7 +1176,6 @@ fi:
     tag_style: "Tunnisteiden visuaalinen tyyli."
     staff_tags: "Lista tunnisteista, joita vain henkilökunta voi lisätä"
     min_trust_level_to_tag_topics: "Vähimmäisluottamustaso, jolla voi lisätä tunnisteita ketjuihin"
-    suppress_overlapping_tags_in_list: "Piilota tunnisteet listanäkymistä, jos ne menevät otsikon kanssa päällekkäin"
     remove_muted_tags_from_latest: "Jos tunniste on vaimennettu, älä näytä ketjua Tuoreimmissa."
     errors:
       invalid_email: "Sähköpostiosoite ei kelpaa."
@@ -1656,16 +1655,6 @@ fi:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Varmuuskopiointi suoritettu onnistuneesti"
-      text_body_template: |
-        Varmuuskopiointi onnistui.
-
-        Lataa varmuuskopio siirtymällä [ylläpito > varmuuskopiot](%{base_url}/admin/backups).
-
-        Tässä loki:
-
-        ```text
-        %{logs}
-        ```
     backup_failed:
       subject_template: "Varmmuskopiointi epäonnistui"
       text_body_template: |
@@ -1734,7 +1723,7 @@ fi:
         Vastauksesi lähetettiin tuntemattomasta sähköpostiosoitteesta. Yritä lähettää viesti toisesta osoitteesta, tai ota yhteyttä henkilökuntaan.
     email_reject_screened_email:
       subject_template: "[%{site_name}] Sähköpostiongelma-- Estetty sähköpostiosoite"
-      text_body_template: |
+      text_body_template: |+
         Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
 
         Viestisi lähetettiin estetystä sähköpostiosoitteesta. Yritä lähettää viesti toisesta sähköpostiosoitteesta tai ota yhteyttä henkilökuntaan.
@@ -1765,7 +1754,7 @@ fi:
         Sähköpostiosoitteesi ei vastaa yhtäkään käyttäjistä. Kokeile lähettää viestisi toisesta sähköpostiosoitteesta tai ota yhteyttä henkilökuntaan.
     email_reject_empty:
       subject_template: "[%{site_name}] Sähköpostiongelma -- Ei sisältöä"
-      text_body_template: |
+      text_body_template: |+
         Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
 
         Emme löytäneet sähköpostiviestistäsi sisältöä.
@@ -2086,7 +2075,7 @@ fi:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
@@ -2152,7 +2141,7 @@ fi:
         %{base_url}/users/authorize-email/%{email_token}
     confirm_old_email:
       subject_template: "[%{site_name}] Vahvista nykyinen sähköpostiosoiteesi"
-      text_body_template: |
+      text_body_template: |+
         Ennen kuin voit vaihtaa sähköpostiosoitteesti, meidän täytyy varmistaa, että hallinnoit nykyistä sähköpostiosoitetta. Kun olet suorittanut tämän, varmistamme vielä uuden sähköpostiosoitteenkin.
 
         Vahvista sähköpostiosoitteesti sivustolle %{site_name} klikkaamalla linkkiä:
@@ -2360,7 +2349,7 @@ fi:
   privacy_topic:
     title: "Rekisteriseloste"
   static:
-    search_help: |
+    search_help: |+
       <h3>Vinkkejä</h3>
       <p>
       <ul>
@@ -2458,13 +2447,13 @@ fi:
     great_topic:
       name: Loistava ketju
       description: Ketjunavaus sai 50 tykkäystä
-      long_description: |
+      long_description: |+
         Tämä arvomerkki myönnetään, kun luomasi ketju saa 50 tykkäystä. Aloitit kiehtovan keskustelun, jossa vaihdetuista ajatuksista yhteisö nautti!
 
     nice_share:
       name: Hyvä jako
       description: Jakoi viestin, ja linkin kautta saapui 25 vierailijaa
-      long_description: |
+      long_description: |+
         Tämä arvomerkki myönnetään, kun jaat linkin, jota klikkaa 25 ulkopuolista vierailijaa. Kiitos kun levität sanaa palstan keskusteluista ja yhteisöstä.
 
     good_share:
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index de331a00b4d..f558ff83f5d 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -310,7 +310,7 @@ fr:
   assets_topic_body: "Ceci est un sujet permanent, visible uniquement par l'équipe, pour stocker les images et fichiers utilisés pour le design du site. Ne pas le supprimer !\n\n\nMarche à suivre:\n\n1. Répondre à ce sujet\n2. Envoyer toutes les images que vous voulez utilisés comme logos, favicons, et tout ce que vous souhaitez. (Utiliser l'icone dans la barre d'édition ou glisser-déposer ou coller les images)\n3. Envoyer votre réponse\n4. Afin d'obtenir le chemin complet de votre image, faites un clic-droit dessus ou éditer votre message et copier le chemin.\n5. Coller le chemin de l'image dans les [paramètres requis](/admin/site_settings/category/required).\n\nDe plus, si vous souhaitez envoyer d'autres formats de fichier, modifier l'option `authorized_extensions` dans les [paramètres de fichier](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Bienvenue dans le salon"
-    body: |
+    body: |2
 
       Félicitation ! :confetti_ball:
 
@@ -566,6 +566,14 @@ fr:
     different_user_description: "Vous êtes actuellement connecté avec un utilisateur différent de celui à qui le courriel est adressé. Veuillez vous déconnecter, ou utiliser le mode anonyme, et essayer à nouveau."
     not_found_description: "Désolé, nous ne pouvons pas vous désabonner. Il est possible que le lien de votre courriel soit expiré."
     log_out: "Déconnexion"
+  user_api_key:
+    title: "Autoriser l'accès d'application"
+    authorize: "Autoriser"
+    read: "lecture"
+    read_write: "lecture/écriture"
+    description: "Voulez-vous autoriser à \"%{application_name}\" l'accès en %{access} à votre compte ?"
+    no_trust_level: "Désolé, vous n'avez pas le niveau de confiance requis pour accéder à l'API utilisateur"
+    generic_error: "Désolé, nous n'avons pu générer de clés pour l'API utilisateur, cette fonctionnalité peut être désactivée par l'administrateur"
   reports:
     visits:
       title: "Visites utilisateur"
@@ -752,6 +760,8 @@ fr:
     min_private_message_title_length: "Longueur minimale pour un titre de message en nombre de caractères"
     min_search_term_length: "Longueur minimale autorisée du texte saisie avant de lancer une recherche en nombre de caractères"
     search_tokenize_chinese_japanese_korean: "Forcer la tokenisation dans la recherche chinois/japonais/koréen, même sur des sites non-CJK."
+    search_prefer_recent_posts: "Si la recherche dans votre forum est lente, cette option tente l'indéxation des messages les plus récents en premier"
+    search_recent_posts_size: "Combien de messages récents à garder dans l'index"
     allow_uncategorized_topics: "Autorise la création de sujets sans catégorie. ATTENTION : S'il existe des sujets non-catégorisés, vous devez les catégoriser avant de désactiver cette fonction."
     allow_duplicate_topic_titles: "Autoriser la création de sujet avec le même titre."
     unique_posts_mins: "Combien de temps avant qu'un utilisateur puisse poster le même contenu à nouveau"
@@ -919,6 +929,7 @@ fr:
     top_topics_formula_log_views_multiplier: "formule pour la valeur de multiplicateur de vues de journal (n) dans les sujets tendance : `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "formule pour la valeur de multiplicateur de premiers J'aime (n) dans les sujets tendance: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "formule pour la valeur de multiplicateur de moins de J'aime par message (n) dans les sujets tendance: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    rebake_old_posts_count: "Nombre d'anciens messages à être régénéré toutes les 15 minutes."
     rate_limit_create_topic: "Après la création d'un sujet, les utilisateurs doivent attendre (n) secondes avant de pouvoir en créer un nouveau."
     rate_limit_create_post: "Après avoir posté un message, les utilisateurs doivent attendre (n) secondes avant de pouvoir en poster un nouveau."
     rate_limit_new_user_create_topic: "Après la création d'un sujet, les nouveaux utilisateurs doivent attendre (n) secondes avant de pouvoir en créer un nouveau."
@@ -933,6 +944,7 @@ fr:
     max_topic_invitations_per_day: "Nombre maximum d'invitations à un sujet qu'un utilisateur peut envoyer par jour."
     alert_admins_if_errors_per_minute: "Nombre d'erreurs par minute nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. NB : nécessite un redémarrage."
     alert_admins_if_errors_per_hour: "Nombre d'erreurs par heure nécessaires pour déclencher une alerte administrateur. Une valeur de 0 désactive cette fonctionnalité. NB : Nécessite un redémarrage."
+    categories_topics: "Nombre de sujets à afficher dans la page /categories."
     suggested_topics: "Nombre de sujets suggérés affichés en bas d'un sujet."
     limit_suggested_to_category: "Afficher uniquement les sujets de la catégorie courante dans les sujets similaires."
     suggested_topics_max_days_old: "Les sujets suggérés ne devraient pas être plus anciens que n jours."
@@ -1004,6 +1016,7 @@ fr:
     title_fancy_entities: "Convertir les caractères ASCII commun en jolies entitées HTML dans les titres des sujets, comme SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "La taille minimale d'un titre avant que l'on vérifie l'existence de sujets identiques."
     min_body_similar_length: "La taille minimale d'un message avant que l'on vérifie l'existence de sujets identiques."
+    desktop_category_page_style: "Style visuel de la page /categories."
     category_colors: "Une liste de couleurs en hexadécimale autorisées pour les catégories."
     category_style: "Style visuel pour les badges de catégorie."
     max_image_size_kb: "La taille maximale des images en Ko. Doit être configuré dans nginx (client_max_body_size) / apache ou proxy aussi."
@@ -1133,6 +1146,7 @@ fr:
     feed_polling_url: "EMBARQUER UNIQUEMENT: Url du flux RSS/ATOM à embarqué."
     embed_by_username: "Pseudo de l'utilisateur Discourse qui crée les sujets embarqués."
     embed_username_key_from_feed: "Clé pour extraire le pseudo du flux."
+    embed_title_scrubber: "Expression régulière pour nettoyer les titres intégrables."
     embed_truncate: "Tronquer les messages embarqués."
     embed_post_limit: "Nombre maximum de messages à embarquer."
     embed_username_required: "Un pseudo d'utilisateur pour la création du sujet est nécessaire."
@@ -1176,6 +1190,13 @@ fr:
     default_categories_watching: "Liste de catégories surveillées par défaut."
     default_categories_tracking: "Liste de catégories suivies par défaut."
     default_categories_muted: "Liste de catégories silencées par défaut."
+    max_user_api_reqs_per_day: "Nombre maximum de requêtes de l'API utilisateur par clé et par jour"
+    max_user_api_reqs_per_minute: "Nombre maximum de requêtes de l'API utilisateur par clé et par minute"
+    allow_read_user_api_keys: "Autoriser la génération de clés en lecture seule pour l'API utilisateur"
+    allow_write_user_api_keys: "Autoriser la génération de clés en écriture pour l'API utilisateur"
+    allow_push_user_api_keys: "Autoriser la génération de clés pour utiliser le service push pour l'API utilisateur"
+    max_api_keys_per_user: "Nombre maximum de clés de l'API utilisateur par utilisateur"
+    min_trust_level_for_user_api_key: "Niveau de confiance requis pour générer des clés pour l'API utilisateur"
     tagging_enabled: "Activer les tags sur les sujets ?"
     min_trust_to_create_tag: "Le niveau de confiance minimum requis pour créer un tag."
     max_tags_per_topic: "Le nombre maximum de tags pouvant être ajoutés à un sujet."
@@ -1187,7 +1208,7 @@ fr:
     tag_style: "Style visuel pour tag badges."
     staff_tags: "Une liste de tags qui ne peuvent être appliqués que par des responsables."
     min_trust_level_to_tag_topics: "Niveau de confiance minimum requis pour taguer des sujets"
-    suppress_overlapping_tags_in_list: "Cacher les tags de la liste s'ils recouvrent le titre"
+    suppress_overlapping_tags_in_list: "Si des tags correspondent exactement à des mots du titre d'un sujet, ne pas afficher ces tags"
     remove_muted_tags_from_latest: "Ne pas afficher les sujets avec des tags silencieux dans la liste des sujets récents."
     errors:
       invalid_email: "Adresse de courriel invalide."
@@ -1473,7 +1494,7 @@ fr:
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
     subject_template: "[%{site_name}] Nouvelle version de Discourse, mise à jour disponible"
-    text_body_template: |
+    text_body_template: |+
       Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible !
 
       Votre version : %{installed_version}
@@ -1525,7 +1546,7 @@ fr:
   system_messages:
     post_hidden:
       subject_template: "Message caché suite à des signalements de la communauté"
-      text_body_template: |
+      text_body_template: |+
         Bonjour,
 
         Ceci est un message automatique de %{site_name} pour vous informer que votre message a été caché.
@@ -2097,7 +2118,7 @@ fr:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 2b4baf6718b..48e3a8f533b 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -49,6 +49,7 @@ he:
         reply_user_not_matching_error: "מתרחש כאשר תשובה מגיעה מכתובת דוא\"ל אחרת מזו שההתראה נשלחה אליה."
         topic_not_found_error: "קורה כאשר הגיעה תגובה אבל הנושא הקשור נמחק."
         topic_closed_error: "קורה כאשר הגיעה תגובה אבל הנושא הקשור נסגר."
+        bounced_email_error: "המייל הוא דוח מיילים מוחזרים"
         screened_email_error: "מתרחש כאשר כתובת הדוא\"ל של השולח/ת כבר סוננה."
   errors: &errors
     format: '%{attribute} %{message}'
@@ -229,7 +230,7 @@ he:
       כבר פרסמת כמה נושאים ותגובות, אבל תמונת הפרופיל שלך לא מיוחדת- היא רק אות.
       שקלת **[להכנס לפרופיל משתמש שלך ](%{profile_path})** ולהעלות תמונה שמייצגת אותך?
       יותר קל לעקוב אחרי שיחות ולמצוא אנשים מעניינים כשלכולם יש תמונת פרופיל יחודית!
-    sequential_replies: |
+    sequential_replies: |+
       ### שקלו להשיב לכמה פרסומים בבת אחת
 
       במקום להשיב בתגובות עוקבות לנושא, שקלו בבקשה לפרסם תגובה אחת שכוללת ציטוטים מהפרסומים הקודמים או הפניות ל@שם_משתמש/ת.
@@ -303,7 +304,7 @@ he:
   assets_topic_body: "זהו נושא קבוע, הגלוי רק לצוות, לשמירת תמונות וקבצים שמשמשים לעיצוב האתר. אל תמחקו אותו!\n\n\nכיצד:\n\n\n1. הגיבו לנושא זה.\n2. העלו כאן את כל התמונות שברצונכם להשתמש כלוגואים, לוגואים מוקטנים (favicons) וכן הלאה. (השתמשו בלוגו ההעלאה בסרגל הכלים בעורך הפרסום, או גררו-שחררו או הדביקו את התמונות.)\n3. שלחו את התגובה כדי לפרסם אותה.\n4. הקליקו עם הכפתור הימני על התמונות בפרסום החש שלכם כדי להשיג את הכתובת של התמונה שהועלתה, או הקליקו על סמל העריכה כדי לערוך את הפרסום ולאחזר את הכתובת של התמונות. העתיקו את הכתובות.\n5. הדביקו את כתובות התמונות אלתוך [הגדרות בסיסיות](/מנהל/הגדרות_אתגר/קטגוריה/נדרש).\n\nאם אתכם צריכים לאפשר העלאת קבצים מסוגים שונים, ערכו את \"הרחבות מאושרות\" בתוך [הגדרות_קובץ](/מנהל/הגדרות_אתר/קטגוריה/קבצים)."
   lounge_welcome:
     title: "ברוכים הבאים ללאונג'"
-    body: |
+    body: |2
 
       ברכות!: confetti_ball
 
@@ -558,6 +559,14 @@ he:
     different_user_description: "אתם כרגע מחוברים כמשתמש אחר מאשר אליו שלחנו מייל. אנא התנתקו, או עיברו למצב אנונימי, ונסו שוב."
     not_found_description: "מצטערים, לא מצאנו את ביטול המנוי הזה. ייתכן שהלינק במייל שלכם כבר לא בתוקף?"
     log_out: "התנתקות"
+  user_api_key:
+    title: "אישור גישת אפליקציה"
+    authorize: "אישור"
+    read: "קריאה"
+    read_write: "קריאה/כתיבה"
+    description: "האם תרצו להעניק ל \"%{application_name}\" גישת %{access} לחשבונכם?"
+    no_trust_level: "מצטערים, אין לכם את רמת האמון הנדרשת כדי לגשת ל API של המשתמשים"
+    generic_error: "מצטערים, לא הצלחנו לייצר את מפתחות ה API של המשתמש, ייתכן שיכולת זו מנוטרלת על ידי מנהלי האתר"
   reports:
     visits:
       title: "ביקורי משתמש"
@@ -744,6 +753,8 @@ he:
     min_private_message_title_length: "אורך הכותרת המנימילי המותר להודעה בתווים"
     min_search_term_length: "מספר התווים המינמלי התקין כאורך מונח לחיפוש"
     search_tokenize_chinese_japanese_korean: "אלצו את החיפוש לנתח סינית/יפנית/קוריאנית גם באתרים שאינם בשפות אלו"
+    search_prefer_recent_posts: "אם חיפוש בפורום הגדול שלכם איטי, אופציה זו מנסה לאנדקס קודם כל את הפוסטים החדשים יותר"
+    search_recent_posts_size: "כמה פוסטים חדשים לשמור באינדקס"
     allow_uncategorized_topics: "הרשה לפתוח נושאים ללא קטגוריה.\nאזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את האופציה. "
     allow_duplicate_topic_titles: "אשר/י נושאים עם כותרות זהות או משוכפלות."
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
@@ -813,11 +824,15 @@ he:
     must_approve_users: "על הצוות לאשר את כל המשתמשים החדשים לפני שהם מקבלים גישה לאתר. אזהרה: בחירה זו עבור אתר קיים תשלול גישה ממשתמשים קיימים שאינם מנהלים."
     pending_users_reminder_delay: "הודיעו למנחים אם משתמשים חדשים ממתינים לאישור למעלה מכמות זו של שעות. קבעו ל -1 כדי לנטרל התראות."
     maximum_session_age: "משתמשים ישארו מחוברים ל n שעות מאז ביקורם האחרון"
+    ga_tracking_code: "מיושן: קוד גוגל אנליטיקס (ga.js) למעקב, כגון: UA-12345678-9ֿ; ראו http://google.com/analytics"
+    ga_domain_name: "מיושן: שם דומיין לגוגל אנליטיקס (ga.js), למשל: mysite.com; ראו http://google.com/analytics"
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics"
+    gtm_container_id: "מזהה קונטיינר של מנהל תגיות גוגל. למשל: GTM-ABCDEF"
     enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag"
     allow_moderators_to_create_categories: "Allow moderators to create new categories"
     cors_origins: "מקורות שאפשר לבצע להם בקשות קרוס-דומיין (Cross origin requests). כל מקור צריך לכלול את התחילית http:// או https:// . משתנה הסביבה DISCOURCE_ENABLE_CORS חייב להיות true כדי לאפשר CORS."
+    use_admin_ip_whitelist: "מנהלים יכולים להתחבר רק אם הכתובת שלהם מופיע ברשימת ה IPs המסוננים (ניהול > לוגים > כתובות IP מסוננות)."
     top_menu: "החליטו אילו פריטים יופיעו בניווט עמוד הבית ובאיזה סדר לדוגמא |אחרונים|חדשים|קטגוריות|מובילים|נקראו|פורסמו|סימניות"
     post_menu: "Determine which items appear on the post menu, and in what order. Example like|edit|flag|delete|share|bookmark|reply"
     post_menu_hidden_items: "פריטי התפריט להסתרה כברירת מחדל בתפריט הפרסום, אלא אם כן נלחץ לחצן ההרחבה."
@@ -840,6 +855,7 @@ he:
     allow_index_in_robots_txt: "פרטו ב-robots.txt שלאתר זה מותר להיות מאונדקס על ידי מנועי חיפוש."
     email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
     email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
+    forgot_password_strict: "אל תיידעו משתמשים בנוגע לקיום חשבון כשהם משתמשים באפשרות של ״שכחתי סיסמה״."
     log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמ/ת בכל המכשירים"
     version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה של האדמין"
     new_version_emails: "שלחו דוא\"ל לכתובת של contact_email כשגרסא חדשה של Discourse זמינה."
@@ -856,9 +872,11 @@ he:
     min_admin_password_length: "אורך סיסמה מינימלית לאדמיניסטרטור."
     block_common_passwords: "אל תאפשרו סיסמאות מתוך 10,000 הסיסמאות הנפוצות ביותר."
     enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)"
+    verbose_sso_logging: "רישום יומנים מפורטים בנוגע לדיאגנוסטיקות SSO ל /logs"
     enable_sso_provider: "הטמיעו את פרוטוקול הספק Discourse SSO בנקודת הקצה /session/sso_provider, דורש כיוון של sso_secret"
     sso_url: "URL of single sign on endpoint (must include http:// or https://)"
     sso_secret: "מחרוזת סודית המשמשית לאמת באופן קרפיטוגרפי מידע SSO, וודאו שהיא באורך 10 תווים ומעלה"
+    sso_overrides_bio: "דורס ביוגרפיה של משתמשים בפרופיל המשתמש ומונע מהם מלשנות אותה"
     sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)"
     sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)"
     sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes."
@@ -866,6 +884,7 @@ he:
     sso_not_approved_url: "Redirect unapproved SSO accounts to this URL"
     enable_local_logins: "אפשרו שם חשבונות מבוססים על שן משתמש מקומי וסיסמאת התחברות. (שימו לב: אפשרות זו חייבת להיות מותרת כדי שהזמנות להצטרפות יפעלו)"
     allow_new_registrations: "אפשרו הרשמות משתמשים חדשים. בטלו סימון זה כדי למנוע יצירת חשבונות חדשים."
+    enable_signup_cta: "הציגו הודעה למשתמשים אנונימיים חוזרים שמציעה להם להרשם כדי לקבל חשבון."
     enable_yahoo_logins: "Enable Yahoo authentication"
     enable_google_oauth2_logins: "אפשרו הזדהות באמצעות Oauth2 של גוגל. זהו מנגנון ההזדהות שנתמך כרגע על ידי גוגל. דורש מפתח וסיסמא."
     google_oauth2_client_id: "זהות לקוח (Client ID) של אפליקציית ה-Google שלך."
@@ -873,6 +892,7 @@ he:
     enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret"
     twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com"
     twitter_consumer_secret: "Consumer secret for Twitter authentication, registered at http://dev.twitter.com"
+    enable_instagram_logins: "אפשרו אימות אינסטגרם, מצריך instagram_consumer_key ו instagram_consumer_secret"
     instagram_consumer_key: "מפתח לאימות אינסטגרם"
     instagram_consumer_secret: "סוד לאימות אינסטגרם"
     enable_facebook_logins: "Enable Facebook authentication, requires facebook_app_id and facebook_app_secret"
@@ -894,6 +914,7 @@ he:
     active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
     verbose_localization: "הצגת טיפים מורחבים של לוקליזציה בממשק המשתמש."
     previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours"
+    rebake_old_posts_count: "מספר הפוסטים הישנים לאפייה מחדש בכל 15 דקות."
     rate_limit_create_topic: "לאחר יצירת נושא, על המשתמשים להמתין (n) שניות לפני יצירת נושא אחר."
     rate_limit_create_post: "לאחר הפרסום על המשתמשים להמתין (n) שניות לפני יצירת פרסום חדש."
     rate_limit_new_user_create_topic: "לאחר יצירת נושא, משתמשים חדשים יחוייבו לחכות (n) שניות לפני שיוכלו ליצור נושא אחר."
@@ -906,6 +927,9 @@ he:
     max_private_messages_per_day: "מספר מקסימלי של הודעות שמשתמש/ת יכולים ליצור ביום."
     max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמש/ת לשלוח ביום."
     max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמש יכול לשלוח ביום. "
+    alert_admins_if_errors_per_minute: "מספר השגיאות בדקה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
+    alert_admins_if_errors_per_hour: "מספר השגיאות בשעה לפני ששולחים התראה למנהל. ערך של 0 מנטרל אפשרות זו. שימו לב: מצריך הרצה מחדש."
+    categories_topics: "מספר נושאים להצגה בדף /קטגוריות."
     suggested_topics: "מספר הנושאים המוצעים שיופיעו בתחתית הנושא המוצג."
     limit_suggested_to_category: "הצגת רק נושאים מהקטגוריה הנוכחית ברשימת הנושאים המומלצים."
     suggested_topics_max_days_old: "נושאים מוצעים לא אמורים להיות בני יותר מ n ימים."
@@ -923,6 +947,7 @@ he:
     avatar_sizes: "רשימה של גדלי אווטרים שנוצרת אוטומטית. "
     external_system_avatars_enabled: "Use external system avatars service."
     default_opengraph_image_url: "כתובת של תמונת opengraph בברירת המחדל."
+    allow_all_attachments_for_group_messages: "אפשרו צירוף קבצים להודעות לקבוצות."
     convert_pasted_images_to_hq_jpg: "המירו תמונות מודבקות לקבצי JPG באיכות גבוהה."
     convert_pasted_images_quality: "איכות של קובץ ה JPG המומר (1 זו האיכות הנמוכה ביותר, 100 הטובה ביותר)."
     enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) בפרסומים. אזהרה: עלול להביא לבעיות בטיחות באתר."
@@ -939,6 +964,8 @@ he:
     tl2_requires_likes_given: "כמה לייקים משתמש צריך לתת לפני שישודרג לרמת אמון 2."
     tl2_requires_topic_reply_count: "בכמה נושאים משתמש צריך לענות לפני שישודרג לרמת אמון 2."
     tl3_time_period: "דרישות פרק זמן של רמת אמון 3 (בימים)"
+    tl3_requires_days_visited: "מספר מינימלי של ימים שמשתמש צריך לבקר באתר ב (תקופת זמן tl3) הימים האחרונים כדי להיות מועמד לקידום לרמת אמון 3. קבעו ליותר מתקופת זמן של  tl3 כדי לנטרל קידום ל tl3. (0 או יותר)."
+    tl3_requires_topics_replied_to: "מספר מינימלי של נושאים שמשתמש צריך להגיב עליהם ב (תקופת זמן tl3) ימים כדי להיות מועמד לקידום לרמת אמון 3. (0 או יותר)"
     tl3_requires_topics_viewed_all_time: "מספר מינימלי של נושאים שמשתמש צריך לעיין בהם על מנת שיתאפשר לו להיות משודרג לרמת אמון 3."
     tl3_requires_posts_read_all_time: "מספר מינימלי של פרסומים שמשתמש קרא על מנת שיוכל להיות משודרג לרמת אמון 3."
     tl3_promotion_min_duration: "מספר הימים המינימלי ששדרוג לרמת אמון 3 תארך לפני שמשתמש יורד בדרגה לרמת אמון 2."
@@ -966,6 +993,7 @@ he:
     title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants http://daringfireball.net/projects/smartypants/"
     min_title_similar_length: "האורך המינימלי של כותרת לפני שהיא נבדקת עבור איתור נושאים דומים."
     min_body_similar_length: "האורך המינימלי של גוף הפרסום לפני שהוא ייבדק לאיתור נושאים דומים."
+    desktop_category_page_style: "סגנון ויזואלי לדף /קטגוריות."
     category_colors: "רשימה של ערכי צבעים האקסדיצמלים מותרים לסימון קטגוריות."
     category_style: "סגנון ויזואלי עבור עיטורי קטגוריות."
     max_image_size_kb: "גודל קובץ מקסימלי להעלאה בקילו-בייטים (kB). ערך זה חייב להיות מוגדרת גם ב-nginx (client_max_body_size) / apache או בפרוקסי."
@@ -988,6 +1016,7 @@ he:
     faq_url: "If you have a FAQ hosted elsewhere that you want to use, provide the full URL here."
     tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here."
     privacy_policy_url: "If you have a Privacy Policy document hosted elsewhere that you want to use, provide the full URL here."
+    newuser_spam_host_threshold: "מספר הפעמים שמשתמשים חדשים יכולים לקשר לאותו מחשב במסגרת `newuser_spam_host_threshold` הפרסומים שלהם לפני שייחשבו ספאם."
     white_listed_spam_host_domains: "רשימה של מתחמים (domain) שיוחרגו מבדיקת הספאם. משתמשים חדשים לעולם לא יוגבלו ביצירת פרסומים חדשים עם קישורים למתחמים אלו."
     staff_like_weight: "כמה משקל עודף יש להעניק ללייקים של הצוות."
     topic_view_duration_hours: "ספרו צפיות חדשות בנושא פעם אחת לכל IP/משתמש לכל N שעות"
@@ -1006,15 +1035,19 @@ he:
     auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post."
     reply_by_email_enabled: "אפשרו  תגובה לנושאים באמצעות הדוא\"ל."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "השתמשו ב HTML במקום בטקסט בשביל מייל נכנס. עלול ליצור בעיות עיצוב לא-צפויות!"
     disable_emails: "מנעו מ-Discourse ממשלו דוא\"ל כלשהו."
     strip_images_from_short_emails: "הסרת תמונות מדוא\"ל בגודל של פחות מ-2800 בייטים"
     short_email_length: "אורכו של דוא\"ל קצר בבייטים (Bytes)"
     display_name_on_email_from: "הצגת שמות מלאים בשדה ה״מאת״ במיילים"
     unsubscribe_via_email: "אפשרו למשתמשים לבטל מנוי אימייל באמצעות שליחת מייל עם המילה ״unsubscribe״ בנושא או גוף המייל"
+    unsubscribe_via_email_footer: "צירוף ״ביטול מנוי באמצעות קישור מייל mailto:״ בתחתית מיילים נשלחים"
     delete_email_logs_after_days: "מחיקת יומני מיילים אחרי (N) ימים. 0 ישמור אותם ללא הגבלה"
     max_emails_per_day_per_user: "מספר המיילים המקסימאלי שניתן לשלוח למשתמש/ת ביום. הקישו 0 למשלוח ללא הגבלה."
+    auto_generated_whitelist: "רשימת כתובות דואר מהן לא ייבדק אם התוכן נוצר-אוטומטית. למשל: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "חסימת מיילים נכנסים שמזוהים ככאלו שנוצרו אוטומטית."
     ignore_by_title: "התעלמות ממיילים נכנסים לפי הכותרת שלהם."
+    mailgun_api_key: "מפתח API סודי של Mailgun לאימות של הודעות webhook."
     soft_bounce_score: "ניקוד-החזר מתווסף למשתמש כאשר מתרחשת החזרה זמנית."
     hard_bounce_score: "ניקוד-החזר מתווסף למשתמש כאשר מתרחשת החזרה קבועה."
     bounce_score_threshold: "ניקוד-החזר מקסימלי לפני שנפסיק לשלוח מיילים למשתמש."
@@ -1040,12 +1073,14 @@ he:
     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."
     username_change_period: "The number of days after registration that accounts can change their username (0 to disallow username change)."
     email_editable: "Allow users to change their e-mail address after registration."
+    logout_redirect: "כתובת להפנות אליה את הדפדפנים לאחר התנתקות (למשל: http://somesite.com/logout)"
     allow_uploaded_avatars: "Allow users to upload custom profile pictures."
     allow_animated_avatars: "Allow users to use animated gif profile pictures. WARNING: run the avatars:refresh rake task after changing this setting."
     allow_animated_thumbnails: "יצירת תמונות אנימציה מוקטנות קטנות של קבצי אנימציית gif."
     default_avatars: "כתובות URL לאווטרים אשר ישמשו כברירת מחדל למשתמשים חדשים עד אשר ישנו אותם."
     automatically_download_gravatars: "הורדת גראווטרים למשתמשים בעת יצירת החשבון או שינוי כתובת הדוא\"ל."
     digest_topics: "המספר המקסימלי של נושאים להציג במייל הסיכום."
+    delete_digest_email_after_days: "השתקת מיילי סיכום למשתמשים שלא ביקרו באתר למעלה מ (n) ימים."
     digest_suppress_categories: "וותרו על קטגוריות אלו במיילים מסכמים."
     disable_digest_emails: "בטל סיכומי מיילים לכל המשתמשים."
     detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures."
@@ -1056,11 +1091,13 @@ he:
     allow_anonymous_posting: "אפשרו למשתמשים לעבור למצב אנונימי"
     anonymous_posting_min_trust_level: "רמת האמון המינמלית הנדרשת כדי לאפשר פרסום אנונימי"
     anonymous_account_duration_minutes: "בכדי להגן על האנונימות צרו חשבון אנונימי כל N דקות לכ משתמש. לדוגמה: אם מכוון ל-600, כאשר יעברו 600 דקות מהפרסום האחרון והמשתמש/ת יחליפו לזהות אנונימית, חשבון אנונימי חדש יווצר."
+    hide_user_profiles_from_public: "נטרלו כרטיסי משתמשים, פרופילי משתמשים ומדריך משתמשים למשתמשים אנונימיים."
     allow_profile_backgrounds: "אפשרו למשתמשים להעלות רקעים לפרופיל."
     sequential_replies_threshold: "מספר הפוסטים שעל משתמש לפרסם אחד-לאחר-השני בנושא לפני שמזכירים לו שהוא משאיר יותר מידי תגובות ברצף."
     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: "איזה אחוז מהפרסומים משתמש צריך לייצר בנושא לפני שיקבל תזכורת לגבי שליטת/שתלטנות יתר על הנושא."
     suppress_uncategorized_badge: "אל תציגו את העיטור לנושאים נטולי קטגוריה ברשימת הנושאים."
+    permalink_normalizations: "החילו את הביטויים הרגולריים האלו לפני שמתאימים קישורים-קבועים, למשל: /(topic.*)\\?.*/\\1 יסיר מחרוזות שאילתה מנתיבי נושאים. הפורמט הוא regex+string משתמש ב \\1 וכד׳ כדי לגשת להתאמות"
     global_notice: "הציגו הודעת אזהרה דחופה כללית לכל המבקרים, החליפו לריק כדי להסתיר אותה (ניתן להשתמש ב-HTML)."
     disable_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל."
     automatically_unpin_topics: "הסרת נעיצה אוטומטית כאשר המשתמש/ת מגיע לתחתית."
@@ -1080,6 +1117,7 @@ he:
     feed_polling_url: "הטמעה בלבד: URL של פיד RSS/ATOM להטמעה."
     embed_by_username: "שם המשתמש של המשתמש/ת שיוצר את הנושאים המוטמעים."
     embed_username_key_from_feed: "מפתח למשיכת שם המשתמש ב-discourse מהפיד."
+    embed_title_scrubber: "ביטויים רגולריים כדי לנקות כותרות מוטמעות."
     embed_truncate: "חיתוך הפרסומים המוטמעים."
     embed_post_limit: "מספר מקסימלי של פרסומים להטמעה."
     embed_username_required: "נדרש שם משתמש ליצירת הפוסט."
@@ -1089,6 +1127,8 @@ he:
     enable_cdn_js_debugging: "אפשרו ל-/logs להציג שגיאות בצורה נכונה באמצעות הוספת הרשאות לגישה בין אתרים (crossorigin permissions) בכל ה-js הכלולים."
     show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו הודעה המבקשת מן המנהלים/מנהלות ליצור עוד נושאים."
     delete_drafts_older_than_n_days: Delete drafts older than (n) days.
+    bootstrap_mode_min_users: "מספר משתמשים מינימלי שנדרש כדי לנטרל מצב איתחול (קבעו ל 0 כדי לנטרל)"
+    vacuum_db_days: "הריצו VACUUM ANALYZE כדי להשיב מקום בבסיס הנתונים לאחר המרות (קבעו ל 0 כדי לנטרל)"
     prevent_anons_from_downloading_files: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד."
     slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
     enable_emoji: "אפשרו emoji"
@@ -1096,7 +1136,10 @@ he:
     enforce_square_emoji: "חובת מימדי ריבועיים בכל ה-emojis."
     approve_post_count: "מספר הפוסטים ממשתמשים חדשים או בסיסיים שחייבים לאשר אותם"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
+    notify_about_queued_posts_after: "אם יש פוסטים שהמתינו לסקירה ליותר מכמות השעות הזו, יישלח מייל ל contact_email. קבעו 0 כדי לנטרל את המיילים האלו."
+    auto_close_messages_post_count: "מספר פוסטים מקסימלי בהודעה לפני שהיא נסגרת אוטומטית (0 לניטרול)"
     auto_close_topics_post_count: "מספר מקסימלי של פוסטים בנושא לפני שהוא נסגר אוטומטית (0 לביטול)"
+    code_formatting_style: "כפתור קוד בדפדפן יציע אוטומטית סגנון קידוד זה"
     default_email_digest_frequency: "באיזו תדירות משתמשים יקבלו סיכומי מיילים כברירת מחדל."
     default_include_tl0_in_digests: "כללו פרסומים ממשתמשים חדשים בדוא\"ל מסכם כברירת מחדל. משתמשים יוכלו לשנות זאת בהעדפות האישיות."
     default_email_private_messages: "שלח מייל כשמישהו שולח הודעה למשתמש, בתור ברירת מחדל."
@@ -1117,6 +1160,13 @@ he:
     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."
+    max_user_api_reqs_per_day: "המספר המקסימלי של בקשות API של משתמש ליום"
+    max_user_api_reqs_per_minute: "המספר המקסימלי של בקשות API של משתמש לדקה"
+    allow_read_user_api_keys: "אפשרו ייצור של מפתחות API של משתמש לקריאה בלבד"
+    allow_write_user_api_keys: "אפשרו ייצור של מפתחות API של משתמש לכתיבה"
+    allow_push_user_api_keys: "אפשרו ייצור של מפתחות API של משתמש לדחיפה"
+    max_api_keys_per_user: "מספר מקסימלי של מפתחות API של משתמש לכל משתמש"
+    min_trust_level_for_user_api_key: "רמת אמון נדרשת לייצור של מפתחות API של משתמש"
     tagging_enabled: "לאפשר תגיות על נושאים?"
     min_trust_to_create_tag: "רמת האמון המינימלית שנדרשת כדי ליצור תג."
     max_tags_per_topic: "מספר התגים המקסימלי שניתן להקצות לנושא."
@@ -1126,7 +1176,8 @@ he:
     tag_style: "סגנון ויזואלי לתג עיטורים."
     staff_tags: "רשימת תגים שניתנים להחלה רק על ידי אנשי צוות"
     min_trust_level_to_tag_topics: "רמת אמון מינימלית שדרושה כדי לתייג נושאים"
-    suppress_overlapping_tags_in_list: "הסתירו תגיות מתצוג ברשימות אם הן חופפות לכותרות"
+    suppress_overlapping_tags_in_list: "אם תגים תואמים בדיוק מילים בכותרות נושאים, אל תציגו את התגים"
+    remove_muted_tags_from_latest: "אל תציגו נושאים מתוייגים עם תגים מושתקים ברשימת הנושאים האחרונים."
     errors:
       invalid_email: "כתובת דוא\"ל לא קיימת."
       invalid_username: "אין משתמש/ת עם שם משתמש כזה."
@@ -1143,6 +1194,7 @@ he:
       invalid_reply_by_email_address: "Value must contain '%{reply_key}' and be different from the notification email."
       invalid_alternative_reply_by_email_addresses: "על הערכים חייבים לכלול  '%{reply_key}' ולהיות שונים ממייל העדכון."
       pop3_polling_authentication_failed: "אימות POP3 נכשל. אנא וודאו את הרשאות ה pop3 שלכם."
+      reply_by_email_address_is_empty: "אתם חייבים להגדיר את 'מענה באמצעות כתובת מייל' לפני שאתם מאפשרים תגובה באמצעות מייל."
       user_locale_not_enabled: "לפני שתוכלו להפעיל אפשרות זאת, יש לאפשר \"הגדרות מקומיות מותאמות משתמש/ת\""
   search:
     within_post: "#%{post_number} פרסומים של %{username}"
@@ -1242,6 +1294,7 @@ he:
     reserved_username: "שם משתמש זה אסור. "
     missing_user_field: "לא מילאת את כל שדות המשתמש/ת"
     close_window: "האימות הושלם. סגרו חלון זה כדי להמשיך."
+    already_logged_in: "אופס, נראה שאתם מנסים לקבל הזמנה שנועדה למשתמש אחר. אם אתם לא %{current_user}, אנא התנתקו ונסו שוב."
   user:
     no_accounts_associated: "אין חשבונות מקושרים."
     deactivated: "הושבת בעקבות מיילים רבים מידי שהוחזרו ל '%{email}'."
@@ -1271,6 +1324,14 @@ he:
       other: "%{count} סימונים ממתינים לטיפול"
   unsubscribe_mailer:
     subject_template: "אשר/י שאינך מעוניינ/ת יותר לקבל עדכוני דוא\"ל מ%{site_title}"
+    text_body_template: |
+      מישהו (כנראה אתם?) ביקש לא לקבל יותר עדכוני מייל מ %{site_domain_name} לכתובת זו.
+      אם אתם מעוניינים לאשר זאת, אנא לחצו על הקישור הזה:
+
+      %{confirm_unsubscribe_link}
+
+
+      אם אתם מעוניינים להמשיך לקבל עדכונים במייל, אתם יכולים להתעלם ממייל זה.
   invite_mailer:
     subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}"
     text_body_template: |
@@ -1352,8 +1413,34 @@ he:
     subject_template: "[%{site_name}] Email Deliverability Test"
   new_version_mailer:
     subject_template: "[%{site_name}] גרסת Discourse חדשה, עדכון זמין."
+    text_body_template: |
+      יש! יצאה גרסה חדשה של [Discourse](http://www.discourse.org)
+
+      הגרסה שלכם: %{installed_version}
+      הגרסה החדשה: **%{new_version}**
+
+      - שדרגו באמצעות כפתור **[שדרוג בלחיצה-אחת בדפדפן](%{base_url}/admin/upgrade)** הפשוט שלנו
+
+      - בידקו מה חדש ב[יומן השינויים בגיטהאב](https://github.com/discourse/discourse/commits/master)
+
+      - בקרו את [meta.discourse.org](https://meta.discourse.org) לחדשות, דיונים, ותמיכה ב Discourse
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] update available"
+    text_body_template: |
+      יש! יצאה גרסה חדשה של [Discourse](http://www.discourse.org)
+
+      הגרסה שלכם: %{installed_version}
+      הגרסה החדשה: **%{new_version}**
+
+      - שדרגו באמצעות כפתור **[שדרוג בלחיצה-אחת בדפדפן](%{base_url}/admin/upgrade)** הפשוט שלנו
+
+      - בידקו מה חדש ב[יומן השינויים בגיטהאב](https://github.com/discourse/discourse/commits/master)
+
+      - בקרו ב-[meta.discourse.org](https://meta.discourse.org) לחדשות, דיונים, ותמיכה ב Discourse
+
+      ### הערות בנוגע לגרסה
+
+      %{notes}
   queued_posts_reminder:
     subject_template:
       one: "[%{site_name}] תגובה אחת מחכה לבדיקה"
@@ -1502,7 +1589,7 @@ he:
       text_body_template: |
         הגיבוי הצליח.
 
-        בקרו ב [אדמיניסטרציה > גיבויים](%{base_url}/admin/backups) כדי להוריד את הגיבוי החדש שלכם.
+        בקרו ב [ניהול > גיבויים](%{base_url}/admin/backups) כדי להוריד את הגיבוי החדש שלכם.
 
         הנה היומן:
 
@@ -1603,8 +1690,18 @@ he:
         התשובה שלכם נשלחה מכתובת מייל שונה מזו שציפינו לה, אז אנחנו לא בטוחים אם זה אותו אדם. נסו לשלוח מכתובת מייל אחרת, או ליצור קשר עם חבר צוות.
     email_reject_no_account:
       subject_template: "[%{site_name}]  בעיית מייל -- חשבון לא מזוהה"
+      text_body_template: |
+        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
+
+        אנחנו לא מוצאים חשבונות שמתאימים לכתובת המייל שלכם. נסו לשלוח מכתובת מייל אחרת, או צרו קשר עם חבר צוות.
     email_reject_empty:
       subject_template: "[%{site_name}]  בעיית מייל -- ללא תוכן"
+      text_body_template: |
+        אנחנו מצטערים, אך הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
+
+        לא מצאנו תוכן תגובה במייל שלכם.
+
+        אם אתם מקבלים את ההודעה הזו ו_כן_ כללתם תגובה, נסו שוב עם סיגנון פשוט יותר.
     email_reject_parsing:
       subject_template: "[%{site_name}]  בעיית מייל -- תוכן לא זוהה."
       text_body_template: |
@@ -1613,6 +1710,16 @@ he:
         לא מצאנו תוכן במייל שלכם. **אנא ודאו שהתגובה שלכם בראש המייל** -- אנחנו לא יכולים לעבד תגובות בין השורות.
     email_reject_invalid_access:
       subject_template: "[%{site_name}]  בעיית מייל -- גישה לא תקינה"
+      text_body_template: |
+        אנחנו מצטערים, אבל הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
+
+        לחשבון שלכם אין מספיק הרשאות כדי לפרסם נושאים חדשים בקטגוריה זו. אם אתם מאמינים שזו טעות, צרו קשר עם חבר צוות.
+    email_reject_strangers_not_allowed:
+      subject_template: "[%{site_name}] בעיית מייל -- גישה לא נכונה"
+      text_body_template: |
+        אנחנו מצטערים, אבל הודעת המייל שלכם ל %{destination} (עם הכותרת %{former_title}) לא עבדה.
+
+        הקטגוריה ששלחתם אליה את המייל הזה מאפשרת רק תגובות ממשתמשים עם חשבונות תקינים וכתובות מייל ידועות. אם אתם מאמינים שזו טעות, אנא פנו לחבר צוות.
     email_reject_invalid_post:
       subject_template: "[%{site_name}] בעיית מייל -- תקלה בפרסום"
       text_body_template: |
@@ -1689,10 +1796,34 @@ he:
         לפרטים נוספים, אנא פנו ל[הנחיות הקהילה](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "חשבון זמנית בהשהיה"
+      text_body_template: |
+        שלום,
+
+        זוהי הודעה אוטומטית מ %{site_name} כדי ליידע אתכם שהחשבון שלכם הושהה באופן זמני כאמצעי זהירות.
+
+        אנא המשיכו לבקר, אך לא תוכלו לענות או ליצור נושאים עד ש[חבר צוות](%{base_url}/about) יסקור את הפוסטים האחרונים שלכם. אנחנו מתנצלים על אי הנוחות.
+
+        להנחיות נוספות, אנא פנו ל[הנחיות הקהילה](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "המשתמש החדש %{username} נחסם על ידי דגלים של הקהילה"
+      text_body_template: |
+        זוהי הודעה אוטומטית.
+
+        המשתמש החדש [%{username}](%{user_url}) נחסם אוטומטית כיוון שמספר משתמשים דיגלו פוסטים שלו.
+
+        אנא [סיקרו את הדגלים](%{base_url}/admin/flags). אם %{username} נחסם בטעות מלפרסם, לחצו על כפתור שחרור הנעילה ב [דף הניהול למשתמש זה](%{user_url}).
+
+        סף זה ניתן לשינוי באמצעות הגדרת האתר `block_new_user`.
     spam_post_blocked:
       subject_template: "הודעות של המשתמש/ת החדש/ה %{username} נחסמו בשל קישורים חוזרים."
+      text_body_template: |
+        זוהי הודעה אוטומטית.
+
+        המשתמש החדש [%{username}](%{user_url}) ניסה ליצור מספר פוסטים עם קישורים ל %{domains}, אבל הפוסטים האלו נחסמו כדי למנוע ספאם. המשתמש עדיין יכול ליצור פוסטים חדשים שלא מקשרים ל %{domains}.
+
+        אנא [סיקרו את המשתמש](%{user_url}).
+
+        ניתן לכוון זאת בהגדרות האתר `newuser_spam_host_threshold` ו`white_listed_spam_host_domains`.
     unblocked:
       subject_template: "החשבון כבר לא מושהה"
       text_body_template: |
@@ -1722,14 +1853,23 @@ he:
     כדי להפסיק את המיילים האלו, [לחצו כאן](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
     כדי להפסיק את המיילים האלו, [לחצו כאן](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    אתם מקבלים את זה כיוון שאיפשרתם מצב רשימת תפוצה.
+
+    כדי לבטל את המנוי על המיילים האלו, [לחצו כאן](%{unsubscribe_url}).
   subject_re: "תגובה: "
   subject_pm: "[PM] "
   user_notifications:
     previous_discussion: "Previous Replies"
+    reached_limit:
+      one: "א-ז-ה-ר-ה: הגעתם לגבול של מיילים יומיים. הודעות מייל נוספות לא יישלחו."
+      other: "א-ז-ה-ר-ה: הגעתם לגבול של %{count} מיילים יומיים. הודעות מייל נוספות לא יישלחו."
     in_reply_to: "בתגובה ל"
     unsubscribe:
       title: "Unsubscribe"
       description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:"
+    reply_by_email: "[בקרו בנושא](%{base_url}%{url}) או ענו למייל זה כדי להגיב."
+    reply_by_email_pm: "[בקרו בהודעה](%{base_url}%{url}) או ענו למייל זה כדי להגיב."
     only_reply_by_email: "השיבו למייל זה כדי לענות."
     visit_link_to_respond: "[בקרו בנושא](%{base_url}%{url}) כדי לענות."
     visit_link_to_respond_pm: "[בקרו בהודעה](%{base_url}%{url}) כדי לענות."
@@ -1870,7 +2010,7 @@ he:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
@@ -1879,6 +2019,7 @@ he:
       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}"
       read_more: "Read More"
@@ -1951,7 +2092,7 @@ he:
         %{new_email}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
-      text_body_template: |
+      text_body_template: |+
         ברוכים הבאים ל%{site_name}!
 
         חבר צוות אישר את החשבון שלך ב %{site_name}.
@@ -2021,6 +2162,8 @@ he:
     post_deleted: "post was deleted by the author"
     user_suspended: "user was suspended"
     already_read: "user has already read this post"
+    exceeded_emails_limit: "נחצה max_emails_per_day_per_user"
+    exceeded_bounces_limit: "נחצה bounce_score_threshold"
     message_blank: "message is blank"
     message_to_blank: "message.to is blank"
     text_part_body_blank: "text_part.body is blank"
@@ -2096,7 +2239,7 @@ he:
     great_post:
       name: תשובה מעולה
       description: התקבלו 50 לייקים על תגובה
-      long_description: |
+      long_description: |+
         עיטור זה מוענק כאשר תגובה שלכם מקבלת 50 לייקים. וואו! התגובה שלכם עוררה השראה, הקסימה, גלגלה מצחוק או הביאה זווית חדשה והקהילה אהבה את זה.
 
     nice_topic:
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index f1619e3608c..6cd39e6465c 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -294,7 +294,7 @@ 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}
 
 
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 59e305a878b..14b9813f956 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -310,7 +310,7 @@ 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: |
+    body: |2
 
       Congratulazioni! :confetti_ball:
 
@@ -548,6 +548,8 @@ it:
   unsubscribe:
     title: "Annulla iscrizione"
     stop_watching_topic: "Smetti di osservare questo argomento, %{link}"
+    mute_topic: "Silenziare tutte le notifiche per questo argomento, %{link}"
+    unwatch_category: "Smetti di osservare tutti gli argomenti in %{category}"
   reports:
     visits:
       title: "Visite Utente"
@@ -793,7 +795,7 @@ it:
     show_email_on_profile: "Mostra l'email di un utente nel suo profilo (visibile solo a se stesso e allo staff)"
     email_token_valid_hours: "I messaggi di password dimenticata / attivazione account sono validi per (n) ore."
     email_token_grace_period_hours: "I messaggi di password dimenticata / attivazione account sono ancora validi per un periodo di grazia di (n) ore dopo essere stati convalidati."
-    enable_badges: "Attiva il sistema a targhette"
+    enable_badges: "Attiva il sistema a distintivi"
     allow_index_in_robots_txt: "Specifica nel file robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca."
     email_domains_blacklist: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com/trashmail.net"
     log_out_strict: "Quando si fa logout, esci da TUTTE le sessioni dell'utente su tutti i dispositivi"
@@ -900,7 +902,7 @@ it:
     min_title_similar_length: "Lunghezza minima di un titolo che attiva il controllo su argomenti simili."
     min_body_similar_length: "Lunghezza minima del corpo di un messaggio che attiva il controllo su argomenti simili."
     category_colors: "Un elenco di valori esadecimali di colori permessi per le categorie."
-    category_style: "Stile grafico delle targhette relative alle categorie."
+    category_style: "Stile grafico dei distintivi relativi alle categorie."
     max_image_size_kb: "Dimensione massima in kB per caricare immagini degli utenti. Deve essere configurata anche in nginx (client_max_body_size) / apache o nel proxy."
     max_attachment_size_kb: "Dimensione massima dei file che gli utenti possono caricare, in kB. Configura il limite anche in nginx (client_max_body_size) / apache o nel proxy."
     authorized_extensions: "Una lista di estensioni dei file che è permesso caricare (usa '*' per permettere tutti i tipi di file) "
@@ -954,7 +956,7 @@ it:
     automatically_download_gravatars: "Scarica i Gravatars per gli utenti quando viene creato l'account o quando viene modificata l'email"
     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."
+    suppress_uncategorized_badge: "Non mostrare il distintivo per gli argomenti senza categoria nell'elenco degli argomenti."
     global_notice: "Mostra a tutti i visitatori un avviso con striscione globale URGENTE, EMERGENZA, lascia vuoto per nasconderlo (HTML consentito)."
     full_name_required: "Il nome completo è un campo obbligatorio del profilo utente."
     invites_per_page: "Inviti predefiniti mostrati nella pagina utente."
@@ -970,7 +972,14 @@ it:
     default_categories_watching: "Elenco di categorie osservate per default."
     default_categories_tracking: "Elenco di categorie seguite per default."
     default_categories_muted: "Elenco di categorie silenziate per default."
-    tag_style: "Stile grafico delle targhette relative alle etichette."
+    tagging_enabled: "Abilitare le etichette per gli argomenti?"
+    min_trust_to_create_tag: "Il livello di esperienza minimo per creare un'etichetta."
+    max_tags_per_topic: "Il numero massimo di etichette che si possono applicare ad un argomento."
+    max_tag_search_results: "Il numero massimo di risultati da mostrare nella ricerca di etichette."
+    tags_sort_alphabetically: "Mostra le etichette in ordine alfabetico. Per default vengono mostrate in ordine di popolarità."
+    tag_style: "Stile grafico dei distintivi relativi alle etichette."
+    staff_tags: "Un elenco di etichette che possono essere usate soltanto dai membri dello staff"
+    min_trust_level_to_tag_topics: "Livello di esperienza minimo richiesto per etichettare argomenti"
     errors:
       invalid_email: "Indirizzo email non valido."
       invalid_username: "Non c'è alcun utente con quel nome."
@@ -1163,7 +1172,7 @@ it:
       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: |
+      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.
@@ -1292,7 +1301,7 @@ it:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
@@ -1426,6 +1435,12 @@ it:
   privacy_topic:
     title: "Politica della Privacy"
   badges:
+    editor:
+      long_description: |
+        Questo distintivo viene assegnato la prima volta che modifichi uno dei tuoi messaggi. Anche se non potrai modificare i tuoi messaggi indefinitamente, la modifica è sempre una buona idea — puoi migliorare i tuoi messaggi, correggere piccoli errori o aggiungere qualcosa che avevi tralasciato nel momento della prima stesura. Effettua modifiche per migliorare i tuoi messaggi!
+    basic_user:
+      long_description: |
+        Questo distintivo viene assegnato quando raggiungi il livello di esperienza 1. Grazie per essere stato nei paraggi per un po' a leggere qualche argomento e a imparare di cosa tratta la nostra comunità. Le restrizioni iniziali che avevi come nuovo utente sono state allentate; ti sono ora state assegnate tutte le capacità essenziali, come ad esempio i messaggi personali, le segnalazioni, la modifica delle wiki e la possibilità di inviare più immagini e collegamenti.
     member:
       name: Membro
     regular:
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index c1a47dc02f6..c118e1cfdca 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -166,7 +166,7 @@ ja:
       - コミュニティメンバー同士のやりとりは礼儀正しく、マナーを保ちましょう。
       - 建設的な批判は歓迎します。ただし批判は「人」に対してではなく「アイデア」に対して行いましょう。
       詳細は[コミュニティガイドライン](/guidelines)を参照してください。このパネルは最初の %{education_posts_text} のみに表示されます。
-    sequential_replies: |
+    sequential_replies: |+
       ### 一度に複数の投稿に返信する
 
       トピックにたくさん返信する代わりに、以前の投稿への @name メンションや引用などを活用して返信を一つの投稿にまとめましょう。
@@ -236,7 +236,7 @@ ja:
   assets_topic_body: "これはパーマネントトピックです。スタッフのみが閲覧でき、サイトデザインに使用する画像とファイルを保存するために使用します。削除しないでください！\n\n利用方法:\n\n\n1. このトピックに回答\n2. ロゴやファビコンなどに使用する全ての画像をアップロード(エディタのアップロードアイコンか、ドラッグアンドドロップで画像を貼付ける)\n3. 回答を投稿\n4. 新しい投稿の画像を右クリックしてアップロード済み画像のパスを取得するか、編集アイコンをクリックして画像のパスを探し、画像パスをコピーする\n5. 画像パスを[基本設定](/admin/site_settings/category/required)に貼付ける\n\nもし、別のファイルタイプが必要な場合、[ファイル設定](/admin/site_settings/category/files)の`サポートするファイルの拡張` を編集してください"
   lounge_welcome:
     title: "ラウンジへようこそ"
-    body: |
+    body: |2
 
       素晴らしい! :confetti_ball:
 
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 6e4932dd753..e1c4a82f522 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -244,7 +244,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: |
+    body: |2
 
       축하합니다! :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:
@@ -1245,7 +1245,7 @@ ko:
   csv_export:
     boolean_yes: "네"
     boolean_no: "아니오"
-  static_topic_first_reply: |
+  static_topic_first_reply: |+
     이 글타래인 %{page_name} 페이지의 첫글 수정.
 
   guidelines_topic:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index a8e3f9a89b9..3bb978144e4 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -224,7 +224,7 @@ 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: |
+    body: |2
 
       Gratulerer! :confetti_ball:
 
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index dac1940a213..3989b435ecb 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -307,7 +307,7 @@ 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: |
+    body: |2
 
       Gefeliciteerd! :confetti_ball:
 
@@ -1281,7 +1281,7 @@ nl:
         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.
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 038a66189ff..2d2c428c64d 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -186,7 +186,7 @@ pl_PL:
       one: "1 wpis"
       few: "%{count} wpisy"
       other: "%{count} wpisów"
-    new-topic: |
+    new-topic: |+
       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?
@@ -290,7 +290,7 @@ 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: |
+    body: |2
 
       Gratulacje! :confetti_ball:
 
@@ -346,6 +346,7 @@ pl_PL:
       first_day_topics_per_day: "Osiągnąłeś maksymalną liczbę tematów, jakie może napisać nowy użytkownik pierwszego dnia. Musisz odczekać %{time_left}, zanim znów spróbujesz."
       create_topic: "Zbyt szybko tworzysz tematy. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       create_post: "Odpowiadasz zbyt szybko. Musisz poczekać %{time_left}, zanim znów spróbujesz."
+      delete_post: "Zbyt szybko usuwasz posty. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       topics_per_day: "Osiągnąłeś maksymalną liczbę nowych tematów na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       pms_per_day: "Osiągnąłeś maksymalną liczbę wiadomości na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
       create_like: "Osiągnąłeś maksymalną liczbę lajków na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz."
@@ -546,7 +547,12 @@ pl_PL:
     unwatch_category: "Przestań obserwować wszystkie tematy w %{category}"
     mailing_list_mode: "Wyłącz tryb listy mailingowej"
     disable_digest_emails: "Przestań wysyłać mi e-maile z podsumowaniem"
+    all: "Nie wysyłaj mi żadnych wiadomości z %{sitename}"
     log_out: "Wyloguj"
+  user_api_key:
+    title: "Zezwolić na dostęp aplikacji"
+    read: "odczyt"
+    read_write: "odzczyt/zapis"
   reports:
     visits:
       title: "Wizyty użytkowników"
@@ -726,6 +732,7 @@ pl_PL:
     crawl_images: "Pobieraj grafiki ze zdalnych URLi aby ustawić poprawną wysokość i szerokość w tagu img."
     download_remote_images_to_local: "Pobieraj zdalne grafiki i twórz ich lokalne kopie aby zapobiegać uszkodzonym/brakującym obrazkom na stronach."
     download_remote_images_threshold: "Minimalna ilość wolnego miejsca na dysku wymagana przez funkcję pobierania zdalnych grafik (w procentach)"
+    download_remote_images_max_days_old: "Nie pobieraj zdalnych obrazów dla postów które mają więcej niż n dni."
     disabled_image_download_domains: "Zdalne grafiki z tych domen nie będą pobierane."
     post_edit_time_limit: "Autor może edytować lub usunąć swój wpis przez tyle minut po jego utworzeniu. Ustawienie 0 oznacza 'zawsze'."
     edit_history_visible_to_public: "Pozwól wszystkim przeglądać poprzednie wersje edytowanych wpisów. Gdy wyłączone, jedynie obsługa/staff może."
@@ -988,7 +995,7 @@ pl_PL:
     subject_template: "%{invitee_name} zaprosił cię do dołączenia do %{site_domain_name}"
   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!
 
 
@@ -1036,7 +1043,7 @@ 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:
@@ -1048,7 +1055,7 @@ pl_PL:
 
     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})
@@ -1114,7 +1121,7 @@ pl_PL:
         %{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}.
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 71a3bb5345f..d3898e2930c 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -244,14 +244,14 @@ pt:
       Pode editar a sua resposta anterior para adicionar uma citação ao destacar o texto e selecionar o botão  <b>resposta com citação</b> que aparece.
 
       É mais fácil para todos ler tópicos que tenham poucas respostas em profundidade em vez de muitas mas pequenas respostas individuais.
-    dominating_topic: |
+    dominating_topic: |+
       ### Deixe que os outros se juntem à conversa
 
       Este tópico é claramente importante para si &ndash; publicou mais de %{percent}% das respostas aqui.
 
       Tem a certeza de que está a fornecer o tempo adequado para que outras pessoas também possam partilhar os seus pontos de vista?
 
-    too_many_replies: |
+    too_many_replies: |+
       ### Chegou ao limite de respostas para este tópico
 
       Pedimos desculpa mas novos utilizadores estão temporariamente limitados a %{newuser_max_replies_per_topic} respostas no mesmo tópico.
@@ -308,7 +308,7 @@ pt:
   assets_topic_body: "Este é um tópico permanente, visível apenas ao pessoal, para armazenar imagens e ficheiros usados no design do sítio. Não o apague!\n\n\nVeja como:\n\n\n1. Responda a este tópico.\n2. Carregue todas as imagens que deseja usar para os logótipos, favicons, e tudo o mais. (Use o ícone da ferramenta de carregamento neste editor de mensagens, arraste ou cole imagens).\n3. Submeta a sua resposta.\n4. Clique com o botão direito do rato nas imagens da sua nova mensagem para obter o caminho das imagens submetidas, ou carregue no ícone de edição para editar a sua mensagem e recuperar o caminho para as imagens. Copie os caminhos das imagens.\n5. Cole esses caminhos em [configurações básicas](/admin/site_settings/category/required).\n\n\nSe precisar de ativar o carregamento de diferentes tipos de ficheiros, edite `authorized_extensions` em [configurações de ficheiros](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Bem-vindo ao Salão"
-    body: |
+    body: |2+
 
       Parabéns! :confetti_ball:
 
@@ -1129,7 +1129,6 @@ pt:
     tag_style: "Estilo visual dos distintivos de tags."
     staff_tags: "Lista de tags que só pode ser aplicadas por membros do staff."
     min_trust_level_to_tag_topics: "Nível de confiança mínimo necessário para atribuir tags a tópicos."
-    suppress_overlapping_tags_in_list: "Esconder tags das listagens, caso se sobreponham ao título."
     errors:
       invalid_email: "Endereço de email inválido."
       invalid_username: "Não existe nenhum utilizador com esse nome de utilizador."
@@ -1400,21 +1399,21 @@ pt:
         A sua conta associada com este email não está activa. Por favor active a sua conta antes de enviar emails.
     email_reject_blocked_user:
       subject_template: "[%{site_name}] Problema de email -- Utilizador bloqueado"
-      text_body_template: |
+      text_body_template: |+
         Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou.
 
         A sua conta associada com este endereço de email foi bloqueada.
 
     email_reject_reply_user_not_matching:
       subject_template: "[%{site_name}] Problema de email -- Utilizador de resposta não encontrado"
-      text_body_template: |
+      text_body_template: |+
         Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou.
 
         A sua resposta foi enviada de um email diferente daquele que esperávamos, por esta razão não temos a certeza que seja a mesma pessoa. Tente enviar de outro endereço de email ou contacte um membro do pessoal.
 
     email_reject_no_account:
       subject_template: "[%{site_name}] Problema de email -- Conta Desconhecida"
-      text_body_template: |
+      text_body_template: |+
         Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou.
 
         Não conseguimos encontrar nenhuma conta com combine com o seu endereço de email. Tente enviar de outro endereço de email ou contacte um membro do pessoal.
@@ -1551,7 +1550,7 @@ pt:
       subject_template: "[%{site_name}] [MP] %{topic_title}"
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index b862c4b8d18..43bc1f4d89a 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -303,7 +303,7 @@ 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: |
+    body: |2
 
       Parabéns! :confetti_ball:
 
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 644d2709327..2a43f1b94c4 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -200,7 +200,7 @@ 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: |
+    body: |2
 
       Congratulations! :confetti_ball:
 
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index f422531b540..d4c2ad285ec 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -261,12 +261,12 @@ ru:
       Вместо нового ответа, сейчас можно начать редактировать свой предыдущий ответ и просто добавить в него новые цитаты и ответы та них. Для этого нужно выделить требуемый текст и нажать на появившуюся кнопку <b>ответить цитированием</b>.
 
       Для большинства читатей, намного проще читать темы, в которых длинные ответы и их мало, чем когда много коротеньких ответов.
-    dominating_topic: |
+    dominating_topic: |2
 
       Данная тема является для вас важной &ndash; количество ваших ответов превышает %{percent}% процентов.
 
       Уверены ли вы, что так же даете другим людям возможность высказать свою точку зрения?
-    too_many_replies: |
+    too_many_replies: |2
 
       Новые пользователи ограничены %{newuser_max_replies_per_topic} ответами в одной и той же теме.
 
@@ -324,7 +324,7 @@ ru:
   assets_topic_body: "Это постоянная тема, для хранения изображений и файлов, используемых в дизайне сайта, доступная только сотрудникам. Не удаляйте её! \n\n\nВаши действия:\n\n\n1. Ответьте в эту тему.\n2. Загрузите все изображения, которые вы хотите использовать для логотипов, значков и т.д. сюда. (Используйте значок на панели инструментов в редакторе сообщений, перетащите мышкой, или вставьте изображения из буфера.) \n3. Сохраните свое сообщение.\n4. Щелкните правой кнопкой мыши изображении в новом сообщении, чтобы получить путь к загруженным изображениям, или щелкните значок редактирования  и получите путь к изображениям. Скопируйте пути к изображениям.\n5. Вставьте эти пути в [Настройки сайта] (/admin/site_settings/category/required) .\n\n\nЕсли Вам нужно активировать дополнительные типы файлов, отредактируйте `authorized_extensions` во вкладке [Файлы] (/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Добро пожаловать в Фойе"
-    body: |
+    body: |2
 
       Поздравляем! :confetti_ball:
 
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index d998673bd8b..16a48d46d50 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -286,7 +286,7 @@ 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: |
+    body: |2
 
       Gratulácia! :confetti_ball:
 
@@ -1424,7 +1424,7 @@ 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:
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 121bb74f7d1..910bd496b9e 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -244,7 +244,7 @@ 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: |
+    body: |2
 
       Congratulations! :confetti_ball:
 
@@ -1076,7 +1076,7 @@ sq:
       Kjo ftesë vjen nga një përdorues i besuar, si rrjedhojë një llogari do të krijohet automatikisht për ju.
   invite_password_instructions:
     subject_template: "Set password for your %{site_name} account"
-    text_body_template: |
+    text_body_template: |+
       Faleminderit që pranuat ftesën tek %{site_name} -- mirësevini!
 
       Klikoni këtë lidhje për të zgjedhur një fjalëkalim tani:
@@ -1416,7 +1416,7 @@ sq:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 8ed47481fd0..ad2cafae329 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -310,7 +310,7 @@ sv:
   assets_topic_body: "Detta är ett permanent ämne, endast synligt för personal, med syfte att lagra bilder och filer som ska användas till webbplatsens design. Radera ej detta ämne!\n\n\nSå här fungerar det:\n\n\n1. Svara på detta ämne.\n2. Ladda upp alla bilder du vill använda som logotyp, favicon och så vidare här. (Använd verktygfältets uppladdningsikon i inläggsredigeraren, eller dra-och-släpp eller klistra in bilder)\n3. Skicka ditt svar för att posta det.\n4. Högerklicka på bilderna i ditt nya inlägg för att få sökvägen till de uppladdade bilderna, eller klicka på redigera-ikonen för att redigera inlägget och på så sätt hämta sökvägen till bilderna. Kopiera bildernas sökväg. \n5. Klistra in bildernas sökvägar i de [grundläggande inställningarna](/admin/site_settings/category/required).\n\n\nOm du behöver möjliggöra uppladdning av flera olika filtyper, redigera `authorized_extensions` i [inställningarna för filer](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Välkommen till loungen"
-    body: |
+    body: |2
 
       Grattis! :confetti_ball:
 
@@ -1167,7 +1167,6 @@ sv:
     tag_style: "Visuell stil för tagg-utmärkelser."
     staff_tags: "En lista av taggar som endast kan användas av personalen"
     min_trust_level_to_tag_topics: "Lägsta förtroendenivå som krävs för att tagga ämnen"
-    suppress_overlapping_tags_in_list: "Dölj taggar från listvyer om de överlappar med titeln"
     remove_muted_tags_from_latest: "Visa inte ämnen som taggats med dolda taggar i listan med senaste ämnen."
     errors:
       invalid_email: "Felaktig e-postadress."
@@ -1959,7 +1958,7 @@ sv:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
@@ -2129,7 +2128,7 @@ sv:
     Redigera det första inlägget i det här ämnet för att ändra innehållet i %{page_name} sidan.
   guidelines_topic:
     title: "FAQ/Riktlinjer"
-    body: |
+    body: |+
       <a name="civilized"></a>
 
       ## [Det här är ett civiliserat forum för allmän diskussion](#civilized)
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index c47f7d125da..16a9e3f9992 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -277,7 +277,7 @@ 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: |
+    body: |2
 
       Tebrikler! :confetti_ball:
 
@@ -1238,7 +1238,7 @@ 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: |
+      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.
@@ -1391,7 +1391,7 @@ tr_TR:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 6006651edc3..6803e04d0eb 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -288,7 +288,7 @@ 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: |
+    body: |2
 
       Chúc mừng! :confetti_ball:
 
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 365ef712766..229a4729b0c 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -149,7 +149,7 @@ zh_CN:
   is_invalid: "无效；请描述得更清楚一点"
   next_page: "下一页 →"
   prev_page: "← 上一页"
-  page_num: "%{num} 页"
+  page_num: "第%{num}页"
   home_title: "首页"
   topics_in_category: "“%{category}”分类中的主题"
   rss_posts_in_topic: "“%{topic}”的 RSS 内容聚合"
@@ -158,7 +158,7 @@ zh_CN:
   num_posts: "帖子："
   num_participants: "参与者："
   read_full_topic: "阅读整个主题"
-  private_message_abbrev: "消息"
+  private_message_abbrev: "私信"
   rss_description:
     latest: "最新主题"
     hot: "最热主题"
@@ -297,7 +297,7 @@ zh_CN:
   assets_topic_body: "这是一个永久主题，仅对管理人员可见，用于存储论坛设计使用的图像和文件。不要删除它！\n\n\n详细教程：\n\n\n1. 回复到这个主题。\n2. 上传你想用作站点标志、图标和其他所有图片到这儿。（使用帖子编辑器工具栏中的上传图标，或者拖拽或者粘贴图像。）\n3. 提交你的回复添加帖子。\n4. 在你的新帖子里右键点击图片获得这些已上传图片的链接，或者点击编辑按钮来编辑帖子，获得到图片的相对地址。复制这些相对地址。\n5. 粘贴这些图像的路径到[基础设置](/admin/site_settings/category/required)。\n\n\n如果你需要运行额外的上传文件类型，在[文件设置](/admin/site_settings/category/files)中编辑 `authorized_extensions`。"
   lounge_welcome:
     title: "欢迎来到贵宾室"
-    body: |
+    body: |2
 
       恭喜！ :confetti_ball:
 
@@ -527,6 +527,9 @@ zh_CN:
     different_user_description: "你登录的帐户与邮件不符。请登出，或进入隐私模式，然后再重试。"
     not_found_description: "对不起，我们找不到这个退订链接。有可能你的邮件中的链接已经过期？"
     log_out: "退出"
+  user_api_key:
+    read: "阅读"
+    read_write: "读/写"
   reports:
     visits:
       title: "用户访问量"
@@ -1138,7 +1141,6 @@ zh_CN:
     tag_style: "标签的视觉样式。"
     staff_tags: "只可由管理人员使用的标签列表"
     min_trust_level_to_tag_topics: "给主题加标签的最小信任等级"
-    suppress_overlapping_tags_in_list: "如果在列表视图中，主题标题包含标签，则隐藏标签"
     remove_muted_tags_from_latest: "在最新主题列表中，不显示有静音标签的主题。"
     errors:
       invalid_email: "电子邮箱地址无效。"
@@ -1304,7 +1306,7 @@ zh_CN:
 
       这封邀请来组于受信任的用户，所以你可以立即回复。
   custom_invite_mailer:
-    subject_template: "%{invitee_name} 邀请你 '%{topic_title}' 在 %{site_domain_name}"
+    subject_template: "%{invitee_name}邀请你'%{topic_title}'在%{site_domain_name}"
     text_body_template: |
       %{invitee_name}邀请你参与
 
@@ -1340,7 +1342,7 @@ zh_CN:
 
       这封邀请发自受信任的用户，所以你的帐户将被自动创建。
   custom_invite_forum_mailer:
-    subject_template: "%{invitee_name} 邀请你加入 %{site_domain_name}"
+    subject_template: "%{invitee_name}邀请你加入%{site_domain_name}"
     text_body_template: |
       %{invitee_name}邀请你加入
 
@@ -1670,7 +1672,7 @@ zh_CN:
         你的账户没有达到足够的信任等级在该分类发布新主题。如果你有异议，联系管理人员。
     email_reject_strangers_not_allowed:
       subject_template: "[%{site_name}] 电子邮件错误 -- 无权限"
-      text_body_template: |
+      text_body_template: |+
         我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
 
         邮件发至的分类只接受来自合法帐户且邮件地址已确认的用户的有邮件。如果你有异议，联系管理人员。
@@ -1826,8 +1828,8 @@ zh_CN:
     reply_by_email: "[访问主题](%{base_url}%{url})或者发邮件回复。"
     reply_by_email_pm: "[访问消息](%{base_url}%{url})或者发邮件回复。"
     only_reply_by_email: "发邮件回复。"
-    visit_link_to_respond: "[访问主题](%{base_url}%{url}) 以回复."
-    visit_link_to_respond_pm: "[访问消息](%{base_url}%{url}) 以回复."
+    visit_link_to_respond: "[访问主题](%{base_url}%{url})以回复."
+    visit_link_to_respond_pm: "[访问消息](%{base_url}%{url})以回复."
     posted_by: "%{username}发表于%{post_date}"
     invited_to_private_message_body: |
       %{username} 邀请你至消息交流：
@@ -1965,7 +1967,7 @@ zh_CN:
         %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
-      text_body_template: |
+      text_body_template: |2
 
         %{message}
     digest:
@@ -2566,7 +2568,7 @@ zh_CN:
     great_share:
       name: 精彩的分享
       description: 分享了一个有 1000 个独立访问者的帖子
-      long_description: |
+      long_description: |+
         该徽章授予给分享链接给 1000 个其他访客的你。哇！你把一个有意思的讨论推广给了广大的读者们，并且帮助社群前进了一大步！
 
     first_like:
@@ -2587,7 +2589,7 @@ zh_CN:
     campaigner:
       name: 活动家
       description: 已邀请了 3 个初级用户
-      long_description: |
+      long_description: |+
         该徽章授予给邀请了 3 人加入社群的你，你的朋友在站点上度过了很长的时间，已经成为了基础用户。活跃的社区需要新鲜的血液日常参与，并为交流带来多元视点。
 
     champion:
diff --git a/plugins/poll/config/locales/client.da.yml b/plugins/poll/config/locales/client.da.yml
index d90a4b77b75..d354a5e55e4 100644
--- a/plugins/poll/config/locales/client.da.yml
+++ b/plugins/poll/config/locales/client.da.yml
@@ -28,6 +28,7 @@ da:
           x_options:
             one: "Vælg <strong>1</strong> mulighed"
             other: "Vælg <strong>%{count}</strong> muligheder"
+          between_min_and_max_options: "Vælg imellem <strong>%{min}</strong> og <strong>%{max}</strong> valgmuligheder"
       cast-votes:
         title: "Afgiv dine stemmer"
         label: "Stem nu!"
diff --git a/plugins/poll/config/locales/server.da.yml b/plugins/poll/config/locales/server.da.yml
index a6496200259..a644ab921e5 100644
--- a/plugins/poll/config/locales/server.da.yml
+++ b/plugins/poll/config/locales/server.da.yml
@@ -31,6 +31,7 @@ da:
     edit_window_expired:
       cannot_change_polls: "Du kan ikke tilføje, slette eller omdøbe en afstemning efter de første %{minutes} minutter."
       op_cannot_edit_options: "Du kan ikke tilføje eller slette afstemnings indstillinger efter de første %{minutes} minutter. Venligst kontakt en moderator hvis du har behov for at redigere en afstemning."
+      staff_cannot_add_or_remove_options: "Du kan ikke tilføje eller fjerne afstemningsmuligheder efter de første %{minutes} minutter. Du bør lukke dette emne og oprette et nyt istedet."
     no_polls_associated_with_this_post: "Ingen afstemninger er associeret med dette indlæg."
     no_poll_with_this_name: "Ingen afstemning med navnet <strong>%{name}</strong> er associeret med dette indlæg."
     post_is_deleted: "Kan ikke gøres på et slettet indlæg."
diff --git a/plugins/poll/config/locales/server.it.yml b/plugins/poll/config/locales/server.it.yml
index 299509c3ec6..c53b6c4e72d 100644
--- a/plugins/poll/config/locales/server.it.yml
+++ b/plugins/poll/config/locales/server.it.yml
@@ -9,6 +9,7 @@ it:
   site_settings:
     poll_enabled: "Permettere agli utenti di creare sondaggi?"
     poll_maximum_options: "Numero massimo di opzioni permesse in un sondaggio."
+    poll_edit_window_mins: "Numero di minuti dopo la creazione di un messaggio durante i quali i sondaggi possono ancora essere modificati."
   poll:
     multiple_polls_without_name: "Ci sono più sondaggi privi di nome. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
     multiple_polls_with_same_name: "Ci sono più sondaggi con lo stesso nome: <strong>%{name}</strong>. Usa l'attributo '<code>name</code>' per identificare univocamente i tuoi sondaggi."
@@ -27,6 +28,10 @@ it:
     requires_at_least_1_valid_option: "Devi scegliere almeno una opzione valida."
     default_cannot_be_made_public: "I sondaggi con voti non possono essere resi pubblici."
     named_cannot_be_made_public: "Il sondaggio dal nome <strong>%{name}</strong> ha voti e non può essere reso pubblico."
+    edit_window_expired:
+      cannot_change_polls: "Non puoi aggiungere, cancellare o rinominare i sondaggi dopo i primi %{minutes} minuti."
+      op_cannot_edit_options: "Non puoi aggiungere o cancellare le voci del sondaggio dopo i primi %{minutes} minuti. Contatta un moderatore se hai bisogno di modificare una voce di sondaggio."
+      staff_cannot_add_or_remove_options: "Non puoi aggiungere o cancellare le voci del sondaggio dopo i primi %{minutes} minuti. Per farlo devi chiudere questo argomento ed aprirne uno nuovo."
     no_polls_associated_with_this_post: "Non ci sono sondaggi associati con questo messaggio."
     no_poll_with_this_name: "Nessun sondaggio avente nome <strong>%{name}</strong> è associato a questo messaggio."
     post_is_deleted: "Non è possibile operare su un messaggio cancellato."
diff --git a/public/500.da.html b/public/500.da.html
index 38866ce02a8..2eb2158fe61 100644
--- a/public/500.da.html
+++ b/public/500.da.html
@@ -7,6 +7,6 @@
     <h1>Hovsa</h1>
     <p>Der skete en uventet fejl i den software der styrer dette diskussions forum. Vi undskylder for beværet.</p>
     <p>Detaljerede informationer om fejlen er blevet logget og en automatisk besked er sendt til ejerne. Vi kigger på det.</p>
-    <p>No further action is necessary. However, if the error condition persists, you can provide additional detail, including steps to reproduce the error, by posting a discussion topic in the site's feedback category.</p>
+    <p>Du behøver ikke gøre mere. Men hvis fejlet bliver ved med at opstå, kan du give yderligere detaljer til at reproducere fejlen ved at lave et indlæg i feedback kategorien.</p>
 </body>
 </html>