Update Translations

config/locales/client.da.yml

@@ -27,6 +27,7 @@ da:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
+      timeline_date: "MMM YYYY"
       long_no_year: "MMM D h:mm a"
       long_no_year_no_time: "MMM D"
       full_no_year_no_time: "MMMM Do"
@@ -38,6 +39,7 @@ da:
       long_date_with_year_without_time: "MMM D, 'YY"
       long_date_without_year_with_linebreak: "MMM D <br/>LT"
       long_date_with_year_with_linebreak: "MMM D, 'YY <br/>LT"
+      wrap_ago: "%{date} siden"
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
@@ -112,9 +114,12 @@ da:
       email: 'send dette link i en e-mail'
     action_codes:
       public_topic: "offentliggjorde dette emne %{when}"
+      private_topic: "gjorde dette emne privat %{when}"
       split_topic: "delte dette emne op %{when}"
       invited_user: "Inviterede %{who} %{when}"
+      invited_group: "inviterede %{who} %{when}"
       removed_user: "fjernede %{who} %{when}"
+      removed_group: "fjernede %{who} %{when}"
       autoclosed:
         enabled: 'lukket %{when}'
         disabled: 'åbnet %{when}'
@@ -135,6 +140,7 @@ da:
         disabled: 'aflistet %{when}'
     topic_admin_menu: "administrationshandlinger på emne"
     emails_are_disabled: "Alle udgående emails er blevet deaktiveret globalt af en administrator. Ingen emailnotifikationer af nogen slags vil blive sendt."
+    bootstrap_mode_disabled: "Bootstrap tilstand vil blive deaktiveret indenfor de næste 24 timer."
     edit: 'redigér titel og kategori for dette emne'
     not_implemented: "Beklager, denne feature er ikke blevet implementeret endnu."
     no_value: "Nej"
@@ -200,7 +206,7 @@ da:
       contact_info: "I tilfælde af kritiske situationer eller vigtige spørgsmål angående denne side, kontakt os venligst på %{contact_info}."
     bookmarked:
       title: "Bogmærke"
-      clear_bookmarks: "Ryd Bogmærker"
+      clear_bookmarks: "Fjern bogmærker"
       help:
         bookmark: "Klik for at sætte et bogmærke i det første indlæg i denne tråd"
         unbookmark: "Klik for at fjerne alle bogmærker i dette emne"
@@ -235,6 +241,8 @@ da:
     undo: "Fortryd"
     revert: "Gendan"
     failed: "Fejlet"
+    switch_to_anon: "Gå i anonym tilstand"
+    switch_from_anon: "Afslut anonym tilstand"
     banner:
       close: "Afvis denne banner."
       edit: "Rediger dette banner >>"
@@ -310,6 +318,7 @@ da:
       selector_placeholder: "Tilføj medlemmer"
       owner: "ejer"
       visible: "Gruppen er synlige for alle brugere"
+      index: "Grupper"
       title:
         one: "gruppe"
         other: "grupper"
@@ -332,6 +341,8 @@ da:
         watching:
           title: "Kigger"
           description: "Du får beskeder om hvert nyt indlæg i hver besked og antallet af nye svar bliver vist."
+        watching_first_post:
+          description: "Du får kun besked om første indlæg i hvert nyt emne i denne gruppe."
         tracking:
           title: "Følger"
           description: "Du får besked hvis nogen nævner dit @navn eller svarer dig og antallet af nye svar bliver vist."
@@ -426,6 +437,7 @@ da:
         disable: "Deaktiver notifikationer"
         enable: "Aktiver notifikationer"
         each_browser_note: "Bemærk: Du skal ændre indstillingen i alle dine browsere."
+      dismiss_notifications: "Afvis alle"
       dismiss_notifications_tooltip: "Marker alle ulæste notifikationer som læst"
       disable_jump_reply: "Ikke hop til mit indlæg efter jeg svarer"
       dynamic_favicon: "Vis nyt / opdateret emnetal på browserikon"
@@ -440,8 +452,22 @@ da:
       suspended_notice: "Denne bruger er suspenderet indtil {{date}}."
       suspended_reason: "Begrundelse: "
       github_profile: "Github"
+      email_activity_summary: "Resumé over aktivitet"
+      mailing_list_mode:
+        label: "Mailing list tilstand"
+        enabled: "Aktiverer mailing list tilstand"
+        daily: "Send daglige opdateringer"
+        individual: "Send en email for hvert nyt indlæg"
+        many_per_day: "Send mig en email for hvert nyt indlæg (omkring {{dailyEmailEstimate}} per dag)"
+        few_per_day: "Send mig en email or hvert nyt indlæg (cirka 2 om dagen)"
+      tag_settings: "Mærker"
+      watched_tags_instructions: "Du vil automatisk følge alle emner med disse mærker. Du bliver informeret om alle nye indlæg og emner og antallet af nye indlæg bliver vises ved emnet."
+      tracked_tags_instructions: "Du tracker automatisk alle emner med disse mærker. Antallet af nye indlæg bliver vises ved hvert emne."
       watched_categories: "Overvåget"
+      watched_categories_instructions: "Du overvåger automatisk alle emner i disse kategorier. Du får besked om alle nye indlæg og emner, og antallet af nye indlæg vises ved hvert emne."
       tracked_categories: "Fulgt"
+      tracked_categories_instructions: "Du tracker automatisk alle emner i disse kategorier. Antallet af nye indlæg vises ved hvert emne."
+      watched_first_post_tags_instructions: "Du får besked om første indlæg i hvert nyt emne med disse mærker."
       muted_categories: "Ignoreret"
       muted_categories_instructions: "Du får ikke beskeder om nye emner i disse kategorier og de fremstår ikke i seneste."
       delete_account: "Slet min konto"
@@ -1505,8 +1531,10 @@ da:
       notifications:
         watching:
           title: "Overvåger"
+          description: "Du overvåger automatisk alle emner i disse kategorier. Du får besked om hvert nyt indlæg i hvert emne og antallet af nye svar bliver vist."
         tracking:
           title: "Følger"
+          description: "Du tracker automatisk alle emner i disse kategorier. Du får besked hvis nogen nævner dit @navn eller svarer dig, og antallet af nye svar bliver vist."
         regular:
           title: "Normal"
           description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig."
@@ -1683,6 +1711,105 @@ da:
       full: "Opret / Besvar / Se"
       create_post: "Besvar / Se"
       readonly: "Se"
+    lightbox:
+      download: "download"
+    search_help:
+      title: 'Søg i hjælp'
+    keyboard_shortcuts_help:
+      title: 'Tastaturgenveje'
+      jump_to:
+        title: 'Hop til'
+        home: '<b>g</b>, <b>h</b> Hjem'
+        latest: '<b>g</b>, <b>l</b> Seneste'
+        new: '<b>g</b>, <b>n</b> Ny'
+        unread: '<b>g</b>, <b>u</b> Ulæst'
+        categories: '<b>g</b>, <b>c</b> Kategorier'
+        top: '<b>g</b>, <b>t</b> Top'
+        bookmarks: '<b>g</b>, <b>b</b> Bogmærker'
+        profile: '<b>g</b>, <b>p</b> Profil'
+        messages: '<b>g</b>, <b>m</b> Beskeder'
+      navigation:
+        title: 'Navigation'
+        jump: '<b>#</b> Gå til indlæg #'
+        back: '<b>u</b> Tilbage'
+        up_down: '<b>k</b>/<b>j</b> Flyt udvalgte &uarr; &darr;'
+        open: '<b>o</b> eller <b>Enter</b> Åben det valgte emne'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Næste/Forrige'
+      application:
+        title: 'Applikation'
+        create: '<b>c</b> Opret nyt emne'
+        notifications: '<b>n</b> Åben notifikationer'
+        hamburger_menu: '<b>=</b> Åben hamburger menu'
+        user_profile_menu: '<b>p</b> Åben bruger menu'
+        show_incoming_updated_topics: '<b>.</b> Vis opdaterede emner'
+        search: '<b>/</b> Søg'
+        help: '<b>?</b> Åben tastaturhjælp'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Afvis Nyt/Indlæg'
+        dismiss_topics: '<b>x</b>, <b>t</b> Afvis emner'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Log ud'
+      actions:
+        title: 'Handlinger'
+    tagging:
+      selector_no_tags: "ingen mærker"
+      sort_by: "Sortér efter:"
+      sort_by_count: "antal"
+      sort_by_name: "navn"
+      manage_groups: "Håndtér tag grupper"
+      manage_groups_description: "Definér grupper til at håndtere tags"
+      filters:
+        without_category: "%{filter} %{tag} emner"
+        with_category: "%{filter} %{tag} emner i %{category}"
+        untagged_without_category: "%{filter} utagged emner"
+        untagged_with_category: "%{filter} utaggede emner i %{category}"
+      notifications:
+        watching:
+          title: "Overvåger"
+          description: "Du vil automatisk overvåge alle emner med dette tag. Du vil blive notificeret om alle nye indlæg og emner. Samtidig vil antallet af ulæste indlæg også vises ved siden af emnet."
+        watching_first_post:
+          title: "Overvåger første indlæg"
+          description: "Du vil kun blive notificeret om det første indlæg under hvert nyt emne i dette tag."
+        tracking:
+          title: "Følger"
+          description: "Du vil automatisk følge alle emner i dette tag. Et antal af ulæste og nye indlæg vil vises ved siden af emnet."
+        regular:
+          description: "Du vil blive notificeret if nogen nævner dit You will be notified if someone mentions your @name or replies to your post."
+      groups:
+        title: "Tag grupper"
+        about: "Tilføj tags til grupper for nemmere håndtering."
+        new: "Ny gruppe"
+        tags_label: "Tags i denne gruppe:"
+        parent_tag_placeholder: "Valgfrit"
+        new_name: "Ny tag gruppe"
+        save: "Gem"
+        delete: "Slet"
+        confirm_delete: "Er du sikker du vil slette denne tag gruppe?"
+      topics:
+        none:
+          unread: "Du har ingen ulæste emner."
+          new: "Du har ingen nye emner."
+          read: "Du har ikke læst nogen emner endnu."
+          posted: "Du har ikke oprettet nogen emner endnu."
+          latest: "Der er ikke nogen seneste emner."
+          hot: "Der er ikke nogen populære emner."
+          bookmarks: "Du har ikke bogmærket nogen emner endnu."
+          top: "Der er ikke nogen populære emner."
+          search: "Der er ikke nogen søgeresultater."
+        bottom:
+          latest: "Der er ikke flere seneste emner."
+          hot: "Der er ikke flere populære emner."
+          posted: "Der er ikke flere oprettede emner."
+          read: "Der er ikke flere læste emner."
+          new: "Der er ikke flere nye emner."
+          unread: "Der er ikke flere ulæste emner."
+          top: "Der er ikke flere populære emner."
+          bookmarks: "Der er ikke flere bogmærkede emner."
+          search: "Der er ikke flere søgeresultater."
+    invite:
+      custom_message: "Gør din invitation lidt mere personlig ved at skrive en "
+      custom_message_link: "personlig besked"
+      custom_message_placeholder: "Skriv en personlig besked"
+      custom_message_template_forum: "Hej, du burde tilmelde dig dette forum!"
+      custom_message_template_topic: "Hej, jeg tænkte du måske ville synes om dette emne!"
   admin_js:
     type_to_filter: "skriv for at filtrere…"
     admin:

config/locales/client.de.yml

@@ -140,7 +140,7 @@ de:
         disabled: 'unsichtbar gemacht, %{when}'
     topic_admin_menu: "Thema administrieren"
     emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt."
-    bootstrap_mode_enabled: "Damit du mit deiner Seite einfacher loslegen kannst, befindest du dich im Bootstrapping-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche Zusammenfassung per E-Mail. Der Modus wird automatisch deaktiviert, sobald sich mindestens %{min_users} angemeldet haben."
+    bootstrap_mode_enabled: "Damit du mit deiner Site einfacher loslegen kannst, befindest du dich im Bootstrapping-Modus. Alle neuen Benutzer erhalten die Vertrauensstufe 1 und bekommen eine tägliche Zusammenfassung per E-Mail. Der Modus wird automatisch deaktiviert, sobald sich mindestens %{min_users} Benutzer angemeldet haben."
     bootstrap_mode_disabled: "Der Bootstrapping-Modus wird innerhalb der nächsten 24 Stunden deaktiviert."
     s3:
       regions:
@@ -788,8 +788,8 @@ de:
     too_few_topics_notice: "Lass' <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussionen starten!</a> Es existieren bisher <strong>%{currentTopics} von %{requiredTopics}</strong> benötigten Themen. Neue Besucher benötigen bestehende Konversationen, die sie lesen und auf die sie antworten können."
     too_few_posts_notice: "Lass' <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>die Diskussionen starten!</a> Es existieren bisher <strong>%{currentPosts} von %{requiredPosts}</strong> benötigten Beiträgen. Neue Besucher benötigen bestehende Konversationen, die sie lesen und auf die sie antworten können."
     logs_error_rate_notice:
-      reached: "<b>[%{relativeAge}]</b> Aktuelle Rate von <a href='%{url}' target='_blank'>%{rate}</a> hat die eingestellte Grenze der Seite von %{siteSettingRate} erreicht."
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> hat die eingestellte Grenze für die Site von %{siteSettingRate} erreicht."
-      exceeded: "<b>[%{relativeAge}]</b> Aktuelle Rate vpm <a href='%{url}' target='_blank'>%{rate}</a> hhat die eingestellte Grenze der Seite von %{siteSettingRate} erreicht."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> hat die eingestellte Grenze für die Site von %{siteSettingRate} überschritten."
       rate:
         one: "ein Fehler/%{duration}"
         other: "%{count} Fehler/%{duration}"
@@ -815,7 +815,7 @@ de:
       hide_forever: "Nein danke"
       hidden_for_session: "In Ordnung, ich frag dich morgen wieder. Du kannst dir auch jederzeit unter „Anmelden“ ein Benutzerkonto erstellen."
       intro: "Hallo! :heart_eyes: Es sieht so aus, als würde dir die Diskussion gefallen. Du hast aber noch kein Benutzerkonto."
-      value_prop: "Wenn du ein Benutzerkonto anlegst, merken wir uns, was du gelesen hast, damit du immer dort fortsetzten kannst, wo du aufgehört hast. Du kannst auch Benachrichtigungen – hier oder per E-Mail – erhalten, wenn neue Beiträge verfasst werden. Beiträge, die dir gefallen, kannst du mit einem Like versehen und diese Freude mit allen teilen. :heartbeat:"
+      value_prop: "Wenn du ein Benutzerkonto anlegst, merken wir uns, was du gelesen hast, damit du immer dort fortsetzen kannst, wo du aufgehört hast. Du kannst auch Benachrichtigungen – hier oder per E-Mail – erhalten, wenn neue Beiträge verfasst werden. Beiträge, die dir gefallen, kannst du mit einem Like versehen und diese Freude mit allen teilen. :heartbeat:"
     summary:
       enabled_description: "Du siehst gerade eine Zusammenfassung des Themas: die interessantesten Beiträge, die von der Community bestimmt wurden."
       description: "Es gibt <b>{{replyCount}}</b> Antworten."
@@ -913,8 +913,10 @@ de:
       more_emoji: "mehr..."
       options: "Optionen"
       whisper: "flüstern"
+      unlist: "unsichtbar"
       add_warning: "Dies ist eine offizielle Warnung."
       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..."
       saved_draft_tip: "gespeichert"
@@ -979,6 +981,9 @@ de:
       modal_ok: "OK"
       modal_cancel: "Abbrechen"
       cant_send_pm: "Entschuldige, aber du kannst keine Nachricht an %{username} senden."
+      yourself_confirm:
+        title: "Hast du vergessen Empfänger hinzuzufügen?"
+        body: "Im Augenblick wird diese Nachricht nur an dich selbst gesendet!"
       admin_options_title: "Optionale Mitarbeiter-Einstellungen für dieses Thema"
       auto_close:
         label: "Zeitpunkt der automatischen Schließung:"
@@ -1062,6 +1067,7 @@ de:
       most_liked: "Anzahl der Likes"
       select_all: "Alle auswählen"
       clear_all: "Auswahl aufheben"
+      too_short: "Der Suchbegriff ist zu kurz."
       result_count:
         one: "1 Ergebnis für <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} Ergebnisse für <span class='term'>\"{{term}}\"</span>"
@@ -1182,7 +1188,7 @@ de:
       toggle_information: "Details zum Thema ein- oder ausblenden"
       read_more_in_category: "Möchtest du mehr lesen? Entdecke andere Themen in {{catLink}} oder {{latestLink}}."
       read_more: "Möchtest du mehr lesen? {{catLink}} oder {{latestLink}}."
-      read_more_MF: "Du {UNREAD, plural, =0 {} one {hast <a href='/unread'>ein ungelesenes</a> Thema } other {hast <a href='/unread'># ungelesene</a> Themen } } {NEW, plural, =0 {} one { {BOTH, select, true{und } false {hast } other{}} <a href='/new'>ein neues</a> Thema} other { {BOTH, select, true{und } false {hast } other{}} <a href='/new'># neue</a> Themen} } übrig. Oder {CATEGORY, select, true {entdecke andere Themen in {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "Du {UNREAD, plural, =0 {} one {hast <a href='/unread'>ein ungelesenes</a> Thema } other {hast <a href='/unread'># ungelesene</a> Themen } } {NEW, plural, =0 {} one { {BOTH, select, true{und } false {hast } other{}} <a href='/new'>ein neues</a> Thema} other { {BOTH, select, true{und } false {hast } other{}} <a href='/new'># neue</a> Themen} }. Oder {CATEGORY, select, true {entdecke andere Themen in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: Alle Kategorien durchsehen
       view_latest_topics: aktuelle Themen anzeigen
       suggest_create_topic: Möchtest du ein neues Thema erstellen?
@@ -1452,7 +1458,7 @@ de:
         about: "dieser Beitrag ist ein Wiki"
       archetypes:
         save: 'Speicheroptionen'
-      few_likes_left: "Danke für’s Teilen der Liebe! Du hast für heute nur noch wenige „Gefällt mir“-Angaben übrig."
+      few_likes_left: "Danke fürs Teilen der Liebe! Du hast für heute nur noch wenige „Gefällt mir“-Angaben übrig."
       controls:
         reply: "verfasse eine Antwort auf diesen Beitrag"
         like: "dieser Beitrag gefällt mir"
@@ -1902,7 +1908,7 @@ de:
       earned_n_times:
         one: "Abzeichen 1-mal erhalten"
         other: "Abzeichen %{count}-mal erhalten"
-      granted_on: "Verliehen am %{date}"
+      granted_on: "Verliehen %{date}"
       others_count: "Andere mit diesem Abzeichen (%{count})"
       title: Abzeichen
       allow_title: "kann als Titel verwendet werden"

config/locales/client.es.yml

@@ -788,8 +788,8 @@ es:
     too_few_topics_notice: "¡Vamos a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dar por comenzada la comunidad!</a> Hay <strong>%{currentTopics} / %{requiredTopics}</strong> temas. Los nuevos visitantes necesitan algo que leer y a lo que responder."
     too_few_posts_notice: "¡Vamos a <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>dar por empezada la comunidad!</a> Hay <strong>%{currentPosts} / %{requiredPosts}</strong> mensajes. Los nuevos visitantes necesitan algo que leer y a lo que responder."
     logs_error_rate_notice:
-      reached: "<b>[%{relativeAge}]</b> La tasa actual <a href='%{url}' target='_blank'>%{rate}</a> ha alcanzado el límite establecido en las opciones del sitio en el %{siteSettingRate}."
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> alcanzó el límite establecido en las opciones del sitio del %{siteSettingRate}."
-      exceeded: "<b>[%{relativeAge}]</b> La tasa actual <a href='%{url}' target='_blank'>%{rate}</a> ha excedido el límite establecido en las opciones del sitio en el %{siteSettingRate}."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excedió el límite establecido en las opciones del sitio del %{siteSettingRate}."
       rate:
         one: "1 error/%{duration}"
         other: "%{count} errores/%{duration}"
@@ -913,8 +913,10 @@ es:
       more_emoji: "más..."
       options: "Opciones"
       whisper: "susurrar"
+      unlist: "invisible"
       add_warning: "Ésta es una advertencia oficial."
       toggle_whisper: "Activar/desactivar Susurro"
+      toggle_unlisted: "Visible / Invisible"
       posting_not_on_topic: "¿A qué tema quieres responder?"
       saving_draft_tip: "guardando..."
       saved_draft_tip: "guardado"
@@ -979,6 +981,9 @@ es:
       modal_ok: "OK"
       modal_cancel: "Cancelar"
       cant_send_pm: "Lo sentimos, no puedes enviar un mensaje a %{username}."
+      yourself_confirm:
+        title: "¿Olvidaste añadir destinatarios?"
+        body: "¡Vas a enviarte este mensaje a ti mismo!"
       admin_options_title: "Opciones de moderación para este tema"
       auto_close:
         label: "Tiempo para cierre automático del tema"
@@ -1062,6 +1067,7 @@ es:
       most_liked: "Más \"Me gusta\" recibidos"
       select_all: "Seleccionar todo"
       clear_all: "Limpiar todo"
+      too_short: "El término de búsqueda es demasiado corto."
       result_count:
         one: "1 resultado para <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
@@ -2168,7 +2174,7 @@ es:
         group_owners: Propietarios
         add_owners: Añadir propietarios
         incoming_email: "Correos electrónicos entrantes personalizados"
-        incoming_email_placeholder: "introducir dirección de emai"
+        incoming_email_placeholder: "introducir dirección de email"
       api:
         generate_master: "Generar clave maestra de API"
         none: "No hay ninguna clave de API activa en este momento."

config/locales/client.et.yml

@@ -492,6 +492,7 @@ et:
       tracked_categories: "Jälgitud"
       tracked_categories_instructions: "Sa jälgid kõiki uusi teemasid nendes foorumites automaatselt. Lugemata ja uute postituste arv on näha teema pealkirja kõrval."
       watched_first_post_categories: "Vaatan esimest postitust"
+      watched_first_post_categories_instructions: "Sind teavitatakse esimesest postitusest igas uues teemas nendes foorumites."
       watched_first_post_tags: "Vaatan esimest postitust"
       watched_first_post_tags_instructions: "Sind teavitatakse esimesest postitusest igas nende siltidega uues teemas."
       muted_categories: "Vaigistatud"
@@ -536,6 +537,7 @@ et:
         error: "Välja muutmisel tekkis viga."
       change_username:
         title: "Muuda kasutajanime"
+        confirm: "Muutes oma kasutajanime, katkevad kõik varasemad viited sinu postitustele ja @name mainimised. Oled täiesti veendunud, et soovid seda?"
         taken: "Vabandust, see kasutajanimi on võetud."
         error: "Kasutajanime muutmisel tekkis tõrge."
         invalid: "Selline kasutajanimi ei ole lubatud. Kasutada tohib ainult numbreid ja tähti"
@@ -619,12 +621,14 @@ et:
         always: "alati"
         never: "mitte kunagi"
       email_digests:
+        title: "Kui ma siinset paika ei külasta, saada mulle kokkuvõtlik meil populaarsemate teemade ja vastustega."
         every_30_minutes: "iga pooltund"
         every_hour: "iga tund"
         daily: "igapäevaselt"
         every_three_days: "iga kolme päeva tagant"
         weekly: "iga nädal"
         every_two_weeks: "iga kahe nädala tagant"
+      include_tl0_in_digests: "Kajasta meili teel kokkuvõttes ka uute kasutajate loodud sisu."
       email_in_reply_to: "Lisa e-kirjale katkend eelmisest vastusest"
       email_direct: "Teavita mind, kui keegi tsiteerib minu postitust, vastab minu postitusele, mainib minu @kasutajanime või kutsub mind teemaga liituma"
       email_private_messages: "Saada meilile teavitus, kui minuga kontakteerutakse sõnumi teel"
@@ -672,7 +676,9 @@ et:
         rescind: "Eemalda"
         rescinded: "Kutse eemaldatud"
         reinvite: "Saada kutse uuesti"
+        reinvite_all: "Saada kõik kutsed uuesti"
         reinvited: "Kutse uuesti saadetud"
+        reinvited_all: "Kõik kutsed uuesti saadetud"
         time_read: "Lugemise aeg"
         days_visited: "Päevi külastatud"
         account_age_days: "Konto vanus päevades"
@@ -703,12 +709,21 @@ et:
         post_count:
           one: "postitus loodud"
           other: "postitust loodud"
+        likes_given:
+          one: "<i class='fa fa-heart'></i> antud"
+          other: "<i class='fa fa-heart'></i> antud"
+        likes_received:
+          one: "<i class='fa fa-heart'></i> saadud"
+          other: "<i class='fa fa-heart'></i> saadud"
         days_visited:
           one: "päev külastatud"
           other: "päevi külastatud"
         posts_read:
           one: "postitus loetud"
           other: "postitust loetud"
+        bookmark_count:
+          one: "järjehoidja"
+          other: "järjehoidjad"
         top_replies: "Parimad vastused"
         no_replies: "Veel ei ole vastuseid."
         more_replies: "Veel vastuseid"
@@ -718,6 +733,12 @@ et:
         top_badges: "Parimad märgised"
         no_badges: "Märgiseid veel pole"
         more_badges: "Veel märgiseid"
+        top_links: "Parimad viited"
+        no_links: "Viiteid veel pole."
+        most_liked_by: "Enim meeldinud kasutajale"
+        most_liked_users: "Enim meeldinud"
+        most_replied_to_users: "Enim vastatud teemasse"
+        no_likes: "Meeldimisi veel pole."
       associated_accounts: "Sisselogimisi"
       ip_address:
         title: "Viimane IP-aadress"
@@ -767,6 +788,8 @@ et:
     too_few_topics_notice: "Tõmbame <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>selle vestluse käima!</a> Hetkel on tehtud <strong>%{currentTopics} / %{requiredTopics}</strong> teemat. Uued külastajad vajavad vestlusi, milles osaleda."
     too_few_posts_notice: "Tõmbame <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>selle vestluse käima!</a> Hetkel on tehtud <strong>%{currentPosts} / %{requiredPosts}</strong> postitust. Uued külastajad vajavad vestlusi, milles osaleda."
     logs_error_rate_notice:
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> on saavutanud saidi sätetes kehtestatud limiidi %{siteSettingRate}."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> ületab saidi sätetes kehtestatud limiiti %{siteSettingRate}."
       rate:
         one: "1 viga/%{duration}"
         other: "%{count} viga/%{duration}"
@@ -808,6 +831,7 @@ et:
       title: "Sõnum"
       invite: "Kutsu teisi..."
       remove_allowed_user: "Kas soovid tõesti {{name}} sellest sõnumist eemaldada?"
+      remove_allowed_group: "Kas soovid tõesti {{name}} sellest sõnumist eemaldada?"
     email: 'Meiliaadress'
     username: 'Kasutajanimi'
     last_seen: 'Vaadatud'
@@ -874,6 +898,12 @@ et:
       github:
         title: "GitHub abil"
         message: "Autentimine GitHub abil (veendu, et hüpikaknad oleks lubatud)"
+    emoji_set:
+      apple_international: "Apple/International"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -883,14 +913,18 @@ et:
       more_emoji: "veel..."
       options: "Võimalused"
       whisper: "sosista"
+      unlist: "eemaldatud"
       add_warning: "See on ametlik hoiatus."
       toggle_whisper: "Lülita sosistamine ümber"
+      toggle_unlisted: "Lülita eemaldamine ümber"
       posting_not_on_topic: "Millisesse teemasse soovid vastata?"
       saving_draft_tip: "salvestan..."
       saved_draft_tip: "salvestatud"
       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"
         title_too_short: "Pealkiri peab olema vähemalt {{min}} sümbolit pikk"
@@ -933,6 +967,7 @@ et:
       quote_text: "Plokktsitaat"
       code_title: "Eelvormindatud tekst"
       code_text: "taanda eelvormindatud tekst 4 tühiku võrra"
+      paste_code_text: "kirjuta või kleebi kood siia"
       upload_title: "Lae üles"
       upload_description: "sisesta üleslaetu kirjeldus siia"
       olist_title: "Numberloend"
@@ -946,6 +981,9 @@ et:
       modal_ok: "OK"
       modal_cancel: "Tühista"
       cant_send_pm: "Kahjuks ei saa sa kasutajale %{username} sõnumit saata."
+      yourself_confirm:
+        title: "Kas unustasid saajad lisada?"
+        body: "Hetkel saadetakse see sõnum vaid sulle endale!"
       admin_options_title: "Meeskonna valikulised sätted selle teema jaoks"
       auto_close:
         label: "Teema automaatse sulgemise aeg:"
@@ -959,6 +997,7 @@ et:
     notifications:
       title: "teavitused @name mainimiste, oma postitustele ja teemadele vastamiste, sõnumite, jne kohta"
       none: "Hetkel ei saa teavitusi laadida."
+      empty: "Teavitusi ei leitud."
       more: "vaata vanemaid teavitusi"
       total_flagged: "tähistatud postitusi kokku"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -977,7 +1016,9 @@ et:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> võttis Sinu kutse vastu</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> liigutas {{description}}</p>"
+      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Teenisid '{{description}}'</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Uus teema</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} sõnum Sinu {{group_name}} postkastis</p>"
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} sõnumit Sinu {{group_name}} postkastis</p>"
@@ -1026,6 +1067,7 @@ et:
       most_liked: "Enim meeldinud"
       select_all: "Vali kõik"
       clear_all: "Puhasta kõik"
+      too_short: "Otsitav tekst on liiga lühike."
       result_count:
         one: "1 tulemus <span class='term'>\"{{term}}\"</span> kohta"
         other: "{{count}} tulemust <span class='term'>\"{{term}}\"</span> kohta"
@@ -1037,6 +1079,7 @@ et:
       post_format: "postituse nr{{post_number}} tegi {{username}}"
       context:
         user: "Otsi kasutaja @{{username}} postitusi"
+        category: "Otsi #{{category}} foorumist"
         topic: "Otsi sellest teemast"
         private_messages: "Otsi sõnumeid"
     hamburger_menu: "mine teise teemaloetelu või liigi juurde"
@@ -1158,19 +1201,28 @@ et:
       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
         go_top: "üles"
         go_bottom: "alla"
         go: "mine"
         jump_bottom: "hüppa viimase postituse juurde"
+        jump_prompt: "hüppa postituse juurde"
+        jump_prompt_long: "Millise postituse juurde soovid hüpata?"
         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:
-          '3_10': 'Sulle saabuvad teavitused kuna vaatled selle teema seda silti.'
+          mailing_list_mode: "Sul on aktiveeritud postiloendi režiim, seega teavitatakse sind vastustest siia teemasse meili teel."
+          '3_10': 'Sulle saabuvad teavitused, kuna jälgid selle teemaga seotud silti.'
           '3_6': 'Sulle saabuvad teavitused, kuna vaatled seda liiki.'
           '3_5': 'Sulle saabuvad teavitused kuna hakkasid seda teemat automaatselt jälgima.'
           '3_2': 'Sulle saabuvad teavitused kuna jälgid seda teemat.'
@@ -1223,6 +1275,8 @@ et:
         invisible: "Ära avalda teemade nimekirjas"
         visible: "Avalda teemade nimekirjas"
         reset_read: "Nulli andmed teema lugemise kohta"
+        make_public: "Loo avalik teema"
+        make_private: "Loo privaatsõnum"
       feature:
         pin: "Tõsta teema esile"
         unpin: "Eemalda teema esiletõstmine"
@@ -1269,12 +1323,14 @@ et:
         no_banner_exists: "Bänner-teemat ei ole."
         banner_exists: "Hetkel <strong class='badge badge-notification unread'>on</strong> üks bänner-teema."
       inviting: "Kutsun..."
+      automatically_add_to_groups: "See kutse annab juurdepääsu ka gruppidele:"
       invite_private:
         title: 'Kutsu sõnumisse'
         email_or_username: "Kutsutava meiliaadress või kasutajanimi"
         email_or_username_placeholder: "meiliaadress või kasutajanimi"
         action: "Kutsu"
         success: "Oleme kutsunud selle kasutaja sõnumis osalema."
+        success_group: "Oleme kutsunud selle grupi sõnumis osalema."
         error: "Kahjuks tekkis selle kasutaja kutsumisel üks tõrge."
         group_name: "grupi nimi"
       controls: "Teema juhtpult"
@@ -1314,6 +1370,10 @@ et:
         instructions:
           one: "Vali teema, kuhu soovid selle postituse liigutada."
           other: "Vali teema, kuhu soovid need <b>{{count}}</b> postitust liigutada."
+      merge_posts:
+        title: "Ühenda valitud postitused"
+        action: "ühenda valitud postitused"
+        error: "Valitud postituste ühendamisel tekkis viga."
       change_owner:
         title: "Muuda postituste omanikku"
         action: "muuda omanikku"
@@ -1380,7 +1440,9 @@ et:
         create: "Vabandame, postituse loomisel tekkis viga. Palun proovi uuesti."
         edit: "Vabandame, postituse redigeerimisel tekkis viga. Palun proovi uuesti."
         upload: "Vabandame, selle faili üleslaadimisel tekkis viga. Palun proovi uuesti."
+        file_too_large: "Vabandame. see fail on liiga suur (maksimum on {{max_size_kb}}kB). Miks mitte laadida see suur fail mõnda failijagamisteenusesse pilves ja jagada viidet selleni?"
         too_many_uploads: "Vabandame, faile saab üles laadida vaid ühekaupa."
+        too_many_dragged_and_dropped_files: "Vabandame, faile saab üles laadida vaid kuni 10 korraga."
         upload_not_authorized: "Vabandame, faili tüüp, mida püüad üles laadida, ei ole lubatud (lubatud laiendid: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Vabandame, uued kasutajad ei saa pilte üles laadida."
         attachment_upload_not_allowed_for_new_user: "Vabandame, uued kasutajad ei saa manuseid üles laadida."
@@ -1390,6 +1452,7 @@ et:
         no_value: "Ei, säilita"
         yes_value: "Jah, hülga"
       via_email: "see postitus saabus meili teel"
+      via_auto_generated_email: "see postitus saabus automaatselt genereeritud meili teel"
       whisper: "see postitus on vaikne sosin moderaatoritele"
       wiki:
         about: "see postitus on wiki"
@@ -1514,6 +1577,10 @@ et:
         confirm:
           one: "Oled kindel, et soovid selle postituse kustutada?"
           other: "Oled kindel, et soovid kõik need postitused kustutada?"
+      merge:
+        confirm:
+          one: "Oled kindel, et soovid need postitused ühendada?"
+          other: "Oled kindel, et soovid need {{count}} postitust ühendada?"
       revisions:
         controls:
           first: "Esimene redaktsioon"
@@ -1599,6 +1666,7 @@ et:
           description: "Sa vaatled nendes foorumites kõiki teemasid automaatselt. Sind teavitatakse igast uuest postitusest igas teemas. Ühtlasi kuvatakse uute vastuste arv."
         watching_first_post:
           title: "Vaatan esimest postitust"
+          description: "Sind teavitatakse vaid esimesest postitusest igas uues teemas nendes foorumites."
         tracking:
           title: "Jälgib"
           description: "Sa vaatled kõiki nende foorumite teemasid automaatselt. Sind teavitatakse, kui keegi sinu @name mainib või sulle vastab. Ühtlasi kuvatakse uute vastuste arv."
@@ -1613,6 +1681,7 @@ et:
       action: 'Tähista postitus'
       take_action: "Tegutse"
       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"
@@ -1640,9 +1709,15 @@ et:
       title: "Teema kokkuvõte"
       participants_title: "Sagedased postitajad"
       links_title: "Populaarsed viited"
+      links_shown: "kuva veel viiteid..."
       clicks:
         one: "1 klikk"
         other: "%{count} klikki"
+    post_links:
+      about: "laienda veel selles postuses olevaid viiteid"
+      title:
+        one: "1 veel"
+        other: "%{count} veel"
     topic_statuses:
       warning:
         help: "See on ametlik hoiatus."
@@ -1778,6 +1853,103 @@ et:
       full: "Loo / Vasta / Vaata"
       create_post: "Vasta / Vaata"
       readonly: "Vaata"
+    lightbox:
+      download: "lae alla"
+    search_help:
+      title: 'Otsi spikrist'
+    keyboard_shortcuts_help:
+      title: 'Klaviatuuri kiirvalikud'
+      jump_to:
+        title: 'Hüppa'
+        home: '<b>g</b>, <b>h</b> Avaleht'
+        latest: '<b>g</b>, <b>l</b> Viimased'
+        new: '<b>g</b>, <b>n</b> Uued'
+        unread: '<b>g</b>, <b>u</b> Lugemata'
+        categories: '<b>g</b>, <b>c</b> Foorumid'
+        top: '<b>g</b>, <b>t</b> Parimad'
+        bookmarks: '<b>g</b>, <b>b</b> Järjehoidjad'
+        profile: '<b>g</b>, <b>p</b> Profiil'
+        messages: '<b>g</b>, <b>m</b> Sõnumid'
+      navigation:
+        title: 'Navigatsioon'
+        jump: '<b>#</b> Mine postitusse #'
+        back: '<b>u</b> Tagasi'
+        up_down: '<b>k</b>/<b>j</b> Liiguta valitut &uarr; &darr;'
+        open: '<b>o</b> or <b>Enter</b> Ava valitud teema'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Järgmine/eelmine sektsioon'
+      application:
+        title: 'Rakendus'
+        create: '<b>c</b> Loo uus teema'
+        notifications: '<b>n</b> Ava teavitused'
+        hamburger_menu: '<b>=</b> Ava rippmenüü'
+        user_profile_menu: '<b>p</b> Ava kasutajamenüü'
+        show_incoming_updated_topics: '<b>.</b> Näita uuendatud teemasid'
+        search: '<b>/</b> Otsi'
+        help: '<b>?</b> Ava klaviatuuri abimenüü'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Lükka Uued/Postitused tagasi'
+        dismiss_topics: '<b>x</b>, <b>t</b> Lükka teemad tagasi'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Logi välja'
+      actions:
+        title: 'Tegevused'
+        bookmark_topic: '<b>f</b> Lülita teema järjehoidja sisse/välja
+
+           '
+        pin_unpin_topic: '<b>shift</b>+<b>p</b>  Kinnita/Vabasta teema'
+        share_topic: '<b>shift</b>+<b>s</b> Jaga teemat'
+        share_post: '<b>s</b> Jaga postitust'
+        reply_as_new_topic: '<b>t</b> Vasta viidates teemale'
+        reply_topic: '<b>shift</b>+<b>r</b> Vasta teemale'
+        reply_post: '<b>r</b> Vasta postitusele'
+        quote_post: '<b>q</b> Tsiteeri postitust'
+        like: '<b>l</b> Märgi postitus meeldivaks'
+        flag: '<b>!</b> Tähista postitus'
+        bookmark: '<b>b</b> Pane postitusele järjehoidja'
+        edit: '<b>e</b> Muuda postitust'
+        delete: '<b>d</b> Kustuta postitus'
+        mark_muted: '<b>m</b>, <b>m</b> Vaigista teema'
+        mark_regular: '<b>m</b>, <b>r</b> Tavaline (vaikimisi) teema'
+        mark_tracking: '<b>m</b>, <b>t</b> Jälgi teemat'
+        mark_watching: '<b>m</b>, <b>w</b> Vaatle teemat'
+    badges:
+      earned_n_times:
+        one: "Teenis selle märgise 1 kord"
+        other: "Teenis selle märgise %{count} korda"
+      granted_on: "Märgistatud %{date}"
+      others_count: "Teised selle märgisega (%{count})"
+      title: Märgised
+      allow_title: "saadaval tiitel"
+      multiple_grant: "määratud mitmeid kordi"
+      badge_count:
+        one: "1 märgis"
+        other: "%{count} märgist"
+      more_badges:
+        one: "+1 veel"
+        other: "+%{count} veel"
+      granted:
+        one: "1 lubatud"
+        other: "%{count} lubatud"
+      select_badge_for_title: Vali märgis, mida kasutada oma pealkirjana
+      none: "<pole ühtegi>"
+      badge_grouping:
+        getting_started:
+          name: Alustamine
+        community:
+          name: Kogukond
+        trust_level:
+          name: Usaldustase
+        other:
+          name: Muu
+        posting:
+          name: Postitan
+    google_search: |
+      <h3>Otsi Google abil</h3>
+      <p>
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <input type="text" id='user-query' value="">
+      <input type='hidden' id='google-query' name="q">
+      <button class="btn btn-primary">Google</button>
+      </form>
+      </p>
     tagging:
       all_tags: "Kõik sildid"
       selector_all_tags: "kõik sildid"
@@ -1789,6 +1961,9 @@ et:
       delete_confirm: "Oled Sa kindel, et soovid selle sildi kustutada?"
       rename_tag: "Nimeta silt ümber"
       rename_instructions: "Vali sildile uus nimi:"
+      sort_by: "Järjesta:"
+      sort_by_count: "üldarv"
+      sort_by_name: "nimi"
       manage_groups: "Halda siltide gruppe"
       manage_groups_description: "Määra siltide organiseerimiseks grupid"
       filters:
@@ -1801,26 +1976,57 @@ et:
           title: "Vaatlen"
           description: "Sa vaatled kõiki selle sildiga teemasid automaatselt. Sind teavitatakse kõigist uutest postitustest ja teemadest, koos lugemata ja uute postituste arvuga teema pealkirja kõrval."
         watching_first_post:
+          title: "Vaatan esimest postitust"
           description: "Sind teavitatakse vaid esimesest postitusest igas uues selle sildiga teemas."
         tracking:
+          title: "Jälgin"
           description: "Sa jälgid kõiki selle sildiga uusi teemasid. Lugemata ja uute postituste arv on näha teema pealkirja kõrval."
+        regular:
+          title: "Tavaline"
+          description: "Sind teavitatakse, kui keegi Sinu @name mainib või vastab Sinu positusele."
         muted:
+          title: "Vaigistatud"
           description: "Sind ei teavitata ühestki uuest selle sildiga teemast, samuti ei ilmu nad lugemata postituste sakil."
       groups:
         title: "Siltide grupid"
         about: "Hõlpsamaks haldamiseks lisa sildid gruppidesse."
+        new: "Uus grupp"
         tags_label: "Sildid selles grupis:"
         parent_tag_label: "Ülemsilt:"
         parent_tag_placeholder: "Valikuline"
         parent_tag_description: "Sellesse gruppi kuuluvaid silte ei saa kasutada, kui ülemsilt on puudu."
         one_per_topic_label: "Vaid üks selle grupi silt teema kohta"
         new_name: "Uus siltide grupp"
+        save: "Salvesta"
+        delete: "Kustuta"
         confirm_delete: "Oled kindel, et soovid selle siltide grupi kustutada?"
       topics:
         none:
           unread: "Sul ei ole lugemata teemasid."
+          new: "Sul ei ole uusi teemasid."
+          read: "Sa ei ole veel ühtegi teemat lugenud."
+          posted: "Sa ei ole veel ühtegi teemasse postitanud."
+          latest: "Ühtegi värsket teemat pole."
+          hot: "Ühtegi kuuma teemat pole."
+          bookmarks: "Sul ei ole veel ühtegi järjehoidjaga teemal."
+          top: "Ühtegi parimat teemat pole."
+          search: "Otsing ei andnud tulemusi."
         bottom:
+          latest: "Rohkem värskeid teemasid pole."
+          hot: "Rohkem kuumi teemasid pole."
+          posted: "Rohkem uute postitustega teemasid pole."
+          read: "Rohkem loetud teemasid pole."
+          new: "Rohkem uusi teemasid pole."
           unread: "Rohkem lugemata teemasid pole."
+          top: "Rohkem parimaid teemasid pole."
+          bookmarks: "Rohkem järjehoidjaga teemasid pole."
+          search: "Rohkem otsingutulemusi pole."
+    invite:
+      custom_message: "Muuda oma kutse veidi personaalsemaks kirjutades"
+      custom_message_link: "individuaalne sõnum"
+      custom_message_placeholder: "Sisesta oma individuaalne sõnum"
+      custom_message_template_forum: "Kuule, Sa peaksid selle foorumiga liituma!"
+      custom_message_template_topic: "Kuule, arvan et see teema meeldiks Sulle!"
   admin_js:
     type_to_filter: "filtreerimiseks trüki..."
     admin:
@@ -1868,6 +2074,7 @@ et:
           30_days_ago: "30 päeva tagasi"
           all: "Kõik"
           view_table: "tabel"
+          view_graph: "diagramm"
           refresh_report: "Värskenda raportit"
           start_date: "Alguskuupäev"
           end_date: "Lõpukuupäev"
@@ -2160,6 +2367,7 @@ et:
         test_error: "Testmeili saatmisel tekkis viga. Palun kontrolli oma meilisätteid, veendu, et sinu teenusepakkuja ei blokeeri meiliühendusi ja proovi uuesti."
         sent: "Saadetud"
         skipped: "Üle hüpatud"
+        bounced: "Välja visatud"
         received: "Saadud"
         rejected: "Tagasi lükatud"
         sent_at: "Saadetud"
@@ -2269,6 +2477,9 @@ et:
             grant_moderation: "anna modereerimisõigus"
             revoke_moderation: "võta modereerimisõigus ära"
             backup_operation: "varundustoiming"
+            deleted_tag: "kustutatud silt"
+            renamed_tag: "ümbernimetatud silt"
+            revoke_email: "kutsu meil tagasi"
         screened_emails:
           title: "Varjestatud meilid"
           description: "Kui keegi üritab uut kontot luua, siis kontrollitakse järgmisi meiliaadresse ja vastavuse korral registreerimine peatatakse või tehakse mõni muu toiming."
@@ -2437,9 +2648,18 @@ et:
         block_failed: 'Viga kasutaja blokeerimisel.'
         block_confirm: 'Oled Sa kindel, et soovid seda kasutajat blokeerida? Kasutaja ei saa peale seda luua ühtegi teemat ega postitust.'
         block_accept: 'Jah, blokeeri see kasutaja'
+        bounce_score: "Väljaviskamiste skoor"
+        reset_bounce_score:
+          label: "Lähtesta"
+          title: "Lähtesta väljaviskamiste skoor tagasi 0"
         deactivate_explanation: "Deaktiveeritud kasutaja peab valideerima oma meiliaadressi."
         suspended_explanation: "Peatatud kasutaja ei saa sisse logida."
         block_explanation: "Blokeeritud kasutaja ei saa postitada ega alustada teemasid."
+        staged_explanation: "Ettevalmistamisel oleval kasutajal on lubatud postitada ettemääratud teemadesse vaid meili teel."
+        bounce_score_explanation:
+          none: "Sellelt meiliaadressilt pole viimasel ajal tagasipõrgatusi saabunud."
+          some: "Sellelt meiliaadressilt on viimasel ajal mõned tagasipõrgatused saabunud."
+          threshold_reached: "Sellelt meiliaadressilt on saabunud liiga palju tagasipõrgatusi."
         trust_level_change_failed: "Viga kasutaja usaldustaseme muutmisel."
         suspend_modal_title: "Peata kasutaja"
         trust_level_2_users: "Kasutajad usaldustasemel 2"
@@ -2555,6 +2775,7 @@ et:
           login: "Sisselogimine"
           plugins: "Pistikprogrammid"
           user_preferences: "Kasutaja seaded"
+          tags: "Sildid"
       badges:
         title: Märgised
         new_badge: Uus märgis
@@ -2650,6 +2871,7 @@ et:
         embed_truncate: "Lühenda sängitatud postitused"
         embed_whitelist_selector: "CSS valik elementidele, mida lubada sängitamistes"
         embed_blacklist_selector: "CSS valik elementidele, mida eemaldada sängitamistes"
+        embed_classname_whitelist: "CSS klasside lubatud nimed"
         feed_polling_enabled: "Impordi postitused RSS/ATOM'i kaudu"
         feed_polling_url: "URL või RSS/ATOM voog, mida kududa"
         save: "Salvesta sängitamise sätted"

config/locales/client.fi.yml

@@ -358,7 +358,7 @@ fi:
           title: "Tarkkaillut"
           description: "Saat ilmoituksen uusista viesteistä jokaisessa viestiketjussa, ja uusien vastausten lukumäärä näytetään."
         watching_first_post:
-          title: "Tarkkaillaan uusia ketjuja"
+          title: "Tarkkaile uusia ketjuja"
           description: "Saat ilmoituksen vain ketjujen ensimmäisistä viesteistä tässä ryhmässä."
         tracking:
           title: "Seurannassa"
@@ -476,6 +476,7 @@ fi:
         instructions: |
           Asetus syrjäyttää koosteet tapahtumista.<br />
           Vaimennettujen ketjujen ja alueiden viestejä ei sisällytetä sähköposteihin.
+
         daily: "Lähetä päivittäin"
         individual: "Lähetä sähköpostia jokaisesta uudesta viestistä"
         many_per_day: "Lähetä minulle sähköpostia jokaisesta uudesta viestistä (noin {{dailyEmailEstimate}} päivässä)"
@@ -788,8 +789,6 @@ fi:
     too_few_topics_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentTopics} / %{requiredTopics}</strong> ketjua. Uusia kävijöitä varten tarvitaan keskusteluita, joita voivat lukea ja joihin vastata."
     too_few_posts_notice: "Laitetaanpa <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>keskustelu alulle!</a> Tällä hetkellä palstalla on <strong>%{currentPosts} / %{requiredPosts}</strong> viestiä. Uusia kävijöitä varten tarvitaan keskusteluita, joita voivat lukea ja joihin vastata."
     logs_error_rate_notice:
-      reached: "<b>[%{relativeAge}]</b> Virheiden määrä <a href='%{url}' target='_blank'>%{rate}</a> on saavuttanut sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
-      exceeded: "<b>[%{relativeAge}]</b> Virheiden määrä <a href='%{url}' target='_blank'>%{rate}</a> on ylittänyt sivuston asetuksissa määritellyn rajan %{siteSettingRate}."
       rate:
         one: "1 virhe/%{duration}"
         other: "%{count} virhettä/%{duration}"
@@ -913,8 +912,10 @@ fi:
       more_emoji: "lisää..."
       options: "Asetukset"
       whisper: "kuiskaus"
+      unlist: "listaamaton"
       add_warning: "Tämä on virallinen varoitus."
       toggle_whisper: "Vaihda kuiskaus"
+      toggle_unlisted: "Listauksissa näkyminen"
       posting_not_on_topic: "Mihin ketjuun haluat vastata?"
       saving_draft_tip: "tallennetaan..."
       saved_draft_tip: "tallennettu"
@@ -979,6 +980,9 @@ fi:
       modal_ok: "OK"
       modal_cancel: "Peruuta"
       cant_send_pm: "Et voi lähettää viestiä käyttäjälle  %{username}."
+      yourself_confirm:
+        title: "Unohditko lisätä vastaanottajia?"
+        body: "Olet lähettämässä viestiä vain itsellesi!"
       admin_options_title: "Tämän ketjun vain henkilökunnalle näytettävät asetukset"
       auto_close:
         label: "Sulje ketju automaattisesti tämän ajan jälkeen:"
@@ -1062,6 +1066,7 @@ fi:
       most_liked: "Tykätyin"
       select_all: "Valitse kaikki"
       clear_all: "Tyhjennä kaikki"
+      too_short: "Hakusana on liian lyhyt."
       result_count:
         one: "1 tulos haulle <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} tulosta haulle <span class='term'>\"{{term}}\"</span>"
@@ -1076,7 +1081,7 @@ fi:
         category: "Etsi alueelta #{{category}}"
         topic: "Etsi tästä ketjusta"
         private_messages: "Etsi viesteistä"
-    hamburger_menu: "siirry toiseen ketjuun tai alueelle"
+    hamburger_menu: "vaihda ketjulistausta tai siirry toiselle alueelle"
     new_item: "uusi"
     go_back: 'mene takaisin'
     not_logged_in_user: 'käyttäjäsivu, jossa on tiivistelmä käyttäjän viimeaikaisesta toiminnasta sekä käyttäjäasetukset'
@@ -1644,7 +1649,7 @@ fi:
       email_in_allow_strangers: "Hyväksy viestejä anonyymeiltä käyttäjiltä joilla ei ole tiliä"
       email_in_disabled: "Uusien ketjujen luominen sähköpostitse on otettu pois käytöstä sivuston asetuksissa. Salliaksesi uusien ketjujen luomisen sähköpostilla, "
       email_in_disabled_click: 'ota käyttöön "email in" asetus.'
-      suppress_from_homepage: "Vaimenna tämä ketju kotisivulta."
+      suppress_from_homepage: "Vaimenna alue kotisivulta."
       allow_badges_label: "Salli arvomerkkien myöntäminen tältä alueelta"
       edit_permissions: "Muokkaa oikeuksia"
       add_permission: "Lisää oikeus"
@@ -1657,11 +1662,13 @@ fi:
       notifications:
         watching:
           title: "Tarkkaile"
+          description: "Tarkkailet kaikkia ketjuja näillä alueilla. Saat ilmoituksen jokaisesta uudesta viestistä missä tahansa ketjussa, ja uusien vastausten määrä näytetään."
         watching_first_post:
-          title: "Tarkkaillaan uusia ketjuja"
+          title: "Tarkkaile uusia ketjuja"
           description: "Saat ilmoituksen näille alueille luoduista ketjuista."
         tracking:
           title: "Seuraa"
+          description: "Seuraat kaikkia ketjuja näillä alueilla. Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle, ja uusien vastausten määrä näytetään."
         regular:
           title: "Tavallinen"
           description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle."
@@ -1771,7 +1778,7 @@ fi:
       latest:
         title: "Tuoreimmat"
         title_with_count:
-          one: "Tuoremmat (1)"
+          one: "Tuoreimmat (1)"
           other: "Tuoreimmat ({{count}})"
         help: "ketjut, joissa on viimeaikaisia viestejä"
       hot:
@@ -1948,7 +1955,7 @@ fi:
       tags: "Tunnisteet"
       choose_for_topic: "valitse valinnaiset tunnisteet tälle ketjulle"
       delete_tag: "Poista tunniste"
-      delete_confirm: "Oletko varma, että haluat poistaa tämän tunnisteen"
+      delete_confirm: "Oletko varma, että haluat poistaa tunnisteen?"
       rename_tag: "Uudelleennimeä tunniste"
       rename_instructions: "Valitse uusi nimi tälle tunnisteelle:"
       sort_by: "Järjestä:"
@@ -1966,10 +1973,11 @@ fi:
           title: "Tarkkaile"
           description: "Ketjut, joilla on tämä tunniste, asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista, ja uusien ja lukemattomien viestien lukumäärä näytetään ketjujen yhteydessä. "
         watching_first_post:
-          title: "Tarkkaillaan uusia ketjuja"
+          title: "Tarkkaile uusia ketjuja"
           description: "Saat ilmoituksen luoduista ketjuista, joilla on joku näistä tunnisteista."
         tracking:
           title: "Seuraa"
+          description: "Seuraat kaikkia ketjuja, joilla on tämä tunniste. Lukemattomien ja uusien viestien lukumäärä näytetään ketjun yhteydessä."
         regular:
           title: "Tavallinen"
           description: "Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa viestiisi."
@@ -2103,8 +2111,8 @@ fi:
         clear_topic_flags_title: "Tämä ketju on tutkittu ja sitä koskeneet ongelmat ratkaistu. Klikkaa Valmis poistaaksesi liput."
         more: "(lisää vastauksia...)"
         dispositions:
-          agreed: "olet samaa mieltä"
+          agreed: "samaa mieltä"
-          disagreed: "olet eri mieltä"
+          disagreed: "eri mieltä"
           deferred: "lykätty"
         flagged_by: "Liputtajat"
         resolved_by: "Selvittäjä"

config/locales/client.fr.yml

@@ -404,8 +404,8 @@ fr:
       subcategories: "Sous-catégories"
       topic_stats: "Le nombre de nouveaux sujets."
       topic_stat_sentence:
-        one: "%{count} nouveau sujet depuis %{unit}."
+        one: "%{count} nouveau sujet par %{unit}."
-        other: "%{count} nouveaux sujets depuis %{unit}."
+        other: "%{count} nouveaux sujets par %{unit}."
       post_stats: "Le nombre de nouveaux messages."
       post_stat_sentence:
         one: "%{count} nouveau message depuis %{unit}."
@@ -508,7 +508,7 @@ fr:
       muted_users_instructions: "Cacher toutes les notifications de ces utilisateurs."
       muted_topics_link: "Afficher les sujets en sourdine"
       watched_topics_link: "Afficher les sujets surveillés"
-      automatically_unpin_topics: "Desépingler automatiquement quand j'arrive à la fin."
+      automatically_unpin_topics: "Désépingler automatiquement les sujets quand j'arrive à la fin."
       staff_counters:
         flags_given: "signalements utiles"
         flagged_posts: "messages signalés"
@@ -519,7 +519,7 @@ fr:
         all: "Tous"
         inbox: "Boîte de réception"
         sent: "Envoyé"
-        archive: "Archiver"
+        archive: "Archive"
         groups: "Mes groupes"
         bulk_select: "Sélectionner des messages"
         move_to_inbox: "Déplacer dans la boîte de réception"
@@ -559,11 +559,11 @@ fr:
         image_is_not_a_square: "Attention : nous avons découpé votre image ; la largeur et la hauteur n'étaient pas égales."
         cache_notice: "Votre photo de profil a bien été modifié, mais il se peut qu'il mette un certain temps à apparaître à cause des caches de navigateur."
       change_profile_background:
-        title: "Arrière plan du profil"
+        title: "Arrière-plan du profil"
         instructions: "L'arrière-plan du profil sera centré avec une largeur par défaut de 850 pixels."
       change_card_background:
-        title: "Arrière plan de la carte de l'utilisateur"
+        title: "Arrière-plan de la carte de l'utilisateur"
-        instructions: "Les images d'arrière plan seront centrées avec une taille par défaut de 590 pixels."
+        instructions: "Les images d'arrière-plan seront centrées avec une taille par défaut de 590 pixels."
       email:
         title: "Courriel"
         instructions: "Ne sera jamais visible publiquement"
@@ -659,12 +659,12 @@ fr:
         title: "Invitations"
         user: "Utilisateurs"
         sent: "Envoyé"
-        none: "Il n'y a pas d'invitation en attente à afficher."
+        none: "Il n'y a pas d'invitations en attente à afficher."
         truncated:
           one: "Afficher la première invitation."
           other: "Afficher les {{count}} premières invitations."
         redeemed: "Invitations acceptées"
-        redeemed_tab: "Utilisés"
+        redeemed_tab: "Utilisées"
         redeemed_tab_with_count: "Invitations acceptées ({{count}})"
         redeemed_at: "Acceptée le"
         pending: "Invitations en attente"
@@ -720,7 +720,7 @@ fr:
           other: "jours visités"
         posts_read:
           one: "message lu"
-          other: "Messages lus"
+          other: "messages lus"
         bookmark_count:
           one: "signet"
           other: "signets"
@@ -788,8 +788,8 @@ fr:
     too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Démarrons cette discussion !</a> Il y a actuellement <strong>%{currentTopics} / %{requiredTopics}</strong> sujets. Les nouveaux visiteurs ont besoin de quelques conversations à lire et répondre."
     too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>Démarrons cette discussion !</a> Il y a actuellement <strong>%{currentPosts} / %{requiredPosts}</strong> messages. Les nouveaux visiteurs ont besoin de quelques conversations à lire et répondre."
     logs_error_rate_notice:
-      reached: "<b>[%{relativeAge}]</b> Le taux actuel de <a href='%{url}' target='_blank'>%{rate}</a> a atteint la limite de %{siteSettingRate} définie dans les paramètres du site."
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a atteint la limite de %{siteSettingRate} définie dans les paramètres du site."
-      exceeded: "<b>[%{relativeAge}]</b> Le taux actuel de <a href='%{url}' target='_blank'>%{rate}</a> a dépassé la limite de %{siteSettingRate} définie dans les paramètres du site."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> a dépassé la limite de %{siteSettingRate} définie dans les paramètres du site."
       rate:
         one: "1 erreur/%{duration}"
         other: "%{count} erreurs/%{duration}"
@@ -913,8 +913,10 @@ fr:
       more_emoji: "plus..."
       options: "Options"
       whisper: "murmure"
+      unlist: "non listé"
       add_warning: "Ceci est un avertissement officiel."
-      toggle_whisper: "Activer/Désactiver Whisper"
+      toggle_whisper: "Modifier le murmure"
+      toggle_unlisted: "Modifier la visibilité"
       posting_not_on_topic: "À quel sujet voulez-vous répondre ?"
       saving_draft_tip: "sauvegarde en cours..."
       saved_draft_tip: "sauvegardé"
@@ -943,7 +945,7 @@ fr:
       title_placeholder: "Quel est votre sujet en une phrase descriptive ?"
       edit_reason_placeholder: "pourquoi éditez-vous ?"
       show_edit_reason: "(ajouter la raison de l'édition)"
-      reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour formatter. Glissez ou collez des images."
+      reply_placeholder: "Écrivez ici. Utilisez Markdown, BBCode, ou HTML pour mettre en forme. Glissez ou collez des images."
       view_new_post: "Voir votre nouveau message."
       saving: "Sauvegarde"
       saved: "Sauvegardé !"
@@ -979,6 +981,9 @@ fr:
       modal_ok: "OK"
       modal_cancel: "Annuler"
       cant_send_pm: "Désolé, vous ne pouvez pas envoyer de message à l'utilisateur %{username}."
+      yourself_confirm:
+        title: "Avez-vous oublié d'ajouter des destinataires ?"
+        body: "Pour le moment, ce message est uniquement envoyé à vous-même !"
       admin_options_title: "Paramètres optionnels pour ce sujet"
       auto_close:
         label: "Heure de fermeture automatique de ce sujet :"
@@ -1044,7 +1049,7 @@ fr:
       title: "Ajouter une image"
       title_with_attachments: "Ajouter une image ou un fichier"
       from_my_computer: "Depuis mon appareil"
-      from_the_web: "Depuis le web"
+      from_the_web: "Depuis le Web"
       remote_tip: "lien vers l'image"
       remote_tip_with_attachments: "lien vers l'image ou le fichier {{authorized_extensions}}"
       local_tip: "sélectionnez des images depuis votre appareil"
@@ -1053,22 +1058,23 @@ fr:
       hint_for_supported_browsers: "vous pouvez aussi glisser/déposer ou coller des images dans l'éditeur"
       uploading: "Fichier en cours d'envoi"
       select_file: "Sélectionner Fichier"
-      image_link: "lien vers lequel pointe l'image"
+      image_link: "lien vers lequel l'image pointera"
     search:
       sort_by: "Trier par"
       relevance: "Pertinence"
-      latest_post: "Dernier Message"
+      latest_post: "Dernier message"
-      most_viewed: "Plus Vu"
+      most_viewed: "Plus vu"
-      most_liked: "Plus Aimé"
+      most_liked: "Plus aimé"
       select_all: "Sélectionner tout"
       clear_all: "Tout désélectionner"
+      too_short: "Votre terme de recherche est trop court."
       result_count:
         one: "1 résultat pour <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} résultats pour <span class='term'>\"{{term}}\"</span>"
       title: "rechercher des sujets, messages, utilisateurs ou catégories"
       no_results: "Aucun résultat."
-      no_more_results: "Pas davantage de résultats."
+      no_more_results: "Aucun résultat supplémentaire."
-      search_help: Aide pour la recherche
+      search_help: Aide à la recherche
       searching: "Recherche en cours…"
       post_format: "#{{post_number}} par {{username}}"
       context:
@@ -1076,7 +1082,7 @@ fr:
         category: "Rechercher dans la catégorie #{{category}}"
         topic: "Rechercher dans ce sujet"
         private_messages: "Rechercher des messages"
-    hamburger_menu: "se rendre dans une autre liste de sujet ou catégorie"
+    hamburger_menu: "aller à une autre catégorie ou liste de sujets"
     new_item: "nouveau"
     go_back: 'retour'
     not_logged_in_user: 'page utilisateur avec un résumé de l''activité en cours et les préférences '
@@ -1090,7 +1096,7 @@ fr:
         dismiss_read: "Ignorer tous les sujets non lus"
         dismiss_button: "Ignorer..."
         dismiss_tooltip: "Ignorer les nouveaux messages ou arrêter des suivre les sujets"
-        also_dismiss_topics: "Arrêter de suivre ces sujets, ils ne s'afficheront donc plus en \"non lu\" pour moi"
+        also_dismiss_topics: "Arrêter de suivre ces sujets pour qu'ils ne soient plus jamais marqués comme non lus"
         dismiss_new: "Ignorer les nouveaux"
         toggle: "activer la sélection multiple des sujets"
         actions: "Actions sur sélection multiple"
@@ -1120,12 +1126,12 @@ fr:
           new: '<p>Vos nouveaux sujets apparaissent ici.</p><p>Par défaut, les sujets sont considérés comme nouveaux et affichent l''indicateur <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nouveau</span> lorsqu''ils ont été créés depuis moins de 2 jours.</p><p>Vous pouvez modifier cela dans vos <a href="%{userPrefsUrl}">préférences</a>.</p>'
           unread: '<p>Vos sujets non lus apparaissent ici.</p><p>Par défaut, les sujets considérés comme non lus et qui affichent le nombre de messages non lus <span class="badge new-posts badge-notification">1</span> sont ceux :</p> <ul><li>que vous avez crées</li><li>auxquels vous avez répondus</li><li>que vous avez lus plus de 4 minutes</li></ul><p>ou que vous avez explicitement suivis ou surveillés.</p><p>Vous pouvez modifier cela dans vos <a href="%{userPrefsUrl}">préférences</a>.</p>'
       bottom:
-        latest: "Il n'y a plus de sujet à lire."
+        latest: "Il n'y a plus de sujets à lire."
-        hot: "Il n'y a plus de sujet populaire à lire."
+        hot: "Il n'y a plus de sujets populaires à lire."
-        posted: "Il n'y a plus de sujet à lire."
+        posted: "Il n'y a plus de sujets à lire."
-        read: "Il n'y a plus de sujet à lire."
+        read: "Il n'y a plus de sujets à lire."
-        new: "Il n'y a plus de nouveau sujet."
+        new: "Il n'y a plus de nouveaux sujets."
-        unread: "Il n'y a plus de sujet à lire."
+        unread: "Il n'y a plus de sujets à lire."
         category: "Il n'y a plus de sujets dans {{category}} à lire."
         top: "Il n'y a plus de meilleurs sujets."
         bookmarks: "Il n'y a plus de sujets dans vos signets."
@@ -1140,7 +1146,7 @@ fr:
       private_message: 'Écrire un message'
       archive_message:
         help: 'Transférer message dans votre archive'
-        title: 'Archiver'
+        title: 'Archive'
       move_to_inbox:
         title: 'Déplacer dans la boîte de réception'
         help: 'Redéplacer dans la boîte de réception'
@@ -1216,7 +1222,7 @@ fr:
         title: modifier la fréquence des notifications concernant ce sujet
         reasons:
           mailing_list_mode: "Vous avez activé la liste de diffusion, vous serez donc notifié des réponses à ce sujet par courriel."
-          '3_10': 'Vous recevrez des notifications sur ce sujet car vous surveillez ce tag.'
+          '3_10': 'Vous recevrez des notifications car vous surveillez un tag de ce sujet.'
           '3_6': 'Vous recevrez des notifications parce que vous surveillez cette catégorie.'
           '3_5': 'Vous recevrez des notifications parce que vous avez commencé à surveiller ce sujet automatiquement.'
           '3_2': 'Vous recevrez des notifications car vous surveillez ce sujet.'
@@ -1270,7 +1276,7 @@ fr:
         visible: "Afficher dans la liste des sujets"
         reset_read: "Réinitialiser les lectures"
         make_public: "Rendre sujet publique"
-        make_private: "Rendre sujet privé"
+        make_private: "Rendre le sujet privé"
       feature:
         pin: "Épingler la discussion"
         unpin: "Désépingler la discussion"
@@ -1350,7 +1356,7 @@ fr:
           other: "{{count}} messages"
         cancel: "Supprimer le filtre"
       split_topic:
-        title: "Déplacer vers Nouveau Sujet"
+        title: "Déplacer vers un nouveau sujet"
         action: "déplacer vers un nouveau sujet"
         topic_name: "Titre du nouveau sujet"
         error: "Il y a eu une erreur en déplaçant les messages vers un nouveau sujet."
@@ -1457,19 +1463,19 @@ fr:
         reply: "Rédiger une réponse à ce message"
         like: "J'aime ce message"
         has_liked: "vous avez aimé ce message"
-        undo_like: "annuler j'aime"
+        undo_like: "annuler J'aime"
         edit: "Éditer ce message"
         edit_anonymous: "Désolé, mais vous devez être connecté pour éditer ce message."
         flag: "signaler secrètement ce message pour attirer l'attention ou envoyer une notification privée à son sujet"
         delete: "Supprimer ce message"
         undelete: "Annuler la suppression de ce message"
-        share: "Partager ce message"
+        share: "partager ce message"
         more: "Plus"
         delete_replies:
           confirm:
             one: "Voulez-vous aussi supprimer la réponse qui suit directement ce message ?"
-            other: "Voulez-vous aussi supprimer les  {{count}} réponse qui suivent directement ce message ?"
+            other: "Voulez-vous aussi supprimer les  {{count}} réponses qui suivent directement ce message ?"
-          yes_value: "Oui, supprimer les réponses égalements"
+          yes_value: "Oui, supprimer les réponses également"
           no_value: "Non, juste ce message"
         admin: "action sur message d'administrateur"
         wiki: "Basculer en mode wiki"
@@ -1497,7 +1503,7 @@ fr:
           spam: "Annuler le signalement"
           inappropriate: "Annuler le signalement"
           bookmark: "Retirer de vos signets"
-          like: "Annuler j'aime"
+          like: "Annuler J'aime"
           vote: "Retirer votre vote"
         people:
           off_topic: "signalé comme hors-sujet."
@@ -1718,7 +1724,7 @@ fr:
       bookmarked:
         help: "Vous avez ajouté ce sujet à vos signets"
       locked:
-        help: "Ce sujet est fermé; il n'accepte plus de nouvelles réponses"
+        help: "Ce sujet est fermé ; il n'accepte plus de nouvelles réponses"
       archived:
         help: "Ce sujet est archivé; il est gelé et ne peut être modifié"
       locked_and_archived:
@@ -1755,7 +1761,7 @@ fr:
     likes_lowercase:
       one: "J'aime"
       other: "J'aime"
-    likes_long: "il y a {{number}} j'aime dans ce sujet"
+    likes_long: "il y a {{number}} J'aime dans ce sujet"
     users: "Utilisateurs"
     users_lowercase:
       one: "utilisateur"
@@ -1794,7 +1800,7 @@ fr:
         title_with_count:
           one: "1 non lu"
           other: " ({{count}}) non lus"
-        help: "sujets que vous suivez ou suivez attentivement actuiellement avec des messages non lus"
+        help: "sujets avec des messages non lus que vous suivez ou surveillez"
         lower_title_with_count:
           one: "1 non lu"
           other: "{{count}} non lus"
@@ -1824,7 +1830,7 @@ fr:
         title: "Top"
         help: "les meilleurs sujets de l'année, du mois, de la semaine ou du jour"
         all:
-          title: "depuis toujours"
+          title: "Depuis toujours"
         yearly:
           title: "Annuel"
         quarterly:
@@ -1886,7 +1892,7 @@ fr:
       actions:
         title: 'Actions'
         bookmark_topic: '<b>f</b> Modifier le signet du sujet'
-        pin_unpin_topic: '<b>MAJ.</b>+<b>p</b> Épingler/desépingler le sujet'
+        pin_unpin_topic: '<b>MAJ.</b>+<b>p</b> Épingler/désépingler le sujet'
         share_topic: '<b>MAJ.</b>+<b>s</b> Partager le sujet'
         share_post: '<b>s</b> Partager le message'
         reply_as_new_topic: '<b>t</b> Répondre en tant que sujet lié'
@@ -1924,7 +1930,7 @@ fr:
       none: "<none>"
       badge_grouping:
         getting_started:
-          name: Pour commencer
+          name: Initiation
         community:
           name: Communauté
         trust_level:
@@ -1932,7 +1938,7 @@ fr:
         other:
           name: Autre
         posting:
-          name: En train d'écrire un message
+          name: Contribution
     google_search: |
       <h3>Rechercher avec Google</h3>
       <p>
@@ -2061,7 +2067,7 @@ fr:
           yesterday: "Hier"
           last_7_days: "les 7 derniers jours"
           last_30_days: "les 30 derniers jours"
-          all_time: "depuis toujours"
+          all_time: "Depuis toujours"
           7_days_ago: "il y a 7 jours"
           30_days_ago: "il y a 30 jours"
           all: "Tous"
@@ -2598,7 +2604,7 @@ fr:
         private_topics_count: Messages privés
         posts_read_count: Messages lus
         post_count: Messages crées
-        topics_entered: Sujets consultés
+        topics_entered: Sujets vus
         flags_given_count: Signalements effectués
         flags_received_count: Signalements reçus
         warnings_received_count: Avertissements reçus
@@ -2667,7 +2673,7 @@ fr:
           requirement_heading: "Pré-requis"
           visits: "Visites"
           days: "jours"
-          topics_replied_to: "Sujets auquels l'utilisateur a répondu"
+          topics_replied_to: "Sujets auxquels l'utilisateur a répondu"
           topics_viewed: "Sujets vus"
           topics_viewed_all_time: "Sujets vus (depuis le début)"
           posts_read: "Messages lus"

config/locales/client.it.yml

@@ -1355,6 +1355,7 @@ it:
         edit: "Spiacenti, si è verificato un errore nel modificare il tuo messaggio. Prova di nuovo."
         upload: "Spiacenti, si è verificato un errore durante il caricamento del file. Prova di nuovo."
         too_many_uploads: "Spiacenti, puoi caricare un solo file per volta."
+        too_many_dragged_and_dropped_files: "Spiacenti, puoi caricare solo 10 file alla volta."
         upload_not_authorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare immagini."
         attachment_upload_not_allowed_for_new_user: "Spiacenti, i nuovi utenti non possono caricare allegati."

config/locales/client.ja.yml

@@ -929,11 +929,12 @@ ja:
       title: "トピック、投稿、ユーザ、カテゴリを探す"
       no_results: "何も見つかりませんでした。"
       no_more_results: "検索結果は以上です。"
-      search_help: 検索ヘルプ
+      search_help: 検索のヘルプ
       searching: "検索中..."
       post_format: "#{{post_number}}  {{username}}から"
       context:
         user: "@{{username}}の投稿を検索"
+        category: "#{{category}} から検索する"
         topic: "このトピックを探す"
         private_messages: "メッセージ検索"
     hamburger_menu: "他のトピック一覧やカテゴリを見る"
@@ -1581,6 +1582,8 @@ ja:
       full: "作成 / 返信 / 閲覧"
       create_post: "返信 / 閲覧"
       readonly: "閲覧できる"
+    search_help:
+      title: '検索のヘルプ'
     keyboard_shortcuts_help:
       title: 'ショートカットキー'
       jump_to:

config/locales/client.ko.yml

@@ -149,7 +149,7 @@ ko:
     faq: "FAQ"
     guidelines: "가이드라인"
     privacy_policy: "개인보호 정책"
-    privacy: "개인정보 취급방침"
+    privacy: "개인정보처리방침"
     terms_of_service: "서비스 이용약관"
     mobile_view: "모바일로 보기"
     desktop_view: "PC로 보기"
@@ -683,9 +683,9 @@ ko:
     read_only_mode:
       enabled: "이 사이트는 현재 읽기전용 모드입니다. 브라우징은 가능하지만, 댓글달기, 좋아요 등 다른 행위들은 현재 비활성화 되어있습니다."
       login_disabled: "사이트가 읽기 전용모드로 되면서 로그인은 비활성화되었습니다."
-    too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentTopics} / %{requiredTopics}</strong> 주제와 <strong>%{currentPosts} / %{requiredPosts}</strong> 글이 있습니다. 새 방문자는 읽고 응답할 대화꺼리가 좀 필요해요."
+    too_few_topics_and_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentTopics} / %{requiredTopics}</strong> 주제와 <strong>%{currentPosts} / %{requiredPosts}</strong> 글이 있습니다. 새 방문자에게는 읽고 응답할 대화거리가 필요합니다."
-    too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentTopics} / %{requiredTopics}</strong> 주제가 있습니다. 새 방문자는 읽고 응답할 대화꺼리가 좀 필요해요."
+    too_few_topics_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentTopics} / %{requiredTopics}</strong> 주제가 있습니다. 새 방문자에게는 읽고 응답할 대화거리가 필요합니다."
-    too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentPosts} / %{requiredPosts}</strong> 글이 있습니다. 새 방문자는 읽고 응답할 대화꺼리가 좀 필요해요."
+    too_few_posts_notice: "<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>토론을 시작하시죠!</a> 현재 <strong>%{currentPosts} / %{requiredPosts}</strong> 글이 있습니다. 새 방문자에게는 읽고 응답할 대화거리가 필요합니다."
     learn_more: "더 배우기"
     year: '년'
     year_desc: '지난 365일간 생성된 주제'
@@ -1399,7 +1399,7 @@ ko:
       edit: '편집'
       edit_long: "카테고리 편집"
       view: '카테고리 안의 주제 보기'
-      general: '장군'
+      general: '일반'
       settings: '설정'
       topic_template: "주제 템플릿"
       delete: '카테고리 삭제'
@@ -2186,7 +2186,7 @@ ko:
         anonymize_failed: "There was a problem anonymizing the account."
         delete: "사용자 삭제"
         delete_forbidden_because_staff: "관리자 및 운영자 계정은 삭제할 수 없습니다."
-        delete_posts_forbidden_because_staff: "어드민와 운영자들의 포스트는 삭제할 수 없습니다."
+        delete_posts_forbidden_because_staff: "관리자와 운영자의 글은 삭제할 수 없습니다."
         delete_forbidden:
           other: "사용자가 작성한 글이 있으면 사용자를 삭제 할 수 없습니다. 사용자를 삭제 하기 전에 사용자가 작성한 글을 모두 삭제해야 합니다. (%{count}일 이전에 작성한 글은 삭제할 수 없습니다.)"
         cant_delete_all_posts:

config/locales/client.nl.yml

@@ -788,8 +788,6 @@ nl:
     too_few_topics_notice: "Laten <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>we de discussie starten!</a> Er zijn al <strong>%{currentTopics} / %{requiredTopics}</strong> topics. Nieuwe bezoekers hebben conversaties nodig om te lezen en reageren."
     too_few_posts_notice: "Laten <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>we de discussie starten!</a>. Er zijn op dit moment <strong>%{currentPosts} / %{requiredPosts}</strong> berichten. Nieuwe bezoekers hebben conversaties nodig om te lezen en reageren."
     logs_error_rate_notice:
-      reached: "<b>[%{relativeAge}]</b> Huidige waarde van <a href='%{url}' target='_blank'>%{rate}</a> heeft de limiet van %{siteSettingRate} bereikt, zoals ingesteld in de site-instellingen."
-      exceeded: "<b>[%{relativeAge}]</b> Huidige waarde van <a href='%{url}' target='_blank'>%{rate}</a> heeft de limiet van %{siteSettingRate} overschreden, zoals ingesteld in de site-instellingen."
       rate:
         one: "1 fout/%{duration}"
         other: "%{count} fouten/%{duration}"
@@ -979,6 +977,9 @@ nl:
       modal_ok: "OK"
       modal_cancel: "Annuleer"
       cant_send_pm: "Sorry, je kan geen bericht sturen naar %{username}."
+      yourself_confirm:
+        title: "Ben je vergeten om ontvangers toe te voegen?"
+        body: "Het bericht wordt nu alleen naar jezelf verzonden!"
       admin_options_title: "Optionele stafinstellingen voor deze topic"
       auto_close:
         label: "Tijd waarna topic automatisch wordt gesloten:"
@@ -1062,6 +1063,7 @@ nl:
       most_liked: "Meest geliked"
       select_all: "Alles selecteren"
       clear_all: "Wis Alles"
+      too_short: "Je zoekterm is te kort."
       result_count:
         one: "1 resultaat voor <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} resultaat voor <span class='term'>\"{{term}}\"</span>"
@@ -1216,7 +1218,6 @@ nl:
         title: verander de frequentie van notificaties over deze topic
         reasons:
           mailing_list_mode: "De mailinglijstmodus staat ingeschakeld, dus zul je via e-mail notificaties ontvangen bij nieuwe antwoorden in deze topic."
-          '3_10': 'Je zal notificaties ontvangen omdat je een tag op deze topic in de gaten houdt.'
           '3_6': 'Je ontvangt notificaties omdat je deze categorie in de gaten houdt.'
           '3_5': 'Je ontvangt notificaties omdat je deze topic automatisch in de gaten houdt.'
           '3_2': 'Je ontvangt notificaties omdat je deze topic in de gaten houdt.'

config/locales/client.pl_PL.yml

@@ -28,6 +28,7 @@ pl_PL:
         millions: "{{number}}M"
     dates:
       time: "H:mm"
+      timeline_date: "MMM YYYY"
       long_no_year: "D MMM H:mm"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
@@ -39,6 +40,7 @@ pl_PL:
       long_date_with_year_without_time: "D MMM 'YY"
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
       long_date_with_year_with_linebreak: "D MMM 'YY <br/>LT"
+      wrap_ago: "%{date} temu"
       tiny:
         half_a_minute: "< 1m"
         less_than_x_seconds:
@@ -132,7 +134,9 @@ pl_PL:
     action_codes:
       split_topic: "podziel ten temat %{when}"
       invited_user: "%{who} został zaproszony %{when}"
+      invited_group: "%{who} został zaproszony %{when}"
       removed_user: "%{who} został usunięty %{when}"
+      removed_group: "%{who} został usunięty %{when}"
       autoclosed:
         enabled: 'zamknięcie %{when}'
         disabled: 'otworzenie %{when}'
@@ -153,19 +157,22 @@ pl_PL:
         disabled: 'odlistowanie %{when}'
     topic_admin_menu: "akcje administratora"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
+    bootstrap_mode_disabled: "Tryb Bootstrap zostanie wyłączony w ciągu najbliższych 24 godzin."
     s3:
       regions:
         us_east_1: "US East (N. Virginia)"
         us_west_1: "US West (N. California)"
         us_west_2: "US West (Oregon)"
         us_gov_west_1: "AWS GovCloud (US)"
-        eu_west_1: "EU (Ireland)"
+        eu_west_1: "EU (Irlandia)"
         eu_central_1: "EU (Frankfurt)"
         ap_southeast_1: "Asia Pacific (Singapore)"
         ap_southeast_2: "Asia Pacific (Sydney)"
+        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
-        sa_east_1: "South America (Sao Paulo)"
+        sa_east_1: "Ameryka Południowa (Sao Paulo)"
+        cn_north_1: "Chiny (Beijing)"
     edit: 'edytuj tytuł i kategorię tego tematu'
     not_implemented: "Bardzo nam przykro, ale ta funkcja nie została jeszcze zaimplementowana."
     no_value: "Nie"
@@ -269,7 +276,10 @@ pl_PL:
     enable: "Włącz"
     disable: "Wyłącz"
     undo: "Cofnij"
+    revert: "Przywróć"
     failed: "Niepowodzenie"
+    switch_to_anon: "Włącz tryb anonimowy"
+    switch_from_anon: "Zakończ tryb anonimowy"
     banner:
       close: "Zamknij ten baner."
       edit: "Edytuj ten baner >>"
@@ -321,6 +331,8 @@ pl_PL:
       title: "Użytkownicy"
       likes_given: "Oddane"
       likes_received: "Otrzymane"
+      topics_entered: "Odsłony"
+      topics_entered_long: "Wyświetlone Tematy"
       time_read: "Czas"
       topic_count: "Tematy"
       topic_count_long: "Utworzone tematy"
@@ -339,11 +351,14 @@ pl_PL:
       empty:
         posts: "Członkowie tej grupy nie opublikowali żadnych postów."
         members: "W tej grupie nie ma żadnych członków."
+        mentions: "Nie ma wzmianki w tej grupie."
+        messages: "Nie ma żadnej wiadomości dla tej grupy."
         topics: "Członkowie tej grupy nie opublikowali żadnych postów."
       add: "Dodaj"
       selector_placeholder: "Dodaj członków"
       owner: "właściciel"
       visible: "Grupa jest widoczna dla wszystkich użytkowników"
+      index: "Grupy"
       title:
         one: "grupa"
         few: "grupy"
@@ -366,6 +381,10 @@ pl_PL:
       notifications:
         watching:
           title: "Obserwowanie"
+          description: "Dostaniesz powiadomienie o każdym nowym wpisie w każdej dyskusji, zobaczysz również ilość odpowiedzi."
+        watching_first_post:
+          title: "Oglądasz pierwszy post"
+          description: "Zostaniesz powiadomiony tylko o pierwszym wpisie w każdym nowym temacie w tej grupie."
         tracking:
           title: "Śledzenie"
           description: "Dostaniesz powiadomienie, gdy ktoś ci odpowie lub wspomni twoją @nazwę, zobaczysz również liczbę odpowiedzi."
@@ -458,9 +477,11 @@ pl_PL:
         not_supported: "Powiadomienia nie są wspierane przez tę przeglądarkę. Przepraszamy."
         perm_default: "Włącz powiadomienia"
         perm_denied_btn: "Brak uprawnień"
+        perm_denied_expl: "Odmówiłeś dostępu dla powiadomień. Pozwól na powiadomienia w ustawieniach przeglądarki."
         disable: "Wyłącz powiadomienia"
         enable: "Włącz powiadomienia"
         each_browser_note: "Uwaga: to ustawienie musisz zmienić w każdej przeglądarce której używasz."
+      dismiss_notifications: "Odrzuć wszystkie"
       dismiss_notifications_tooltip: "Oznacz wszystkie powiadomienia jako przeczytane"
       disable_jump_reply: "Po odpowiedzi nie przechodź do nowego wpisu"
       dynamic_favicon: "Pokazuj licznik powiadomień na karcie jako dynamiczny favicon"
@@ -475,8 +496,23 @@ pl_PL:
       suspended_notice: "ten użytkownik jest zawieszony do {{date}}."
       suspended_reason: "Powód: "
       github_profile: "Github"
+      email_activity_summary: "Podsumowanie aktywności"
+      mailing_list_mode:
+        label: "Tryb listy mailingowej"
+        enabled: "Włącz tryb listy mailingowej"
+        daily: "Wyślij codzienne aktualizacje"
+        individual: "Wyślij e-mail dla każdego nowego postu"
+        many_per_day: "Wyślij mi e-mail dla każdego nowego posta (około {{dailyEmailEstimate}} na dzień)"
+        few_per_day: "Wyślij mi e-mail dla każdego nowego posta (około 2 dziennie)"
+      tag_settings: "Tagi"
+      watched_tags: "Obserwowane"
+      tracked_tags: "Śledzone"
+      muted_tags: "Wyciszone"
       watched_categories: "Obserwowane"
       tracked_categories: "Śledzone"
+      watched_first_post_categories: "Oglądasz pierwszy post"
+      watched_first_post_tags: "Oglądasz pierwszy post"
+      watched_first_post_tags_instructions: "Zostaniesz powiadomiony tylko o pierwszym wpisie w każdym nowym temacie oznaczonym tymi tagami."
       muted_categories: "Wyciszone"
       muted_categories_instructions: "Nie będziesz powiadamiany o nowych tematach w tych kategoriach. Nie pojawią się na liście nieprzeczytanych."
       delete_account: "Usuń moje konto"
@@ -489,6 +525,8 @@ pl_PL:
       muted_users: "Uciszeni"
       muted_users_instructions: "Wstrzymaj powiadomienia od tych użytkowników."
       muted_topics_link: "Pokaż wyciszone tematy"
+      watched_topics_link: "Pokaż obserwowane tematy"
+      automatically_unpin_topics: "Automatycznie odpinaj tematy kiedy dotrę do końca strony."
       staff_counters:
         flags_given: "uczynnych oflagowań"
         flagged_posts: "oflagowane wpisy"
@@ -514,6 +552,7 @@ pl_PL:
         set_password: "Ustaw hasło"
       change_about:
         title: "Zmień O mnie"
+        error: "Wystąpił błąd podczas zmiany tej wartości."
       change_username:
         title: "Zmień nazwę użytkownika"
         taken: "Przykro nam, ale ta nazwa jest zajęta."
@@ -595,6 +634,7 @@ pl_PL:
         first_time: "Pierwszy lajk"
         never: "Nigdy"
       email_previous_replies:
+        unless_emailed: "chyba wcześniej wysłany"
         always: "zawsze"
         never: "nigdy"
       email_digests:
@@ -651,7 +691,9 @@ pl_PL:
         rescind: "Usuń"
         rescinded: "Zaproszenie usunięte"
         reinvite: "Ponów zaproszenie"
+        reinvite_all: "Wyślij ponownie wszystkie zaproszenia"
         reinvited: "Ponowne wysłanie zaproszenia"
+        reinvited_all: "Wszystkie zaproszenia zostały ponownie wysłane!"
         time_read: "Czas odczytu"
         days_visited: "Dni odwiedzin"
         account_age_days: "Wiek konta w dniach"
@@ -675,14 +717,41 @@ pl_PL:
       summary:
         title: "Podsumowanie"
         stats: "Statystyki"
+        time_read: "czas odczytu"
+        topic_count:
+          one: "utworzono temat"
+          few: "utworzono tematów"
+          other: "utworzono tematy"
+        post_count:
+          one: "utworzono post"
+          few: "utworzonych postów"
+          other: "utworzono posty"
+        days_visited:
+          one: "dzień odwiedzin"
+          few: "dni odwiedzin"
+          other: "dni odwiedzin"
+        posts_read:
+          one: "przeczytany post"
+          few: "przeczytanych postów"
+          other: "przeczytane posty"
+        bookmark_count:
+          one: "zakładka"
+          few: "zakładki"
+          other: "zakładki"
         top_replies: "Najlepsze odpowiedzi"
+        no_replies: "Póki co brak odpowiedzi."
         more_replies: "Więcej odpowiedzi"
         top_topics: "Najlepsze tematy"
+        no_topics: "Póki co brak tematów."
         more_topics: "Więcej tematów"
         top_badges: "Najlepsze odznaki"
+        no_badges: "Póki co brak odznak."
         more_badges: "Więcej odznak"
+        top_links: "Najlepsze linki"
+        no_links: "Póki co brak linków."
         most_liked_by: "Najbardziej lajkowane przez"
         most_liked_users: "Najbardziej lajkowane"
+        most_replied_to_users: "Najwięcej odpowiedzi do"
         no_likes: "Brak lajków."
       associated_accounts: "Powiązane konta"
       ip_address:
@@ -728,6 +797,7 @@ pl_PL:
     read_only_mode:
       enabled: "Strona jest w trybie tylko-do-odczytu. Możesz nadal przeglądać serwis, ale operacje takie jak postowanie, lajkowanie i inne są wyłączone."
       login_disabled: "Logowanie jest zablokowane, gdy strona jest w trybie tylko do odczytu."
+      logout_disabled: "Wylogowanie jest zablokowane gdy strona jest w trybie tylko do odczytu."
     too_few_topics_and_posts_notice: "Pora <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>rozruszać dyskusję!</a> Aktualnie istnieje <strong>%{currentTopics} / %{requiredTopics}</strong> tematów i <strong>%{currentPosts} / %{requiredPosts}</strong> wpisów. Odwiedzający potrzebują więcej tematów i konwersacji do czytania i pisania na ich temat."
     too_few_topics_notice: "Pora <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>rozruszać dyskusję!</a> Aktualnie istnieje <strong>%{currentTopics} / %{requiredTopics}</strong> tematów. Odwiedzający potrzebują więcej tematów i konwersacji do czytania i pisania na ich temat."
     too_few_posts_notice: "Pora <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>rozruszać dyskusję!</a> Aktualnie istnieje <strong>%{currentPosts} / %{requiredPosts}</strong> wpisów. Odwiedzający potrzebują więcej tematów i konwersacji do czytania i pisania na ich temat."
@@ -769,6 +839,7 @@ pl_PL:
       title: "Wiadomość"
       invite: "Zaproś innych"
       remove_allowed_user: "Czy naprawdę chcesz usunąć {{name}} z tej dyskusji?"
+      remove_allowed_group: "Czy naprawdę chcesz usunąć {{name}} z tej wiadomości?"
     email: 'Email'
     username: 'Nazwa konta'
     last_seen: 'Ostatnio oglądane'
@@ -823,6 +894,8 @@ pl_PL:
       twitter:
         title: "przez Twitter"
         message: "Uwierzytelnianie przy pomocy konta na Twitterze (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
+      instagram:
+        message: "Uwierzytelnianie przy pomocy konta na Instagramie (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
       facebook:
         title: "przez Facebook"
         message: "Uwierzytelnianie przy pomocy konta Facebook (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
@@ -832,11 +905,18 @@ pl_PL:
       github:
         title: "przez GitHub"
         message: "Uwierzytelnianie przez GitHub (upewnij się, że blokada wyskakujących okienek nie jest włączona)"
+    emoji_set:
+      apple_international: "Apple/Międzynarodowy"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
       alt: 'Alt'
     composer:
+      emoji: "Emoji :)"
       more_emoji: "więcej…"
       options: "Opcje"
       whisper: "szept"
@@ -885,10 +965,12 @@ pl_PL:
       link_description: "wprowadź tutaj opis odnośnika"
       link_dialog_title: "Wstaw odnośnik"
       link_optional_text: "opcjonalny tytuł"
+      link_url_placeholder: "http://example.com"
       quote_title: "Cytat"
       quote_text: "Cytat"
       code_title: "Tekst sformatowany"
       code_text: "Sformatowany blok tekstu poprzedź 4 spacjami"
+      paste_code_text: "wpisz lub wklej tutaj kod"
       upload_title: "Dodaj"
       upload_description: "wprowadź opis tutaj"
       olist_title: "Lista numerowana"
@@ -902,6 +984,8 @@ pl_PL:
       modal_ok: "OK"
       modal_cancel: "Anuluj"
       cant_send_pm: "Przepraszamy, niestety nie możesz wysłać prywatnej wiadomości do %{username}."
+      yourself_confirm:
+        title: "Nie zapomniałeś dodać odbiorców?"
       admin_options_title: "Opcjonalne ustawienia obsługi dla tego tematu"
       auto_close:
         label: "Automatycznie zamykaj tematy po:"
@@ -915,6 +999,7 @@ pl_PL:
     notifications:
       title: "powiadomienia o wywołanej @nazwie, odpowiedzi do twoich wpisów i tematów, prywatne wiadomości, itp"
       none: "Nie udało się załadować listy powiadomień."
+      empty: "Nie znaleziono powiadomień."
       more: "pokaż starsze powiadomienia"
       total_flagged: "wszystkie oflagowane wpisy"
       mentioned: "<i title='wspomniano' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -952,6 +1037,7 @@ pl_PL:
         moved_post: "Twój wpis został przeniesiony przez"
         linked: "Linkownie do twojego wpisu"
         granted_badge: "Przyznanie odznaki"
+        group_message_summary: "Wiadomości w grupowej skrzynce odbiorczej"
       popup:
         mentioned: '{{username}} wspomina o tobie w "{{topic}}" - {{site_title}}'
         group_mentioned: '{{username}} wspomniał o Tobie w "{{topic}}" - {{site_title}}'
@@ -982,6 +1068,7 @@ pl_PL:
       most_liked: "Najbardziej lajkowane"
       select_all: "Zaznacz wszystkie"
       clear_all: "Wyczyść wszystkie"
+      too_short: "Wyszukiwane określenie jest zbyt krótkie."
       result_count:
         one: "1 wynik dla <span class='term'>\"{{term}}\"</span>"
         few: "{{count}} wyniki dla <span class='term'>\"{{term}}\"</span>"
@@ -994,6 +1081,7 @@ pl_PL:
       post_format: "#{{post_number}} za {{username}}"
       context:
         user: "Szukaj wpisów @{{username}}"
+        category: "Szukaj w kategorii #{{category}}"
         topic: "Szukaj w tym temacie"
         private_messages: "Wyszukiwanie wiadomości"
     hamburger_menu: "przejdź do innej listy lub kategorii"
@@ -1023,6 +1111,9 @@ pl_PL:
           one: "Zaznaczono <b>1</b> temat."
           few: "Zaznaczono <b>{{count}}</b> tematy."
           other: "Zaznaczono <b>{{count}}</b> tematów."
+        change_tags: "Zmień tagi"
+        choose_new_tags: "Wybierz nowe tagi dla tych tematów:"
+        changed_tags: "Tagi tych tematów były zmieniane."
       none:
         unread: "Nie masz nieprzeczytanych tematów."
         new: "Nie masz nowych tematów."
@@ -1117,12 +1208,18 @@ pl_PL:
       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
         go_top: "początek"
         go_bottom: "koniec"
         go: "idź"
         jump_bottom: "Przejdź na koniec"
+        jump_prompt: "przejdź do postu"
         jump_bottom_with_number: "przeskocz do wpisu %{post_number}"
         total: w sumie wpisów
         current: obecny wpis
@@ -1181,6 +1278,8 @@ pl_PL:
         invisible: "Ustaw jako niewidoczny"
         visible: "Ustaw jako widoczny"
         reset_read: "Zresetuj przeczytane dane"
+        make_public: "Upublicznij temat"
+        make_private: "Utwórz prywatną wiadomość"
       feature:
         pin: "Przypnij temat"
         unpin: "Odepnij temat"
@@ -1229,6 +1328,7 @@ pl_PL:
         no_banner_exists: "Baner nie jest obecnie ustawiony."
         banner_exists: "Baner <strong class='badge badge-notification unread'>jest</strong> obecnie ustawiony."
       inviting: "Zapraszam…"
+      automatically_add_to_groups: "To zaproszenie obejmuje również dostęp do tych grup:"
       invite_private:
         title: 'Zaproś do dyskusji'
         email_or_username: "Adres email lub nazwa użytkownika zapraszanej osoby"
@@ -1276,6 +1376,9 @@ pl_PL:
           one: "Wybierz temat, do którego chcesz przenieś ten wpis."
           few: "Wybierz temat, do którego chcesz przenieść wybrane <b>{{count}}</b> wpisy."
           other: "Wybierz temat, do którego chcesz przenieść <b>{{count}}</b> wybranych wpisów."
+      merge_posts:
+        title: "Scal wybrane posty"
+        action: "scal wybrane posty"
       change_owner:
         title: "Zmień właściciela wpisów"
         action: "zmień właściciela"
@@ -1351,6 +1454,7 @@ pl_PL:
         edit: "Przepraszamy, podczas edytowania twojego wpisu wystąpił błąd. Spróbuj ponownie."
         upload: "Przepraszamy, wystąpił błąd podczas wczytywania Twojego pliku. Proszę, spróbuj ponownie."
         too_many_uploads: "Przepraszamy, ale możesz wgrać tylko jeden plik naraz."
+        too_many_dragged_and_dropped_files: "Przepraszamy, ale możesz wgrać tylko 10 plików naraz."
         upload_not_authorized: "Przepraszamy, ale plik który chcesz wgrać jest niedozwolony (dozwolone rozszerzenia: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Przepraszamy, ale nowi użytkownicy nie mogą wgrywać obrazów."
         attachment_upload_not_allowed_for_new_user: "Przepraszamy, ale nowi użytkownicy nie mogą wgrywać załączników."
@@ -1360,7 +1464,10 @@ pl_PL:
         no_value: "Nie, pozostaw"
         yes_value: "Tak, porzuć"
       via_email: "ten wpis został dodany emailem"
+      via_auto_generated_email: "ten post został dodany poprzez automatycznie wygenerowaną wiadomość e-mail"
       whisper: "ten wpis jest prywatnym szeptem do moderatorów"
+      wiki:
+        about: "ten post jest Wiki"
       archetypes:
         save: 'Opcje zapisu'
       controls:
@@ -1508,6 +1615,7 @@ pl_PL:
           last: "Ostatnia wersja"
           hide: "Ukryj tę wersję"
           show: "Pokaż tę wersję"
+          revert: "Przywróć do tej wersji"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
@@ -1530,6 +1638,9 @@ pl_PL:
       general: 'Ogólne'
       settings: 'Ustawienia'
       topic_template: "Szablon tematu"
+      tags: "Tagi"
+      tags_placeholder: "(Opcjonalnie) lista dozwolonych tagów"
+      tag_groups_placeholder: "(Opcjonalnie) lista dozwolonych grup tagów"
       delete: 'Usuń kategorię'
       create: 'Nowa kategoria'
       create_long: 'Utwórz nową kategorię'
@@ -1576,6 +1687,8 @@ pl_PL:
       notifications:
         watching:
           title: "Obserwuj wszystko"
+        watching_first_post:
+          title: "Oglądasz pierwszy post"
         tracking:
           title: "Śledzona"
         regular:
@@ -1589,6 +1702,7 @@ pl_PL:
       action: 'Oflaguj wpis'
       take_action: "Podejmij działanie"
       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"
@@ -1615,6 +1729,7 @@ pl_PL:
       title: "Podsumowanie tematu"
       participants_title: "Najczęściej piszą"
       links_title: "Popularne linki"
+      links_shown: "pokaż więcej linków..."
       clicks:
         one: "1 kliknięcie"
         few: "%{count} kliknięć"
@@ -1757,9 +1872,141 @@ pl_PL:
       full: "tworzyć / odpowiadać / przeglądać"
       create_post: "odpowiadać / przeglądać"
       readonly: "przeglądać"
+    lightbox:
+      download: "pobierz"
     keyboard_shortcuts_help:
+      title: 'Skróty klawiszowe'
+      jump_to:
+        title: 'Skocz do'
+        home: '<b>g</b>, <b>h</b> Strona główna'
+        latest: '<b>g</b>, <b>l</b> Najnowsze'
+        new: '<b>g</b>, <b>n</b> Nowe'
+        unread: '<b>g</b>, <b>u</b> Nieprzeczytane'
+        categories: '<b>g</b>, <b>c</b> Kategorie'
+        bookmarks: '<b>g</b>, <b>b</b> Zakładki'
+        profile: '<b>g</b>, <b>p</b> Profil'
+        messages: '<b>g</b>, <b>m</b> Wiadomości'
+      navigation:
+        title: 'Nawigacja'
+        jump: '<b>#</b> idź do postu #'
+        back: '<b>u</b> wstecz'
+        up_down: '<b>k</b>/<b>j</b> Przesuń zaznaczenie &uarr; &darr;'
+      application:
+        title: 'Aplikacja'
+        create: '<b>c</b> utwórz nowy temat'
+        notifications: '<b>n</b> otwarte powiadomienia'
+        hamburger_menu: '<b>=</b> Otwórz menu'
+        user_profile_menu: '<b>p</b> Otwórz menu użytkownika'
+        show_incoming_updated_topics: '<b>.</b> Pokaż zaktualizowane tematy'
+        search: '<b>/</b> Wyszukaj'
+        dismiss_topics: '<b>x</b>, <b>t</b> wyczyść listę tematów'
       actions:
+        title: 'Akcje'
+        bookmark_topic: '<b>f</b> dodaj/usuń zakładkę na temat'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> przypnij/odepnij temat'
+        share_post: '<b>s</b> Udostępnij post'
+        reply_topic: '<b>shift</b>+<b>r</b> Odpowiedz w temacie'
+        reply_post: '<b>r</b> Odpowiedz na post'
         like: '<b>l</b> Lajkuj post'
+        flag: '<b>!</b> Oznacz post'
+        edit: '<b>e</b> Edytuj post'
+        delete: '<b>d</b> Usuń post'
+        mark_tracking: '<b>m</b>, <b>t</b> śledź temat'
+    badges:
+      earned_n_times:
+        one: "Otrzymano tą odznakę 1 raz"
+        few: "Otrzymano tą odznakę %{count} razy"
+        other: "Otrzymano tą odznakę %{count} razy"
+      granted_on: "Przyznano %{date}"
+      others_count: "Inni użytkownicy z tą odznaką (%{count})"
+      title: Odznaki
+      allow_title: "dostępny tytuł"
+      multiple_grant: "przyznana wielokrotnie"
+      more_badges:
+        one: "+1 więcej"
+        few: "+%{count} więcej"
+        other: "+%{count} więcej"
+      granted:
+        one: "1 przyznany"
+        few: "%{count} przyznanych"
+        other: "%{count} przyznanych"
+      select_badge_for_title: Wybierz odznakę do użycia jako twój tytuł
+      none: "<brak>"
+      badge_grouping:
+        getting_started:
+          name: Pierwsze kroki
+        community:
+          name: Społeczność
+        trust_level:
+          name: Poziom Zaufania
+        other:
+          name: Inne
+        posting:
+          name: Pisanie
+    tagging:
+      all_tags: "Wszystkie tagi"
+      selector_all_tags: "wszystkie tagi"
+      selector_no_tags: "brak tagów"
+      changed: "zmienione tagi:"
+      tags: "Tagi"
+      choose_for_topic: "Wybierz opcjonalne tagi dla tych tematów:"
+      delete_tag: "Usuń Tag"
+      delete_confirm: "Czy na pewno chcesz usunąć ten tag?"
+      rename_tag: "Zmień nazwę taga"
+      rename_instructions: "Wybierz nową nazwę dla tego taga:"
+      sort_by: "Sortuj po:"
+      sort_by_name: "nazwa"
+      manage_groups: "Zarządzaj grupą tagów"
+      manage_groups_description: "Definiowanie grup do organizowania tagów"
+      filters:
+        without_category: "%{filter} %{tag} tematy"
+        with_category: "%{filter} %{tag} tematy w %{category}"
+        untagged_without_category: "%{filter} nieoznaczone tematy"
+        untagged_with_category: "%{filter} nieoznaczone tematy w %{category}"
+      notifications:
+        watching:
+          title: "Obserwowane"
+        watching_first_post:
+          title: "Oglądasz pierwszy post"
+        tracking:
+          title: "Śledzenie"
+        regular:
+          title: "Normalny"
+        muted:
+          title: "Wyciszony"
+      groups:
+        title: "Tagi grup"
+        about: "Dodaj etykiety do grup aby zarządzać nimi łatwiej."
+        new: "Nowa Grupa"
+        tags_label: "Tagi w tej grupie:"
+        parent_tag_label: "Nadrzędny tag:"
+        parent_tag_placeholder: "Opcjonalnie"
+        new_name: "Nowa grupa tagów"
+        save: "Zapisz"
+        delete: "Usuń"
+      topics:
+        none:
+          unread: "Nie masz nieprzeczytanych tematów."
+          new: "Nie masz nowych tematów."
+          read: "Nie przeczytałeś jeszcze żadnych tematów."
+          posted: "Jeszcze nie zamieściłeś postów w żadnym z tematów."
+          latest: "Brak najnowszych tematów."
+          hot: "Brak gorących tematów."
+          bookmarks: "Nie posiadasz tematów dodanych do zakładek."
+          top: "Brak najlepszych tematów."
+          search: "Brak wyników wyszukiwania."
+        bottom:
+          latest: "Nie ma więcej najnowszych tematów."
+          hot: "Nie ma więcej gorących tematów."
+          posted: "Nie ma więcej tematów, w których pisałeś."
+          read: "Nie ma więcej przeczytanych tematów."
+          new: "Nie ma więcej nowych tematów."
+          unread: "Nie ma więcej nieprzeczytanych tematów."
+          top: "Nie ma już więcej najlepszych tematów."
+          search: "Nie znaleziono więcej wyników wyszukiwania."
+    invite:
+      custom_message_link: "niestandardowa wiadomość"
+      custom_message_placeholder: "Wpisz swoją niestandardową wiadomość"
   admin_js:
     type_to_filter: "pisz, aby filtrować…"
     admin:
@@ -1810,6 +2057,7 @@ pl_PL:
           refresh_report: "Odśwież raport"
           start_date: "Data początkowa"
           end_date: "Data końcowa"
+          groups: "Wszystkie grupy"
       commits:
         latest_changes: "Ostatnie zmiany: aktualizuj często!"
         by: "przez"
@@ -1945,6 +2193,14 @@ pl_PL:
           backups: "Kopie zapasowe"
           logs: "Logi"
         none: "Brak kopii zapasowych."
+        read_only:
+          enable:
+            title: "Włącz tryb tylko do odczytu"
+            label: "Włącz tylko do odczytu"
+            confirm: "Czy na pewno chcesz włączyć tryb tylko do odczytu?"
+          disable:
+            title: "Wyłącz tryb tylko do odczytu"
+            label: "Wyłącz tylko do odczytu"
         logs:
           none: "Póki co brak logów…"
         columns:
@@ -1978,6 +2234,7 @@ pl_PL:
             is_disabled: "Przywracanie jest zablokowane w ustawieniach."
             label: "Przywróć"
             title: "Przywróć kopię zapasową"
+            confirm: "Czy na pewno chcesz przywrócić tą kopię zapasową?"
           rollback:
             label: "Wycofaj"
             title: "Wycofaj bazę danych do poprzedniego poprawnego stanu"
@@ -2051,6 +2308,7 @@ pl_PL:
           delete_confirm: "Usunąć ten schemat kolorów?"
           undo: "cofnij"
           undo_title: "Cofnij zmiany tego koloru od ostatniego zapisu"
+          revert: "przywróć"
           revert_title: "Zresetuj  ten kolor do wartości domyślnej."
           primary:
             name: 'podstawowy'
@@ -2077,18 +2335,21 @@ pl_PL:
             name: 'niebezpieczeństwo'
             description: 'Kolor podświetlenia dla akcji takich jak usuwanie wpisów i tematów.'
           success:
+            name: 'sukces'
             description: 'Używany do oznaczania operacji zakończonych sukcesem.'
           love:
             name: 'polubienie'
             description: "Kolor przycisku lajkuj"
       email:
         settings: "Ustawienia"
+        templates: "Szablony"
         preview_digest: "Pokaż zestawienie aktywności"
         sending_test: "Wysyłanie testowego emaila…"
         error: "<b>BŁAD</b> - %{server_error}"
         test_error: "Wystąpił problem podczas wysyłania testowego maila. Sprawdź ustawienia poczty, sprawdź czy Twój serwer nie blokuje połączeń pocztowych i spróbuj ponownie."
         sent: "Wysłane"
         skipped: "Pominięte"
+        bounced: "Odbite"
         received: "Otrzymane"
         rejected: "Odrzucone"
         sent_at: "Wysłany na"
@@ -2114,13 +2375,16 @@ pl_PL:
           subject: "Temat"
           error: "Błąd"
           modal:
+            title: "Szczegóły przychodzącego emaila"
             error: "Błąd"
+            headers: "Nagłówki"
             subject: "Temat"
             body: "Treść"
           filters:
             from_placeholder: "from@example.com"
             to_placeholder: "to@example.com"
             cc_placeholder: "cc@example.com"
+            subject_placeholder: "Temat..."
             error_placeholder: "Błąd"
         logs:
           none: "Nie znaleziono logów."
@@ -2171,6 +2435,7 @@ pl_PL:
             change_site_setting: "zmiana ustawień serwisu"
             change_site_customization: "modyfikacja personalizacji serwisu"
             delete_site_customization: "usunięcie personalizacji strony"
+            change_site_text: "zmiana tekstu serwisu"
             suspend_user: "zawieszenie użytkownika"
             unsuspend_user: "odwieszenie użytkownika"
             grant_badge: "przyznanie odznaki"
@@ -2186,6 +2451,8 @@ pl_PL:
             create_category: "Dodaj nową kategorię"
             block_user: "zablokuj użytkownika"
             unblock_user: "odblokuj użytkownika"
+            backup_operation: "operacja tworzenia kopii zapasowej"
+            deleted_tag: "usunięty tag"
         screened_emails:
           title: "Ekranowane emaile"
           description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana."
@@ -2359,6 +2626,8 @@ pl_PL:
         unblock_failed: 'Wystąpił problem podczaj odblokowania użytkownika.'
         block_failed: 'Wystąpił problem podczas blokowania użytkownika.'
         block_accept: 'Tak, zablokuj tego użytkownika'
+        reset_bounce_score:
+          label: "Przywróć"
         deactivate_explanation: "Wymusza ponowne potwierdzenie adresu email tego konta."
         suspended_explanation: "Zawieszony użytkownik nie może się logować."
         block_explanation: "Zablokowany użytkownik nie może tworzyć wpisów ani zaczynać tematów."
@@ -2428,6 +2697,9 @@ pl_PL:
           title: "Widoczne w publicznym profilu?"
           enabled: "widoczne w profilu"
           disabled: "niewidoczne w profilu"
+        show_on_user_card:
+          title: "Pokaż na karcie użytkownika?"
+          enabled: "pokazany na karcie użytkownika"
         field_types:
           text: 'Pole tekstowe'
           confirm: 'Potwierdzenie'
@@ -2473,6 +2745,7 @@ pl_PL:
           login: "Logowanie"
           plugins: "Wtyczki"
           user_preferences: "Ustawienia użytk."
+          tags: "Tagi"
       badges:
         title: Odznaki
         new_badge: Nowa odznaka
@@ -2481,6 +2754,7 @@ pl_PL:
         badge: Odznaka
         display_name: Wyświetlana nazwa
         description: Opis
+        long_description: Długi opis
         badge_type: Typ odznaki
         badge_grouping: Grupa
         badge_groupings:
@@ -2567,6 +2841,7 @@ pl_PL:
         embed_truncate: "Skracaj treść osadzanych wpisów"
         embed_whitelist_selector: "Selektor CSS elementów jakie mogą być osadzane"
         embed_blacklist_selector: "Selektor CSS elementów jakie są usuwane podczas osadzania"
+        embed_classname_whitelist: "Dozwolone nazwy klas CSS"
         feed_polling_enabled: "Importowanie wpisów via RSS/ATOM"
         feed_polling_url: "URL kanału RSS/ATOM"
         save: "Zapisz"

config/locales/client.pt.yml

@@ -152,6 +152,7 @@ pt:
         eu_central_1: "U.E. (Francoforte)"
         ap_southeast_1: "Ásia-Pacífico (Singapura)"
         ap_southeast_2: "Ásia-Pacífico (Sydney)"
+        ap_south_1: "Ásia Pacifico (Bombaim)"
         ap_northeast_1: "Ásia-Pacífico (Tóquio)"
         ap_northeast_2: "Ásia-Pacífico (Seoul)"
         sa_east_1: "América do Sul (São Paulo)"
@@ -356,6 +357,9 @@ pt:
         watching:
           title: "A vigiar"
           description: "Será notificado de cada nova publicação em todas as mensagens, e uma contagem de novas respostas será exibida."
+        watching_first_post:
+          title: "A vigiar a primeira entrada"
+          description: "Será apenas notificado acerca da primeira entrada em cada tópico deste grupo."
         tracking:
           title: "A Acompanhar"
           description: "Será notificado se alguém mencionar o seu @nome ou lhe responder, e uma contagem de novas respostas será exibida."
@@ -450,6 +454,7 @@ pt:
         disable: "Desativar Notificações"
         enable: "Ativar Notificações"
         each_browser_note: "Nota: Tem que alterar esta configuração em todos os navegadores de internet que utiliza."
+      dismiss_notifications: "Dispensar tudo"
       dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler"
       disable_jump_reply: "Não voltar para a minha mensagem após ter respondido"
       dynamic_favicon: "Mostrar contagem de tópicos novos / atualizados no ícone do browser."
@@ -464,10 +469,22 @@ pt:
       suspended_notice: "Este utilizador está suspenso até {{date}}."
       suspended_reason: "Motivo: "
       github_profile: "Github"
+      email_activity_summary: "Sumário de actividade"
+      mailing_list_mode:
+        label: "Modo de lista de distribuição"
+        enabled: "Ativar modo de lista de distribuição"
+        instructions: |
+          Esta configuração sobrepõe o sumário de actividade.<br />
+          Tópicos e categorias mudos não são incluídos nestes correios electrónicos.
+        daily: "Enviar actualizações diárias"
+        individual: "Enviar um correio electrónico por cada nova mensage"
       tag_settings: "Etiquetas"
+      watched_tags: "Visto"
+      tracked_tags: "Vigiado"
       muted_tags: "Silenciado"
       watched_categories: "Vigiado"
       tracked_categories: "Acompanhado"
+      watched_first_post_categories: "A ver a primeira mensage"
       muted_categories: "Silenciado"
       muted_categories_instructions: "Não será notificado de nada acerca de novos tópicos nestas categorias, e estes não irão aparecer nos recentes."
       delete_account: "Eliminar A Minha Conta"

config/locales/client.pt_BR.yml

@@ -9,7 +9,7 @@ pt_BR:
   js:
     number:
       format:
-        separator: "."
+        separator: ","
         delimiter: ","
       human:
         storage_units:
@@ -106,7 +106,7 @@ pt_BR:
       next_month: 'Próximo Mês'
     share:
       topic: 'compartilhe o link desse tópico'
-      post: 'post #%{postNumber}'
+      post: 'mensagem #%{postNumber}'
       close: 'fechar'
       twitter: 'compartilhe este link no Twitter'
       facebook: 'compartilhe este link no Facebook'
@@ -140,6 +140,8 @@ pt_BR:
         disabled: 'desalistou %{when}'
     topic_admin_menu: "ações administrativas do tópico"
     emails_are_disabled: "Todo o envio de email foi globalmente desabilitado por algum administrador. Nenhum email de notificações de qualquer tipo será enviado."
+    bootstrap_mode_enabled: "Para fazer o lançamento do seu novo site mais fácil, você está no modo de inicialização. A todos os novos usuários será concedido nível de confiança 1 e terão o resumo diário das atualizações ativado. Isso será automaticamente desativado quando a contagem total de usuários exceder %{min_users} usuários."
+    bootstrap_mode_disabled: "O modo de inicialização será desativado nas próximas 24 horas."
     s3:
       regions:
         us_east_1: "Leste dos EUA (N. da Virgínia)"
@@ -150,9 +152,11 @@ pt_BR:
         eu_central_1: "EU (Frankfurt)"
         ap_southeast_1: "Ásia Pacífico (Singapura)"
         ap_southeast_2: "Ásia Pacífico (Sidney)"
+        ap_south_1: "Ásia-Pacífico (Mumbai)"
         ap_northeast_1: "Ásia Pacífico (Tóquio)"
         ap_northeast_2: "Ásia Pacífico (Seul)"
         sa_east_1: "América do Sul (São Paulo)"
+        cn_north_1: "China (Beijing)"
     edit: 'edite o título e a categoria deste tópico'
     not_implemented: "Esse recurso ainda não foi implementado, desculpe!"
     no_value: "Não"
@@ -253,6 +257,8 @@ pt_BR:
     undo: "Desfazer"
     revert: "Reverter"
     failed: "Falhou"
+    switch_to_anon: "Entrar no Modo Anônimo"
+    switch_from_anon: "Sair do Modo Anônimo"
     banner:
       close: "Ignorar este banner."
       edit: "Editar este banner >>"
@@ -349,19 +355,20 @@ pt_BR:
         none: "Nenhum"
       notifications:
         watching:
-          title: "Assistindo"
+          title: "Observando"
           description: "Você será notificado sobre toda nova postagem em toda mensagem, e uma contagem de novas mensagens será mostrada."
         watching_first_post:
+          title: "Observando o primeiro post"
           description: "Você somente será notificado sobre a primeira postagem em cada novo tópico neste grupo."
         tracking:
-          title: "Rastreando"
+          title: "Monitorando"
           description: "Você será notificado se alguém mencionar seu @name ou responder a você, e uma contagem de novas respostas será mostrada."
         regular:
           title: "Normal"
           description: "Você será notificado se alguém mencionar seu @name ou responder a você."
         muted:
-          title: "Mudo"
+          title: "Silenciado"
-          description: "Você será notificado sobre qualquer coisa sobre novos tópicos neste grupo."
+          description: "Você nunca será notificado sobre novos tópicos nesse grupo."
     user_action_groups:
       '1': "Curtidas dadas"
       '2': "Curtidas recebidas"
@@ -447,6 +454,7 @@ pt_BR:
         disable: "Desativar Notificações"
         enable: "Ativar Notificações"
         each_browser_note: "Nota: Você deve modificar essa configuração em todos navegadores que você usa."
+      dismiss_notifications: "Descartar tudo"
       dismiss_notifications_tooltip: "Marcar todas as notificações não lidas como lidos"
       disable_jump_reply: "Não pular para o meu tópico depois que eu respondo"
       dynamic_favicon: "Exibir ícone no navegador de tópicos novos / atualizados."
@@ -463,13 +471,30 @@ pt_BR:
       github_profile: "Github"
       email_activity_summary: "Sumário de Atividades"
       mailing_list_mode:
+        label: "Modo de lista de discussão"
+        enabled: "Ativar o modo lista de discussão"
+        instructions: |
+          Essa opção sobrepõe o sumário de atividades.<br />
+          Tópicos e categorias silenciados não são incluídos nesses emails.
         daily: "Enviar atualizações diárias"
         individual: "Enviar email para cada postagem nova"
+        many_per_day: "Me envie um email para cada nova postagem (aproximadamente {{dailyEmailEstimate}} por dia)"
         few_per_day: "Me envie um email para cada nova postagem (aproximadamente 2 por dia)"
-      tracked_tags: "Monitorado"
+      tag_settings: "Etiquetas"
+      watched_tags: "Observadas"
+      watched_tags_instructions: "Você vai observar automaticamente todos os tópicos com estas etiquetas. Você será notificado de todas as novas mensagens e tópicos.  Além disso, a contagem de mensagens novas também aparecerá ao lado do tópico."
+      tracked_tags: "Monitoradas"
+      tracked_tags_instructions: "Você vai monitorar automaticamente todos os tópicos com essas etiquetas. A contagem de mensagens novas aparecerá ao lado do tópico."
       muted_tags: "Silenciado"
-      watched_categories: "Acompanhados"
+      muted_tags_instructions: "Você não será notificado sobre novos tópicos com estas etiquetas, e eles não aparecerão nos tópicos Recentes"
-      tracked_categories: "Monitorado"
+      watched_categories: "Observando"
+      watched_categories_instructions: "Você vai observar automaticamente todos os tópicos dessas categorias. Você será notificado de todas as novas mensagens e tópicos.  Além disso, a contagem de mensagens novas também aparecerá ao lado do tópico."
+      tracked_categories: "Monitoradas"
+      tracked_categories_instructions: "Você vai monitorar automaticamente todos os tópicos dessas categorias. A contagem de mensagens novas aparecerá ao lado do tópico."
+      watched_first_post_categories: "Observando a primeira mensagem"
+      watched_first_post_categories_instructions: "Você será notificado sobre a primeira postagem em cada novo tópico destas categorias."
+      watched_first_post_tags: "Observando a primeira mensagem"
+      watched_first_post_tags_instructions: "Você será notificado sobre a primeira postagem em cada novo tópico com estas etiquetas."
       muted_categories: "Silenciado"
       muted_categories_instructions: "Você não será notificado sobre novos tópicos nessas categorias, e não aparecerão no Recentes"
       delete_account: "Excluir Minha Conta"
@@ -486,7 +511,7 @@ pt_BR:
       automatically_unpin_topics: "Desafixar automaticamente os tópicos quando eu chegar ao fundo."
       staff_counters:
         flags_given: "sinalizadas úteis"
-        flagged_posts: "posts marcados"
+        flagged_posts: "posts sinalizados"
         deleted_posts: "posts apagados"
         suspensions: "suspensões"
         warnings_received: "avisos"
@@ -512,6 +537,7 @@ pt_BR:
         error: "Houve um erro ao alterar esse valor."
       change_username:
         title: "Alterar Nome de Usuário"
+        confirm: "Se você mudar seu Nome de Usuário, todas as citações das suas respostas e as menções ao seu @nome serão desfeitas. Você tem certeza?"
         taken: "Desculpe, esse Nome de Usuário já está sendo usado."
         error: "Houve um erro ao alterar o seu Nome de Usuário."
         invalid: "Esse Nome de Usuário é inválido. Deve conter apenas números e letras."
@@ -521,11 +547,11 @@ pt_BR:
         error: "Houve um erro ao alterar seu email. Talvez ele já esteja sendo usado neste forum?"
         success: "Enviamos um email para esse endereço. Por favor, siga as instruções de confirmação."
       change_avatar:
-        title: "Mudar sua imagem de perfil"
+        title: "Alterar sua imagem de perfil"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baseado em"
         gravatar_title: "Alterar seu avatar no site do Gravatar"
-        refresh_gravatar_title: "Atualizar o Gravatar"
+        refresh_gravatar_title: "Atualize seu Gravatar"
-        letter_based: "Imagem de perfil dada pelo sistema"
+        letter_based: "Sistema concedeu imagem de perfil."
         uploaded_avatar: "Foto pessoal"
         uploaded_avatar_empty: "Adicionar foto pessoal"
         upload_title: "Enviar sua foto"
@@ -568,8 +594,8 @@ pt_BR:
         enter_email: 'Nome de usuário encontrado, insira o email correspondente. '
         prefilled: "Email corresponde a esse nome de usuário registrado"
       locale:
-        title: "idioma da interface"
+        title: "idioma de interface"
-        instructions: "Idioma da interface de usuário. Irá mudar quando você atualizar a página."
+        instructions: "Idioma de interface do usuário. Será alterado quando você atualizar a página."
         default: "(padrão)"
       password_confirmation:
         title: "Senha novamente"
@@ -577,7 +603,7 @@ pt_BR:
       last_emailed: "Último email enviado"
       last_seen: "Visto"
       created: "Entrou"
-      log_out: "Log Out"
+      log_out: "Sair"
       location: "Localização"
       card_badge:
         title: "Cartão de emblemas do usuário"
@@ -586,7 +612,7 @@ pt_BR:
       like_notification_frequency:
         title: "Notificar ao ser curtido"
         always: "Sempre"
-        first_time_and_daily: "Primeira curtida em um post e diariamente"
+        first_time_and_daily: "Postagem é curtida pela primeira vez e diariamente"
         first_time: "Primeira curtida em um post"
         never: "Nunca"
       email_previous_replies:
@@ -595,12 +621,14 @@ pt_BR:
         always: "sempre"
         never: "nunca"
       email_digests:
+        title: "Mande-me um email com o sumário dos tópicos e respostas populares quando eu não visitar o fórum"
         every_30_minutes: "a cada 30 minutos"
         every_hour: "a cada hora"
         daily: "diariamente"
         every_three_days: "a cada três dias"
         weekly: "semanalmente"
         every_two_weeks: "a cada duas semanas"
+      include_tl0_in_digests: "Incluir o conteúdo de usuários novos nos emails de sumário"
       email_in_reply_to: "Incluir um excerto das respostas ao post nos emails"
       email_direct: "Me envie um email quando alguém me citar, responder minhas mensagens, mencionar meu @usuário, ou me convidar para um tópico"
       email_private_messages: "Me envie um email quando alguém me enviar mensagem particular"
@@ -610,12 +638,12 @@ pt_BR:
       new_topic_duration:
         label: "Considerar tópicos como novos quando"
         not_viewed: "Eu ainda não os vi"
-        last_here: "criado desde de que eu estava aqui pela última vez"
+        last_here: "criado desde de que estive aqui pela última vez"
         after_1_day: "criado(s) no último(s) dia"
         after_2_days: "criado(s) nos último(s) 2 dias"
         after_1_week: "criado na última semana"
         after_2_weeks: "criado nas últimas 2 semanas"
-      auto_track_topics: "Seguir automaticamente tópicos que eu entro"
+      auto_track_topics: "Monitorar automaticamente tópicos que eu entro"
       auto_track_options:
         never: "nunca"
         immediately: "imediatamente"
@@ -681,12 +709,21 @@ pt_BR:
         post_count:
           one: "post criado"
           other: "posts criados"
+        likes_given:
+          one: "<i class='fa fa-heart'></i> dada"
+          other: "<i class='fa fa-heart'></i> dadas"
+        likes_received:
+          one: "<i class='fa fa-heart'></i> recebida"
+          other: "<i class='fa fa-heart'></i> recebidas"
         days_visited:
           one: "dia visitado"
           other: "dias visitados"
         posts_read:
           one: "post lido"
           other: "posts lidos"
+        bookmark_count:
+          one: "favorito"
+          other: "favoritos"
         top_replies: "Mais Respondidos"
         no_replies: "Nenhuma resposta ainda."
         more_replies: "Mais Respostas"
@@ -696,6 +733,12 @@ pt_BR:
         top_badges: "Principais Emblemas"
         no_badges: "Nenhum emblema ainda."
         more_badges: "Mais Emblemas"
+        top_links: "Principais Links"
+        no_links: "Ainda sem nenhum link."
+        most_liked_by: "Mais Curtidos Por"
+        most_liked_users: "Mais Curtidos"
+        most_replied_to_users: "Mais Respondidos"
+        no_likes: "Ainda sem nenhuma curtida."
       associated_accounts: "Logins"
       ip_address:
         title: "Último endereço IP"
@@ -745,6 +788,8 @@ pt_BR:
     too_few_topics_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar essa discussão!</a> Existem atualmente <strong>%{currentTopics} / %{requiredTopics}</strong> tópicos. Novos visitantes precisam de algumas conversas para ler e responder."
     too_few_posts_notice: "Vamos <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>começar essa discussão!</a> Existem atualmente <strong>%{currentPosts} / %{requiredPosts}</strong> mensagens. Novos visitantes precisam de algumas conversas para ler e responder."
     logs_error_rate_notice:
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> alcançou a configuração limite do site de %{siteSettingRate}."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> excedeu a configuração limite do site de %{siteSettingRate}."
       rate:
         one: "1 erro/%{duration}"
         other: "%{count} erros/%{duration}"
@@ -854,8 +899,11 @@ pt_BR:
         title: "com GitHub"
         message: "Autenticando com GitHub (certifique-se de que os bloqueadores de popup estejam desativados)"
     emoji_set:
+      apple_international: "Apple/Internacional"
       google: "Google"
       twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -865,14 +913,18 @@ pt_BR:
       more_emoji: "mais..."
       options: "Opções"
       whisper: "sussuro"
+      unlist: "Não listado"
       add_warning: "Este é um aviso oficial."
       toggle_whisper: "Habilitar Sussuro"
+      toggle_unlisted: "Alterar não listado"
       posting_not_on_topic: "Qual tópico você gostaria de responder?"
       saving_draft_tip: "gravando..."
       saved_draft_tip: "salvo"
       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"
         title_too_short: "O título tem que ter no mínimo {{min}} caracteres"
@@ -915,6 +967,7 @@ pt_BR:
       quote_text: "Bloco de citação"
       code_title: "Texto pré-formatado"
       code_text: "identar texto pre-formatado em 4 espaços"
+      paste_code_text: "escreva ou cole o código aqui"
       upload_title: "Enviar"
       upload_description: "digite aqui a descrição do arquivo enviado"
       olist_title: "Lista numerada"
@@ -928,6 +981,9 @@ pt_BR:
       modal_ok: "OK"
       modal_cancel: "Cancelar"
       cant_send_pm: "Desculpe, você não pode enviar uma mensagem para %{username}."
+      yourself_confirm:
+        title: "Você se esqueceu de adicionar destinatários?"
+        body: "No momento esta mensagem está sendo enviada apenas para si mesmo!"
       admin_options_title: "Configurações opcionais da equipe para este tópico"
       auto_close:
         label: "Tempo para fechamento automático do tópico:"
@@ -941,6 +997,7 @@ pt_BR:
     notifications:
       title: "notificações de menção de @name, respostas às suas postagens,  tópicos, mensagens, etc"
       none: "Não foi possível carregar notificações no momento."
+      empty: "Não foi encontrada nenhuma notificação."
       more: "ver notificações antigas"
       total_flagged: "total de mensagens sinalizadas"
       mentioned: "<i title='mentioned' class='fa fa-at'></i><p><span>{{username}}</span> {{description}}</p>"
@@ -959,7 +1016,9 @@ pt_BR:
       invited_to_topic: "<i title='invited to topic' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
+      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Adquirido '{{description}}'</p>"
+      watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Novo Tópico</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagem na caixa de entrada de {{group_name}}</p>"
         other: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} mensagens na caixa de entrada de {{group_name}}</p>"
@@ -976,7 +1035,7 @@ pt_BR:
         invitee_accepted: "Convite aceito por"
         moved_post: "Seu tópico foi movido por"
         linked: "Link para sua mensagem"
-        granted_badge: "Emblema recebido"
+        granted_badge: "Emblema concedido"
         group_message_summary: "Mensagens na caixa de entrada do grupo"
       popup:
         mentioned: '{{username}} mencionou você em "{{topic}}" - {{site_title}}'
@@ -1008,6 +1067,7 @@ pt_BR:
       most_liked: "Mais Curtido"
       select_all: "Selecionar Todos"
       clear_all: "Limpar Todos"
+      too_short: "Seu termo de pesquisa é muito curto."
       result_count:
         one: "1 resultado para <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} resultados para <span class='term'>\"{{term}}\"</span>"
@@ -1019,6 +1079,7 @@ pt_BR:
       post_format: "#{{post_number}} por {{username}}"
       context:
         user: "Procurar respostas de @{{username}}"
+        category: "Procurar a categoria #{{category}}"
         topic: "Procurar nesse tópico"
         private_messages: "Procurar mensagens"
     hamburger_menu: "ir para outra listagem de tópicos ou categoria"
@@ -1047,6 +1108,7 @@ pt_BR:
         selected:
           one: "Você selecionou <b>1</b> tópico."
           other: "Você selecionou <b>{{count}}</b> tópicos."
+        change_tags: "Mudar Etiquetas"
         choose_new_tags: "Escolha novas tags para esses tópicos:"
         changed_tags: "As tags para esses tópicos foram alteradas."
       none:
@@ -1142,20 +1204,27 @@ pt_BR:
       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
         go_top: "topo"
         go_bottom: "último"
         go: "ir"
         jump_bottom: "ir para a última mensagem"
+        jump_prompt: "ir para a mensagem"
+        jump_prompt_long: "Gostaria de ir para qual mensagem?"
         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:
-          '3_6': 'Você receberá notificações porque você está acompanhando esta categoria.'
+          mailing_list_mode: "Você está com o modo de lista de discussão ativado, portanto será notificado sobre as respostas deste tópico por email."
-          '3_5': 'Você receberá notificações porque começou a acompanhar este tópico automaticamente.'
+          '3_10': 'Você receberá notificações porque está acompanhando uma etiqueta neste tópico.'
+          '3_6': 'Você receberá notificações porque você está observando esta categoria.'
+          '3_5': 'Você receberá notificações porque começou a observar este tópico automaticamente.'
           '3_2': 'Você receberá notificações porque está observando este tópico.'
           '3_1': 'Você receberá notificações porque criou este tópico.'
           '3': 'Você receberá notificações porque você está observando este tópico.'
@@ -1169,7 +1238,7 @@ pt_BR:
           '0_2': 'Você está ignorando todas as notificações deste tópico.'
           '0': 'Você está ignorando todas as notificações deste tópico.'
         watching_pm:
-          title: "Acompanhando"
+          title: "Observando"
           description: "Você será notificado de cada mensagem nova neste tópico. Um contador de mensagens novas e não lidas também aparecerá próximo ao tópico."
         watching:
           title: "Observar"
@@ -1191,6 +1260,7 @@ pt_BR:
           description: "Você nunca será notificado de qualquer coisa sobre essa mensagem privada."
         muted:
           title: "Silenciar"
+          description: "Você nunca será notificado sobre esse tópico e ele não aparecerá nos tópicos recentes."
       actions:
         recover: "Recuperar Tópico"
         delete: "Apagar tópico"
@@ -1205,6 +1275,8 @@ pt_BR:
         invisible: "Tornar Invisível"
         visible: "Tornar Visível"
         reset_read: "Repor data de leitura"
+        make_public: "Transformar em Tópico Público"
+        make_private: "Transformar em Mensagem Privada"
       feature:
         pin: "Fixar Tópico"
         unpin: "Desafixar Tópico"
@@ -1233,15 +1305,23 @@ pt_BR:
         pin_note: "Usuários podem desafixar o tópico individualmente para si."
         pin_validation: "Uma data é necessária para fixar este tópico."
         not_pinned: "Não existem tópicos fixados em {{categoryLink}}."
+        already_pinned:
+          one: "Tópicos fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Tópicos fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
         pin_globally: "Fazer com que este tópico apareça no topo de todas listas de tópicos até"
         confirm_pin_globally: "Você já tem {{count}} tópicos fixados globalmente. Muitos tópicos fixados podem prejudicar usuários novos e anônimos. Tem certeza que quer fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do inicio de todas as listas de tópicos."
         unpin_globally_until: "Remover este tópico do topo de todas listagens de tópicos ou esperar até <strong>%{until}</strong>."
         global_pin_note: "Usuários podem desafixar o tópico individualmente para si."
         not_pinned_globally: "Não existem tópicos fixados globalmente."
+        already_pinned_globally:
+          one: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>."
+          other: "Tópicos atualmente fixados globalmente: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Tornar este tópico em um banner que apareça no inicio de todas as páginas."
         remove_banner: "Remover o banner que aparece no inicio de todas as páginas."
         banner_note: "Usuários podem dispensar o banner fechando-o. Apenas um tópico pode ser colocado como banner a cada momento."
+        no_banner_exists: "Não existe tópico banner."
+        banner_exists: "<strong class='badge badge-notification unread'>Existe</strong> atualmente um tópico banner."
       inviting: "Convidando..."
       automatically_add_to_groups: "Este convite também inclui acesso para esses grupos:"
       invite_private:
@@ -1250,6 +1330,7 @@ pt_BR:
         email_or_username_placeholder: "email ou Nome de Usuário"
         action: "Convite"
         success: "Nós convidamos aquele usuário para participar desta mensagem privada."
+        success_group: "Nós convidamos aquele grupo para participar desta mensagem."
         error: "Desculpe, houve um erro ao convidar esse usuário."
         group_name: "nome do grupo"
       controls: "Controles do Tópico"
@@ -1289,6 +1370,10 @@ pt_BR:
         instructions:
           one: "Por favor selecione o tópico para o qual você gostaria de mover esta resposta."
           other: "Por favor selecione o tópico para o qual você gostaria de mover estas <b>{{count}}</b> respostas."
+      merge_posts:
+        title: "Unificar as Mensagens Selecionadas"
+        action: "unificar as mensagens selecionadas"
+        error: "Houve um erro ao unificar as mensagens selecionadas."
       change_owner:
         title: "Trocar Autor das Mensagens"
         action: "trocar autor"
@@ -1355,6 +1440,7 @@ pt_BR:
         create: "Desculpe, houve um erro ao criar sua resposta. Por favor, tente outra vez."
         edit: "Desculpe, houve um erro ao editar sua resposta. Por favor, tente outra vez."
         upload: "Desculpe, houve um erro ao enviar esse arquivo. Por favor, tente outra vez."
+        file_too_large: "Desculpe, o arquivo que você está tentando enviar é muito grande (o tamanho máximo permitido é {{max_size_kb}}kb). Que tal enviar o seu arquivo grande para um serviço de hospedagem na nuvem e depois compartilhar o link?"
         too_many_uploads: "Desculpe, você pode enviar apenas um arquivos por vez."
         too_many_dragged_and_dropped_files: "Desculpe, você só pode subir até 10 arquivos de cada vez."
         upload_not_authorized: "Desculpe, o tipo de arquivo que você está tentando enviar não está autorizado (extensões autorizadas: {{authorized_extensions}})."
@@ -1366,11 +1452,13 @@ pt_BR:
         no_value: "Não, manter"
         yes_value: "Sim, abandone"
       via_email: "post recebido via email"
+      via_auto_generated_email: "essa mensagem chegou através de um email gerado automaticamente"
       whisper: "esta mensagem é um sussuro privado para moderadores"
       wiki:
         about: "esta postagem é uma wiki"
       archetypes:
         save: 'Salvar as opções'
+      few_likes_left: "Obrigado por compartilhar o amor! Restam apenas algumas poucas curtidas sobrando para você usar hoje."
       controls:
         reply: "comece a compor uma resposta para este tópico"
         like: "curtir esta resposta"
@@ -1421,8 +1509,11 @@ pt_BR:
           off_topic: "marcado como off-topic"
           spam: "marcado como spam"
           inappropriate: "marcado como inapropriado"
+          notify_moderators: "notificaram os moderadores"
           notify_user: "enviou uma mensagem"
+          bookmark: "favoritaram isto"
           like: "curtiu isto"
+          vote: "votaram nisto"
         by_you:
           off_topic: "Você sinalizou isto como off-topic"
           spam: "Você sinalizou isto como spam"
@@ -1486,6 +1577,10 @@ pt_BR:
         confirm:
           one: "Tem certeza que quer apagar esta resposta?"
           other: "Tem certeza que quer apagar todos essas respostas?"
+      merge:
+        confirm:
+          one: "Você tem certeza que quer fundir essas postagens?"
+          other: "Você tem certeza que quer fundir essas {{count}} postagens?"
       revisions:
         controls:
           first: "Primeira revisão"
@@ -1517,6 +1612,11 @@ pt_BR:
       general: 'Geral'
       settings: 'Configurações'
       topic_template: "Modelo de Tópico"
+      tags: "Etiquetas"
+      tags_allowed_tags: "Etiquetas que só podem ser usadas nesta categoria:"
+      tags_allowed_tag_groups: "Grupos de etiquetas que só podem ser usados nesta categoria:"
+      tags_placeholder: "(Opcional) lista de etiquetas permitidas"
+      tag_groups_placeholder: "(Opcional) lista de grupos de etiquetas permitidos"
       delete: 'Apagar categoria'
       create: 'Nova categoria'
       create_long: 'Criar uma nova categoria'
@@ -1530,7 +1630,7 @@ pt_BR:
       topic: "tópico da categoria"
       logo: "Imagem do logo da categoria"
       background_image: "Imagem de fundo da categoria"
-      badge_colors: "Badge colors"
+      badge_colors: "Cores do emblema"
       background_color: "Background color"
       foreground_color: "Foreground color"
       name_placeholder: "máximo de uma ou duas palavras"
@@ -1551,7 +1651,7 @@ pt_BR:
       email_in_disabled: "Postar novos tópicos via email está desabilitado nas Configurações do Site. Para habilitar respostas em novos tópicos via email,"
       email_in_disabled_click: 'habilitar a configuração de "email em".'
       suppress_from_homepage: "Suprimir esta categoria da página inicial."
-      allow_badges_label: "Permitir emblemas serem concedidos nessa categoria"
+      allow_badges_label: "Permitir a concessão de emblemas nessa categoria"
       edit_permissions: "Editar Permissões"
       add_permission: "Adicionar Permissões"
       this_year: "este ano"
@@ -1563,8 +1663,13 @@ pt_BR:
       notifications:
         watching:
           title: "Observar"
+          description: "Você vai observar automaticamente todos os tópicos dessas categorias. Você será notificado de todas as novas mensagens em todos os tópicos.  Além disso, a contagem de novas respostas também será exibida."
+        watching_first_post:
+          title: "Observando o primeiro post"
+          description: "Você somente será notificado sobre a primeira postagem em cada novo tópico destas categorias."
         tracking:
           title: "Monitorar"
+          description: "Você vai monitorar automaticamente todos os tópicos dessas categorias. Você será notificado se alguém mencionar o seu @nome ou responder para você.  Além disso, a contagem de novas respostas também será exibida."
         regular:
           title: "Normal"
           description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
@@ -1576,6 +1681,7 @@ pt_BR:
       action: 'Sinalizar resposta'
       take_action: "Tomar Atitude"
       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"
@@ -1584,6 +1690,7 @@ pt_BR:
       submit_tooltip: "Enviar uma sinalização privada"
       take_action_tooltip: "Atingir o limiar de denuncias imediatamente, ao invés de esperar para mais denuncias da comunidade"
       cant: "Desculpe, não é possível colocar uma sinalização neste momento."
+      notify_staff: 'Avisar a equipe privadamente'
       formatted_name:
         off_topic: "É Off-Tópico"
         inappropriate: "É inapropriado"
@@ -1606,6 +1713,11 @@ pt_BR:
       clicks:
         one: "1 clique"
         other: "%{count} cliques"
+    post_links:
+      about: "expandir mais links para esta mensagem"
+      title:
+        one: "mais 1"
+        other: "mais %{count}"
     topic_statuses:
       warning:
         help: "Este é um aviso oficial."
@@ -1628,8 +1740,8 @@ pt_BR:
         help: "Este tópico está fixado para você; ele será mostrado no topo de sua categoria"
       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: "Mensagens"
+    posts: "Postagens"
-    posts_lowercase: "posts"
+    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,
@@ -1688,7 +1800,7 @@ pt_BR:
         title_with_count:
           one: "Não lido (1)"
           other: "Não lidos ({{count}})"
-        help: "tópicos que você está acompanhando ou monitorando com mensagens não lidas"
+        help: "tópicos que você está observando ou monitorando com mensagens não lidas"
         lower_title_with_count:
           one: "1 não lido"
           other: "{{count}} não lidos"
@@ -1741,29 +1853,178 @@ pt_BR:
       full: "Criar / Responder / Ver"
       create_post: "Responder / Ver"
       readonly: "Ver"
+    lightbox:
+      download: "download"
+    search_help:
+      title: 'Ajuda na pesquisa'
+    keyboard_shortcuts_help:
+      title: 'Atalhos de teclado'
+      jump_to:
+        title: 'Ir Para'
+        home: '<b>g</b>, <b>h</b> Início'
+        latest: '<b>g</b>, <b>l</b> Mais recentes'
+        new: '<b>g</b>, <b>n</b> Novos'
+        unread: '<b>g</b>, <b>u</b> Não Lidos'
+        categories: '<b>g</b>, <b>c</b> Categorias'
+        top: '<b>g</b>, <b>t</b> Topo'
+        bookmarks: '<b>g</b>, <b>b</b> Favoritos'
+        profile: '<b>g</b>, <b>p</b> Perfil'
+        messages: '<b>g</b>, <b>m</b> Mensagens'
+      navigation:
+        title: 'Navegação'
+        jump: '<b>#</b> Ir para a mensagem #'
+        back: '<b>u</b> Voltar'
+        up_down: '<b>k</b>/<b>j</b> Move seleção &uarr; &darr;'
+        open: '<b>o</b> ou <b>Enter</b> Abre tópico selecionado'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Pŕoxima seção/seção anterior'
+      application:
+        title: 'Aplicação'
+        create: '<b>c</b> Criar um tópico novo'
+        notifications: '<b>n</b> Abre notificações'
+        hamburger_menu: '<b>=</b> Abrir o menu hambúrguer'
+        user_profile_menu: '<b>p</b> Abrir menu do usuário'
+        show_incoming_updated_topics: '<b>.</b> Exibir tópicos atualizados'
+        search: '<b>/</b> Pesquisa'
+        help: '<b>?</b> Abrir ajuda de teclado'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Descartar Novas Postagens'
+        dismiss_topics: '<b>x</b>, <b>t</b> Descartar Tópicos'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Deslogar'
+      actions:
+        title: 'Ações'
+        bookmark_topic: '<b>f</b> Favoritar o tópico'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Fixar/Desfixar tópico'
+        share_topic: '<b>shift</b>+<b>s</b> Compartilhar tópico'
+        share_post: '<b>s</b> Compartilhar mensagem'
+        reply_as_new_topic: '<b>t</b> Responder como tópico linkado'
+        reply_topic: '<b>shift</b>+<b>r</b> Responder ao tópico'
+        reply_post: '<b>r</b> Responder a mensagem'
+        quote_post: '<b>q</b> Citar resposta'
+        like: '<b>l</b> Curtir a mensagem'
+        flag: '<b>!</b> Sinalizar mensagem'
+        bookmark: '<b>b</b> Favoritar mensagem'
+        edit: '<b>e</b> Editar mensagem'
+        delete: '<b>d</b> Excluir mensagem'
+        mark_muted: '<b>m</b>, <b>m</b> Silenciar tópico'
+        mark_regular: '<b>m</b>, <b>r</b> Tópico regular (padrão)'
+        mark_tracking: '<b>m</b>, <b>t</b> Monitorar o tópico'
+        mark_watching: '<b>m</b>, <b>w</b> Observar o tópico'
     badges:
+      earned_n_times:
+        one: "Emblema adquirido 1 vez"
+        other: "Emblema adquirido %{count} vezes"
+      granted_on: "Concedido em %{date}"
       others_count: "Outros com esse emblema (%{count})"
       title: Emblemas
+      allow_title: "título disponível"
+      multiple_grant: "concedido várias vezes"
+      badge_count:
+        one: "1 Emblema"
+        other: "%{count} Emblemas"
+      more_badges:
+        one: "+1 Mais"
+        other: "+%{count} Mais"
+      granted:
+        one: "1 concedido"
+        other: "%{count} concedidos"
       select_badge_for_title: Selecione um emblema para usar como o seu título
+      none: "<nenhum>"
       badge_grouping:
         getting_started:
-          name: Começando
+          name: Primeiros Passos
+        community:
+          name: Comunidade
+        trust_level:
+          name: Nível de Confiança
+        other:
+          name: Outros
+        posting:
+          name: Publicando
+    google_search: |
+      <h3>Procurar com o Google</h3>
+      <p>
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <input type="text" id='user-query' value="">
+      <input type='hidden' id='google-query' name="q">
+      <button class="btn btn-primary">Google</button>
+      </form>
+      </p>
     tagging:
+      all_tags: "Todas as Etiquetas"
+      selector_all_tags: "todas as etiquetas"
+      selector_no_tags: "sem etiquetas"
+      changed: "etiquetas alteradas:"
+      tags: "Etiquetas"
+      choose_for_topic: "Escolha marcadores opcionais para este tópico"
       delete_tag: "Apagar marcação"
       delete_confirm: "Você tem certeza que deseja apagar essa marcação?"
       rename_tag: "Renomear marcador"
+      rename_instructions: "Escolha um novo nome para o marcador"
       sort_by: "Ordenar por"
+      sort_by_count: "quantidade"
+      sort_by_name: "nome"
+      manage_groups: "Gerenciar grupos de marcadores"
+      manage_groups_description: "Definir grupos para organizar marcadores"
+      filters:
+        without_category: "%{filter} %{category} Tópicos"
+        with_category: "%{filter} %{tag} tópicos em %{category}"
+        untagged_without_category: "%{filter} tópicos não etiquetados"
+        untagged_with_category: "%{filter} tópicos não etiquetados em %{category}"
       notifications:
+        watching:
+          title: "Observando"
+          description: "Você vai observar automaticamente todos os tópicos com esta etriqueta. Você será notificado de todas as novas mensagens e tópicos.  Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado do tópico."
+        watching_first_post:
+          title: "Observando o primeiro post"
+          description: "Você somente será notificado sobre a primeira postagem em cada novo tópico com esta etiqueta."
+        tracking:
+          title: "Monitorando"
+          description: "Automaticamente monitora todos tópicos com essa etiqueta. Uma contagem de posts não lidos e novos aparecerá próximo ao tópico."
+        regular:
+          title: "Normal"
+          description: "Você será notificado se alguém mencionar o seu @nome ou responder à sua mensagem."
         muted:
           title: "Silenciado"
+          description: "Você não será notificado sobre novos tópicos com essa etiqueta e eles não vão aparecer na guia de mensagens não lidas."
       groups:
+        title: "Grupos de Etiquetas"
+        about: "Adicione marcadores aos grupos para gerenciá-los mais facilmente"
+        new: "Novo grupo"
+        tags_label: "Marcadores neste grupo"
+        parent_tag_label: "Categoria Principal"
+        parent_tag_placeholder: "Opcional"
+        parent_tag_description: "Etiquetas deste grupo não podem ser usadas a menos que a etiqueta principal esteja presente."
+        one_per_topic_label: "Limite uma etiqueta por tópico deste grupo"
+        new_name: "Novo Grupo de Etiquetas"
         save: "Salvar"
         delete: "Apagar"
+        confirm_delete: "Tem certeza de que deseja remover este grupo de etiquetas?"
       topics:
         none:
+          unread: "Não há nenhum tópico não lido."
           new: "Você tem tópicos novos"
+          read: "Você ainda não leu nenhum tópico."
+          posted: "Você ainda não escreveu em nenhum tópico."
+          latest: "Não há tópicos recentes."
+          hot: "Não há tópicos quentes."
+          bookmarks: "Você ainda não tem tópicos nos favoritos."
+          top: "Não há tópicos em alta."
+          search: "Não foram encontrados resultados."
         bottom:
+          latest: "Não há mais tópicos recentes."
+          hot: "Não há mais tópicos quentes."
+          posted: "Não há mais tópicos postados."
+          read: "Não há mais tópicos lidos."
           new: "Não há mais tópicos novos."
+          unread: "Não há mais tópicos não lidos."
+          top: "Não há mais tópicos em alta."
+          bookmarks: "Não há mais tópicos nos favoritos."
+          search: "Não existem mais resultados."
+    invite:
+      custom_message: "Faça seu convite um pouco mais pessoal escrevendo um"
+      custom_message_link: "mensagem personalizada"
+      custom_message_placeholder: "Insira a sua mensagem personalizada"
+      custom_message_template_forum: "Ei, você devia entrar neste fórum!"
+      custom_message_template_topic: "Ei, eu acho que você vai gostar deste tópico!"
   admin_js:
     type_to_filter: "escreva para filtrar..."
     admin:
@@ -1776,7 +2037,7 @@ pt_BR:
         up_to_date: "Você está atualizado!"
         critical_available: "Uma atualização crítica está disponível."
         updates_available: "Atualizações estão disponíveis."
-        please_upgrade: "Por favor atualize!"
+        please_upgrade: "Por favor, atualize!"
         no_check_performed: "Não foi feita verificação por atualizações. Certifique-se de sidekiq esta em execucao."
         stale_data: "Não foi feita verificação por atualizações ultimamente. Certifique-se de sidekiq esta em execucao."
         version_check_pending: "Parece que você atualizou recentemente. Fantástico!"
@@ -1811,6 +2072,7 @@ pt_BR:
           30_days_ago: "30 Dias Atrás"
           all: "Tudo"
           view_table: "tabela"
+          view_graph: "gráfico"
           refresh_report: "Atualizar Relatório"
           start_date: "Data de Início"
           end_date: "Data do Final"
@@ -1901,6 +2163,7 @@ pt_BR:
         add_members: "Adicionar membros"
         custom: "Definidos"
         bulk_complete: "Os usuários foram adicionados ao grupo."
+        bulk: "Adição em Massa ao Grupo"
         bulk_paste: "Cole uma lista de usernames ou emails, um por linha:"
         bulk_select: "(selecione um grupo)"
         automatic: "Automático"
@@ -1910,6 +2173,8 @@ pt_BR:
         primary_group: "Configurar automaticamente como grupo primário"
         group_owners: Prorietários
         add_owners: Adicionar proprietários
+        incoming_email: "Endereço de email de entrada personalizado"
+        incoming_email_placeholder: "Insira um endereço de email"
       api:
         generate_master: "Gerar chave Mestra de API"
         none: "Não existem chaves API ativas no momento."
@@ -1933,7 +2198,7 @@ pt_BR:
         enabled: "Habilitado?"
         is_enabled: "S"
         not_enabled: "N"
-        change_settings: "Mudar Configurações"
+        change_settings: "Alterar Configurações"
         change_settings_short: "Configurações"
         howto: "Como eu instalo plugins?"
       backups:
@@ -1942,6 +2207,14 @@ pt_BR:
           backups: "Backups"
           logs: "Registros"
         none: "Nenhum backup disponível."
+        read_only:
+          enable:
+            title: "Ativar o modo somente-leitura"
+            label: "Ativar somente leitura"
+            confirm: "Tem certeza que quer habilitar modo somente leitura?"
+          disable:
+            title: "Desativar o modo somente-leitura"
+            label: "Desativar somente leitura"
         logs:
           none: "Nenhum registro ainda..."
         columns:
@@ -1955,7 +2228,7 @@ pt_BR:
           error: "Houve um erro ao carregar '{{filename}}': {{message}}"
         operations:
           is_running: "Uma operação está sendo executada..."
-          failed: "A {{operation}} falhou. Por favor, cheque os registros."
+          failed: "A {{operação}} falhou. Por favor, cheque os registros."
           cancel:
             label: "Cancelar"
             title: "Cancelar a operação atual"
@@ -1979,6 +2252,7 @@ pt_BR:
           rollback:
             label: "Reverter"
             title: "Reverter o banco de dados para seu estado anterior"
+            confirm: "Tem certeza que deseja reverter o banco de dados para seu estado anterior?"
       export_csv:
         user_archive_confirm: "Tem certeza que você quer baixar os seus tópicos?"
         success: "Exportação iniciada, você será notificado por mensagem particular quando o processo estiver completo."
@@ -2032,6 +2306,7 @@ pt_BR:
         email_templates:
           title: "Modelos de E-mail"
           subject: "Assunto"
+          multiple_subjects: "Este modelo de email tem vários assuntos."
           body: "Corpo"
           none_selected: "Selecione um modelo de e-mail para iniciar a edição."
           revert: "Reverter Alterações"
@@ -2081,13 +2356,16 @@ pt_BR:
             name: 'curtir'
             description: "A cor do botão curtir."
       email:
+        title: "Emails"
         settings: "Settings"
+        templates: "Modelos"
         preview_digest: "Preview Digest"
         sending_test: "Enviando e-mail de teste..."
         error: "<b>ERRO</b> - %{server_error}"
         test_error: "Houve um problema ao enviar o email de teste. Por favor, verifique as configurações de email, se o seu provedor não está bloqueando conexões de email e tente novamente."
         sent: "Enviados"
         skipped: "Ignorados"
+        bounced: "Devolvido"
         received: "Recebido"
         rejected: "Rejeitado"
         sent_at: "Enviado para "
@@ -2107,6 +2385,26 @@ pt_BR:
         last_seen_user: "Último Usuário Visto:"
         reply_key: "Chave de Resposta"
         skipped_reason: "Ignorar Motivo"
+        incoming_emails:
+          from_address: "De"
+          to_addresses: "Para"
+          cc_addresses: "Cc"
+          subject: "Assunto"
+          error: "Erro"
+          none: "Nenhum email recebido."
+          modal:
+            title: "Detalhes dos Emails Recebidos"
+            error: "Erro"
+            headers: "Cabeçalhos"
+            subject: "Assunto"
+            body: "Corpo"
+            rejection_message: "Email de Rejeição"
+          filters:
+            from_placeholder: "de@exemplo.com"
+            to_placeholder: "para@exemplo.com"
+            cc_placeholder: "cc@exemplo.com"
+            subject_placeholder: "Assunto..."
+            error_placeholder: "Erro"
         logs:
           none: "Nenhum registro encontrado."
           filters:
@@ -2172,7 +2470,14 @@ pt_BR:
             create_category: "criar uma categoria"
             block_user: "bloquear usuário"
             unblock_user: "desbloquear usuário"
+            grant_admin: "conceder admin"
+            revoke_admin: "revogar admin"
+            grant_moderation: "conceder moderação"
+            revoke_moderation: "revogar moderação"
             backup_operation: "operação de backup"
+            deleted_tag: "etiqueta removida"
+            renamed_tag: "etiqueta renomeada"
+            revoke_email: "revogar email"
         screened_emails:
           title: "Emails Filtrados"
           description: "Quando alguém tenta cria uma nova conta, os seguintes endereços de email serão verificados e o registro será bloqueado, ou outra ação será executada."
@@ -2186,7 +2491,7 @@ pt_BR:
           domain: "Domínio"
         screened_ips:
           title: "IPs Filtrados"
-          description: 'Endereços IP que estão sendo acompanhados. Use "Permitir" para confiar em endereços IP.'
+          description: 'Endereços IP que estão sendo observados. Use "Permitir" para confiar em endereços IP.'
           delete_confirm: "Tem certeza que deseja remover a regra para %{ip_address}?"
           roll_up_confirm: "Tem certeza que deseja combinar endereços IP filtrados comuns em subnets?"
           rolled_up_some_subnets: "Entradas de IP banidos combinadas nestas subnets: %{subnets}."
@@ -2240,7 +2545,7 @@ pt_BR:
           newuser: 'Usuários no Nível de Confiança 0 (Usuário Novo)'
           basic: 'Usuários no Nível de Confiança 1 (Usuário Básico)'
           member: 'Usuário em Nível de Confiança 2 (Membro)'
-          regular: 'Usuário em Nível de Confiança 3 (Regular)'
+          regular: 'Usuário em Nível de Confiança 3 (Habitual)'
           leader: 'Usuário em Nível de Confiança 4 (Líder)'
           staff: "Equipe de apoio"
           admins: 'Usuários Administradores'
@@ -2274,6 +2579,7 @@ pt_BR:
         moderator: "Moderador?"
         admin: "Admin?"
         blocked: "Bloqueado?"
+        staged: "Testado?"
         show_admin_profile: "Admin"
         edit_title: "Editar Título"
         save_title: "Salvar Título"
@@ -2340,9 +2646,18 @@ pt_BR:
         block_failed: 'Houve um problema ao bloquear o usuário.'
         block_confirm: 'Você tem certeza que quer bloquear este usuário? Ele não vai poder criar nenhum tópico ou postagem nova.'
         block_accept: 'Sim, bloquear este usuário'
+        bounce_score: "Pontuação de Devolução"
+        reset_bounce_score:
+          label: "Redefinir"
+          title: "Redefinir pontuação de devolução para 0"
         deactivate_explanation: "Um usuário desativado deve revalidar seu email."
         suspended_explanation: "Um usuário suspenso não pode entrar."
         block_explanation: "Um usuário bloqueado não pode postar ou iniciar tópicos."
+        staged_explanation: "Um usuário de teste só pode postar por email em tópicos específicos."
+        bounce_score_explanation:
+          none: "Nenhuma devolução foi recebida recentemente daquele email."
+          some: "Algumas devoluções foram recebidas recentemente daquele email."
+          threshold_reached: "Muitas devoluções daquele email foram recebidas."
         trust_level_change_failed: "Houve um problema ao trocar o nível de confiança do usuário."
         suspend_modal_title: "Usuário Suspenso"
         trust_level_2_users: "Usuários de Nível de Confiança 2"
@@ -2409,6 +2724,10 @@ pt_BR:
           title: "Mostrar no perfil público?"
           enabled: "mostrado no perfil"
           disabled: "não mostrado no perfil"
+        show_on_user_card:
+          title: "Exibir no cartão de usuário?"
+          enabled: "exibir no cartão de usuário"
+          disabled: "não exibido no cartão de usuário"
         field_types:
           text: 'Campo Texto'
           confirm: 'Confirmação'
@@ -2421,6 +2740,7 @@ pt_BR:
         revert: "Reverter alterações"
         revert_confirm: "Tem certeza que deseja reverter as alterações?"
         go_back: "Voltar para pesquisa"
+        recommended: "Recomendamos a personalização do seguinte texto para se adequar as suas necessidades:"
         show_overriden: 'Apenas mostrar valores alterados'
       site_settings:
         show_overriden: 'Exibir apenas valores alterados'
@@ -2469,7 +2789,7 @@ pt_BR:
           modal_title: Agrupamentos de emblemas
         granted_by: Concedido Por
         granted_at: Concedido Em
-        reason_help: (Um link para um post ou tópico)
+        reason_help: (Um link para uma mensagem ou tópico)
         save: Salvar
         delete: Remover
         delete_confirm: Tem certeza de que deseja remover este emblema?
@@ -2482,9 +2802,9 @@ pt_BR:
         granted_badges: Emblemas Concedidos
         grant: Conceder
         no_user_badges: "%{name} não teve nenhum emblema concedido."
-        no_badges: Não há emblemas que podem ser concedidos.
+        no_badges: Não há emblemas que possam ser concedidos.
         none_selected: "Selecione um emblema para começar"
-        allow_title: Permitir ao emblema ser usado como título
+        allow_title: Permitir que o emblema seja usado como título
         multiple_grant: Pode ser concedido várias vezes
         listable: Mostrar emblema na página pública de emblemas
         enabled: Habilitar emblema
@@ -2502,8 +2822,9 @@ pt_BR:
           post_revision: "Quando um usuário edita ou cria uma resposta"
           trust_level_change: "Quando um usuário muda seu nível de confiança"
           user_change: "Quando um usuário é editado ou criado"
+          post_processed: "Após o processamento da mensagem"
         preview:
-          link_text: "Prever medalhas concedidas"
+          link_text: "Pré-visualizar emblemas concedidos"
           plan_text: "Prever com plano de busca"
           modal_title: "Preview da Busca de Medalhas"
           sql_error_header: "Houve um erro com a busca."

config/locales/client.ro.yml

@@ -130,7 +130,7 @@ ro:
       google+: 'distribuie pe Google+'
       email: 'trimite această adresă pe email'
     action_codes:
-      split_topic: "desparte acest topic %{when}"
+      split_topic: "desparte această discuție %{when}"
       autoclosed:
         enabled: 'închis %{when}'
         disabled: 'deschis %{when}'
@@ -149,7 +149,7 @@ ro:
       visible:
         enabled: 'listat %{when}'
         disabled: 'retras %{when}'
-    topic_admin_menu: "acțiuni subiect administrator"
+    topic_admin_menu: "Opțiuni administrare discuție"
     emails_are_disabled: "Trimiterea de emailuri a fost dezactivată global de către un administrator. Nu vor fi trimise notificări email de nici un fel."
     s3:
       regions:
@@ -176,7 +176,7 @@ ro:
     joined: "Înregistrat"
     admin_title: "Admin"
     flags_title: "Semnalare"
-    show_more: "Detaliază"
+    show_more: "Mai mult"
     show_help: "Opțiuni"
     links: "Adrese"
     links_lowercase:
@@ -594,7 +594,7 @@ ro:
         weekly: "săptămânal"
         every_two_weeks: "la fiecare două săptămâni"
       email_direct: "Trimite un email când cineva mă citează, îmi răspunde la un post, menţionează @username meu, sau mă invită la o discuţie."
-      email_private_messages: "Trimite-mi un mesaj când cineva îmi răspunde."
+      email_private_messages: "Trimite-mi un emai când cineva îmi răspunde."
       email_always: "Trimite-mi notificarile de email atunci cand sunt activ pe site."
       other_settings: "Altele"
       categories_settings: "Categorii"
@@ -890,10 +890,10 @@ ro:
       show_preview: 'arată previzualizare »'
       hide_preview: '« ascunde previzualizare'
       quote_post_title: "Citează întreaga postare"
-      bold_title: "Gros"
+      bold_title: "Aldin"
-      bold_text: "text gros"
+      bold_text: "text aldin"
-      italic_title: "Aplecare"
+      italic_title: "Italic"
-      italic_text: "text aplecat"
+      italic_text: "text italic"
       link_title: "Adresă Hyper"
       link_description: "adaugă aici descrierea adresei hyper"
       link_dialog_title: "Introdu adresă hyper"
@@ -1092,8 +1092,9 @@ ro:
       options: "Opțiunile discuției"
       show_links: "arată link-urile din această discuție"
       toggle_information: "activează detaliile discuției"
-      read_more_in_category: "Vreți să citiți mai mult? Priviți alte discuții din {{catLink}} sau {{latestLink}}."
+      read_more_in_category: "Vrei să citești mai mult? Răsfoiește alte discuții din {{catLink}} sau {{latestLink}}."
-      read_more: "Vreți să citiți mai mult? {{catLink}} sau {{latestLink}}."
+      read_more: "Vrei să citești mai multe discuții? {{catLink}} sau {{latestLink}}."
+      read_more_MF: "{ UNREAD, plural, =0 {} one { Este <a href='/unread'>o discuție necitită</a> } other { Sunt <a href='/unread'># discuții necitite</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{și } false {este } other{}} <a href='/new'>o discuție nouă</a>} other { {BOTH, select, true{și } false {sunt } other{}} <a href='/new'># discuții noi</a>} } remaining, or {CATEGORY, select, true {răsfoiește alte discuții în {catLink}} false {{latestLink}} other {} }"
       browse_all_categories: Priviți toate categoriile
       view_latest_topics: arată ultimele discuții
       suggest_create_topic: De ce să nu creați o discuție?
@@ -1170,20 +1171,20 @@ ro:
         visible: "Fă vizibil"
         reset_read: "Resetează informația citită"
       feature:
-        pin: "Promovează discuţia pe pagină..."
+        pin: "Promovează discuţia"
         unpin: "Anulează promovarea discuției"
-        pin_globally: "Promovează discuţia pe site..."
+        pin_globally: "Promovează discuţia global"
-        make_banner: "Marchează discuție"
+        make_banner: "Adaugă statutul de banner"
-        remove_banner: "Demarchează discuție"
+        remove_banner: "Șterge statutul de banner"
       reply:
         title: 'Răspunde'
         help: 'începe să compui un răspuns pentru această discuție'
       clear_pin:
-        title: "Înlătură promovarea"
+        title: "Șterge promovarea"
-        help: "Înlătură promovarea acestei discuții pentru a nu mai apărea la începutul listei de discuții"
+        help: "Șterge promovarea acestei discuții pentru a nu mai apărea la începutul listei de discuții"
       share:
         title: 'Distribuie'
-        help: 'distribuie o adresă acestei discuții'
+        help: 'distribuie o adresă spre această discuție'
       flag_topic:
         title: 'Marcheză'
         help: 'marchează privat această discuție pentru atenție sau trimite o notificare privată despre ea'
@@ -1360,9 +1361,9 @@ ro:
       actions:
         flag: 'Semnal'
         defer_flags:
-          one: "Marcat pentru amânare."
+          one: "Amână marcarea"
-          few: "Marcate pentru amânare."
+          few: "Amână marcările"
-          other: "Marcate pentru amânare."
+          other: "Amână marcările"
         it_too:
           off_topic: "Semnalează și tu"
           spam: "Semnalează și tu"
@@ -1386,7 +1387,7 @@ ro:
           off_topic: "Ați marcat ca fiind în afara discuției"
           spam: "Ați marcat ca fiind spam"
           inappropriate: "Ați marcat ca nepotrivit"
-          notify_moderators: "Ați marcat pentru a fi moderată"
+          notify_moderators: "Ai marcat discuția pentru moderare"
           notify_user: "Aţi trimis un mesaj către acest utilizator"
           bookmark: "Ați marcat ca semn de carte această postare"
           like: "Ați apreciat"
@@ -1736,7 +1737,7 @@ ro:
         mobile_title: "Mobil"
         space_free: "{{size}} liber"
         uploads: "încărcări"
-        backups: "backups"
+        backups: "copii de siguranță"
         traffic_short: "trafic"
         traffic: "Cereri web"
         page_views: "Cereri API"
@@ -1885,11 +1886,11 @@ ro:
         change_settings_short: "Setări"
         howto: "Cum instalez un plugin?"
       backups:
-        title: "Backups"
+        title: "Copii de siguranță"
         menu:
-          backups: "Backups"
+          backups: "Copii de siguranță"
           logs: "Rapoarte"
-        none: "Nicio rezervare valabilă."
+        none: "Nici o copie de siguranță disponibilă."
         logs:
           none: "Nu există rapoarte..."
         columns:
@@ -1910,19 +1911,19 @@ ro:
             confirm: "Sunteți sigur că doriți să anulați operația curentă?"
           backup:
             label: "Salvare de siguranţă"
-            title: "Creați o rezervă"
+            title: "Creați o copie de siguranță"
-            confirm: "Sunteți sigur că doriți să creați o nouă rezervă?"
+            confirm: "Ești sigur că vrei să faci o nouă copie de siguranță?"
             without_uploads: "Da (nu include fişierele)"
           download:
             label: "Descarcă"
-            title: "Downloadează brezervă"
+            title: "Downloadează copia de siguranță"
           destroy:
-            title: "Sterge rezervă"
+            title: "Sterge copie de siguranță"
-            confirm: "Sunteți sigur că doriți să distrugeți această rezervă ?"
+            confirm: "Ești sigur ca vrei să ștergi această copie de siguranță?"
           restore:
             is_disabled: "Restabilirea este dezactivată din setările siteului."
             label: "Restaurează"
-            title: "Restabilește rezervă"
+            title: "Restaurează copia de siguranță"
           rollback:
             label: "Revenire la situaţia anterioară"
             title: "Restabilește baza de date în stadiul anterior"
@@ -1944,7 +1945,7 @@ ro:
         button_text: "Trimite o invitație"
         button_title: "Trimite o invitație"
       customize:
-        title: "Modifică"
+        title: "Personalizări"
         long_title: "Modificarea Site-ului"
         css: "Foaie de stil"
         header: "Titlu"
@@ -2390,7 +2391,7 @@ ro:
         reset: 'resetează'
         none: 'nimic'
         no_results: "Nu s-au găsit rezultate."
-        clear_filter: "Golește"
+        clear_filter: "Șterge"
         add_url: "adaugă URL"
         categories:
           all_results: 'Toate'
@@ -2405,12 +2406,12 @@ ro:
           onebox: "Onebox"
           seo: 'SEO'
           spam: 'Spam'
-          rate_limits: 'Limita rată'
+          rate_limits: 'Limite'
           developer: 'Developer'
           embedding: "Includere"
           legal: "Legal"
           uncategorized: 'Altele'
-          backups: "Rezervări"
+          backups: "Copii de siguranță"
           login: "Autentificare"
           plugins: "Plugin-uri"
           user_preferences: "Preferințe"
@@ -2420,18 +2421,18 @@ ro:
         new: Nou
         name: Nume
         badge: Insignă
-        display_name: Afițeaza numele
+        display_name: Afișeaza numele
-        description: Descrierea
+        description: Descriere
         badge_type: Tipul insignei
         badge_grouping: Grup
         badge_groupings:
           modal_title: Insigne de grup
         granted_by: Acordat de
         granted_at: Acordat la
-        reason_help: (O legătură către un mesaj sau o discuţie)
+        reason_help: (O legătură către o postare sau o discuţie)
         save: Salvează
         delete: Șterge
-        delete_confirm: Sunteți sigur că stergeți insigna?
+        delete_confirm: Ești sigur că vrei să ștergi această insignă?
         revoke: Revocă
         reason: Motiv
         expand: Extinde &hellip;
@@ -2447,29 +2448,29 @@ ro:
         multiple_grant: Poate sa fie acordată de mai multe ori
         listable: Arată insignă pe pagina publică a insignelor
         enabled: Activează insignă
-        icon: Iconită
+        icon: Pictogramă
         image: Imagine
         icon_help: "Folosiţi o clasă Font Awesome sau un URL pentru imagine"
-        query: Verificare insignă (SQL)
+        query: Interogare insignă (SQL)
         target_posts: Interogarea mesajelor ţintă
         auto_revoke: Pornește verificarea de revocare î fiecare zi
         show_posts: Arata mesaje ce acordă insigne pe pagina de insigne
         trigger: Declanșator
         trigger_type:
-          none: "reinprospatează zilnic"
+          none: "Actualizare zilnică"
           post_action: "Când un utilizator reacționează la un mesaj"
           post_revision: "Când un utlizator creează sau editează un mesaj"
           trust_level_change: "Când un utilizator schimbă nivelul de încredere"
           user_change: "Când un utilizator este editat sau creat"
         preview:
-          link_text: "Vedeţi insignele acordate"
+          link_text: "Previzualizare insigne acordate"
-          plan_text: "Vedeţi cu plan de execuţie"
+          plan_text: "Previzualizare cu interogare"
-          modal_title: "Interogare Previzualizare Insignă"
+          modal_title: "Previzualizare Interogare Insignă"
           sql_error_header: "A apărut o eroare la executarea interogării."
           error_help: "Vezi legăturile următoare pentru ajutor referitor la interogări pentru insigne."
           bad_count_warning:
             header: "ATENȚIE!"
-          sample: "Specimen:"
+          sample: "Exemplu:"
           grant:
             with: <span class="username">%{username}</span>
             with_post: <span class="username">%{username}</span> pentru mesajul în %{link}
@@ -2478,12 +2479,12 @@ ro:
       emoji:
         title: "Emoji"
         help: "Adaugă un nou \"emoji\" care va fi disponibil pentru toţi. (PROTIP: trage şi adaugă mai multe fişiere odată)"
-        add: "Adaugă un Nou Emoji"
+        add: "Adaugă un emoji nou"
         name: "Nume"
         image: "Imagine"
-        delete_confirm: "Sunteţi sigur că doriţi să ștergeți :%{name}: emoji?"
+        delete_confirm: "Ești sigur că vrei să ștergi emoji-ul :%{name}:?"
       embedding:
-        confirm_delete: "Sunteți sigur că vreți să ștergeți acest host?"
+        confirm_delete: "Ești sigur că vrei să ștergi acest host?"
         sample: "Folosiți următorul cod HTML în site-ul dvs. pentru a crea și pentru a embed-ui topic-uri discourse. Înlocuiți <b>REPLACE_ME</b> cu URL-ul canonic al paginii pe care doriți să o embed-uiți."
         title: "Embedding"
         host: "Host-uri permise"
@@ -2495,7 +2496,7 @@ ro:
         embed_post_limit: "Numărul maxim de postări de încorporat."
         save: "Salvați setările pentru embeding"
       permalink:
-        title: "Link-uri"
+        title: "Adrese permanente"
         url: "URL"
         topic_id: "ID discuție"
         topic_title: "Discuție"
@@ -2504,8 +2505,8 @@ ro:
         category_id: "ID categorie"
         category_title: "Categorie"
         external_url: "URL extern"
-        delete_confirm: Sigur doriți să ștergeți acest link ?
+        delete_confirm: Ești sigur că vrei să ștergi această adresă permanentă?
         form:
           label: "Nou:"
-          add: "Adăugați"
+          add: "Adaugă"
           filter: "Căutare (URL sau URL extern)"

config/locales/client.ru.yml

@@ -29,17 +29,19 @@ ru:
         millions: "{{number}} млн."
     dates:
       time: "HH:mm"
+      timeline_date: "MMM YYYY"
       long_no_year: "D MMM HH:mm"
       long_no_year_no_time: "D MMM"
-      full_no_year_no_time: "MMMM Do"
+      full_no_year_no_time: "D MMM"
       long_with_year: "D MMM YYYY, HH:mm"
       long_with_year_no_time: "D MMM, YYYY"
-      full_with_year_no_time: "MMMM Do, YYYY"
+      full_with_year_no_time: "LL"
       long_date_with_year: "D MMM YY, LT"
       long_date_without_year: "D MMM, LT"
       long_date_with_year_without_time: "D MMM YYYY"
       long_date_without_year_with_linebreak: "D MMM <br/>LT"
       long_date_with_year_with_linebreak: "D MMM YYYY <br/>LT"
+      wrap_ago: "%{date} назад"
       tiny:
         half_a_minute: "< 1мин"
         less_than_x_seconds:
@@ -149,11 +151,13 @@ ru:
       google+: 'Поделиться ссылкой через Google+'
       email: 'Поделиться ссылкой по электронной почте'
     action_codes:
-      public_topic: "сделать тему публичной %{when}"
+      public_topic: "Сделал эту тему публичной %{when}"
-      private_topic: "сделать тему приватной %{when}"
+      private_topic: "Сделал эту тему приватной %{when}"
       split_topic: "Разделил эту тему %{when}"
       invited_user: "Пригласил %{who} %{when}"
+      invited_group: "Пригласил %{who} %{when}"
       removed_user: "Исключил %{who} %{when}"
+      removed_group: "Исключил %{who} %{when}"
       autoclosed:
         enabled: 'Закрыл тему %{when}'
         disabled: 'Открыл тему %{when}'
@@ -174,7 +178,8 @@ ru:
         disabled: 'Исключил из списков %{when}'
     topic_admin_menu: "действия администратора над темой"
     emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту."
-    bootstrap_mode_disabled: "Bootstrap режим будет отключен в течение 24 часов."
+    bootstrap_mode_enabled: "Чтобы облегчить развитие вашего нового сайта в самом начале, был включен режим запуска. В этом режиме, всем новым пользователям будет автоматически присвоен 1й уровень доверия при регистрации и включена ежедневная почтовая рассылка сводки новостей. Режим запуска будет выключен автоматически, как только количество зарегистрированных пользователей достигнет %{min_users}."
+    bootstrap_mode_disabled: "Режим запуска будет отключен в течение 24 часов."
     s3:
       regions:
         us_east_1: "US East (N. Virginia)"
@@ -185,9 +190,11 @@ ru:
         eu_central_1: "EU (Frankfurt)"
         ap_southeast_1: "Asia Pacific (Singapore)"
         ap_southeast_2: "Asia Pacific (Sydney)"
+        ap_south_1: "Asia Pacific (Mumbai)"
         ap_northeast_1: "Asia Pacific (Tokyo)"
         ap_northeast_2: "Asia Pacific (Seoul)"
         sa_east_1: "South America (Sao Paulo)"
+        cn_north_1: "China (Beijing)"
     edit: 'отредактировать название и раздел темы'
     not_implemented: "Извините, эта функция еще не реализована!"
     no_value: "Нет"
@@ -297,6 +304,8 @@ ru:
     undo: "Отменить"
     revert: "Вернуть"
     failed: "Проблема"
+    switch_to_anon: "Войти в Анонимный режим"
+    switch_from_anon: "Выйти из Анонимного режима"
     banner:
       close: "Больше не показывать это объявление."
       edit: "Редактировать это объявление >>"
@@ -378,6 +387,7 @@ ru:
       selector_placeholder: "Добавить участников"
       owner: "владелец"
       visible: "Группа видима всем пользователям"
+      index: "Группы"
       title:
         one: "группа"
         few: "группы"
@@ -400,8 +410,10 @@ ru:
         none: "(Нет)"
       notifications:
         watching:
-          title: "Отслеживание"
+          title: "Наблюдать"
           description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов."
+        watching_first_post:
+          description: "Уведомлять только о первом сообщении в каждой новой теме в этой группе."
         tracking:
           title: "Следить"
         regular:
@@ -499,6 +511,7 @@ ru:
         disable: "Отключить оповещения"
         enable: "Включить оповещения"
         each_browser_note: "Примечание: эта настройка устанавливается в каждом браузере индивидуально."
+      dismiss_notifications: "Отложить все"
       dismiss_notifications_tooltip: "Пометить все непрочитанные уведомления прочитанными"
       disable_jump_reply: "Не переходить к вашему новому сообщению после ответа"
       dynamic_favicon: "Показывать колличество новых / обновленных тем на иконке сообщений"
@@ -514,10 +527,22 @@ ru:
       suspended_reason: "Причина:"
       github_profile: "Github"
       mailing_list_mode:
-        daily: "Отправить ежедневные обновления"
+        label: "Режим почтовой рассылки"
-        individual: "Отправлять письмо каждый раз, когда появляется новое сообщение."
+        enabled: "Включить почтовую рассылку"
+        instructions: |
+          Настройки почтовой рассылки перекрывают настройки сводки активности.<br />
+          Темы и разделы с выключенными уведомлениями не будут включены в письма рассылки.
+        daily: "Присылать ежедневные обновления"
+        individual: "Присылать письмо для каждого нового сообщения"
+        many_per_day: "Присылать письмо для каждого нового сообщения (примерно {{dailyEmailEstimate}} в день)"
+        few_per_day: "Присылать письмо для каждого нового сообщения (примерно 2 в день)"
+      tag_settings: "Теги"
+      watched_tags: "Наблюдение"
+      muted_tags: "Выключено"
       watched_categories: "Наблюдение"
       tracked_categories: "Отслеживаемые разделы"
+      watched_first_post_categories_instructions: "Уведомлять только о первом сообщении в каждой новой теме в этих разделах."
+      watched_first_post_tags_instructions: "Уведомлять только о первом сообщении в каждой новой теме с этими тегами."
       muted_categories: "Выключенные разделы"
       muted_categories_instructions: "Не уведомлять меня о новых темах в этих разделах и не показывать новые темы на странице «Непрочитанные»."
       delete_account: "Удалить мою учётную запись"
@@ -530,6 +555,7 @@ ru:
       muted_users: "Выключено"
       muted_users_instructions: "Не отображать уведомления от этих пользователей."
       muted_topics_link: "Показать темы \"Без уведомлений\""
+      watched_topics_link: "Показать наблюдаемые темы"
       automatically_unpin_topics: "Автоматически откреплять топики после прочтения."
       staff_counters:
         flags_given: "полезные жалобы"
@@ -634,6 +660,8 @@ ru:
       like_notification_frequency:
         title: "Уведомлять при получении симпатии"
         always: "Всегда"
+        first_time_and_daily: "Для первой симпатии, и далее не чаще раза в день"
+        first_time: "Только для первой симпатии"
         never: "Никогда"
       email_previous_replies:
         always: "всегда"
@@ -677,7 +705,7 @@ ru:
         none: "Приглашения, ожидающие одобрения, отсутствуют."
         truncated:
           one: "Первое приглашение"
-          few: "Первые {{count}} приглашений"
+          few: "Первые {{count}} приглашения"
           many: "Первые {{count}} приглашений"
           other: "Первые {{count}} приглашений"
         redeemed: "Принятые приглашения"
@@ -693,7 +721,9 @@ ru:
         rescind: "Отозвать"
         rescinded: "Приглашение отозвано"
         reinvite: "Повторить приглашение"
+        reinvite_all: "Повторить все приглашения"
         reinvited: "Приглашение выслано повторно"
+        reinvited_all: "Все приглашения высланы повторно!"
         time_read: "Времени читал"
         days_visited: "Дней посещал"
         account_age_days: "Дней с момента регистрации"
@@ -800,6 +830,7 @@ ru:
     refresh: "Обновить"
     read_only_mode:
       login_disabled: "Вход отключён, пока сайт в режиме «только для чтения»"
+      logout_disabled: "Выход отключён, пока сайт в режиме «только для чтения»"
     too_few_topics_and_posts_notice: "Давайте <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>приступим к обсуждению!</a> Сейчас <strong>%{currentTopics} / %{requiredTopics}</strong> тем и <strong>%{currentPosts} / %{requiredPosts}</strong> сообщений. Новым пользователям будет интереснее тут, если появится больше тем для обсуждений."
     too_few_topics_notice: "Давайте <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>приступим к обсуждению!</a> Сейчас <strong>%{currentTopics} / %{requiredTopics}</strong> тем. Новым пользователям будет интереснее тут, если появится больше тем для обсуждений."
     too_few_posts_notice: "Давайте <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>приступим к обсуждению!</a>  Сейчас <strong>%{currentPosts} / %{requiredPosts}</strong> сообщений. Новым пользователям будет интереснее тут, если появится больше сообщений для обсуждения."
@@ -842,6 +873,7 @@ ru:
       title: "Сообщение"
       invite: "Пригласить других..."
       remove_allowed_user: "Вы действительно хотите удалить {{name}} из данного сообщения?"
+      remove_allowed_group: "Вы действительно хотите удалить {{name}} из данного сообщения?"
     email: 'Email'
     username: 'Псевдоним'
     last_seen: 'Был'
@@ -908,6 +940,12 @@ ru:
       github:
         title: "С помощью GitHub"
         message: "Вход с помощью учетной записи GitHub (убедитесь, что блокировщик всплывающих окон отключен)"
+    emoji_set:
+      apple_international: "Apple/International"
+      google: "Google"
+      twitter: "Twitter"
+      emoji_one: "Emoji One"
+      win10: "Win10"
     shortcut_modifier_key:
       shift: 'Shift'
       ctrl: 'Ctrl'
@@ -1283,21 +1321,35 @@ ru:
         help: 'пожаловаться на сообщение'
         success_message: 'Вы пожаловались на тему.'
       feature_topic:
-        title: "Выделить эту тему"
+        title: "Закрепить эту тему"
-        confirm_pin: "У вас уже есть {{count}} закрепленных тем. Слишком большое количество закрепленных тем может стать препятствием для новых и анонимных пользователей. Вы уверены, что хотите закрепить еще одну тему в этом разделе?"
+        pin: "Закрепить эту тему вверху раздела {{categoryLink}} до"
-        unpin: "Убрать эту тему из верха раздела {{categoryLink}}."
+        confirm_pin: "У вас уже есть закрепленные темы в разделе ({{count}}). Перебор таких тем может оказаться неприятным неудобством для новичков и анонимных читателей. Вы уверены, что хотите закрепить еще одну тему в этом разделе?"
-        pin_note: "Пользователи могут открепить тему для себя."
+        unpin: "Отменить закрепление этой темы вверху раздела {{categoryLink}}."
-        pin_validation: "Дата необходима, чтобы прикрепить эту тему"
+        unpin_until: "Отменить закрепление этой темы вверху раздела {{categoryLink}} (произойдет автоматически <strong>%{until}</strong>)."
+        pin_note: "Пользователи могут открепить тему, каждый сам для себя."
+        pin_validation: "Чтобы закрепить эту тему, требуется дата."
         not_pinned: "В разделе {{categoryLink}} нет закрепленных тем."
-        confirm_pin_globally: "У вас уже есть {{count}} глобально закрепленных тем. Слишком большое количество закрепленных тем может стать препятствием для новых и анонимных пользователей. Вы уверены, что хотите глобально закрепить еще одну тему?"
+        already_pinned:
-        unpin_globally: "Убарть эту тему из верха всех списков тем."
+          one: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
-        unpin_globally_until: "Убарть эту тему из верха всех списков тем."
+          few: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        global_pin_note: "Пользователи могут открепить тему для себя."
+          many: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Глобально закрепленных тем в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        pin_globally: "Закрепить эту тему вверху всех разделов и списков тем до"
+        confirm_pin_globally: "У вас уже есть глобально закрепленные темы ({{count}}). Перебор таких тем может оказаться неприятным неудобством для новичков и анонимных читателей. Вы уверены, что хотите глобально закрепить еще одну тему?"
+        unpin_globally: "Отменить прикрепление этой темы вверху всех разделов и списков тем."
+        unpin_globally_until: "Отменить прикрепление этой темы вверху всех разделов и списков тем (произойдет автоматически <strong>%{until}</strong>)."
+        global_pin_note: "Пользователи могут открепить тему, каждый сам для себя."
         not_pinned_globally: "Нет глобально закрепленных тем."
+        already_pinned_globally:
+          one: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>1</strong>"
+          few: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          many: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
+          other: "Глобально закрепленных тем: <strong class='badge badge-notification unread'>{{count}}</strong>"
         make_banner: "Превратить эту тему в объявление, которое будет отображаться вверху всех страниц."
-        remove_banner: "Убрать объявление, которое отображается вверху всех страниц."
+        remove_banner: "Убрать тему-объявление, которое отображается вверху всех страниц."
-        banner_note: "Пользователи могут отклонить объявление, закрыв его. Только одну тему можно сделать текущим объявлением."
+        banner_note: "Пользователи могут закрывать объявление, каждый сам для себя, после чего оно больше не будет для них покываться. Только одна тема может быть сделана активным объявлением в любой момент времени."
-        no_banner_exists: "Нет текущих объявлений."
+        no_banner_exists: "Нет текущих тем-объявлений."
+        banner_exists: "На данный момент <strong class='badge badge-notification unread'>уже есть</strong> тема-объявление."
       inviting: "Высылаю приглашение..."
       invite_private:
         title: 'Пригласить в беседу'
@@ -1350,6 +1402,10 @@ ru:
           few: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщения."
           many: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений."
           other: "Пожалуйста, выберите тему, в которую вы хотели бы переместить эти <b>{{count}}</b> сообщений."
+      merge_posts:
+        title: "Соединить выделенные сообщения"
+        action: "Соединить выделенные сообщения"
+        error: "Произошла ошибка во время соединения выделенных сообщений."
       change_owner:
         title: "Изменить владельца сообщений"
         action: "изменить владельца"
@@ -1681,6 +1737,7 @@ ru:
       action: 'Пожаловаться'
       take_action: "Принять меры"
       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: "Да, удалить спамера"
@@ -1862,6 +1919,128 @@ ru:
       full: "Создавать / Отвечать / Просматривать"
       create_post: "Отвечать / Просматривать"
       readonly: "Просматривать"
+    keyboard_shortcuts_help:
+      title: 'Сочетания клавиш'
+      jump_to:
+        title: 'Быстрый переход'
+        home: '<b>g</b>, <b>h</b> Главная'
+        latest: '<b>g</b>, <b>l</b> Последние'
+        new: '<b>g</b>, <b>n</b> Новые'
+        unread: '<b>g</b>, <b>u</b> Непрочитанные'
+        categories: '<b>g</b>, <b>c</b> Разделы'
+        top: '<b>g</b>, <b>t</b> Обсуждаемые'
+        bookmarks: '<b>g</b>, <b>b</b> Закладки'
+        profile: '<b>g</b>, <b>p</b> Профиль'
+        messages: '<b>g</b>, <b>m</b> Личные сообщения'
+      navigation:
+        title: 'Навигация'
+        jump: '<b>#</b> Перейти к сообщению №'
+        back: '<b>u</b> Назад'
+        up_down: '<b>k</b>/<b>j</b> Двигать курсор выделения темы &uarr; &darr;'
+        open: '<b>o</b> или <b>Enter</b> Открыть выделенную курсором тему'
+        next_prev: '<b>shift</b>+<b>j</b>/<b>shift</b>+<b>k</b> Следующая/предыдущая секция'
+      application:
+        title: 'Форум'
+        create: '<b>c</b> Создать тему'
+        notifications: '<b>n</b> Открыть уведомления'
+        hamburger_menu: '<b>=</b> Открыть меню гамбургер'
+        user_profile_menu: '<b>p</b> Открыть меню профиля'
+        show_incoming_updated_topics: '<b>.</b> Показать обновленные темы'
+        search: '<b>/</b> Поиск'
+        help: '<b>?</b> Показать сочетания клавиш'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Отложить новые сообщения'
+        dismiss_topics: '<b>x</b>, <b>t</b> Отложить темы'
+        log_out: '<b>shift</b>+<b>z</b> <b>shift</b>+<b>z</b> Выйти'
+      actions:
+        title: 'Темы'
+        bookmark_topic: ' <b>f</b> Добавить / удалить из заклодок'
+        pin_unpin_topic: '<b>shift</b>+<b>p</b> Закрепить / Открепить тему'
+        share_topic: '<b>shift</b>+<b>s</b> Поделиться темой'
+        share_post: '<b>s</b> Поделиться сообщением'
+        reply_as_new_topic: '<b>t</b> Ответить в новой связанной теме'
+        reply_topic: '<b>shift</b>+<b>r</b> Ответить в теме'
+        reply_post: '<b>r</b> Ответить на сообщение'
+        quote_post: '<b>q</b> Процитировать сообщение'
+        like: '<b>l</b> Выразить симпатию за сообщение'
+        flag: '<b>!</b> Анонимная жалоба'
+        bookmark: '<b>b</b> Добавить сообщение в закладки'
+        edit: '<b>e</b> Редактировать сообщение'
+        delete: '<b>d</b> Удалить сообщение'
+        mark_muted: '<b>m</b>, <b>m</b> Откл. уведомления в теме'
+        mark_regular: '<b>m</b>, <b>r</b> Стандартные уведомления в теме (по-умолчанию)'
+        mark_tracking: '<b>m</b>, <b>t</b> Следить за темой'
+        mark_watching: '<b>m</b>, <b>w</b> Наблюдать за темой'
+    tagging:
+      all_tags: "Все теги"
+      selector_all_tags: "Все теги"
+      selector_no_tags: "Нет тегов"
+      changed: "Теги изменены:"
+      tags: "Теги"
+      choose_for_topic: "Выберите теги для этой темы (опционально)"
+      delete_tag: "Удалить тег"
+      delete_confirm: "Вы уверены, что хотите удалить этот тег?"
+      rename_tag: "Редактировать тег"
+      rename_instructions: "Выберите новое название тега:"
+      sort_by: "Сортировка:"
+      sort_by_count: "Количество"
+      sort_by_name: "Название"
+      manage_groups: "Управление группами тегов"
+      manage_groups_description: "Организуйте теги в группы"
+      filters:
+        without_category: "%{filter} темы с тегом %{tag}"
+        with_category: "%{filter} темы с тегом %{tag} в разделе %{category}"
+        untagged_without_category: "%{filter} темы без тегов"
+        untagged_with_category: "%{filter} темы в разделе %{category} без тегов"
+      notifications:
+        watching:
+          title: "Наблюдать"
+          description: "Автоматически наблюдать за всеми темами с этим тегом.  Уведомлять о всех новых темах и сообщениях, а также показывать количество непрочитанных и новых сообщений рядом с названиями тем."
+        watching_first_post:
+          title: "Наблюдать создание тем"
+          description: "Уведомлять только о первом сообщении в каждой новой теме с этим тегом."
+        tracking:
+          title: "Следить"
+          description: "Автоматически следить за всеми темами с этим тегом. Показывать количество непрочитанных и новых сообщений рядом с названиями тем."
+        regular:
+          title: "Стандартные уведомления"
+          description: "Уведомлять, только если кто-то упомянет меня по @псевдониму, или ответит на мое сообщение."
+        muted:
+          title: "Без уведомлений"
+          description: "Не уведомлять об обновлениях в новых темах с этим тегом и не показывать на странице «Непрочитанные»."
+      groups:
+        title: "Группы тегов"
+        about: "Для простоты управления тегами, распределите их по группам"
+        new: "Новая группа"
+        tags_label: "Теги в этой группе:"
+        parent_tag_label: "Родительский тег:"
+        parent_tag_placeholder: "Опционально"
+        parent_tag_description: "Теги из этой группы будут доступны только после добавления к теме родительского тега."
+        one_per_topic_label: "Разрешить не более одного тега из этой группы в одной теме"
+        new_name: "Назание новой группы"
+        save: "Сохранить"
+        delete: "Удалить"
+        confirm_delete: "Вы уверены, что хотите удалить эту группу тегов?"
+      topics:
+        none:
+          unread: "Нет непрочитанных тем."
+          new: "Нет новых тем."
+          read: "Вы еще не прочитали ни одной темы."
+          posted: "Вы еще не принимали участие ни в одной теме."
+          latest: "Нет последних тем."
+          hot: "Нет популярных тем."
+          bookmarks: "У вас пока нет тем в закладках."
+          top: "Нет обсуждаемых тем."
+          search: "Поиск не дал результатов."
+        bottom:
+          latest: "Больше нет последних тем."
+          hot: "Больше нет популярных тем."
+          posted: "Больше нет тем с сообщениями."
+          read: "Больше нет прочитанных тем."
+          new: "Больше нет новых тем."
+          unread: "Больше нет непрочитанных тем."
+          top: "Больше нет обсуждаемых тем."
+          bookmarks: "Больше нет тем в закладках."
+          search: "Больше нет результатов поиска."
   admin_js:
     type_to_filter: "Введите текст для фильтрации..."
     admin:

config/locales/client.sq.yml

@@ -69,7 +69,7 @@ sq:
         almost_x_years:
           one: "1v"
           other: "%{count}v"
-        date_month: "MMM D"
+        date_month: "D MMM"
         date_year: "MMM 'YY"
       medium:
         x_minutes:
@@ -109,7 +109,7 @@ sq:
       post: 'postim #%{postNumber}'
       close: 'mbylle'
       twitter: 'shpërndaje këtë lidhje në Twitter'
-      facebook: 'shpërndaje këtë lidhje ne Facebook'
+      facebook: 'postojeni këtë lidhje në Facebook'
       google+: 'shpërndaje këtë lidhje në Google+'
       email: 'dërgoje këtë lidhje me email'
     action_codes:
@@ -130,14 +130,14 @@ sq:
         enabled: 'arkivoi %{when}'
         disabled: 'paarkivuar %{when}'
       pinned:
-        enabled: 'mbërthyer %{when}'
+        enabled: 'ngjitur %{when}'
-        disabled: 'zbërthyer %{when}'
+        disabled: 'çngjitur %{when}'
       pinned_globally:
-        enabled: 'mbërthyer globalisht %{when}'
+        enabled: 'ngjitur globalisht %{when}'
-        disabled: 'ç''mbërthyer %{when}'
+        disabled: 'çngjitur %{when}'
       visible:
         enabled: 'listuar %{when}'
-        disabled: 'ç''listuar %{when}'
+        disabled: 'çlistuar %{when}'
     topic_admin_menu: "veprimet administrative mbi temën"
     emails_are_disabled: "Emailat janë çaktivizuar globalisht nga administratori i faqes. Asnjë njoftim me email nuk do të dërgohet. "
     bootstrap_mode_enabled: "Për të thjeshtuar nisjen e komunitetit, jeni në formatin \"bootstrap\". Të gjithë anëtarët e rinj do të kenë nivelin e besimit 1 dhe emailat e përditshëm të aktivizuar. Këto opsione do të çaktivizohen automatikisht kur numri total i anëtarëve të kalojë numrin %{min_users}."
@@ -257,7 +257,7 @@ sq:
     revert: "Rikthe"
     failed: "Dështoi"
     switch_to_anon: "Filloni sesionin anonim"
-    switch_from_anon: "Dilni nga sesioni anonim"
+    switch_from_anon: "Shkëputu nga sesioni anonim"
     banner:
       close: "Hiq këtë banderolë."
       edit: "Modifiko këtë banderolë >>"
@@ -271,7 +271,7 @@ sq:
       approve: 'Aprovo'
       reject: 'Refuzo'
       delete_user: 'Fshij Anëtarin'
-      title: "Kërkon aprovim"
+      title: "Tema që kërkojnë aprovim"
       none: "Nuk ka postime për të redaktuar."
       edit: "Redakto"
       cancel: "Anulo"
@@ -280,7 +280,7 @@ sq:
         one: "This topic has <b>1</b> post awaiting approval"
         other: "Kjo temë ka <b>{{count}}</b> postime që presin aprovimin"
       confirm: "Ruaj ndryshimet"
-      delete_prompt: "A jeni te sigurtë që doni të fshini <b>%{username}</b>? Ky veprim do të fshijë çdo shkrim të tyre dhe do bllokojë e-mailin dhe IP e tyre."
+      delete_prompt: "Vertet doni ta fshini <b>%{username}</b>? Ky veprim do të fshijë çdo postim të tyrin dhe do të bllokojë email-in dhe adresën e tyre IP."
       approval:
         title: "Postimi ka nevojë për aprovim"
         description: "Postimi juaj u morr, por duhet të aprovohet nga një moderator para se të shfaqet në faqe. Kini pak durim. "
@@ -335,8 +335,8 @@ sq:
       visible: "Grupi është i dukshëm për të gjithë përdoruesit"
       index: "Grupet"
       title:
-        one: "grupë"
+        one: "grup"
-        other: "grupet"
+        other: "grupe"
       members: "Anëtarë"
       topics: "Tema"
       posts: "Postime"
@@ -420,7 +420,7 @@ sq:
       username: "emri i përdoruesit"
       trust_level: "TL"
       read_time: "koha e leximit"
-      topics_entered: "topics entered"
+      topics_entered: "temat e shikuara"
       post_count: "# postimeve"
       confirm_delete_other_accounts: "A jeni të sigurtë që doni të fshini këto llogari?"
     user_fields:
@@ -454,6 +454,7 @@ sq:
         each_browser_note: "Shënim: Duhet të ndryshoni këtë rregullim (setting) në çdo shfletues që përdorni. "
       dismiss_notifications: "Hiqini të gjitha"
       dismiss_notifications_tooltip: "Shëno njoftimet e palexuara si të lexuara"
+      disable_jump_reply: "Mos shko tek postimi im pasi përgjigjem"
       dynamic_favicon: "Tregoni numrin e temave të reja e azhornuara në ikonën e shfletuesit"
       external_links_in_new_tab: "Hap të gjitha lidhjet e jashtme në një tab të ri"
       enable_quoting: "Aktivizo citimin në përgjigje për tekstin e përzgjedhur"
@@ -477,6 +478,7 @@ sq:
       watched_tags_instructions: "Ju do të vëzhgoni automatikisht të gjitha temat nën këtë etiketë. Do të njoftoheni për çdo postim e temë të re, dhe numri i postimeve të reja të palexuara do të afishohet ngjitur me titullin e temës përgjatë listave të faqes. "
       tracked_tags: "Gjurmuar"
       tracked_tags_instructions: "Ju do të gjurmoni automatikisht të gjitha temat nën këtë etiketë. Numri i përgjigjeve të palexuara do të afishohet ngjitur me titullin e temës. "
+      muted_tags: "Të heshtur"
       muted_tags_instructions: "Ju nuk do të njoftoheni për asgjë nga temat e reja të këtyre etiketave, dhe këto tema nuk do të afishohen në faqen \"Më të fundit\" për ju. "
       watched_categories: "Shikuar"
       watched_categories_instructions: "Ju do të vëzhgoni automatikisht të gjitha temat nën këtë kategori. Do të njoftoheni për çdo postim e temë të re, dhe numri i postimeve të reja të palexuara do të afishohet ngjitur me titullin e temës. "
@@ -487,7 +489,9 @@ sq:
       watched_first_post_tags: "Postimi i parë nën vëzhgim"
       watched_first_post_tags_instructions: "Ju do të njoftoheni vetëm për postimin e parë të çdo teme nën këto etiketa."
       muted_categories: "Pa njoftime"
+      muted_categories_instructions: "Ju nuk do të njoftoheni për asgjë nga temat e reja të këtyre kategorive, dhe këto tema nuk do të afishohen në faqen \"Më të fundit\" për ju. "
       delete_account: "Fshi llogarinë time"
+      delete_account_confirm: "Jeni i sigurtë që dëshironi ta mbyllni përgjithmonë llogarinë tuaj? Ky veprim nuk mund të zhbëhet!"
       deleted_yourself: "Llogaria juaj u fshi me sukses."
       unread_message_count: "Mesazhet"
       admin_delete: "Fshi"
@@ -496,6 +500,7 @@ sq:
       muted_users_instructions: "Çaktivizo të gjitha njoftimet nga këta anëtarë."
       muted_topics_link: "Trego temat e heshtura"
       watched_topics_link: "Trego temat e vëzhguara"
+      automatically_unpin_topics: "Çngjiti temat automatikisht kur arrij fundin e faqes."
       staff_counters:
         flags_given: "sinjalizime të dobishme"
         flagged_posts: "postimet e raportuara"
@@ -587,7 +592,7 @@ sq:
       last_emailed: "Emaili i fundit"
       last_seen: "Parë"
       created: "Regjistruar"
-      log_out: "Dilni"
+      log_out: "Shkëputu"
       location: "Vendndodhja"
       card_badge:
         title: "Karta e anëtarit"
@@ -644,7 +649,10 @@ sq:
         truncated:
           one: "Po afishohet ftesa e parë."
           other: "Po afishohen {{count}} ftesat e para."
-        redeemed: "Ridërgo ftesat"
+        redeemed: "Ftesa të Shlyera"
+        redeemed_tab: "Shlyer"
+        redeemed_tab_with_count: "Shlyer ({{count}})"
+        redeemed_at: "Shlyer"
         pending: "Ftesat në pritje"
         pending_tab: "Në pritje"
         pending_tab_with_count: "Në pritje ({{count}})"
@@ -705,6 +713,9 @@ sq:
         top_topics: "Temat popullore"
         no_topics: "Nuk ka ende tema."
         more_topics: "Më shumë tema"
+        top_badges: "Stemat Kryesore"
+        no_badges: "Ende asnjë stemë."
+        more_badges: "Më shumë Stema"
         top_links: "Lidhjet Top"
         no_links: "Nuk ka ende lidhje."
         most_liked_by: "Pëlqyer më shumë nga"
@@ -754,6 +765,9 @@ sq:
     refresh: "Rifresko"
     read_only_mode:
       enabled: "Faqja lejon vetëm leximet per momentin. Mund të vazhdoni të shfletoni, por përgjigjet, pëlqimet dhe veprime të tjera janë të çaktivizuara përkohësisht."
+    too_few_topics_and_posts_notice: "Hajt ta nisim <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>mbarë diskutimin!</a> Keni krijuar <strong>%{currentTopics} / %{requiredTopics}</strong> tema dhe <strong>%{currentPosts} / %{requiredPosts}</strong> postime në faqe. Vizitorët e rinj të faqes kanë nevojë për diskutime në faqe. "
+    too_few_topics_notice: "Hajt ta nisim <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>mbarë diskutimin!</a> Keni krijuar <strong>%{currentTopics} / %{requiredTopics}</strong> tema. Vizitorët e rinj të faqes kanë nevojë për diskutime në faqe. "
+    too_few_posts_notice: "Hajt ta nisim <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>mbarë diskutimin!</a> Keni krijuar <strong>%{currentPosts} / %{requiredPosts}</strong> postime në faqe. Vizitorët e rinj të faqes kanë nevojë për diskutime në faqe. "
     logs_error_rate_notice:
       rate:
         one: "1 gabim/%{duration}"
@@ -767,6 +781,7 @@ sq:
     week_desc: 'temat e krijuara në 7 ditët e fundit'
     day: 'ditë'
     first_post: Postimi i parë
+    unmute: Çaktivizo heshtjen
     last_post: Postimi i fundit
     last_reply_lowercase: përgjigja e fundit
     replies_lowercase:
@@ -807,6 +822,7 @@ sq:
     forgot_password:
       title: "Rivendos fjalëkalimin"
       action: "Kam harruar fjalëkalimin"
+      invite: "Shkruani emrin e përdoruesit ose adresen email dhe ne do t'ju nisim një email për të rivendosur një fjalëkalim të ri."
       reset: "Rivendos fjalëkalimin"
     login:
       title: "Identifikohu"
@@ -824,6 +840,7 @@ sq:
       awaiting_confirmation: "Llogaria juaj është në pritje të aktivizimit, përdorni butonin e fjalëkalimit të humbur që të merrni një email të ri me kodin e aktivizimit."
       awaiting_approval: "Llogaria juaj nuk është aprovuar ende nga një admin. Do t'ju dërgojmë një email kur të aprovohet. "
       requires_invite: "Na vjen keq, ky forum është vetëm për anëtarë të ftuar. "
+      resend_activation_email: "Klikoni këtu për të dërguar sërish email-in e aktivizimit."
       to_continue: "Ju lutemi, identifikohuni"
       forgot: "Nuk i mbaj mend detajet e llogarisë"
       google:
@@ -832,8 +849,10 @@ sq:
         title: "me Google"
       twitter:
         title: "me Twitter"
+        message: "Duke u identifikuar me Twitter (çaktivizoni bllokuesit e popupeve, nëse i përdorni)"
       facebook:
         title: "me Facebook"
+        message: "Duke u identifikuar me Facebook (çaktivizoni bllokuesit e popupeve, nëse i përdorni)"
       yahoo:
         title: "me Yahoo"
       github:
@@ -853,6 +872,7 @@ sq:
       more_emoji: "më shumë..."
       options: "Opsione"
       whisper: "pëshpëritje"
+      unlist: "çlistuar"
       add_warning: "Ky është një paralajmërim zyrtar."
       toggle_whisper: "Hiq pëshpëritjet"
       posting_not_on_topic: "Cilës temë doni t'i përgjigjeni?"
@@ -892,7 +912,7 @@ sq:
       show_preview: 'tregoni panelin e parashikimit &raquo;'
       hide_preview: '&laquo; fshiheni panelin e parashikimit'
       quote_post_title: "Citoni të gjithë postimin"
-      bold_title: "Theksuar"
+      bold_title: "Trashë"
       bold_text: "tekst i trashë"
       italic_title: "Theksuar"
       italic_text: "tekst i theksuar"
@@ -919,6 +939,9 @@ sq:
       modal_ok: "OK"
       modal_cancel: "Anulo"
       cant_send_pm: "Na vjen keq, nuk mund t'i dërgoni mesazh privat anëtarit %{username}."
+      yourself_confirm:
+        title: "Mos harruat të shtonit marrësit?"
+        body: "Për momentin ky mesazh po ju dërgohet vetëm juve!"
       admin_options_title: "Rregullime opsionale të stafit për këtë temë"
       auto_close:
         label: "Data e mbylljes automatike të temës:"
@@ -952,6 +975,7 @@ sq:
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> pranoi ftesën tuaj</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> transferoi {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
+      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Fituar '{{description}}'</p>"
       watching_first_post: "<i title='new topic' class='fa fa-dot-circle-o'></i><p><span>Temë e re</span> {{description}}</p>"
       group_message_summary:
         one: "<i title='messages in group inbox' class='fa fa-group'></i><p> {{count}} message in your {{group_name}} inbox</p>"
@@ -969,6 +993,7 @@ sq:
         invitee_accepted: "Ftesa u pranua nga"
         moved_post: "Postimi juaj u transferua nga"
         linked: "Lidhja drejt postimit tuaj"
+        granted_badge: "Stema u dhurua"
         group_message_summary: "Mesazhet në inboxin e grupit"
       popup:
         mentioned: '{{username}} ju përmendi në "{{topic}}" - {{site_title}}'
@@ -985,9 +1010,11 @@ sq:
       from_the_web: "Nga Interneti"
       remote_tip: "lidhje tek imazhi"
       uploading: "Duke ngarkuar"
+      select_file: "Zgjdhni një Skedar"
     search:
       sort_by: "Rendit sipas"
       most_liked: "Më të pëlqyer"
+      select_all: "Zgjidhni Gjithçka"
       result_count:
         one: "1 rezultat për <span class='term'>\"{{term}}\"</span>"
         other: "{{count}} rezultate për <span class='term'>\"{{term}}\"</span>"
@@ -998,17 +1025,24 @@ sq:
         user: "Kërko postime nga @{{username}}"
         category: "Kërkoni kategorinë #{{category}}"
         topic: "Kërko tek kjo temë"
+    hamburger_menu: "shko tek një kategori ose një listë e re temash"
     new_item: "e re"
     go_back: 'kthehu mbrapa'
     topics:
       bulk:
         reset_read: "Reseto leximet"
         delete: "Fshi temat"
+        dismiss_tooltip: "Hiq veç postimet e reja ose ndalo së ndjekuri temat"
+        dismiss_new: "Hiq të Rejat"
         actions: "Veprime në masë"
         change_category: "Ndrysho kategori"
         close_topics: "Mbyll temat"
         archive_topics: "Arkivo temat"
         notification_level: "Ndrysho nivelin e njoftimeve"
+        choose_new_category: "Zgjidhni kategorinë e re për temat: "
+        selected:
+          one: "Keni zgjedhur <b>1</b> temë."
+          other: "Keni zgjedhur <b>{{count}}</b> tema."
         change_tags: "Ndrysho etiketat"
         choose_new_tags: "Zgjidh etiketa të reja për këto tema:"
         changed_tags: "Etiketat e temave u ndryshuan. "
@@ -1024,6 +1058,7 @@ sq:
         top: "Nuk ka tema popullore."
         educate:
           new: '<p>Temat e reja shfaqen këtu.</p><p>Automatikisht, temat cilësohen si të reja dhe kanë një shënim <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">i ri</span> nëse janë krijuar gjatë dy ditëve të fundit.</p><p>Vizitoni <a href="%{userPrefsUrl}">preferencat</a> për t''a ndryshuar këtë parametër.</p>'
+          unread: '<p>Temat e palexuara shfaqen këtu.</p><p>Automatkisht, temat klasifikohen si të palexuara dhe kanë etiketa me numër <span class="badge new-posts badge-notification">1</span> nëse ju:</p><ul><li>krijuat temën</li><li>iu përgjigjët temës</li><li>lexuat temën për më shumë se 4 minuta</li></ul><p>Ose nëse keni zgjedhur të Gjurmoni ose Vëzhgoni temën duke klikuar në butonin përkatës në fund të çdo teme.</p><p>Vizitoni <a href="%{userPrefsUrl}">preferencat tuaja</a> për të bër ndryshime.</p>'
       bottom:
         latest: "Nuk ka më tema të reja."
         hot: "Nuk ka më tema të nxehta."
@@ -1037,8 +1072,16 @@ 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'
+      archive_message:
+        help: 'Zhvendoseni mesazhin në arkivën tuaj'
+        title: 'Arkivoni'
+      move_to_inbox:
+        title: 'Lëviz në Inbox'
+        help: 'Riktheje mesazhin në inbox'
       list: 'Temat'
       new: 'temë e re'
       new_topics:
@@ -1050,8 +1093,20 @@ sq:
       title: 'Tema'
       invalid_access:
         title: "Tema është private"
+        description: "Na vjen keq, por nuk keni akses tek kjo temë. "
+        login_required: "Duhet të identifikoheni për të parë këtë temë. "
+      server_error:
+        title: "Temën nuk e hapëm dot"
+        description: "Na vjen keq, nuk arritëm t'a ngarkojmue këtë temë, problem serveri. Provoni përsëri më vonë. Nëse problemi vazhdon, ju lutemi të na njoftoni. "
       not_found:
         title: "Tema nuk u gjet"
+        description: "Na vjen keq, nuk e gjetëm dot temën. Mund të jetë fshirë nga një moderator... "
+      total_unread_posts:
+        one: "ju keni 1 postim të palexuar në këtë temë"
+        other: "ju keni {{count}} postime të palexuara në këtë temë"
+      unread_posts:
+        one: "ju keni 1 postim të vjetër të palexuar në këtë temë"
+        other: "ju keni {{count}} postime të vjetra të palexuara në këtë temë"
       new_posts:
         one: "ka 1 postim të ri në këtë temë që nga hera e fundit që ishit këtu"
         other: "ka {{count}} postime të reja në këtë temë që nga hera e fundit që ishit këtu"
@@ -1060,13 +1115,19 @@ sq:
         other: "ka {{count}} pëlqime në këtë temë"
       back_to_list: "Kthehu tek lista e temave"
       options: "Opsionet e temës"
+      show_links: "trego lidhjet në këtë temë"
       toggle_information: "më shumë mbi temën"
       read_more_in_category: "Dëshironi të lexoni më shumë? Shfleto temat në {{catLink}} ose {{latestLink}}."
       read_more: "Dëshironi të lexoni më shumë? {{catLink}} ose {{latestLink}}."
       browse_all_categories: Shfleto kategoritë
       view_latest_topics: shiko temat më të fundit
       suggest_create_topic: Pse nuk hapni një temë të re?
+      deleted: "Tema është fshirë"
+      auto_close_notice: "Kjo temë do të mbyllet automatikisht %{timeLeft}."
+      auto_close_notice_based_on_last_post: "Kjo temë do të mbyllet %{duration} pas përgjigjes së fundit. "
+      auto_close_title: 'Rregullimet e Mbylljes Automatike'
       auto_close_save: "Ruaj"
+      auto_close_remove: "Mos e Mbyll Automatikisht Këtë Temë"
       timeline:
         back: "Kthehu mbrapa"
         back_description: "Kthehu mbrapa tek postimi i fundit i palexuar"
@@ -1085,7 +1146,6 @@ sq:
       notifications:
         title: ndryshoni sa shpesh njoftoheni mbi këtë temë
         reasons:
-          '3_10': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar etiketën e kësaj teme. '
           '3_6': 'Ju do të merrni njoftime sepse jeni duke vëzhguar këtë kategori. '
           '3_5': 'Ju do të njoftoheni duke qënë se jeni duke gjurmuar këtë temë automatikisht. '
           '3_2': 'Ju do të njoftoheni duke qënë se jeni duke vëzhguar këtë temë. '
@@ -1125,20 +1185,51 @@ sq:
           title: "Pa njoftime"
           description: "Ju nuk do të njoftoheni për asgjë mbi këtë temë, dhe tema nuk do të shfaqet në listën e temave më të fundit. "
       actions:
+        recover: "Rivendos temën"
         delete: "Fshi temën"
         open: "Hap temën"
         close: "Mbyll temën"
+        multi_select: "Përzgjidhni Postimet..."
+        auto_close: "Mbylle Automatikisht..."
+        pin: "Ngjite temën..."
+        unpin: "Çngjite temën..."
+        unarchive: "Çarkivoje temën"
+        archive: "Arkivoje temën"
+        invisible: "Hiqeni nga Listat"
+        visible: "Listojeni"
         make_public: "Bëje temën publike"
         make_private: "Bëje mesazh privat"
+      feature:
+        pin: "Ngjite temën"
+        unpin: "Çngjite temën"
+        pin_globally: "Ngjite temën globalisht"
+        make_banner: "Temë banderolë"
+        remove_banner: "Çaktivizo temën banderolë"
       reply:
         title: 'Përgjigju'
         help: 'shkruaj një përgjigje tek kjo temë'
+      clear_pin:
+        help: "Hiqeni statusin \"e ngjitur\" të kësaj teme që të mos afishohet më në majë të listës së temave"
       share:
         title: 'Shpërndaje'
         help: 'shpërndani një lidhje mbi temën'
       flag_topic:
         title: 'Sinjalizo'
         help: 'sinjalizo privatisht këtë temë ose dërgo një njoftim privat'
+        success_message: 'Sinjalizimi juaj i kësaj teme u krye me sukses. '
+      feature_topic:
+        title: "Temë në plan të parë"
+        confirm_pin: "Ju tashmë keni {{count}} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër në këtë kategori?"
+        not_pinned: "Nuk ka tema të përzgjedhura në {{categoryLink}}."
+        already_pinned:
+          one: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Temat kryesore të momentit në {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        confirm_pin_globally: "Ju tashmë keni {{count}} tema të përzgjedhura. Shumë tema të përzgjedhura mund të bëhen barrë për përdorues të rinj dhe anonimë. A jeni i sigurtë që dëshironi ta përzgjidhni një temë tjetër të gjithanëshme?"
+        not_pinned_globally: "Nuk ka tema të përzgjedhura kudo."
+        already_pinned_globally:
+          one: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>1</strong>"
+          other: "Të gjitha temat kryesore të momentit: <strong class='badge badge-notification unread'>{{count}}</strong>"
+        banner_exists: "Për momentin <strong class='badge badge-notification unread'>ka</strong> një temë parrullë."
       invite_private:
         title: 'Ftoje në këtë mesazh'
         email_or_username: "Emaili ose emri i përdoruesit të të ftuarit"
@@ -1150,8 +1241,11 @@ sq:
         username_placeholder: "emri i përdoruesit"
         action: 'Dërgoni ftesën'
         help: 'ftoni të tjerë në këtë temë nëpërmjet emailit ose njoftimeve'
+        to_forum: "Do të dërgojmë një email të shkurtër që do ta lejojë mikun tuaj të regjistrohet menjëherë duke klikuar një lidhje, pa kërkuar hyrjen në sistem."
         sso_enabled: "Vendosni emrin e përdoruesit që dëshironi të ftoni në këtë temë"
         to_topic_blank: "Vendosni emrin e përdoruesit ose adresën email të personit që dëshironi të ftoni në këtë temë"
+        to_topic_email: "Ju keni shtuar një adresë email. Ne do t'i dërgojmë një ftesë në email që do ta lejojë mikun tuaj t'i përgjigjet menjëherë kësaj teme."
+        to_topic_username: "Ju shtuat një emër përdoruesi. Ne do t'i dërgojmë një njoftim me një lidhje duke i ftuar ata në këtë temë."
         to_username: "Vendosni emrin e përdoruesit që dëshironi të ftoni. Sistemi do i dërgojë një njoftim me një lidhje drejt kësaj teme. "
         email_placeholder: 'emri@adresa.com'
         success_email: "Sistemi dërgoi një ftesë për <b>{{emailOrUsername}}</b>. Do t'ju njoftojmë kur ftesa të jetë pranuar. Shikoni edhe faqen Ftesat nën profilin tuaj të anëtarit për të parë statusin e ftesave. "
@@ -1163,13 +1257,34 @@ sq:
           one: "1 postim"
           other: "{{count}} postime"
         cancel: "Hiq filtrin"
+      split_topic:
+        instructions:
+          one: "Jeni duke krijuar një temë të re dhe duke e populluar atë me postimin që keni përzgjedhur."
+          other: "Jeni duke krijuar një temë të re dhe duke e populluar atë me <b>{{count}}</b> postimet që keni përzgjedhur."
+      merge_posts:
+        title: "Bashkoni Postimet e Përzgjedhura"
+        action: "bashkoni postimet e përzgjedhura"
+        error: "Ndodhi një gabim ndërsa po bashkoheshin postimet e përzgjedhura."
       change_owner:
+        title: "Ndrysho autorin e postimeve"
         action: "ndrysho zotëruesin"
+        error: "Pati një gabim gjatë ndryshimit të autorit të postimeve."
+        label: "Autori i ri i postimeve"
+        placeholder: "emri i përdoruesit të autorit"
+      change_timestamp:
+        title: "Ndrysho Datën"
+        action: "ndrysho datën"
+        invalid_timestamp: "Data nuk mund të jetë në të ardhmen."
+        error: "Hasëm në një gabim gjatë ndryshimit të datës së temës. "
+        instructions: "Ju lutem zgjidhni një datë postimi për temën. Postimet në temë do të përditësohen për të patur të njëjtën diferencë kohore."
       multi_select:
         select: 'zgjidh'
         delete: fshij të përzgjedhurat
         cancel: anulo përzgjedhjen
         select_all: përzgjidhi të gjitha
+        description:
+          one: Keni përzgjedhur <b>1</b> postim.
+          other: Keni përzgjedhur <b>{{count}}</b> postime.
     post:
       quote_reply: "cito përgjigjen"
       edit: "Duke modifikuar {{link}} {{replyAvatar}} {{username}}"
@@ -1260,6 +1375,10 @@ sq:
           like:
             one: "1 person pëlqeu këtë postim"
             other: "{{count}} vetë pëlqyen këtë postim"
+      merge:
+        confirm:
+          one: "Jeni i sigurtë që dëshironi t'i bashkoni këto postime?"
+          other: "Jeni i sigurtë që dëshironi t'i bashkoni këto {{count}} postime?"
       revisions:
         controls:
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
@@ -1269,26 +1388,34 @@ sq:
           side_by_side:
             button: '<i class="fa fa-columns"></i> HTML'
     category:
+      can: 'mund&hellip; '
       none: '(pa kategori)'
       all: 'Të gjitha kategoritë'
+      choose: 'Zgjidhni një kategori&hellip;'
       edit: 'redakto'
       edit_long: "Redakto"
-      general: 'I përgjithshëm'
+      view: 'Shiko temat në kategorinë'
+      general: 'Karakteristika të përgjithshme'
       settings: 'Rregullimet'
+      topic_template: "Shabllon i Temës"
       tags: "Etiketat"
       delete: 'Fshini kategorinë'
-      create: 'Kategori e re'
+      create: 'Krijo kategorinë e re'
       create_long: 'Krijo një kategori të re'
       save: 'Ruaj kategorinë'
       name: "Emri i kategorisë"
       description: "Përshkrimi"
+      badge_colors: "Ngjyrat e stemës"
       background_color: " Ngjyra e sfondit"
       color_placeholder: "Çdo ngjyrë web"
+      delete_confirm: "Jeni i sigurtë që dëshironi ta fshini këtë kategori?"
       list: "Shfaq kategoritë"
       change_in_category_topic: "Redakto përshkrimin"
       security: "Siguria"
       images: "Imazhet"
+      auto_close_label: "Mbylle automatikisht temën pas:"
       auto_close_units: "orë"
+      allow_badges_label: "Lejo të jepen stemat në këtë kategori"
       edit_permissions: "Ndryshoni autorizimet"
       add_permission: "Shtoni autorizim"
       this_year: "këtë vit"
@@ -1338,6 +1465,8 @@ sq:
       notify_action: "Message"
     topic_map:
       title: "Përmbledhja e Temës"
+      participants_title: "Postues të Shpeshtë"
+      links_title: "Lidhje Aktive"
       links_shown: "trego më shumë lidhje..."
       clicks:
         one: "1 klik"
@@ -1349,11 +1478,30 @@ sq:
     topic_statuses:
       warning:
         help: "Ky është një paralajmërim zyrtar."
+      locked:
+        help: "Kjo temë është mbyllur; nuk pranon më përgjigje"
+      archived:
+        help: "Kjo temë është arkivuar; nuk mund të bëhen ndryshime "
+      locked_and_archived:
+        help: "Kjo temë është mbyllur dhe arkivuar; nuk pranohen përgjigje apo ndryshime"
+      unpinned:
+        title: "Jo e përzgjedhur"
+        help: "Kjo temë është e çngjitur për ju; do të paraqitet në renditje normale"
+      pinned_globally:
+        title: "E përzgjedhur Kudo"
+        help: "Kjo temë është e ngjitur globalisht; do të paraqitet në majë të postimeve të reja dhe të kategorisë përkatëse"
+      pinned:
+        title: "E përzgjedhur"
+        help: "Kjo temë është e ngjitur për ju; do të paraqitet në majë të kategorisë përkatëse"
+      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"
     replies: "Përgjigjet"
+    views_long: "kjo temë është parë {{number}} herë"
     activity: "Aktiviteti"
     likes: "Pëlqimet"
     likes_lowercase:
@@ -1371,6 +1519,8 @@ sq:
       title: "Raw Email"
     categories_list: "Lista Kategorive"
     filters:
+      with_topics: "Temat nga %{filter}"
+      with_category: "Temat nga: %{filter}, %{category}"
       latest:
         title: "Më të fundit"
         title_with_count:
@@ -1410,7 +1560,7 @@ sq:
           other: "Të reja ({{count}})"
         help: "temat e krijuar gjatë ditëve të fundit"
       posted:
-        title: "Postimet e Mia"
+        title: "Postimet e mia"
         help: "temat ku keni dërguar pêrgjigje"
       bookmarks:
         title: "Të preferuarat"
@@ -1422,22 +1572,27 @@ sq:
           other: "{{categoryName}} ({{count}})"
         help: "temat e fundit në kategorinë {{categoryName}}"
       top:
-        title: "Top"
+        title: "Popullore"
         help: "temat më aktive të vitit, muajit, javës apo ditës së shkuar"
         all:
           title: "Gjithë Kohës"
         yearly:
           title: "Vjetore"
+        quarterly:
+          title: "Tremujorsh"
         monthly:
           title: "Mujore"
         weekly:
           title: "Javore"
         daily:
           title: "Ditore"
-        all_time: "Gjithë Kohës"
+        all_time: "Gjithë kohës"
-        this_year: "Vit"
+        this_year: "Këtë vit"
-        this_week: "javë"
+        this_quarter: "Këtë tremujor"
+        this_month: "Këtë muaj"
+        this_week: "Këtë javë"
         today: "Sot"
+        other_periods: "shiko më  populloret"
     browser_update: 'Fatkeqësisht, <a href="http://www.discourse.org/faq/#browser">shfletuesi juaj është shumë i vjetër për këtë faqe</a>. Ju lutemi, <a href="http://browsehappy.com">azhornoni shfletuesin</a>.'
     permission_types:
       full: "Krijo / Përgjigju / Shiko"
@@ -1466,7 +1621,19 @@ sq:
         back: '<b>u</b> Mbrapa'
       application:
         create: '<b>c</b> Hap një temë të re'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Hiq Të Rejat/Postimet'
+      actions:
+        mark_muted: '<b>m</b>, <b>m</b> Bëje temë të heshtur'
     badges:
+      earned_n_times:
+        one: "Kjo stemë është fituar 1 herë"
+        other: "Kjo stemë është fituar %{count} herë"
+      others_count: "Të tjerë me këtë stemë (%{count})"
+      title: Stema
+      badge_count:
+        one: "1 Stemë"
+        other: "%{count} Stema"
+      select_badge_for_title: Zgjidhni një shenjë dalluese për ta përdorur si titullin tuaj
       badge_grouping:
         trust_level:
           name: Niveli i besimit
@@ -1586,7 +1753,7 @@ sq:
       commits:
         by: "nga"
       flags:
-        old: "Të Vjetër"
+        old: "Të Vjetra"
         active: "Aktive"
         agree: "Pranoj"
         agree_flag_modal_title: "Prano dhe..."
@@ -1597,6 +1764,7 @@ sq:
         delete_post_defer_flag: "Fshini postimin dhe shtyni për më vonë sinjalizimin"
         delete_post_agree_flag: "Fshini postimin dhe bini dakord me sinjalizimin"
         delete_spammer: "Elimino Spammer"
+        delete_spammer_title: "Fshijeni përdoruesin dhe të gjitha temat e postimet nga ky përdorues."
         disagree_flag_unhide_post_title: "Hiqni të gjitha sinjalizimet mbi këtë postim dhe ripublikojeni postimin"
         clear_topic_flags: "U krye"
         more: "(më shumë përgjigje...)"
@@ -1606,6 +1774,7 @@ sq:
         system: "Sistemi"
         reply_message: "Përgjigju"
         no_results: "Nuk ka sinjalizime."
+        topic_flagged: "Kjo <strong>temë</strong> është sinjalizuar."
         was_edited: "Postimi është redaktuar pas sinjalizimit të parë"
         previous_flags_count: "Ky postim është sinjalizuar {{count}} herë."
         summary:
@@ -1623,6 +1792,7 @@ sq:
         name: "Emri"
         add: "Shto"
         add_members: "Shto Anëtar"
+        bulk_select: "(zgjidhni një grup)"
         automatic: "Automatik"
       api:
         generate_master: "Gjenero Master API Key"
@@ -1634,19 +1804,21 @@ sq:
         revoke: "Revoko"
         all_users: "Gjithë Anëtarët"
       plugins:
-        title: "Shtojca"
+        title: "Pluginet"
-        installed: "Shtojcat e Instaluara"
+        installed: "Pluginet e instaluar"
         name: "Emri"
+        none_installed: "Nuk keni instaluar asnjë plugin. "
         version: "Versioni"
         enabled: "Aktivizuar?"
         is_enabled: "Y"
         not_enabled: "N"
         change_settings: "Ndrysho Rregullimet"
         change_settings_short: "Rregullimet"
+        howto: "Si mund të instaloj një plugin?"
       backups:
-        title: "Backups"
+        title: "Rezervat"
         menu:
-          backups: "Backups"
+          backups: "Rezervat"
           logs: "Logs"
         columns:
           filename: "Filename"
@@ -1663,6 +1835,7 @@ sq:
           restore:
             label: "Rikthe"
       export_csv:
+        user_archive_confirm: "Vërtet doni t'i shkarkoni postimet tuaja?"
         failed: "Eksporti dështoi. Kontrolloni log-et. "
         button_text: "Eksporto"
         button_title:
@@ -1679,6 +1852,7 @@ sq:
       customize:
         title: "Personalizo"
         css: "CSS"
+        top: "Popullore"
         head_tag:
           text: "</head>"
         body_tag:
@@ -1733,6 +1907,7 @@ sq:
             address_placeholder: "emri@shembull.com"
             skipped_reason_placeholder: "arsye"
       logs:
+        title: "Ditari"
         created_at: "Krijuar"
         ip_address: "IP"
         delete: 'Fshij'
@@ -1741,21 +1916,27 @@ sq:
         screened_actions:
           block: "blloko"
         staff_actions:
+          title: "Veprime Stafi"
           when: "Kur"
           details: "Detaje"
           new_value: "I Ri"
           modal_title: "Detaje"
           actions:
             change_trust_level: "ndrysho nivelin e besimit"
+            grant_badge: "dhuro stemë"
+            revoke_badge: "tërhiq stemë"
             deleted_tag: "etiketë e fshirë"
             renamed_tag: "etiketë e riemëruar"
         screened_emails:
+          title: "Kontroll Email-ash"
           actions:
             allow: "Lejo"
         screened_urls:
+          title: "Kontroll URL-sh"
           url: "URL"
           domain: "Domain"
         screened_ips:
+          title: "Kontroll IP-sh"
           actions:
             block: "Blloko"
             do_nothing: "Lejo"
@@ -1765,7 +1946,7 @@ sq:
             add: "Shto"
             filter: "Kërko"
         logster:
-          title: "Error Logs"
+          title: "Ditar Gabimesh"
       impersonate:
         title: "Personifiko"
       users:
@@ -1808,7 +1989,7 @@ sq:
         refresh_browsers_message: "Mesazhi u dërgua tek të gjithë klientët!"
         show_public_profile: "Shfaq Profilin Publik"
         ip_lookup: "Shiko IP"
-        log_out: "Dilni"
+        log_out: "Shkëputu"
         revoke_admin: 'Revoko Admin'
         block: 'Blloko'
         activity: Aktiviteti
@@ -1819,7 +2000,9 @@ sq:
         approved_by: "aprovuar nga"
         time_read: "Koha e Leximit"
         delete: "Fshij Anëtarë"
-        delete_dont_block: "Fshij vetëm"
+        delete_confirm: "E SIGURT që doni ta fshini këtë përdorues? Kjo është e përhershme!"
+        delete_and_block: "Fshijeni dhe <b>bllokoni</b> këtë email dhe adresë IP"
+        delete_dont_block: "Vetëm fshijeni"
         deleted: "Anëtari u fshi."
         send_activation_email: "Dërgo Emailin e Aktivizimit"
         activate: "Aktivizoni llogarinë"
@@ -1863,13 +2046,16 @@ sq:
         revert_confirm: "A jeni të sigurtë se doni të riktheni mbrapsht ndryshimet e bëra?"
         go_back: "Kthehu tek kërkimi"
         recommended: "Ju rekomandojmë të ndryshoni tekstin më poshtë sipas nevojave tuaja: "
+        show_overriden: 'Shfaq vetëm të ndryshuarat'
       site_settings:
+        show_overriden: 'Shfaq vetëm të ndryshuarat'
         title: 'Rregullimet'
         reset: 'reseto'
         none: 'asnjë'
         no_results: "Nuk u gjet asnjë rezultat."
         clear_filter: "Pastro"
         categories:
+          users: 'Përdoruesit'
           email: 'Email'
           files: 'Skedarë'
           trust: 'Nivelet e besimit'
@@ -1881,25 +2067,50 @@ sq:
           embedding: "Embedding"
           legal: "Legale"
           uncategorized: 'Të tjerë'
-          backups: "Backups"
+          backups: "Rezervat"
-          login: "Idetifikohu"
+          login: "Identifikohu"
+          plugins: "Pluginet"
           user_preferences: "Rregullimet e përdoruesit"
           tags: "Etiketat"
       badges:
+        title: Stema
+        new_badge: Stemë e Re
         new: I Ri
         name: Emri
+        badge: Stemë
         display_name: Emri Shfaqur
         long_description: Përshkrim i gjatë
+        badge_type: Lloj Steme
         badge_grouping: Grupi
+        badge_groupings:
+          modal_title: Grupime Steme
         save: Ruaj
         delete: Fshij
+        delete_confirm: Jeni i sigurtë që doni ta fshini këtë stemë?
         reason: Arsye
+        revoke_confirm: Jeni i sigurtë që doni ta tërhiqni këtë stemë?
+        edit_badges: Ndryshoni Stemat
+        grant_badge: Dhuroni Stemë
+        granted_badges: Stema të Dhuruara
+        no_user_badges: "%{name} nuk ka marrë ende ndonjë stemë."
+        no_badges: Nuk ka stema që mund të dhurohen.
+        none_selected: "Si fillim zgjidhni një stemë"
+        allow_title: Lejoni stemën të përdoret si titull
+        listable: Shfaqni stemën në faqen publike të stemave
+        enabled: Aktivizoni stemën
         image: Imazh
+        query: Query Steme (SQL)
         trigger_type:
           trust_level_change: "Kur një përdorues ndryshon nivelin e besimit"
         preview:
+          link_text: "Shikim paraprak i stemave të dhuruara"
+          modal_title: "Shikim paraprak Pyetësori Stemash"
           bad_count_warning:
             header: "KUJDES!"
+          no_grant_count: "Asnjë stemë për t'u dhënë."
+          grant_count:
+            one: "<b>1</b> stemë për t'u dhënë."
+            other: "<b>%{count}</b> stema për t'u dhënë."
           sample: "Shëmbull:"
           grant:
             with: <span class="username">%{username}</span>

config/locales/client.sv.yml

@@ -781,8 +781,6 @@ sv:
     too_few_topics_notice: "Låt oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få igång den här diskussionen!</a> Det finns för närvarande <strong>%{currentTopics} / %{requiredTopics}</strong> ämnen. Nya användare behöver några konversationer att läsa och svara på."
     too_few_posts_notice: "Låt oss <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>få igång den här diskussionen!</a> Det finns för närvarande <strong>%{currentPosts} / %{requiredPosts}</strong> inlägg. Nya användare behöver några konversationer att läsa och svara på."
     logs_error_rate_notice:
-      reached: "<b>[%{relativeAge}]</b> Aktuell takt av <a href='%{url}' target='_blank'>%{rate}</a> har nått webbplatsinställningarnas gräns på %{siteSettingRate}."
-      exceeded: "<b>[%{relativeAge}]</b> Aktuell takt av <a href='%{url}' target='_blank'>%{rate}</a> har överträffat webbplatsinställningarnas gräns på %{siteSettingRate}."
       rate:
         one: "1 fel/%{duration}"
         other: "%{count} fel/%{duration}"
@@ -1201,7 +1199,6 @@ sv:
         title: ändra hur ofta du får notifieringar om det här ämnet
         reasons:
           mailing_list_mode: "Du har utskicksläge aktiverat, så du kommer notifieras om inlägg till det här ämnet via e-post."
-          '3_10': 'Du kommer att ta emot notifikationer för att du bevakar en tagg i det här ämnet.'
           '3_6': 'Du kommer att få notifikationer för att du bevakar denna kategori.'
           '3_5': 'Du kommer att ta emot notifikationer för att du automatiskt började följa det här ämnet.'
           '3_2': 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.'

config/locales/client.tr_TR.yml

@@ -452,15 +452,19 @@ tr_TR:
         few_per_day: "Her yeni gönderi için bana email gönder ( 2 günlük )"
       tag_settings: "Etiketler"
       watched_tags: "Gözlendi"
+      watched_tags_instructions: "Bu etiketlerle tüm konuları otomatik olarak izleyebileceksiniz. Tüm yeni gönderi ve konulardan haberdar olabileceksiniz ve yeni gönderileri konunun yanında görünecektir."
       tracked_tags: "Takip edildi"
+      tracked_tags_instructions: "Bu etiketlerle tüm konuları otomatik olarak izleyebileceksiniz. Yeni gönderiler konunun yanında görünecektir."
       muted_tags: "Susturuldu"
       muted_tags_instructions: "Bu etiketler ile yeni konular hakkında herhangi bir bildiri almayacaksınız ve en son gönderilerde belirmeyecekler."
       watched_categories: "Gözlendi"
+      watched_categories_instructions: "Bu kategorilerdeki konuları otomatik olarak izleyebileceksiniz. Tüm yeni gönderi ve konulardan haberdar olabileceksiniz ve yeni gönderileri konunun yanında görünecektir."
       tracked_categories: "Takip edildi"
       tracked_categories_instructions: "Bu kategorilerdeki tüm konuları otomatik olarak takip edeceksiniz. Yeni gönderilerin sayısı ilgili konunun yanında belirecek."
       watched_first_post_categories: "İlk gönderi izlemeniz"
       watched_first_post_categories_instructions: "Bu kategorilerde bulunan tüm konuların ilk gönderilerinde bildirim alacaksınız."
       watched_first_post_tags: "İlk gönderi izlemeniz"
+      watched_first_post_tags_instructions: "Bu etiketlerle her yeni konudaki ilk gönderi için bildirim alacaksınız."
       muted_categories: "Susturuldu"
       muted_categories_instructions: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve en son gönderilerde belirmeyecekler. "
       delete_account: "Hesabımı Sil"
@@ -577,19 +581,24 @@ tr_TR:
       like_notification_frequency:
         title: "Beğenildiğinde bildir"
         always: "Her zaman"
+        first_time_and_daily: "İlk kez bir posta günlük olarak beğenildi"
         first_time: "İlk ileti beğenisi"
         never: "Asla"
       email_previous_replies:
+        title: "Önceki cevapları e-postaların altına ekle"
         unless_emailed: "daha önce gönderilmediyse"
         always: "her zaman"
         never: "asla"
       email_digests:
+        title: "Ben burda yokken popüler konu ve cevapların özetini e-posta olarak gönder"
         every_30_minutes: "30 dakikada bir"
         every_hour: "saatte bir"
         daily: "günlük"
         every_three_days: "her üç günde bir"
         weekly: "haftalık"
         every_two_weeks: "her iki haftada bir"
+      include_tl0_in_digests: "Yeni kullanıcılardan gelen içeriği özet e-postalarına ekle"
+      email_in_reply_to: "Gönderilere gelen yanıtların bir örneğini e-postaya ekle"
       email_direct: "Birisi gönderime cevap verdiğinde, benden alıntı yaptığında, @username şeklinde bahsettiğinde ya da beni bir konuya davet ettiğinde bana bir email at"
       email_private_messages: "Biri bana mesaj yazdığında bana bir email at"
       email_always: "Sitede aktif olduğum sıralarda bile bana e-posta bildirimleri gönder"
@@ -740,6 +749,8 @@ tr_TR:
     too_few_topics_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentTopics} / %{requiredTopics}</strong> konu var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
     too_few_posts_notice: "Hadi <a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>bu tartışmayı başlatalım!</a> Şu anda <strong>%{currentPosts} / %{requiredPosts}</strong> gönderi var. Yeni ziyaretçiler okumak ve yanıtlamak için birkaç tartışmaya ihtiyaç duyarlar."
     logs_error_rate_notice:
+      reached: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> , %{siteSettingRate} 'in site ayarları limitine ulaştı."
+      exceeded: "<b>%{relativeAge}</b> – <a href='%{url}' target='_blank'>%{rate}</a> , %{siteSettingRate} 'in site ayarları limitini aştı."
       rate:
         other: "%{count} hata/%{duration}"
     learn_more: "daha fazlasını öğren..."
@@ -861,14 +872,18 @@ tr_TR:
       more_emoji: "dahası..."
       options: "Seçenekler"
       whisper: "fısıltı"
+      unlist: "listelenmedi"
       add_warning: "Bu resmi bir uyarıdır."
       toggle_whisper: "Fısıldamayı Göster/Gizle"
+      toggle_unlisted: "Listelenmemiş Olanları Değiştir"
       posting_not_on_topic: "Hangi konuyu cevaplamak istiyorsun?"
       saving_draft_tip: "kaydediliyor..."
       saved_draft_tip: "kaydedildi"
       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"
         title_too_short: "Başlık en az {{min}} karakter olmalı"
@@ -925,6 +940,9 @@ tr_TR:
       modal_ok: "Tamam"
       modal_cancel: "İptal"
       cant_send_pm: "Üzgünüz, %{username} kullanıcısına mesaj gönderemezsiniz."
+      yourself_confirm:
+        title: "Alıcıları eklemeyi unuttun mu?"
+        body: "Bu mesaj şu an sadece sana gönderiliyor!"
       admin_options_title: "Bu konu için opsiyonel görevli ayarları"
       auto_close:
         label: "Başlığı otomatik kapatma zamanı:"
@@ -1006,6 +1024,7 @@ tr_TR:
       most_liked: "En Çok Beğenilen"
       select_all: "Tümünü Seç"
       clear_all: "Tümünü Temizle"
+      too_short: "Aradığın terim çok kısa."
       result_count:
         other: "<span class='term'>\"{{term}}\"</span> için sonuçlar {{count}}"
       title: "konu, gönderi, kullanıcı veya kategori ara"
@@ -1046,6 +1065,7 @@ tr_TR:
           other: "<b>{{count}}</b> konu seçtiniz."
         change_tags: "Etiketleri Değiştir"
         choose_new_tags: "Konular için yeni etiketler seçin:"
+        changed_tags: "O konuların etiketleri değiştirildi."
       none:
         unread: "Okunmamış konunuz yok."
         new: "Yeni konunuz yok."
@@ -1142,12 +1162,16 @@ tr_TR:
         go: "git"
         jump_bottom: "son gönderiye geç"
         jump_prompt: "Gönderiye git"
+        jump_prompt_long: "Hangi gönderiye geçmek istersin?"
         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:
+          mailing_list_mode: "e-posta liste modunu etkinleştirdin, böylece bu konuya gelen yanıtlarla ilgili bildirimleri e-posta yoluyla alabileceksin. "
+          '3_10': 'Bu konuyla ilgili bir etiketi izlediğin için bildirim alacaksın.'
           '3_6': 'Bu kategoriyi gözlediğiniz için bildirimlerini alacaksınız.'
           '3_5': 'Bu konuyu otomatik olarak gözlemeye başladığınız için bildirimlerini alacaksınız.'
           '3_2': 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
@@ -1200,6 +1224,7 @@ tr_TR:
         invisible: "Gizle"
         visible: "Görünür Yap"
         reset_read: "Görüntüleme Verilerini Sıfırla"
+        make_public: "Herkese Açık Konu Yap"
         make_private: "Özel mesaj oluştur"
       feature:
         pin: "Başa Tuttur"
@@ -1245,12 +1270,14 @@ tr_TR:
         no_banner_exists: "Manşet konusu yok."
         banner_exists: "Şu an bir manşet konusu <strong class='badge badge-notification unread'>var</strong>."
       inviting: "Davet Ediliyor..."
+      automatically_add_to_groups: "Bu davet aynı zamanda bu gruplara giriş sağlar:"
       invite_private:
         title: 'Mesajlaşmaya Davet Et'
         email_or_username: "Davet edilenin e-postası ya da kullanıcı adı"
         email_or_username_placeholder: "e-posta ya da kullanıcı adı"
         action: "Davet et"
         success: "O kullanıcıyı bu mesajlaşmaya davet ettik."
+        success_group: "Grubu bu mesaja katılması için davet ettik."
         error: "Üzgünüz, kullanıcı davet edilirken bir hata oluştu."
         group_name: "grup adı"
       controls: "Konu Kontrolleri"
@@ -1287,6 +1314,10 @@ tr_TR:
         error: "Gönderiler konuya aşınırken bir hata oluştu."
         instructions:
           other: "Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. "
+      merge_posts:
+        title: "Seçili Gönderileri Birleştir"
+        action: "seçili gönderileri birleştir"
+        error: "Seçili gönderileri birleştirirken bir hata oluştu."
       change_owner:
         title: "Gönderilerin Sahibini Değiştir"
         action: "sahipliğini değiştir"
@@ -1357,11 +1388,13 @@ tr_TR:
         no_value: "Hayır, kalsın"
         yes_value: "Evet, vazgeç"
       via_email: "bu gönderi e-posta ile iletildi"
+      via_auto_generated_email: "bu gönderi otomatik bir e-posta yoluyla gönderildi"
       whisper: "bu gönderi yöneticiler için özel bir fısıltıdır"
       wiki:
         about: "bu gönderi bir wiki"
       archetypes:
         save: 'Seçenekleri kaydet'
+      few_likes_left: "Sevgiyi paylaştığınız için teşekkürler! Bugün için sadece birkaç beğeniniz kaldı. "
       controls:
         reply: "bu gönderiye bir cevap oluşturmaya başlayın"
         like: "bu gönderiyi beğen"
@@ -1461,6 +1494,9 @@ tr_TR:
       delete:
         confirm:
           other: "Tüm bu gönderileri silmek istediğinize emin misiniz?"
+      merge:
+        confirm:
+          other: "{{sayı}} sayıdaki bu gönderileri birleştirmek istediğinize emin misiniz?"
       revisions:
         controls:
           first: "İlk revizyon"
@@ -1469,6 +1505,7 @@ tr_TR:
           last: "Son revizyon"
           hide: "Düzenlemeyi gizle"
           show: "Düzenlemeyi göster"
+          revert: "Bu sürüme geri dön"
           comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> <i class='fa fa-arrows-h'></i> <strong>{{current}}</strong> / {{total}}"
         displays:
           inline:
@@ -1494,6 +1531,8 @@ tr_TR:
       tags: "Etiketler"
       tags_allowed_tags: "Sadece bu kategoride kullanılabilir etiketler:"
       tags_allowed_tag_groups: "Yalnızca bu kategoride kullanılabilir etiket grupları:"
+      tags_placeholder: "(Seçmeli) izin verilen etiketlerin listesi"
+      tag_groups_placeholder: "(Seçmeli) izin verilen etiket gruplarının listesi"
       delete: 'Kategoriyi Sil'
       create: 'Yeni Kategori'
       create_long: 'Yeni bir kategori oluştur'
@@ -1540,11 +1579,13 @@ tr_TR:
       notifications:
         watching:
           title: "Gözleniyor"
+          description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konular size bildirilecek. Ayrıca, okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek."
         watching_first_post:
           title: "İlk gönderi izlemeniz"
           description: "Bu kategorilerde bulunan tüm konuların sadece ilk gönderilerinde bildirim alacaksınız."
         tracking:
           title: "Takip Ediliyor"
+          description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız. Ayrıca, okunmamış ve yeni cevapların sayısı ilgili konunun yanında belirecek."
         regular:
           title: "Normal"
           description: "Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız."
@@ -1588,6 +1629,7 @@ tr_TR:
       clicks:
         other: "%{count} tıklama"
     post_links:
+      about: "bu gönderi için daha fazla link koy"
       title:
         other: "%{count} daha"
     topic_statuses:
@@ -1798,9 +1840,19 @@ tr_TR:
           name: Diğer
         posting:
           name: Gönderiliyor
+    google_search: |
+      <h3>Search with Google</h3>
+      <p>
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <input type="text" id='user-query' value="">
+      <input type='hidden' id='google-query' name="q">
+      <button class="btn btn-primary">Google</button>
+      </form>
+      </p>
     tagging:
       all_tags: "Tüm etiketler"
       selector_all_tags: "tüm etiketler"
+      selector_no_tags: "etiket yok"
       changed: "değişen etiketler:"
       tags: "Etiketler"
       choose_for_topic: "bu konu için etiket seçiniz"
@@ -1816,19 +1868,24 @@ tr_TR:
       filters:
         without_category: "%{filter} %{tag} konular"
         with_category: "%{category} içerisinkeri konular%{filter} %{tag}"
+        untagged_without_category: "%{filtre} etiketlenmemiş konular"
+        untagged_with_category: " %{kategori} içindeki %{filtre} etiketlenmemiş konular"
       notifications:
         watching:
           title: "İzleniyor"
+          description: "Bu etiketteki tüm yeni konuları takip ediyor olacaksınız. Bu etikete ait yeni tüm konularda ve gönderilerde bildirim alacaksınız, ayrıca yeni gönderiler konuların yanında görünecektir."
         watching_first_post:
           title: "İlk gönderi izlemeniz"
           description: "Bu etikette bulunan tüm konuların sadece ilk gönderilerinde bildirim alacaksınız."
         tracking:
           title: "İzleme"
+          description: "Bu etiketteki tüm konuları otomatik olarak takip ediyor olacaksınız. Okunmamış yeni gönderilerin bir kısmı konunun yanında görünecektir."
         regular:
           title: "Düzenli"
           description: "Eğer bir kişi adınızın tagini kullanırsa (@isminiz gibi) veya oluşturduğunuz konuya cevap yazarsa bildirim alacaksınız."
         muted:
           title: "Susturuldu"
+          description: "Bu etikette beliren yeni konular hakkında bildirim almayacaksınız ve bunlar okunmamışlar sekmesinde belirmeyecek."
       groups:
         title: "Etiket Grupları"
         about: "Konuları kolayca yönetmek için onlara etiket ekleyiniz."
@@ -1836,6 +1893,7 @@ tr_TR:
         tags_label: "Bu gruptaki etiketler:"
         parent_tag_label: "Üst etiket:"
         parent_tag_placeholder: "İsteğe Bağlı"
+        parent_tag_description: "Bu gruptaki etiketler aile etiketi yoksa kullanılamaz."
         one_per_topic_label: "Bu etiket grubundan her konu için bir etiket ile sınırla"
         new_name: "Yeni Etiket Grubu"
         save: "Kaydet"
@@ -1863,6 +1921,7 @@ tr_TR:
           bookmarks: "Daha fazla imlenmiş konu bulunmuyor."
           search: "Daha fazla arama sonucu bulunmuyor."
     invite:
+      custom_message: "Davetini daha özel hale getirmek için şunu yaz"
       custom_message_link: "kişiselleştirilmiş mesak"
       custom_message_placeholder: "Kişiselleştirilmiş mesajınızı düzenleyin"
       custom_message_template_forum: "Hey, bu foruma üye olsan iyi olur!"
@@ -2202,6 +2261,7 @@ tr_TR:
         test_error: "Test e-postasının gönderilmesinde sorun yaşandı. Lütfen e-posta ayarlarınızı tekrar kontrol edin, yer sağlayıcınızın e-posta bağlantılarını bloke etmediğinden emin olun, ve tekrar deneyin."
         sent: "Gönderildi"
         skipped: "Atlandı"
+        bounced: "Geri sekenler"
         received: "Alındı"
         rejected: "Reddedildi"
         sent_at: "Gönderildiği Zaman"
@@ -2411,6 +2471,7 @@ tr_TR:
         moderator: "Moderatör mü?"
         admin: "Yönetici mi?"
         blocked: "Engellendi mi?"
+        staged: "Aşamalı?"
         show_admin_profile: "Yönetici"
         edit_title: "Başlığı Düzenle"
         save_title: "Başlığı Kaydet"
@@ -2474,11 +2535,18 @@ tr_TR:
         block_failed: 'Kullanıcı engellenirken bir sorun yaşandı.'
         block_confirm: 'Bu kullanıcıyı bloklamak istediğinize emin misiniz? Bunu yaparsanız yeni başlık ya da gönderi oluşturamayacak.'
         block_accept: 'Evet, bu kullanıcıyı blokla'
+        bounce_score: "Geri Sekme Skoru"
         reset_bounce_score:
           label: "Yenile"
+          title: "Geri sekme skorunu 0'a çek"
         deactivate_explanation: "Deaktive edilmiş bir kullanıcı e-postasını tekrar doğrulamalı."
         suspended_explanation: "Uzaklaştırılmış kullanıcılar sistemde oturum açamaz."
         block_explanation: "Engellenmiş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz."
+        staged_explanation: "Aşamalı bir kullanıcı sadece belirli konularda e-posta ile gönderide bulunabilir."
+        bounce_score_explanation:
+          none: "Bu e-posta adresinden yakın zamanda hiç geri sekme alınmadı."
+          some: "Bu e-posta adresinden yakın zamanda bazı geri sekmeler alındı. "
+          threshold_reached: "Bu e-posta adresinden birçok geri sekme alındı. "
         trust_level_change_failed: "Kullanıcının güven seviyesi değiştirilirken bir sorun yaşandı."
         suspend_modal_title: "Kullanıcıyı Uzaklaştır"
         trust_level_2_users: "Güven Seviyesi 2 Olan Kullanıcılar"

config/locales/client.vi.yml

@@ -84,12 +84,12 @@ vi:
       previous_month: 'Tháng Trước'
       next_month: 'Tháng Sau'
     share:
-      topic: 'chia sẽ chủ đề này'
+      topic: 'chia sẻ chủ đề này'
       post: 'đăng #%{Bài đăng số}'
       close: 'đóng lại'
-      twitter: 'chia sẽ lên Twitter'
+      twitter: 'chia sẻ lên Twitter'
-      facebook: 'chia sẽ lên Facebook'
+      facebook: 'chia sẻ lên Facebook'
-      google+: 'chia sẽ lên Google+'
+      google+: 'chia sẻ lên Google+'
       email: 'Gửi liên kết này qua thư điện tử'
     action_codes:
       split_topic: "chìa chủ đề này lúc %{when}"
@@ -2181,7 +2181,7 @@ vi:
         show_public_profile: "Hiển thị hồ sơ công khai"
         impersonate: 'Mạo danh'
         ip_lookup: "Tìm kiếm địa chỉ IP"
-        log_out: "Đăng suất"
+        log_out: "Đăng xuất"
         logged_out: "Thành viên đã đăng xuất trên tất cả thiết bị"
         revoke_admin: 'Thu hồi quản trị'
         grant_admin: 'Cấp quản trị'

config/locales/client.zh_CN.yml

@@ -86,7 +86,7 @@ zh_CN:
       previous_month: '上个月'
       next_month: '下个月'
     share:
-      topic: '分享内容链接'
+      topic: '分享指向这个主题的链接'
       post: '#%{postNumber} 楼'
       close: '关闭'
       twitter: '分享至 Twitter'
@@ -102,11 +102,11 @@ zh_CN:
       removed_user: "于%{when}移除了%{who}"
       removed_group: "于%{when}移除了%{who}"
       autoclosed:
-        enabled: '于%{when}锁定'
+        enabled: '于%{when}关闭'
-        disabled: '于%{when}解除锁定'
+        disabled: '于%{when}打开'
       closed:
-        enabled: '于%{when}锁定'
+        enabled: '于%{when}关闭'
-        disabled: '于%{when}解除锁定'
+        disabled: '于%{when}打开'
       archived:
         enabled: '于%{when}存档'
         disabled: '于%{when}解除存档'
@@ -249,7 +249,7 @@ zh_CN:
       reject: '否决'
       delete_user: '删除用户'
       title: "需要审核"
-      none: "没有帖子可以审核。"
+      none: "没有帖子需要审核。"
       edit: "编辑"
       cancel: "取消"
       view_pending: "查看待审核帖子"
@@ -333,13 +333,13 @@ zh_CN:
           title: "跟踪"
           description: "你只会收到此组中每个新主题的第一帖的通知。"
         tracking:
-          title: "关注"
+          title: "跟踪"
           description: "你会在别人@你或回复你时收到通知，并且新帖数量也将在这些主题后显示。"
         regular:
           title: "常规"
-          description: "如果某人@你或者回复你，你将收到通知。"
+          description: "如果有人@名字提及你或回复你，你将会收到通知。"
         muted:
-          title: "屏蔽"
+          title: "静音"
           description: "你不会收到组内关于新主题中的任何通知。"
     user_action_groups:
       '1': "送出的赞"
@@ -445,28 +445,28 @@ zh_CN:
         enabled: "启用邮件列表模式"
         instructions: |
           此设置将覆盖活动摘要。<br />
-          屏蔽的主题和分类不包含在这些邮件中。
+          静音主题和分类不包含在这些邮件中。
         daily: "发送每日更新"
         individual: "为每个新帖发送一封邮件通知"
         many_per_day: "为每个新帖给我发送邮件 (大约每天 {{dailyEmailEstimate}} 封)"
         few_per_day: "为每个新帖给我发送邮件 (大约每天 2 封 )"
       tag_settings: "标签"
-      watched_tags: "关注"
+      watched_tags: "监看"
-      watched_tags_instructions: "自动关注有这些标签的主题，有新内容时提醒我，并在列表中显示新帖数量。"
+      watched_tags_instructions: "你将自动监看有了这些标签的所有主题。你将会收到所有新的帖子和主题通知，并且新帖数量也将出现在主题旁边。"
-      tracked_tags: "跟随"
+      tracked_tags: "跟踪"
-      tracked_tags_instructions: "自动跟随有这些标签的主题，并在列表中显示新帖数量。"
+      tracked_tags_instructions: "你将自动跟踪有了这些标签的所有主题，新帖的数量将出现在主题旁边。"
-      muted_tags: "屏蔽"
+      muted_tags: "静音"
-      muted_tags_instructions: "不会收到有这些标签的主题的提醒，并且他们将不会出现在最新主题中。"
+      muted_tags_instructions: "你将不会收到任何关于这些标签的新主题通知，他们也不会出现在最新主题列表。"
-      watched_categories: "关注"
+      watched_categories: "监看"
-      watched_categories_instructions: "自动关注这些分类中的所有主题，有新内容时提醒我，并在列表中显示新帖数量。"
+      watched_categories_instructions: "你将自动监看这些分类中的所有主题。你将会收到所有新的帖子和主题通知，并且新帖数量也将出现在主题旁边。"
-      tracked_categories: "跟随"
+      tracked_categories: "跟踪"
-      tracked_categories_instructions: "自动跟随这些分类中的所有主题，并在列表中显示新帖数量。"
+      tracked_categories_instructions: "你将自动跟踪这些分类中的所有主题。新帖的数量将出现在主题旁边。"
-      watched_first_post_categories: "关注首贴"
+      watched_first_post_categories: "监看头一帖"
-      watched_first_post_categories_instructions: "在这些分类中，新主题发表时提醒我。"
+      watched_first_post_categories_instructions: "在这些分类中的每一个新主题，你将会收到头一帖通知。"
-      watched_first_post_tags: "关注首贴"
+      watched_first_post_tags: "监看头一帖"
-      watched_first_post_tags_instructions: "有这些标签的新主题发表时提醒我。"
+      watched_first_post_tags_instructions: "在有了这些标签的每一个新主题，你将会收到头一帖通知。"
-      muted_categories: "屏蔽"
+      muted_categories: "静音"
-      muted_categories_instructions: "不会收到这些分类中新主题提醒，并且他们将不会出现在最新主题中。"
+      muted_categories_instructions: "在这些分类里面，你将不会收到任何新主题通知，他们也不会出现在最新主题列表。"
       delete_account: "删除我的帐号"
       delete_account_confirm: "你真的要永久删除自己的账号吗？删除之后无法恢复！"
       deleted_yourself: "你的帐号已被删除。"
@@ -474,10 +474,10 @@ zh_CN:
       unread_message_count: "消息"
       admin_delete: "删除"
       users: "用户"
-      muted_users: "屏蔽"
+      muted_users: "静音"
-      muted_users_instructions: "屏蔽任何关于这些用户的通知。"
+      muted_users_instructions: "抑制来自这些用户的所有通知。"
-      muted_topics_link: "显示已屏蔽的主题"
+      muted_topics_link: "显示已静音的主题"
-      watched_topics_link: "显示已关注的主题"
+      watched_topics_link: "显示已监看的主题"
       automatically_unpin_topics: "当我完整阅读了主题时自动解除置顶。"
       staff_counters:
         flags_given: "采纳标记"
@@ -532,7 +532,7 @@ zh_CN:
         title: "个人资料背景"
         instructions: "显示在个人资料页面中，上传的图片将被居中且默认宽度为 850px。"
       change_card_background:
-        title: "用户资料背景"
+        title: "用户卡片背景"
         instructions: "显示在用户卡片中，上传的图片将被居中且默认宽度为 590px。"
       email:
         title: "邮箱"
@@ -612,7 +612,7 @@ zh_CN:
         after_2_days: "两天内发布"
         after_1_week: "一周内发布"
         after_2_weeks: "两周内发布"
-      auto_track_topics: "自动关注我浏览的主题"
+      auto_track_topics: "自动跟踪我浏览的主题"
       auto_track_options:
         never: "从不"
         immediately: "立即"
@@ -749,8 +749,6 @@ zh_CN:
     too_few_topics_notice: "让我们<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论！</a>目前有 <strong>%{currentTopics} / %{requiredTopics}</strong> 个主题。新访客需要能够阅读和回复一些讨论。"
     too_few_posts_notice: "让我们<a href='http://blog.discourse.org/2014/08/building-a-discourse-community/'>开始讨论！</a>目前有 <strong>%{currentPosts} / %{requiredPosts}</strong> 个帖子。新访客需要能够阅读和回复一些讨论。"
     logs_error_rate_notice:
-      reached: "<b>[%{relativeAge}]</b> 目前的错误率 <a href='%{url}' target='_blank'>%{rate}</a> 已达到了站点设置中的 %{siteSettingRate}。"
-      exceeded: "<b>[%{relativeAge}]</b> 目前的错误率 <a href='%{url}' target='_blank'>%{rate}</a> 已超出了站点设置中的 %{siteSettingRate}。"
       rate:
         other: "%{count} 错误/%{duration}"
     learn_more: "了解更多..."
@@ -761,10 +759,10 @@ zh_CN:
     week: '周'
     week_desc: '7 天内创建的主题'
     day: '天'
-    first_post: 首次发帖
+    first_post: 头一帖
-    mute: 屏蔽
+    mute: 静音
-    unmute: 解除屏蔽
+    unmute: 取消静音
-    last_post: 最后发帖
+    last_post: 最后帖
     last_reply_lowercase: 最后回复
     replies_lowercase:
       other: 回复
@@ -816,7 +814,7 @@ zh_CN:
       title: "登录"
       username: "用户"
       password: "密码"
-      email_placeholder: "邮箱地址或用户名"
+      email_placeholder: "电子邮件或者用户名"
       caps_lock_warning: "大写锁定开启"
       error: "出错了"
       rate_limit: "请请稍后再重试"
@@ -899,10 +897,10 @@ zh_CN:
       create_pm: "消息"
       title: "或 Ctrl + 回车"
       users_placeholder: "添加用户"
-      title_placeholder: "一句话阐述要说什么..."
+      title_placeholder: "一句话告诉讨论什么..."
       edit_reason_placeholder: "编辑理由"
       show_edit_reason: "添加理由"
-      reply_placeholder: "支持直接拖拽或粘贴图片，使用 Markdown/BBCode/HTML 语法。"
+      reply_placeholder: "在此键入。使用Markdown，BBCode，或HTML格式。可拖拽或粘贴图片。"
       view_new_post: "浏览新帖。"
       saving: "保存中"
       saved: "已保存！"
@@ -940,7 +938,7 @@ zh_CN:
       cant_send_pm: "抱歉，你不能向 %{username} 发送私信。"
       admin_options_title: "本主题可选设置"
       auto_close:
-        label: "自动关闭主题："
+        label: "自动关闭主题时间："
         error: "请输入一个有效值。"
         based_on_last_post: "以最后回复的时间开始计时"
         all:
@@ -1019,6 +1017,7 @@ zh_CN:
       most_liked: "最多赞"
       select_all: "全选"
       clear_all: "清除所有"
+      too_short: "你的搜索词太短。"
       result_count:
         other: "搜索<span class='term'>“{{term}}”</span>有 {{count}} 条相关结果"
       title: "搜索主题、帖子、用户或分类"
@@ -1051,7 +1050,7 @@ zh_CN:
         toggle: "切换至批量选择"
         actions: "批量操作"
         change_category: "更改分类"
-        close_topics: "锁定主题"
+        close_topics: "关闭主题"
         archive_topics: "存档主题"
         notification_level: "更改通知等级"
         choose_new_category: "选择新分类："
@@ -1073,7 +1072,7 @@ zh_CN:
         search: "没有搜索结果。"
         educate:
           new: '<p>这里显示了近期主题列表。</p><p>默认情况下，以下主题将显示在近期列表。如果是最近 2 天内创建的，还会显示一个<span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">近期</span>标志。<p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中更改要显示哪些内容。</p>'
-          unread: '<p>这里显示你的未读主题。</p><p>默认情况下，下述主题会被放在未读中。并且会在旁边显示未读的数量<span class="badge new-posts badge-notification">1</span>。如果你：</p><ul><li>创建了该主题</li><li>回复了该主题</li><li>阅读该主题超过 4 分钟</li></ul><p>或者你在主题底部的通知控制中选择了跟随或关注。</p><p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改未读设置。</p>'
+          unread: '<p>这里显示你的未读主题。</p><p>默认情况下，下述主题会被放在未读中。并且会在旁边显示未读的数量<span class="badge new-posts badge-notification">1</span>。如果你：</p><ul><li>创建了该主题</li><li>回复了该主题</li><li>阅读该主题超过 4 分钟</li></ul><p>或者你在主题底部的通知控制中选择了跟踪或监看。</p><p>你可以在<a href="%{userPrefsUrl}">用户设置</a>中修改未读设置。</p>'
       bottom:
         latest: "没有更多主题可看了。"
         hot: "没有更多热门主题可看了。"
@@ -1090,8 +1089,8 @@ zh_CN:
         stop_notifications: "你将收到更少的关于<strong>{{title}}</strong>的通知"
         change_notification_state: "你现在的通知状态是"
       filter_to: "本主题中的 {{post_count}} 帖"
-      create: '新主题'
+      create: '发新主题'
-      create_long: '创建主题'
+      create_long: '创建新的主题'
       private_message: '发送消息'
       archive_message:
         help: '移动消息到存档'
@@ -1129,11 +1128,11 @@ zh_CN:
       options: "主题选项"
       show_links: "显示此主题中的链接"
       toggle_information: "切换主题详情"
-      read_more_in_category: "想阅读更多内容？浏览{{catLink}}或{{latestLink}}里的其它主题。"
+      read_more_in_category: "想阅读更多？浏览{{catLink}}的其他主题或者{{latestLink}}。"
-      read_more: "想阅读更多内容？{{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: 浏览最新主题
+      view_latest_topics: 查阅最新主题
       suggest_create_topic: 创建一个新的主题吧！
       jump_reply_up: 转到更早的回复
       jump_reply_down: 转到更新的回复
@@ -1165,50 +1164,50 @@ zh_CN:
         title: 改变你收到本主题通知的频率
         reasons:
           mailing_list_mode: "邮件列表模式已启用，将以邮件通知你关于该主题的回复。"
-          '3_10': '因为你关注该主题上的标签，所以你将收到相关通知。'
+          '3_10': '因为你正监看该主题上的标签，你将会收到通知。'
-          '3_6': '因为你关注该分类，所以你将收到相关通知。'
+          '3_6': '因为你正在监看该分类，你将收到通知。'
-          '3_5': '因为你自动关注了该主题，所以你将收到相关通知。'
+          '3_5': '因为你开始自动监看该主题，你将收到通知。'
-          '3_2': '因为你在关注该主题，所以你将收到相关通知。'
+          '3_2': '因为你正在监看该主题，你将收到通知。'
           '3_1': '因为你创建了该主题，所以你将收到相关通知。'
-          '3': '因为你在关注该主题，所以你将收到相关通知。'
+          '3': '因为你正在监看该主题，你将收到通知。'
-          '2_8': '因为你在跟随该分类，所以你将收到相关通知。'
+          '2_8': '因为你正在跟踪该分类，你将收到通知。'
           '2_4': '因为你在该主题内发表了回复，所以你将收到相关通知。'
-          '2_2': '因为你在跟随该主题，所以你将收到相关通知。'
+          '2_2': '因为你正在跟踪该主题，你将收到通知。'
           '2': '因为你<a href="/users/{{username}}/preferences">阅读了该主题</a>，所以你将收到相关通知。'
-          '1_2': '如果某人@你或者回复你，你将收到通知。'
+          '1_2': '如果有人@名字提及你或回复你，你将会收到通知。'
-          '1': '如果某人@你或者回复你，你将收到通知。'
+          '1': '如果有人@名字提及你或回复你，你将会收到通知。'
           '0_7': '你将忽略关于该分类的所有通知。'
           '0_2': '你将忽略关于该主题的所有通知。'
           '0': '你将忽略关于该主题的所有通知。'
         watching_pm:
-          title: "关注"
+          title: "监看"
           description: "消息有新回复时提醒我，并显示新回复数量。"
         watching:
-          title: "关注"
+          title: "监看"
           description: "主题有新回复时提醒我，并显示新回复数量。"
         tracking_pm:
-          title: "跟随"
+          title: "跟踪"
           description: "在消息标题后显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。"
         tracking:
-          title: "跟随"
+          title: "跟踪"
           description: "在主题标题后显示新回复数量。你只会在别人@你或回复你的帖子时才会收到通知。"
         regular:
           title: "普通"
-          description: "如果某人@你或者回复你，你将收到通知。"
+          description: "如果有人@名字提及你或回复你，你将会收到通知。"
         regular_pm:
           title: "普通"
-          description: "如果某人@你或者回复你，你将收到通知。"
+          description: "如果有人@名字提及你或回复你，你将会收到通知。"
         muted_pm:
-          title: "屏蔽"
+          title: "静音"
           description: "不会收到该消息的任何通知。"
         muted:
-          title: "屏蔽"
+          title: "静音"
           description: "不会收到该主题的任何通知，也不会出现在最新主题中。"
       actions:
         recover: "撤销删除主题"
         delete: "删除主题"
-        open: "解除锁定主题"
+        open: "打开主题"
-        close: "锁定主题"
+        close: "关闭主题"
         multi_select: "选择帖子..."
         auto_close: "自动关闭..."
         pin: "置顶主题..."
@@ -1234,10 +1233,10 @@ zh_CN:
         help: "取消本主题的置顶状态，将不再固定显示在主题列表顶部。"
       share:
         title: '分享'
-        help: '分享内容的链接'
+        help: '分享指向这个主题的链接'
       flag_topic:
         title: '标记'
-        help: '私下标记本帖以引起管理员注意或者发送匿名通知'
+        help: '背地里标记该帖以示警示，或发送关于它的私下通知'
         success_message: '你已经成功标记该主题。'
       feature_topic:
         title: "置顶主题"
@@ -1268,7 +1267,7 @@ zh_CN:
       invite_private:
         title: '邀请至消息'
         email_or_username: "受邀人的邮箱或用户名"
-        email_or_username_placeholder: "邮箱地址或用户名"
+        email_or_username_placeholder: "电子邮件地址或者用户名"
         action: "邀请"
         success: "成功邀请了用户至该消息。"
         success_group: "成功邀请了小组至该消息。"
@@ -1279,10 +1278,10 @@ zh_CN:
         title: '邀请'
         username_placeholder: "用户名"
         action: '发送邀请'
-        help: '邮件或通知邀请其他人至主题'
+        help: '通过电子邮件或通知邀请其他人到该主题'
         to_forum: "将发送一封简洁的邮件，让你的朋友无需注册即可用链接参与讨论。"
-        sso_enabled: "输入你想邀请的人的用户名，以邀请他至该主题。"
+        sso_enabled: "输入其用户名，邀请其人到本主题。"
-        to_topic_blank: "输入你想邀请的人的用户名或邮件，以邀请他至该主题。"
+        to_topic_blank: "输入其用户名或者 Email 地址，邀请其人到本主题。"
         to_topic_email: "你输入了邮箱地址。我们将发送一封邮件邀请，让你的朋友可直接回复该主题。"
         to_topic_username: "你输入了用户名。我们将发送一个至该主题链接的邀请通知。"
         to_username: "输入你想邀请的人的用户名。我们将发送一个至该主题链接的邀请通知。"
@@ -1340,7 +1339,7 @@ zh_CN:
     post:
       reply: "<i class='fa fa-mail-forward'></i> {{replyAvatar}} {{usernameLink}}"
       reply_topic: "<i class='fa fa-mail-forward'></i> {{link}}"
-      quote_reply: "引用"
+      quote_reply: "引述回复"
       edit: "编辑 {{replyAvatar}} {{username}}发表的{{link}}"
       edit_reason: "理由："
       post_number: "帖子 {{number}}"
@@ -1396,10 +1395,10 @@ zh_CN:
         undo_like: "取消赞"
         edit: "编辑本帖"
         edit_anonymous: "抱歉，需要登录后才能编辑该贴。"
-        flag: "私下标记本帖以提醒管理人员关注或发送私信"
+        flag: "背地里标记该帖以示警示，或发送关于它的私下通知"
         delete: "删除本帖"
         undelete: "恢复本帖"
-        share: "分享本帖的链接"
+        share: "分享指向这个帖子的链接"
         more: "更多"
         delete_replies:
           confirm:
@@ -1407,7 +1406,7 @@ zh_CN:
           yes_value: "是，一并删除相关回复"
           no_value: "否，仅删除该帖"
         admin: "帖子管理"
-        wiki: "开启多人协作"
+        wiki: "成为维基"
         unwiki: "关闭多人协作"
         convert_to_moderator: "添加管理人员颜色标识"
         revert_to_regular: "移除管理人员颜色标识"
@@ -1572,20 +1571,20 @@ zh_CN:
       parent: "上级分类"
       notifications:
         watching:
-          title: "关注"
+          title: "监看"
-          description: "自动关注这些分类中的主题，有新内容时提醒我，并在列表中显示新帖数量。"
+          description: "你将自动监看这些分类中的所有主题。你将会收到每一个主题的每一个新帖子的通知，并且将显示新回复的数量。"
         watching_first_post:
-          title: "关注首贴"
+          title: "监看头一帖"
-          description: "在这些分类中，新主题发表时提醒我。"
+          description: "在这些分类里面，你将仅会收到每一个新主题的头一帖的通知。"
         tracking:
-          title: "跟随"
+          title: "跟踪"
-          description: "自动跟随这些分类中的所有主题，并在列表中显示新帖数量。如果某人@你或者回复你，你将收到通知。"
+          description: "你将自动跟踪这些分类中的所有主题。如果有人@名字提及你或回复你，你将会收到通知，并且将显示新回复的数量。"
         regular:
           title: "普通"
-          description: "如果某人@你或者回复你，你将收到通知。"
+          description: "如果有人@名字提及你或回复你，你将会收到通知。"
         muted:
-          title: "屏蔽"
+          title: "静音"
-          description: "不会收到这些分类中的主题的提醒，并且他们将不会出现在最新主题中。"
+          description: "在这些分类里面，你将永远不会收到任何有关新主题的通知，他们也不会出现在最新主题列表。"
     flagging:
       title: '感谢你帮助我们建设文明社群！'
       action: '标记帖子'
@@ -1632,11 +1631,11 @@ zh_CN:
       bookmarked:
         help: "你已经收藏了此主题"
       locked:
-        help: "本主题已关闭；不再接受新的回复"
+        help: "这个主题被关闭；不再允许新的回复"
       archived:
         help: "本主题已归档；即已经冻结，无法修改"
       locked_and_archived:
-        help: "本主题已经关闭并且存档；不再接受新回复且无法修改"
+        help: "这个主题被关闭并存档；不再允许新的回复，并不能改变"
       unpinned:
         title: "解除置顶"
         help: "主题已经解除置顶；它将以默认顺序显示"
@@ -1685,7 +1684,7 @@ zh_CN:
         title: "最新"
         title_with_count:
           other: "最新（{{count}}）"
-        help: "最新发布的帖子"
+        help: "有了新帖的活动主题"
       hot:
         title: "热门"
         help: "最近最受欢迎的主题"
@@ -1698,12 +1697,12 @@ zh_CN:
       categories:
         title: "分类"
         title_in: "分类 - {{categoryName}}"
-        help: "归属于不同分类的所有主题"
+        help: "归入各种类别的所有主题"
       unread:
         title: "未读"
         title_with_count:
           other: "未读（{{count}}）"
-        help: "你正在关注或跟随的主题中有未阅帖子的主题"
+        help: "你目前监看或跟踪有了未读帖子的主题"
         lower_title_with_count:
           other: "{{count}} 条未读"
       new:
@@ -1713,7 +1712,7 @@ zh_CN:
         title: "近期"
         title_with_count:
           other: "近期（{{count}}）"
-        help: "最近几天创建的主题"
+        help: "最近几天里创建的主题"
       posted:
         title: "我的帖子"
         help: "你发表过帖子的主题"
@@ -1727,7 +1726,7 @@ zh_CN:
         help: "{{categoryName}}分类中热门的主题"
       top:
         title: "热门"
-        help: "最近一年、一月、一周或一天的最活跃主题"
+        help: "在最近的一年，一月，一周或一天最活跃的主题"
         all:
           title: "不限时间"
         yearly:
@@ -1860,25 +1859,25 @@ zh_CN:
       manage_groups: "管理标签组"
       manage_groups_description: "管理标签的小组"
       filters:
-        without_category: "%{filter} %{tag} 主题"
+        without_category: "%{tag}的%{filter}主题"
         with_category: "%{filter} %{tag} 主题 在 %{category}"
         untagged_without_category: "无标签的%{filter}主题"
         untagged_with_category: "%{category}无标签的%{filter}主题"
       notifications:
         watching:
-          title: "关注"
+          title: "监看"
-          description: "自动关注有该标签的主题，有新内容时提醒我，并在列表中显示未读和新帖数量。"
+          description: "你将自动监看该标签中的所有主题。你会收到新的帖子和主题的通知，外加未读和新帖的数量也将出现在主题旁边。"
         watching_first_post:
-          title: "关注首贴"
+          title: "监看头一帖"
-          description: "有该标签的新主题发表时提醒我。"
+          description: "在该标签里的每一个新主题，你仅会收到头一帖通知。"
         tracking:
-          title: "跟随"
+          title: "跟踪"
-          description: "自动跟随有该标签的所有主题，并在列表中显示新帖数量。"
+          description: "你将自动跟踪该标签中的所有主题。未读和新帖的数量将会出现在主题旁边。"
         regular:
           title: "普通"
           description: "当有人@你或者回复你的帖子时，你才会收到通知。"
         muted:
-          title: "屏蔽"
+          title: "静音"
           description: "不会收到有该标签的主题的提醒，并且他们将不会出现在未读主题中。"
       groups:
         title: "标签组"

config/locales/server.ar.yml

@@ -17,7 +17,7 @@ ar:
       date_only: "%-d %B %Y"
       long: "%-d %B %Y، %l:%M%P"
   date:
-    month_names: [null, كانون الثاني, شباط, آذار, نيسان, آيار, حزيران, تموز, أب, أيلول, تشرين الأول, تشرين الثاني, كانون الأول]
+    month_names: [null, يناير, فبراير, مارس, أبريل, مايو, يونيو, يوليو, أغسطس, سبتمبر, أكتوبر, نوفمبر, ديسمبر]
     <<: *datetime_formats
   time:
     am: "ص"
@@ -28,7 +28,7 @@ ar:
   posts: "منشورات."
   loading: "يحمّل"
   powered_by_html: 'تدعمه <a href="http://www.discourse.org">دسكورس </a>، يفضّل عرضه وجافاسكربت مفعّل'
-  log_in: "تسجيل الدخول"
+  log_in: "لِج"
   purge_reason: "تم حذفه تلقائيا كحساب مهمل وغير مُفعل"
   disable_remote_images_download_reason: "عُطّل تنزيل الصور عن بعد بسبب نفاذ مساحة القرص الحرّة."
   anonymous: "مجهول"
@@ -36,6 +36,7 @@ ar:
     incoming:
       default_subject: "رسالة ورادة من %{email}"
       show_trimmed_content: "اظهر محتوى أقل"
+      maximum_staged_user_per_email_reached: "أقصى عدد للدعوات التي يمكن للعضو إرسالها باليوم بالبريد الالكتروني."
       errors:
         empty_email_error: "يحدث عندما يكون البريد المستلم فارغ"
         no_message_id_error: "يحدث عندما لا يحتوي البريد على  'Message-Id' في العنوان"
@@ -46,8 +47,9 @@ ar:
         strangers_not_allowed_error: "يحدث عندما يحاول المستخدم انشاء موضوع جديد في قسم هو ليس عضواً فيه"
         insufficient_trust_level_error: "يحدث عندما يحاول مستخدم انشاء موضوع جديد في قسم و تكون درجه ثقه المستخدم اقل من القسم المطلوب "
         reply_user_not_matching_error: "يحدث عندما ياتي الرد من عنوان بريد ألكتروني مختلف من الذي أرسل اليه ألاشعار "
-        topic_not_found_error: "يحدث عندما يصل رد لموضوع تم حذفه"
+        topic_not_found_error: "يحدث عندما يصل رد لموضوع قد حُذف."
         topic_closed_error: "يحدث عندما يصل رد لموضوع تم اغلاقه "
+        bounced_email_error: "هذا البريد الالكتروني هو تقرير ترويجي بالبريد الالكتروني"
         screened_email_error: "وحدث هذا عندما تم حجب عنوان البريد الالكتروني للمرسل"
   errors: &errors
     format: '%{attribute} %{message}'
@@ -222,6 +224,11 @@ ar:
     top: "أفضل المواضيع"
     posts: "اخر المشاركات "
     private_posts: "الرسائل الخاصة الآخيرة"
+    group_posts: "احدث المشاركات من %{group_name} "
+    group_mentions: "احدث التذكيرات من %{group_name} "
+    user_posts: "احدث المشاركات من %{group_name} "
+    user_topics: "  آخر المواضيع بواسطة   @%{username}"
+    tag: "مواضيع معلمة "
   too_late_to_edit: "أُنشئ المنشور منذ فترة طويلة جدا، لذا تعديله أو حذفه لم يعد ممكنا."
   revert_version_same: "ألاصدار الحالي يتطابق مع نفس ألاصدار الذي تحاول استرجاعه ."
   excerpt_image: "صورة"
@@ -312,6 +319,8 @@ ar:
     attributes:
       category:
         name: "اسم الفئة"
+      topic:
+        title: 'عنوان'
       post:
         raw: "متن النص"
       user_profile:
@@ -337,6 +346,9 @@ ar:
           attributes:
             hex:
               invalid: "ليس لونا صالحا"
+        post_reply:
+          base:
+            different_topic: "المشاركة والرد لابد ان يكونا في نفس الموضوع"
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>مجال المعلومات عني لملف تعريفك فارغ حاليا، <a href='/users/%{username_lower}/preferences/about-me'>هل تريد أن تملأه؟</a></div>"
@@ -377,7 +389,7 @@ ar:
     post_template: "%{replace_paragraph}\n\nإستخدم الفقرات الآتية لوضع وصف أطول ، أو لإنشاء تعليمات أو قوانيناً لفئة جديدة :\n\n- لماذا يجب على الأعضاء والزوار استخدام هذه الفئة ؟ ولم انشئت ؟\n\n- ما هو الاختلاف بين هذه الفئة والفئات الأخرى الموجودة في الموقع ؟\n\n- ما هي النقاط الأساسية والعامة التي يجب أن تحتويه المواضيع في هذه الفئة ؟\n\n- هل نحتاج حقا إلى هذه الفئة ؟ وهل نستطيع دمجها مع فئة رئيسية أو فئة فرعية أخرى ؟\n"
     errors:
       uncategorized_parent: "غير مصنف لا يمكن أن يكون فئة الأم"
-      self_parent: "الفئة الفرعية لا يمكن ان تكون كالفئة الرئيسية."
+      self_parent: "لا يمكن أن يكون أب الفئة الفرعية ذات الفئة"
       depth: "لا يمكنك تضمين فئة فرعية تحت فئة فرعية اخرى"
       invalid_email_in: "'%{email_in}' ليس عنوان بريد الكتروني صالح ."
       email_already_used_in_group: "'%{email}' مستخدم من قبل المجموعه '%{group_name}'. "
@@ -420,6 +432,9 @@ ar:
       create_like: "لقد وصلت للعدد الأقصى للإعجابات اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
       create_bookmark: "لقد وصلت للعدد الأقصى للتفضيلات اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
       edit_post: "لقد وصلت للعدد الأقصى للتعديلات اليوم. رجاء انتظر %{time_left} قبل المحاولة مجددا."
+      live_post_counts: "أنت تطلب تعداد حى للمنشورات بسرعه عاليه . الرجاء الانتظار  %{time_left} قبل المحاوله مجدداً"
+      unsubscribe_via_email: "لقد وصلت للحد الأقصى من الغاء الاشتراكات عبر البريد الالكترونى اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
+      topic_invitations_per_day: "لقد وصلت للحد الأقصى للدعوة للمواضيع اليوم. رجاء الانتظار %{time_left} قبل المحاولة مجددا."
     hours:
       zero: "أقل من ساعة"
       one: "ساعة واحدة"
@@ -614,6 +629,7 @@ ar:
     confirmed: "حُدّث بريدك الإلكتروني."
     please_continue: "تابع إلى %{site_name}"
     error: "حدث خطأ في تغيير عنوان بريدك الإلكتروني. لربما يكون العنوان مستخدما بالفعل."
+    error_staged: "حدث خطأ في تغيير عنوان بريدك الإلكتروني. العنوان الذى ادخلته مستخدم من قبل مشترك عبر البريد الالكترونى."
     already_done: "نأسف عنوان التاكيد هدا لم يعد صالحا بعد الان. ربما تم تغيير بريدك بالفعل؟"
     authorizing_old:
       title: "شكرا لك لتاكيدك عنوان بريدك الحالي."
@@ -625,6 +641,7 @@ ar:
     continue_button: "تابع إلى %{site_name}"
     welcome_to: "مرحبا بك في %{site_name}!"
     approval_required: "يجب على المشرف أن يقبل حسابك الجديد قبل أن تستطيع الدخول لهذا المنتدى. سوف تتلقى بريد إلكتروني عندما يتم قبول حسابك."
+    missing_session: "لا نستظيع تحديد اذا كان حسابك قد أنشئ. رجاء التأكد من أن (الكوكيز) بالمتصفح  الذى تستخدمة منشطة."
   post_action_types:
     off_topic:
       title: 'خارج الموضوع'
@@ -690,6 +707,20 @@ ar:
       message:
         make: "هذا الموضوع معلّم الآن. سوف يظهر في أعلى كل صفحة حتى يرفض من قبل المستخدم."
         remove: "هذا الموضوع لم يعد معلّم. لن يظهر في أعلى كل صفحة."
+  unsubscribed:
+    title: "غير مشترك "
+    description: "لقد تم الغاء اشتراكك. لتغير اختيارات بريدك الالكترونى <a href='%{url}'>زور اختياراتك الشخصية</a>"
+  unsubscribe:
+    title: "إلغاء الإشتراك"
+    stop_watching_topic: "توقف عن مراقبة هذا الموضوع،  %{link}"
+    mute_topic: "الغاء جميع التنبيهات لهذا الموضوع،  %{link}"
+    unwatch_category: "توقف عن مراقبة جميع المواضيع فى %{category}"
+    mailing_list_mode: "الغاء وضعية قائمة المراسلات"
+    disable_digest_emails: "توقف عن ارسال الملخصات بالبريد الالكترونى"
+    all: "لا ترسل لى أي بريد الكترونى من %{sitename}"
+    different_user_description: "أنت حالياً سجلت دخولك كمستخدم مختلف عن الذي كان يُرسله له الملخص. الرجاء تسجيل الخروج  ثم  الدخول مرة أخرى  والمحاولة مجدداً."
+    not_found_description: "نأسف ، لم نستطيع أن نلغي اشتراكك . من الممكن أن الرابط المرسل إليك قد انتهت مدته . "
+    log_out: "تسجيل خروج"
   reports:
     visits:
       title: "زيارات العضو"
@@ -773,19 +804,27 @@ ar:
     page_view_anon_reqs:
       title: "مجهولون"
       xaxis: "يوم"
+      yaxis: "عدد قراءات الصفحات للمجهولين"
     page_view_logged_in_reqs:
       title: "مسجل دخول"
       xaxis: "يوم"
+      yaxis: "عدد قراءات الصفحات للمسجلين دخول"
     page_view_crawler_reqs:
       title: "عناكب اﻹنترنت"
       xaxis: "يوم"
+      yaxis: "عدد قراءات الصفحات لزواحف الانترنت"
     page_view_total_reqs:
       title: "مجموع"
       xaxis: "يوم"
+      yaxis: "عدد قراءات الصفحات الكلى"
     page_view_logged_in_mobile_reqs:
+      title: "عدد قراءات الصفحات للمسجلين دخول"
       xaxis: "يوم"
+      yaxis: "عدد قراءات الصفحات للمسجلين دخول عن طريق المحمول"
     page_view_anon_mobile_reqs:
+      title: "عدد قراءات الصفحات للمجهولين"
       xaxis: "اليوم"
+      yaxis: "عدد قراءات الصفحات للمجهولين عن طريق المحمول"
     http_background_reqs:
       title: "خلفية"
       xaxis: "اليوم"
@@ -846,11 +885,13 @@ ar:
     site_contact_username_warning: "أدخل اسم حسابات الأعضاء العاملين الودودين لإرسال رسالة مهمة آليا من تحديث site_contact_username في <a href='/admin/site_settings'>إعدادات الموقع</a>."
     notification_email_warning: "رسائل التنبية البريدية لم تكن مرسلة من عنوان بريدي صالح على مجالك؛ توصيل البريد سيكون غير منتظم ولايمكن الاعتماد عليها. الرجاء وضع رسائل التنبية في عنوان بريدي صالح في إعدادات الموقع  <a href='/admin/site_settings'>Site Settings</a>."
     subfolder_ends_in_slash: "إعدادات المجلدات الداخلية خاطئ;ال DISCOURSE_RELATIVE_URL_ROOT يجب ان تنتهي ب سلاش."
+    missing_mailgun_api_key: "هذا الموقع معد لارسال البريد الالكترونى عن طريق خدمة mailgun لكنكم لم تزودونا بمفتاح  API الخاص بكم لتعريف رسائلكم للخدمة."
   site_settings:
     censored_words: "الكلمات التي ستستبدل تلقائيا مع  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "سيتم حذف الوظائف المخفية تلقائيًا إذا زادت مدة الإخفاء أكثر من 30 يومًا"
     default_locale: "اللغة الإفتراضية لهذا الديسكورس نموذج  (ISO 639-1 Code)"
     allow_user_locale: "السماح للمستخدمين باختيار واجهة تفضيل لغة خاصة بهم."
+    set_locale_from_accept_language_header: "اختيار لغة الواجه للمستخدمين المجهولين طبقا للغة المختارة بمطصحف الشبكة. (اعداد تجريبى، لا يعمل مع ذاكرة المطصفح)"
     min_post_length: "الحد الأدنى المسموح به لطول مشاركة في الأحرف"
     min_first_post_length: "الحد الأدنى المسموح به لطول أول المشاركة (مقدمة العنوان) بالأحرف"
     min_private_message_post_length: "الحد الأدنى المسموح به لطول مشاركة في الأحرف"
@@ -859,6 +900,7 @@ ar:
     max_topic_title_length: "الحد الأعلى المسموح به لطول عنوان موضوع في الأحرف"
     min_private_message_title_length: "الحد الأدنى المسموح به لطول عنوان لرسالة في الأحرف"
     min_search_term_length: "الحد الأدنى الصالح لطول مصطلح  في الأحرف"
+    search_tokenize_chinese_japanese_korean: "ارغام الباحث على تجميع احرف اللغات الصينية واليابانية والكورية حتى على المواقع الغير معدة لتلك اللغات."
     allow_uncategorized_topics: "اسمح بتصميم النقاشات من غير فئات.  تحذير: اذا كان هناك نقاشات غير مصنفه،  يجب عليك تصنيفها قبل اغلاق هذا "
     allow_duplicate_topic_titles: "اسمح بالمواضيع المماثلة والعناوين المكررة."
     unique_posts_mins: "كمية الدقائق التي يمكن للعضو قبلها إنشاء مشاركة مع نفس المحتوى مجددا"
@@ -871,6 +913,7 @@ ar:
     crawl_images: "جلب الصور من الروابط لادراج الأبعاد الصحيحة."
     download_remote_images_to_local: "تحويل الصور البعيدة إلى صور محلية بواسطة تحميلها؛ بإستثناء الصور التالفة"
     download_remote_images_threshold: "ادني مساحه للقرص ضروربه لتحميل الصور البعيده محليا ( في المئه) "
+    download_remote_images_max_days_old: "لا تقم بتحميل الصور من مواقع اخرى للمشاركات اﻷقدم من عدد س من اﻷيام."
     disabled_image_download_domains: "الصور البعيدة لن يتم تنزيلها من هذا المجال. قائمة Pipe-delimited."
     editing_grace_period: "خلال (n) ثواني بعد نشر المشاركة ، التعديل لن يقوم بانشاء نسخة جديدة في السجل الخاص بالتعديل ."
     post_edit_time_limit: "الكاتب  يتستطيع تعديل و مسح مشاركته لعده (n) دقائق بعد النشر.  اضبطه للعدد0 للابد"
@@ -885,9 +928,12 @@ ar:
     add_rel_nofollow_to_user_content: "أضف rel nofollow لجميع محتوى المستخدم المتقدم، باستثناء الروابط الداخلية (بما في ذلك المجالات الأصل). إذا غيرت هذا، يجب عليك عمل rebake لكل المشاركات بـ: \"rake posts:rebake\""
     exclude_rel_nofollow_domains: "قائمه النطاقات حيت لا اتباع لا يجب ان تضاف للروابط. tld.com سوف يقوم تلقائيا  بالسماح  sub.tld.com كذلك  مثل  الاصغر , يجب عليك اضافه النطاق الاعلى مستوي الخاص بالموقع لمساعده  زحف الويب ليجاد جميع المحتويات.اذا كان باقي اجزاء موقعك في نطاقات اخرى , اضفهم ايضا"
     post_excerpt_maxlength: "الحد الأقصى لطول وظيفة مقتطف / ملخص."
+    show_pinned_excerpt_mobile: "اظهر مقتطفات من المواضيع المثبتة فى منظر المحمول."
+    show_pinned_excerpt_desktop: "اظهر مقتطفات من المواضيع المثبتة فى منظر سطح المكتب."
     post_onebox_maxlength: "الحد الأقصى لطول مشاركة oneboxed Discourse بالأحرف."
     onebox_domains_whitelist: "قائمة بالمجالات للسماح روابط تفصيلي؛ وينبغي دعم هذه المجالات OpenGraph أو oEmbed. اختبار لهم في http://iframely.com/debug"
     logo_url: "صورة الشعار في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مستطيل واسع. إذا ترك الحقل فارغا فسيتم استخدام اسم الموقع."
+    digest_logo_url: "صورة الشعار البديل المستخدم في الجزء العلوي لملخص البريد الالكترونى، يجب أن تكون على شكل مستطيل واسع. لا يجب أن تكون الصورة من نوع SVG.  إذا ترك الحقل فارغا فسيتم استخدام `logo_url`."
     logo_small_url: "صورة الشعار صغيرة في الجزء العلوي الأيسر من موقع الويب الخاص بك، يجب أن تكون على شكل مربع، وينظر عند التمرير لأسفل. وإذا ترك فارغا أن أظهرت الصورة الرمزية المنزل."
     favicon_url: "الأيقونة الخاصة بموقعك,  شاهد http://en.wikipedia.org/wiki/Favicon,  لتعمل بشكل صحيح ضمن CDN يجب ان تكون بصيغة png."
     mobile_logo_url: "صورة الشعار الثابتة ستظهر في الجزء العلوي الأيسر في نسخة الجوال من موقعك. يجب أن تكون مربعة. إذا تُركت فارغة، سيتم استخدام الـ `logo_url`. على سبيل المثال: http://example.com/uploads/default/logo.png"
@@ -895,6 +941,7 @@ ar:
     notification_email: "لمن:  يستخدم عنوان البريد الالكتروني عند  إرسال كل رسائل النظام الأساسي. المجال الخاص هنا يجب أن يكون SPF, DKIM وسجلات PTR عكسي تضبط بشكل صحيح لوصول البريد الالكتروني."
     email_custom_headers: "قائمة قناة محددة لرؤوس بريد إلكتروني مخصص."
     email_subject: "لتخصيص تنسيق عناوين رسائل البريد الالكتروني القياسية. انظر  https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    force_https: "ارغام الموقع على استخدام HTTPS فقط. تحذير: لا تفعل هذا الاختيار الا بعد التأكد أن HTTPS مفعلة وتعمل بالكامل فى جميع أنحاء الموقع! هل اختبرت جميع الخوادم  CDN، جميع تسجيلات الدخول من شبكات التواصل الاجتماعى، أية صور أو تبعيات خارجية للتأكد من أنها كلها متوافقه مع HTTPS؟"
     summary_score_threshold: "الحد الأدنى للنقاط المطلوبة لتضمين مشاركة في \"تلخيص هذا الموضوع\""
     summary_posts_required: "الحد الأدنى للمشاركات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل."
     summary_likes_required: "الحد الأدنى للإعجابات في الموضوع قبل \"تلخيص هذا الموضوع\" مفعل."
@@ -906,10 +953,17 @@ ar:
     polling_interval: "عندما لا يكون التصويت طويلا، عدد المرات التي يجب تسجيل عملاء التصويت فيها بالملي ثانية."
     anon_polling_interval: "المرات التي يجب الاستعلام فيها عن العملاء المجهولين بالملي ثانية."
     background_polling_interval: "كم ينبغي أن يكون عدد مرات الاستعلام عن العملاء في المللي ثانية ( عندما يكون الاطار في الخلفية )"
+    flags_required_to_hide_post: "عدد العلامات التى تؤدى الى خفى مشاركة تلقائيا وارسال رسالة الى المستخدم ( 0 تعنى عدم الخفى أو الارسال)"
     cooldown_minutes_after_hiding_posts: "عدد الدقائق يجب على المستخدم الانتظار قبل أن يتمكنوا من تعديل موضوع مخفي عن طريق رفع الأعلام المجتمع"
+    max_topics_in_first_day: "أقصى عدد للمواضيع المسموح للمستخدم بانشائها خلال 24 ساعة من نشر أول مشاركة."
+    max_replies_in_first_day: "أقصى عدد للردود المسموح للمستخدم بنشرها حتى مرور 24 ساعة على نشر أول مشاركة"
     tl2_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ  لـمستوى الثقة 2 (عضو) بالضرب بهذا الرقم"
     tl3_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـ  لـمستوى الثقة 3 (منتظم) بالضرب بهذا الرقم"
     tl4_additional_likes_per_day_multiplier: "زيادة حد الإعجابات باليوم لـمستوى الثقة 4 (قائد) بالضرب بهذا الرقم"
+    num_spam_flags_to_block_new_user: "اذا كانت مشاركات المستخدم الجديد حصلت علي هذا الكم من اعلامات البريد الغير مرغوب من num_users_to_block_new_user  مع اختلاف المستخدمين، اخفي جميع مشاركتهم و امنع جميع المشاركات المستقبليه.0 تعنى الالغاء."
+    num_users_to_block_new_user: "اذا كانت مشاركات المستخدم الجديد حصلت علي num_spam_flags_to_block_new_user  من هذا العدد من المستخدمين المختلفين، اخفي جميع مشاركتهم و امنع جميع المشاركات المستقبليه.0 تعنى الالغاء."
+    num_tl3_flags_to_block_new_user: "اذا كانت مشاركات المستخدم الجديد حصلت علي هذا العدد من علامات  num_tl3_users_to_block_new_user  من مستخدمين مختلفين من مستوى الثقة 3، اخفي جميع مشاركتهم و امنع جميع المشاركات المستقبليه.0 تعنى الالغاء."
+    num_tl3_users_to_block_new_user: "اذا كانت مشاركات المستخدم الجديد حصلت علي هذا العدد من علامات  num_tl3_flags_to_block_new_user  من مستخدمين مختلفين من مستوى الثقة 3، اخفي جميع مشاركتهم و امنع جميع المشاركات المستقبليه.0 تعنى الالغاء."
     notify_mods_when_user_blocked: "إذا تم حظر المستخدم تلقائيا، وإرسال رسالة الى جميع المشرفين."
     flag_sockpuppets: "إذا رد أحد المستخدمين جديد إلى موضوع من عنوان IP نفسه باسم المستخدم الجديد الذي بدأ هذا الموضوع، علم كل من مناصبهم كدعاية المحتملين."
     traditional_markdown_linebreaks: "استعمل السطور التالفه التقليديه في Markdown, التي تتطلب مساحتين بيضاوين للسطور التالفه"
@@ -917,8 +971,11 @@ ar:
     post_undo_action_window_mins: "عدد الدقائق التي يسمح فيها للأعضاء بالتراجع عن آخر إجراءاتهم على المنشور (إعجاب، اشارة، إلخ...)"
     must_approve_users: "يجب أن الموظفين يوافق على جميع حسابات المستخدم الجديدة قبل أن يتم السماح لهم للوصول إلى الموقع. تحذير: تمكين هذا لموقع الحية إلغاء وصول المستخدمين الحاليين غير الموظفين!"
     pending_users_reminder_delay: "نبه المشرفين إذا وجد اعضاء ينتظرون الموافقة لمدة اطول من الساعات ، قم بوضع الخيار -1 لايقاف التنبيهات ."
+    maximum_session_age: "سيظل المستخدم مسجل دخول لهذا العدد من الساعات منذ زيارته اﻷخيرة."
     ga_universal_tracking_code: "تحليلات Google العالمية (analytics.js) تتعقب رمز الشيفرة، مثال: UA-12345678-9; انظر http://google.com/analytics"
     ga_universal_domain_name: "تحليلات Google العالمية (analytics.js) تتعقب اسم المجال، مثال: mysite.com; انظر http://google.com/analytics"
+    gtm_container_id: "هاوية حاوية ادارة العلامات الخاصة بجوجل. على سبيل المثال: GTM-ABCDEF"
+    enable_escaped_fragments: "اللجوء الى استخدام Ajax-Crawling API حالة اكتشاف تواجد زاحف الشبكة. للمزيد: https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     enable_noscript_support: "فعل دعم محرك بحث webcrawler عبر علامة غير نصية."
     allow_moderators_to_create_categories: "السماح للمشرفين إنشاء قسم جديد"
     cors_origins: "اسمح بالأصول للطلبات عبر المنشأ (CORS). كل أصل يجب أن يتضمن http:// أو https://. متغير env لـ DISCOURSE_ENABLE_CORS يجب أن يعين إلى true ليعمل CORS."
@@ -946,6 +1003,7 @@ ar:
     allow_index_in_robots_txt: "تحديد في ملف robots.txt أن يسمح هذا الموقع ليتم فهرستها من قبل محركات البحث على شبكة الإنترنت."
     email_domains_blacklist: "قائمة pipe-delimited المجالات البريد الإلكتروني الذي لا يسمح للمستخدمين تسجيل حسابات مع. مثال: mailinator.com | trashmail.net"
     email_domains_whitelist: "قائمة pipe-delimited من مجالات البريد الإلكتروني التي يجب على المستخدمين تسجيل حسابات مع. تحذير: لن يسمح للمستخدمين مع مجالات البريد الإلكتروني الأخرى غير المذكورة هنا!"
+    forgot_password_strict: "عدم اعلام المستخدم بوجود حساب عند استخدامهم استمارة \"نسيت كلمة السر\""
     log_out_strict: "عند تسجيل الخروج، تسجيل الخروج ALL جلسات للمستخدم على جميع الأجهزة"
     version_checks: "Ping ديسكورس مركزا لتحديثات الإصدار وإظهار الرسائل النسخة الجديدة على لوحة القيادة / مسؤول"
     new_version_emails: "إرسال بريد إلكتروني إلى عنوان contact_email عندما نسخة جديدة من ديسكورس هو متاح."
@@ -962,8 +1020,10 @@ ar:
     min_admin_password_length: "أقل طول مسموح به  للكلمه مرور  بالنسبه لاداري"
     block_common_passwords: "لا تسمح لكلمات المرور المسجلة في قائمة كلمات المرور الشائعةز"
     enable_sso: " اسمح تسجيل دخول واحد عبر موقع خارجي(تحذير :عنوان بريد المستخدم *يجب* ان يتم التحقق من صحته عبر الموقع الخارجي)"
+    verbose_sso_logging: "سجل باسهاب التشخيصات المرتبطة بتسجيل الدخول اﻷحادى (SSO) الى logs/"
     enable_sso_provider: "تنفيذ مزود بروتوكول Discourse SSO على نقطة نهاية /session/sso_provider, يتطلب sso_secret لتعينها"
     sso_secret: "السلسلة السرية استخدمت لتشفير مصادقة معلومات SSO, كن متأكداً أنها 10 حروف أو أكثر"
+    sso_overrides_bio: "تجاوز السيرة الزاتية  بملف التعريف الخاص بالمستخدم ومنعه من تغيره. "
     sso_overrides_email: "يتجاوز البريد الاكتوني المحلي مع بريد موقع خارجي من حمولة SSO عند كل تسجيل دخول, ويمنع   التتغيرات المحلية. (تحذير: ممكن يحدث تعارض بسبب الاختلاف طول اسم المستخدم/المتطلبات)"
     sso_overrides_username: "يتجاوز \"اسم المستخدم المحلي\" مع \"اسم مستخدم موقع خارجي\" من حمولة SSO عند كل تسجيل دخول, ويمنع التغيرات المحلية. (تحذير: ممكن يحدث تعارض بسبب الاختلاف طول اسم المستخدم/المتطلبات)"
     sso_overrides_name: "يتجاوز الاسم المحلي مع اسم موقع خارجي من حمولة SSO عند كل تسجيل دخول, ويمنع التغيرات المحلية. "
@@ -988,6 +1048,7 @@ ar:
     enable_github_logins: "تمكين مصادقة جيثب، يتطلب github_client_id وgithub_client_secret"
     github_client_id: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications"
     github_client_secret: "هوية العميل للمصادقة جيثب، مسجلة في https://github.com/settings/applications"
+    readonly_mode_during_backup: "تمكين وضع القراءة فقط في حين أخذ نسخة احتياطية"
     allow_restore: "تسمح استعادة، والتي يمكن أن تحل محل ALL بيانات الموقع! ترك كاذبة إلا إذا كنت تخطط لاستعادة نسخة احتياطية"
     maximum_backups: "أكبر قدر ممكن من النسخ الاحتياطي للحفاظ على القرص. يتم حذف النسخ الاحتياطية القديمة تلقائيا"
     automatic_backups_enabled: "فعل النسخ الإحتياطي التلقائي بشكل متكرر كما هو محدد."
@@ -1012,6 +1073,7 @@ ar:
     max_private_messages_per_day: "أقصى عدد لرسائل الأعضاء التي يمكن إنشائها باليوم."
     max_invites_per_day: "أقصى عدد للدعوات التي يمكن للعضو إرسالها باليوم."
     max_topic_invitations_per_day: "أقصى عدد لدعوات الموضوع التي يمكن للعضو إرسالها باليوم."
+    alert_admins_if_errors_per_minute: "عدد الأخطاء في الدقيقة الواحدة لكى يرسل تنبيه للمدير. قيمة 0 تعطل هذه الميزة. ملاحظة: تتطلب إعادة تشغيل."
     suggested_topics: "عدد المواضيع المواضيع المقترحة يظهر في أسفل الموضوع."
     limit_suggested_to_category: "أظهر فقط المواضيع من الفئات الحالية في المواضيع المقترحة."
     clean_up_uploads: " يتيم أزالة تحديث غير مرجعية لمنع استضافة غير المشروعة. تحذير: قد تحتاج لعمل نسخة احتياطية من الدليل / تحميل قبل تمكين هذا الإعداد."
@@ -1447,30 +1509,12 @@ ar:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "اكتملت عملية النسخ الإحتياطي بنجاح"
-      text_body_template: "تم النسخ الاحتياطي بنجاح .\nزيارة [admin > backup section](%{base_url}/admin/backups) لتحميل النسخةالاحتياطية الجديدة."
     backup_failed:
       subject_template: "فشل النسخ الإحتياطي"
-      text_body_template: |
-        فشل النسخ الاحتياطي.
-
-        هنا السجل:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "أكتملت الإستعادة بنجاح"
-      text_body_template: "الاستعادة نجحت"
     restore_failed:
       subject_template: "فشل استعادة"
-      text_body_template: |
-        فشل عملية الاستعادة.
-
-        هذا السجل:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "دعوة العضو الجماعية تمت بنجاح"
       text_body_template: "ملف دعوة العضو الجماعية الخاص بك تمت معالجته، %{sent} دعوات مرسلة."
@@ -1677,7 +1721,7 @@ ar:
     anonymous_user: "المستخدم مجهول"
     suspended_not_pm: "عضو موقوف، ليست رسالة"
     seen_recently: "تم رؤية هذا المستخدم مسبقاً"
-    post_not_found: "لا يمكن إيجاد مشاركة مع معرف %{post_id}"
+    post_not_found: "تعذر إيجاد المشاركة ذات المعرف %{post_id}"
     notification_already_read: "تم قراءة هذه الاشعارات "
     topic_nil: "مشاركة.موضوع صفر"
     post_deleted: "تم حذف الموضوع من قبل كاتبه "

config/locales/server.bs_BA.yml

@@ -748,27 +748,10 @@ bs_BA:
       subject_template: "Backup completed successfully"
     backup_failed:
       subject_template: "Backup failed"
-      text_body_template: |
-        The backup has failed.
-
-        Here's the log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Restore completed successfully"
-      text_body_template: "The restore was successful."
     restore_failed:
       subject_template: "Restore failed"
-      text_body_template: |
-        The restore has failed.
-
-        Here's the log:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Bulk user invite processed successfully"
       text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."

config/locales/server.da.yml

@@ -18,14 +18,33 @@ da:
   date:
     month_names: [null, Januar, Februar, Marts, April, Maj, Juni, Juli, August, September, Oktober, November, December]
     <<: *datetime_formats
+  time:
+    am: "am"
+    pm: "pm"
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Emner"
   posts: "indlæg"
   loading: "Indlæser"
   powered_by_html: 'Siden er lavet med <a href="http://www.discourse.org">Discourse</a>, opleves bedst med JavaScript slået til'
   log_in: "Log ind"
+  purge_reason: "Automatisk slettet som forladt, deaktiveret konto"
   disable_remote_images_download_reason: "Fjerndownload af billeder deaktiveret grundet utilstrækkelig diskplads"
   anonymous: "Anonym"
+  emails:
+    incoming:
+      default_subject: "Indgående email fra %{email}"
+      show_trimmed_content: "Vis trimmet indhold"
+      maximum_staged_user_per_email_reached: "Maksimalt antal af brugere oprettet pr. email."
+      errors:
+        empty_email_error: "Dette sker når den rå email der modtages er tom."
+        no_message_id_error: "Dette sker når emailen ikke har nogen 'Message-Id' header."
+        inactive_user_error: "Dette sker når afsenderen ikke er aktiv."
+        blocked_user_error: "Dette sker når afsenderen er blevet blokeret."
+        bad_destination_address: "Dette sker når ingen af email adresserne i To/Cc/Bcc felterne matcher en opsat indgående email adresse."
+        topic_not_found_error: "Dette sker når et svar er kommet, men det relaterede emne er blevet slettet."
+        topic_closed_error: "Dette sker når et svar er kommet, men det relaterede emne er blevet lukket."
+        bounced_email_error: "Emailen er en \"bounced email\" rapport"
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -89,6 +108,8 @@ da:
   not_found: "Den anmodede URL eller ressource kunne ikke findes."
   invalid_access: "Du har ikke tilladelse til at se den anmodede ressource."
   read_only_mode_enabled: "Forummet er i \"kun læsning\" tilstand. Interaktioner er deaktiverede."
+  reading_time: "Læsetid"
+  likes: "Synes godt om"
   too_many_replies:
     one: "Beklager, men nye brugere kan kun skrive 1 svar i hvert emne til at starte med."
     other: "Beklager, men nye brugere kan kun skrive %{count} svar i hvert emne til at starte med."
@@ -105,6 +126,19 @@ da:
     replies:
       one: "1 svar"
       other: "%{count} svar"
+  no_mentions_allowed: "Beklager, du kan ikke nævne andre brugere."
+  too_many_mentions:
+    one: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
+    other: "Beklager, men du kan kun nævne %{count} brugere i et indlæg."
+  no_mentions_allowed_newuser: "Beklager, nye brugere kan ikke nævne andre brugere."
+  too_many_mentions_newuser:
+    one: "Beklager, nye brugere kan kun nævne en bruger i et indlæg."
+    other: "Beklager, nye brugere kan kun nævne %{count} brugere i et indlæg."
+  no_attachments_allowed: "Beklager, nye brugere kan ikke vedhæfte filer i et indlæg."
+  too_many_attachments:
+    one: "Beklager, nye brugere kan kun vedhæfte en fil i et indlæg."
+    other: "Beklager, nye brugere kan kun vedhæfte %{count} filer i et indlæg."
+  no_links_allowed: "Beklager, nye brugere kan ikke bruge links i indlæg."
   spamming_host: "Beklager, du kan ikke indsætte et link til det pågældende domæne."
   user_is_suspended: "Suspenderede brugere tilllades ikke at oprette indlæg."
   topic_not_found: "Der er gået noget galt. Måske er emnet blevet lukket eller slettet mens du kiggede på det?"
@@ -126,14 +160,26 @@ da:
   rss_description:
     latest: "Seneste emner"
     hot: "Populære emner"
+    top: "Populære emner"
     posts: "Seneste indlæg"
+    private_posts: "Seneste private beskeder"
+    group_posts: "Seneste indlæg fra %{group_name}"
+    group_mentions: "Seneste nævnelser fra %{group_name}"
+    user_posts: "Seneste indlæg af @%{username}"
+    tag: "Markerede emner"
   too_late_to_edit: "Dette indlæg er gammelt og kan ikke længere redigeres eller slettes."
+  revert_version_same: "Den nuværende udgave er den samme udgave/version som den du prøver at vende tilbage til."
   excerpt_image: "billede"
   queue:
     delete_reason: "Slettet via køen til moderation af indlæg."
   groups:
     errors:
+      can_not_modify_automatic: "Du kan ikke modificere en automatisk gruppe"
       member_already_exist: "'%{username}' er allerede medlem af denne gruppe."
+      invalid_domain: "'%{domain}' er ikke et gyldigt domæne."
+      invalid_incoming_email: "'%{email}' er ikke en gyldig email adresse."
+      email_already_used_in_group: "'%{email}' er allerede brugt af en bruger i gruppen '%{group_name}'."
+      email_already_used_in_category: "'%{email}' er allerede brugt af en bruger i kategorien '%{category_name}'."
     default_names:
       everyone: "Alle"
       admins: "admins"
@@ -148,6 +194,14 @@ da:
     until_posts:
       one: "indlæg"
       other: "%{count} indlæg"
+    new-topic: |
+      Velkommen til %{site_name} &mdash; **Tak fordi du starter en ny samtale!**
+
+      -  Lyder title interessant hvis du læser den højt? Er det et godt resumé?
+      -  Hvem ville være interesseret i dette? Hvorfor er det vigtigt? Hvilken type svar ønsker du?
+      -  Inkludér relevante ord i dit emne så andre kan *finde* det. For at gruppere dit emne med relaterede emner, så vælg en kategori.
+
+      For mere info, [se vores retningslinjer](/guidelines). Dette panel vil kun vises første gang for %{education_posts_text}.
     new-reply: |
       Velkommen til %{site_name} &mdash; **tak for at du deltager i samtalen!**
 
@@ -168,6 +222,14 @@ da:
       Har du overvejet at **[gå til din brugerprofil](%{profile_path})** og uploade et billede, der repræsenterer dig?
 
       Det er lettere at følge diskussioner og finde interessant mennesker i samtaler, hvor alle har en unik avatar!
+    sequential_replies: |
+      ### Overvej at svare på flere indlæg på en gang
+
+      Istedet for at lave mange små individuelle kommentarer, overvej at lave et enkelt svar som inkluderer "citater" fra tidligere indlæg eller ved at nævne andre brugere med et @.
+
+      Benyt et citat fra et tidligere svar ved at markere den ønskede tekst og herefter vælge <b>opret citat</b> knappen som vises.
+
+      Det er nemmere for alle at læse om emner som har færre svar som går i dybden, end mange små individuelle svar.
     dominating_topic: |
       ### Lad andre deltage i samtalen
 
@@ -190,6 +252,8 @@ da:
     attributes:
       category:
         name: "Kategorinavn"
+      topic:
+        title: 'Titel'
       post:
         raw: "Brødtekst"
       user_profile:
@@ -670,12 +734,19 @@ da:
     download_remote_images_disabled:
       subject_template: "Download af eksterne billeder er slået fra"
       text_body_template: "Indstillingen `download_remote_images_to_local` blev slået fra fordi grænsen for bug af diskplads i `download_remote_images_threshold` blev nået."
+  unsubscribe_link: |
+    [Klik her](%{unsubscribe_url}) hvis du ikke længere vil modtage disse emails.
+  unsubscribe_link_and_mail: |
+    [Klik her](%{unsubscribe_url}) hvis du ikke længere vil modtage disse emails.
   subject_re: "Re:"
   user_notifications:
     previous_discussion: "Forrige svar"
+    in_reply_to: "Som svar på"
     unsubscribe:
       title: "Frameld"
       description: "Ønsker du ikke at modtage disse e-mails? Intet problem! Klik herunder for at framelde med det samme:"
+    reply_by_email: "[Besøg emnet](%{base_url}%{url}) eller svar på denne email for at svare."
+    reply_by_email_pm: "[Gå til besked](%{base_url}%{url}) eller svar på denne email for at svare."
     posted_by: "Oprettet af %{username} den %{post_date}"
     user_replied:
       subject_template: "[%{site_name}] %{username} svarede på dit indlæg i emnet '%{topic_title}'"
@@ -812,13 +883,30 @@ da:
     empathetic:
       name: Empatisk
       description: Har 500 likede indlæg og givet 1000 likes
+    first_mention:
+      description: Nævnte en bruger i et indlæg
+    first_reply_by_email:
+      name: Første svar via email
+      description: Svarede på et indlæg via email
+      long_description: |
+        Dette emblem gives første gang du svarer til et indlæg via email  :e-mail:.
   admin_login:
     success: "Email sendt"
     error: "Fejl!"
     email_input: "Admin email"
     submit_button: "Send email"
-  time:
+  discourse_hub:
-    <<: *datetime_formats
+    access_token_problem: "Fortæl en admin: Venligst opdater indstillingerne så de inkluderer den korrekte  discourse_org_access_key."
+  performance_report:
+    initial_post_raw: Dette emne inkluderer daglige præstationsrapporter for dit site.
+    initial_topic_title: Website præstationsrapport
+  topic_invite:
+    user_exists: "Beklager, men brugeren er allerede inviteret. Du kan kun invitere en bruger til et emne én gang."
+  tags:
+    title: "Tags"
+    staff_tag_disallowed: "Tagget \"%{tag}\" kan kun tildeles af personalet."
+    staff_tag_remove_disallowed: "Tagget \"%{tag}\" kan kun fjernes af personalet."
+  rss_by_tag: "Emner tagget %{tag}"
   activemodel:
     errors:
       <<: *errors

config/locales/server.de.yml

@@ -322,6 +322,7 @@ de:
       * Themen in andere Kategorien verschieben
       * Links veröffentlichen, die von Suchmaschinen weiterverfolgt werden (das automatische [nofollow](http://de.wikipedia.org/wiki/Nofollow) wird entfernt)
       * auf die private Lounge-Kategorie zugreifen, die für Benutzer mit Vertrauensstufe 3 oder höher sichtbar ist
+      * Spam durch eine einzige Meldung ausblenden
 
       Hier ist die [aktuelle Liste aller Stammgäste](/badges/3/regular). Vergiss nicht, hallo zu sagen!
 
@@ -783,15 +784,15 @@ de:
     post_onebox_maxlength: "Maximale Länge eines Onebox-Discourse-Beitrags in Zeichen."
     onebox_domains_whitelist: "Liste von Domains, deren Inhalte für Oneboxen erlaubt sind; diese Domains sollten OpenGraph oder oEmbed unterstützen. Teste ihre Kompatibilität unter http://iframely.com/debug"
     logo_url: "Das Logo oben links auf deiner Site sollte eine breite, rechteckige Form haben. Wenn du kein Logo auswählst, wird stattdessen `title` angezeigt."
-    digest_logo_url: "Das alternative Logo oben in den E-Mail-Zusammenfassungen deiner Webseite. Sollte eine breite, rechteckige Form haben. Sollte kein SVG-Bild sein. Wenn leer, wird `logo_url` verwendet."
+    digest_logo_url: "Das alternative Logo oben in den E-Mail-Zusammenfassungen deiner Site. Sollte eine breite, rechteckige Form haben. Sollte kein SVG-Bild sein. Wenn leer, wird `logo_url` verwendet."
-    logo_small_url: "Dein Logo in klein für die obere linke Seite deiner Website, in Form eines rechteckigen Quadrates. Es wird angezeigt, wenn der Benutzer scrollt. Wenn du dieses Feld frei lässt, wird stattdessen ein Haus-Symbol angezeigt."
+    logo_small_url: "Dein Logo in klein für die obere linke Seite deiner Site, in Form eines rechteckigen Quadrates. Es wird angezeigt, wenn der Benutzer scrollt. Wenn du dieses Feld frei lässt, wird stattdessen ein Haus-Symbol angezeigt."
     favicon_url: "Das Favicon deiner Site. Besuche http://de.wikipedia.org/wiki/Favicon um weitere Informationen zu erhalten. Damit das Favicon korrekt über einen CDN-Service funktioniert, muss es eine .png Datei sein."
     mobile_logo_url: "Das fixierte Logo in der oberen linken Hälfte der mobilen Siteversion. Es sollte eine quadratische Form haben. Wenn du dieses Feld frei lässt, wird `logo_url` benutzt. Z.B. http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Icon für berührungsempfindliche Apple-Geräte. Empfohlene Grösse ist 144px auf 144px."
     notification_email: "Die E-Mail-Adresse die als \"From:\" Absender aller wichtiger System-E-Mails benutzt wird. Die benutzte Domain sollte über korrekte SPF, DKIM und PTR Einträge verfügen, damit E-Mails sicher zugestellt werden können."
     email_custom_headers: "Eine durch senkrechte Striche getrennte Liste von eigenen E-Mail Headerzeilen"
     email_subject: "Format der Betreffzeile in Standard-E-Mails. Siehe https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
-    force_https: "Erzwinge HTTPS für deine Seite. ACHTUNG: aktiviere dies nicht, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du alle CDN-Netzwerke, alle Logins über Soziale Netzwerke, alle externe Logos / Abhängigkeiten geprüft, um sicherzustellen, dass sie auch alle HTTPS-kompatibel sind?"
+    force_https: "Erzwinge HTTPS für deine Site. ACHTUNG: Aktiviere dies nicht, bevor HTTPS nicht vollständig eingerichtet ist und auf jeden Fall überall funktioniert! Hast du alle CDN-Netzwerke, alle Logins über Soziale Netzwerke, alle externe Logos / Abhängigkeiten geprüft, um sicherzustellen, dass sie auch alle HTTPS-kompatibel sind?"
     summary_score_threshold: "Mindestpunktzahl, die ein Beitrag benötigt, um in der \"Thema zusammenfassen\"-Ansicht zu erscheinen."
     summary_posts_required: "Mindestanzahl an Beiträgen in einem Thema, bevor die \"Thema zusammenfassen\"-Funktion aktiviert wird."
     summary_likes_required: "Mindestanzahl an \"Gefällt mir\" Wertungen in einem Thema, bevor die \"Thema zusammenfassen\" Funktion aktiviert wird."
@@ -828,7 +829,6 @@ de:
     ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, beispielsweise: UA-12345678-9; Siehe http://google.com/analytics"
     ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; Siehe http://google.com/analytics"
     gtm_container_id: "Google Tag Manager Container-ID, z.B.: GTM-ABCDEF"
-    gtm_ua_domain_name: "Universal Analytics per Google Tag Manager Domain-Name. 'auto' wird empfohlen."
     enable_escaped_fragments: "Als Fallback die Ajax-Crawling-API von Google verwenden, wenn keine Suchmaschine deaktiviert wurde. Siehe https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     enable_noscript_support: "Aktiviere Standard-Suchmaschinen-Webcrawler-Unterstützung durch den noscript-Tag"
     allow_moderators_to_create_categories: "Erlaube Moderatoren neue Kategorien zu erstellen"
@@ -879,6 +879,7 @@ de:
     enable_sso_provider: "Aktiviere das Discourse SSO Anbieter Protokoll unter /session/sso_provider; benötigt sso_secret."
     sso_url: "URL des Single Sign-On-Endpunkts (muss http:// oder https:// enthalten)"
     sso_secret: "Geheimer Schlüssel für die Authentifizierung von SSO-Informationen. Sollte unbedingt 10 Zeichen oder länger sein."
+    sso_overrides_bio: "Überschreibt \"Über mich\" im Benutzerprofil und verhindert Änderungen durch den Benutzer"
     sso_overrides_email: "Überschreibt lokale E-Mail mit E-Mail der externen Site aus dem SSO-Payload (WARNUNG: Diskrepanzen können aufgrund der Normalisierung lokaler E-Mail-Adressen auftreten.)"
     sso_overrides_username: "Überschreibt lokalen Benutzernamen mit dem Benutzernamen der externen Site aus dem SSO-Payload (WARNUNG: Diskrepanzen können aufgrund von Normalisierung von lokalen Benutzernamen auftreten)"
     sso_overrides_name: "Überschreibt den vollen Namen des Benutzers mit den Daten von der externen Site aus dem SSO-Payload bei jedem Login. Außerdem werden lokale Änderungen verhindert."
@@ -953,6 +954,7 @@ de:
     default_opengraph_image_url: "URL des standardmäßigen Open-Graph-Bildes."
     allow_all_attachments_for_group_messages: "Erlaube alle E-Mail-Anhänge für Gruppen-Nachrichten."
     convert_pasted_images_to_hq_jpg: "Konvertiert eingefügte Bilder in JPG-Dateien mit hoher Qualität."
+    convert_pasted_images_quality: "Qualität der umgewandelten JPG Datei (1 ist die niedrigste, 100 die beste Qualität)."
     enable_flash_video_onebox: "Aktiviere das Einbinden von swf und flv (Adobe Flash) Links in einer Onebox. ACHTUNG: Kann ein Sicherheitsrisiko sein."
     default_invitee_trust_level: "Standardwert für die Vertrauensstufe eines eingeladenen Benutzers (0-4)."
     default_trust_level: "Standardwert für die Vertrauensstufe (0-4) für alle neuen Benutzer. ACHTUNG! Diesen Wert anzuheben kann zu erhöhtem Spam-Aufkommen führen!"
@@ -1044,7 +1046,7 @@ de:
     auto_block_first_post_regex: "Regulärer Ausdruck der dafür sorgt dass passende erste Beiträge von Benutzern genehmigt werden müssen. Groß- und Kleinschreibung wird nicht beachtet.\nBeispiel: raging|a[bc]a blockiert alle ersten Beiträge, die raging, aba oder aca beinhalten. Wird nur auf den ersten Beitrag angewendet."
     reply_by_email_enabled: "Aktviere das Antworten auf Themen via E-Mail."
     reply_by_email_address: "Vorlage für die Antwort einer per E-Mail eingehender E-Mail-Adresse, zum Beispiel: %{reply_key}@reply.example.com oder replies+%{reply_key}@example.com"
-    alternative_reply_by_email_addresses: "Liste alternativer Vorlagen für eingehende E-Mail-Adressen für das Antworten per E-Mail"
+    alternative_reply_by_email_addresses: "Liste alternativer Vorlagen für eingehende E-Mail-Adressen für das Antworten per E-Mail. Beispiel: %{reply_key}@antwort.example.com|antworten+%{reply_key}@example.com"
     incoming_email_prefer_html: "Verwende die HTML-Version statt der Text-Version für eingehende E-Mails. Kann unerwartete Formatierungsprobleme verursachen!"
     disable_emails: "Discourse daran hindern jegliche E-Mails zu verschicken"
     strip_images_from_short_emails: "Entferne Bilder aus E-Mails kleiner als 2800 Bytes."
@@ -1056,15 +1058,17 @@ de:
     max_emails_per_day_per_user: "Maximale Zahl an E-Mails, die Benutzern gesendet werden. 0 zum Deaktivieren der Grenze."
     enable_staged_users: "Erstelle automatisch vorbereitete Benutzer, wenn eingehende E-Mails verarbeitet werden."
     maximum_staged_users_per_email: "Maximale Anzahl vorbereiteter Benutzer, wenn eine eingehende E-Mail bearbeitet wird."
-    auto_generated_whitelist: "Liste von E-Mail-Adressen, die nicht auf automatisch generierte Inhalte überprüft werden."
+    auto_generated_whitelist: "Liste von E-Mail-Adressen, die nicht auf automatisch generierte Inhalte überprüft werden. Beispiel: foo@bar.com|discourse@example.com"
     block_auto_generated_emails: "Eingehende E-Mails blockieren, die als automatisch generiert erkannt werden."
     ignore_by_title: "Ignoriere eingehende E-Mails basierend auf ihrem Betreff."
     mailgun_api_key: "Geheimer Mailgun-API-Schlüssel, um Webhook-Nachrichten zu überprüfen"
-    soft_bounce_score: "Bounce-Score, der einem Benutzer hinzugefügt wird, wenn eine E-Mail vorübergehend nicht zugestellt werden kann."
+    soft_bounce_score: "Der Bounce-Score des Benutzers wird um diesen Wert erhöht, wenn eine E-Mail vorübergehend nicht zugestellt werden kann."
-    hard_bounce_score: "Bounce-Score, der einem Benutzer hinzugefügt werden, wenn eine E-Mail dauerhaft nicht zugestellt werden konnte."
+    hard_bounce_score: "Der Bounce-Score des Benutzers wird um diesen Wert erhöht, wenn eine E-Mail dauerhaft nicht zugestellt werden konnte."
     bounce_score_threshold: "Bounce-Score, ab dem wir einem Benutzer keine E-Mails mehr senden."
     bounce_score_threshold_deactivate: "Bounce-Score, ab dem wir einen Benutzer deaktivieren."
     reset_bounce_score_after_days: "Bounce-Score automatisch nach X Tagen zurücksetzen."
+    attachment_content_type_blacklist: "Liste der Schlüsselwörter für die Ablehnung von Anhängen basierend auf Inhaltstypen."
+    attachment_filename_blacklist: "Liste der Schlüsselwörter für die Ablehnung von Anhängen basierend auf dem Dateinamen."
     manual_polling_enabled: "Eingehende E-Mails über die API für E-Mail-Antworten annehmen."
     pop3_polling_enabled: "E-Mail-Antworten über POP3 abholen."
     pop3_polling_ssl: "SSL für die Verbindung zum POP3-Server verwenden. (Empfohlen)"
@@ -1092,7 +1096,7 @@ de:
     automatically_download_gravatars: "Profilbilder von Gravatar herunterladen, wenn ein Benutzer sich registriert oder seine E-Mail-Adresse ändert."
     digest_topics: "Maximale Anzahl von Themen, die in der E-Mail-Zusammenfassung angezeigt werden."
     digest_min_excerpt_length: "Minimale Zeichenlänge für Auszüge von Beiträgen in der E-Mail-Zusammenfassung."
-    delete_digest_email_after_days: "Unterdrücke E-Mail-Zusammenfassungen für Benutzer, die länger als (n) Tage nicht auf der Seite gesehen wurden."
+    delete_digest_email_after_days: "Unterdrücke E-Mail-Zusammenfassungen für Benutzer, die länger als (n) Tage nicht auf der Site gesehen wurden."
     digest_suppress_categories: "Unterdrücke diese Kategorien in E-Mail-Zusammenfassungen."
     disable_digest_emails: "Deaktiviere E-Mail-Zusammenfassungen für alle Benutzer."
     detect_custom_avatars: "Aktiviere diese Option, um zu überprüfen, ob Benutzer eigene Profilbilder hochgeladen haben."
@@ -1478,7 +1482,7 @@ de:
 
       - Schaue dir im [GitHub-Changelog](https://github.com/discourse/discourse/commits/master) an, was neu ist
 
-      - Besuche [meta.discourse.org](http://meta.discourse.org) ffür Neuigkeiten, Diskussionen und Support für Discourse
+      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Support für Discourse
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] Update verfügbar"
     text_body_template: |
@@ -1491,7 +1495,7 @@ de:
 
       - Schaue dir im [GitHub-Changelog](https://github.com/discourse/discourse/commits/master) an, was neu ist
 
-      - Besuche [meta.discourse.org](http://meta.discourse.org) ffür Neuigkeiten, Diskussionen und Support für Discourse
+      - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Support für Discourse
 
       ### Versionshinweise
 
@@ -1662,7 +1666,16 @@ de:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Sicherung erfolgreich abgeschlossen"
-      text_body_template: "Backup erfolgreich erstellt.\nBesuche [admin > backup section](%{base_url}/admin/backups) um das neue Backup herunterzuladen."
+      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: |
@@ -1670,12 +1683,19 @@ de:
 
         Hier ist das Protokoll:
 
-        ```
+        ```text
         %{logs}
         ```
     restore_succeeded:
       subject_template: "Wiederherstellung erfolgreich abgeschlossen"
-      text_body_template: "Die Wiederherstellung war erfolgreich."
+      text_body_template: |
+        Die Wiederherstellung war erfolgreich.
+
+        Hier ist das Protokoll:
+
+        ```text
+        %{logs}
+        ```
     restore_failed:
       subject_template: "Wiederherstellung fehlgeschlagen"
       text_body_template: |
@@ -1683,7 +1703,7 @@ de:
 
         Hier ist das Protokoll:
 
-        ```
+        ```text
         %{logs}
         ```
     bulk_invite_succeeded:
@@ -1794,12 +1814,6 @@ de:
         %{post_error}
 
         Bitte versuch es erneut, wenn du das Problem beheben kannst.
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] E-Mail-Problem -- Begrenzung"
-      text_body_template: |
-        Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert.
-
-        Grund: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] E-Mail-Problem -- Fehlerhafte Beitragsaktion"
       text_body_template: |
@@ -1919,6 +1933,7 @@ de:
         Es wurden Probleme in deinem Admin-Dashboard gemeldet.
 
         [Bitte überprüfe und behebe sie](%{base_url}/admin).
+
   unsubscribe_link: |
     Um diese E-Mails abzubestellen, [klicke hier](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -2255,7 +2270,7 @@ de:
 
       ## [Dies ist ein zivilisierter Platz für öffentliche Diskussionen](#civilized)
 
-      Bitte behandle dieses Diskussionsforum mit dem gleichen Respekt wie einen öffentlichen Park. Auch wir sind eine gemeinsame Community-Ressource — ein Platz, um Fähigkeiten, Wissen und Interessen durch eine fortlaufenden Dialog zu teilen.
+      Bitte behandle dieses Diskussionsforum mit dem gleichen Respekt wie einen öffentlichen Park. Auch wir sind eine gemeinsame Community-Ressource — ein Platz, um Fähigkeiten, Wissen und Interessen durch einen fortlaufenden Dialog zu teilen.
 
       Dies sind keine harten oder schnelle Regeln, sondern vielmehr Hilfen für die menschliche Einschätzung unserer Community. Folge diesen Richtlinien, damit dies ein sauberer, gut beleuchteter Platz für zivilisierten, öffentlichen Diskurs bleibt.
 
@@ -2263,11 +2278,11 @@ de:
 
       ## [Verbessere die Diskussion](#improve)
 
-      Hilf uns, dies zu einem großartiger Platz für Diskussionen zu machen, indem du stets daran arbeitest, die Diskussion in irgendeiner, noch so geringen Art zu verbessern. Wenn du dir nicht sicher bist, ob dein Beitrag zum Dialog beiträgt, denke darüber nach, was du sagen möchtest und probiere es später noch einmal.
+      Hilf uns, dies zu einem großartigen Platz für Diskussionen zu machen, indem du stets daran arbeitest, die Diskussion in irgendeiner Art zu verbessern, egal wie geringfügig. Wenn du dir nicht sicher bist, ob dein Beitrag zum Dialog beiträgt, denke darüber nach, was du sagen möchtest und probiere es später noch einmal.
 
-      Die Themen, die hier diskutiert werden, sind uns wichtig, und wir möchten, dass du dich so verhältst, als wären sie auch genauso für dich wichtig. Respektiere die Themen und die Personen, die diese diskutieren, auch wenn du mit etwas, was gesagt wird, nicht einverstanden bist.
+      Die hier diskutierten Themen sind uns wichtig und wir möchten, dass du dich so verhältst, als wären sie auch genauso wichtig für dich. Respektiere die Themen und die Personen, die diese diskutieren, auch wenn du mit dem was gesagt wird, nicht einverstanden bist.
 
-      Ein Weg, die Diskussion zu verbessern, besteht darin zu entdecken, was schon passiert ist. Bitte verbringe etwas Zeit damit, die Themen hier zu durchsuchen, bevor du antwortest oder deine eigenen startest, und du wirst eine bessere Chance haben, andere zu treffen, die deine Interessen teilen.
+      Ein Weg, die Diskussion zu verbessern, besteht darin zu entdecken, was schon passiert ist. Bitte verbringe etwas Zeit damit, die Themen hier zu durchsuchen, bevor du antwortest oder deine eigenen startest, und du wirst eine bessere Chance haben andere zu treffen, die deine Interessen teilen.
 
       <a name="agreeable"></a>
 
@@ -2275,20 +2290,20 @@ de:
 
       Du magst auf etwas antworten möchten, indem du widersprichst. Das ist in Ordnung. Aber denke daran, _Ideen zu kritisieren, nicht Personen_. Bitte vermeide:
 
-      *   Beschimpfungen.
+      *   Beschimpfungen
-      *   Persönliche Angriffe.
+      *   Persönliche Angriffe
-      *   Antworten auf den Tonfall einen Beitrag statt auf dessen Inhalt.
+      *   Antworten auf den Tonfall eines Beitrags statt auf dessen Inhalt
       *   Reflexartiges Widersprechen
 
-      Biete stattdessen vernünftige Gegenargument, die den Dialog verbessern.
+      Biete stattdessen vernünftige Gegenargumente, die den Dialog verbessern.
 
       <a name="participate"></a>
 
       ## [Deine Beteiligung zählt](#participate)
 
-      Die Dialoge, die wir führen, geben den Ton für alle an. Hilf uns dabei, die Zukunft dieser Community zu beeinflussen, indem wir uns bewusst für Dialoge entscheiden, die dieses Forum zu einem interessanten Aufenthaltsraum zu machen &mdash; und jene vermeiden, die das nicht tun
+      Die hier geführten Dialoge geben den Ton für alle an. Hilf uns dabei, die Zukunft dieser Community zu beeinflussen, indem wir uns bewusst für Dialoge entscheiden, die dieses Forum zu einem interessanten Aufenthaltsraum machen &mdash; und jene vermeiden, die das nicht tun.
 
-      Discourse bietet Werkzeuge, die der Community ermöglichen, gemeinsam die besten (und schlechtesten) Beiträge zu identifzieren: Favoriten, Lesezeichen, „Gefällt mir“-Angaben, Meldungen, Antworten, Bearbeitungen, und so weiter. Benutze diese Werkzeuge, um deine eigene Erfahrung zu verbessern, und die von allen anderen ebenso.
+      Discourse bietet Werkzeuge, die der Community ermöglichen, gemeinsam die besten (und schlechtesten) Beiträge zu identifizieren: Favoriten, Lesezeichen, „Gefällt mir“-Angaben, Meldungen, Antworten, Bearbeitungen, und so weiter. Benutze diese Werkzeuge, um deine eigene Erfahrung zu verbessern, und die von allen anderen ebenso.
 
       Lass uns versuchen, den Park besser zu verlassen als wir ihn vorgefunden haben.
 
@@ -2300,7 +2315,7 @@ de:
 
       Wenn du schlechtes Verhalten siehst, antworte nicht. Schlechtes Verhalten wird gefördert, indem es anerkannt wird, es verbraucht deine Energie und verbraucht die Zeit von allen. _Melde es einfach_. Wenn genügend Meldungen zusammenkommen, werden Maßnahmen eingeleitet, entweder automatisch oder durch das Eingreifen eines Moderators.
 
-      Um unsere Community aufrechtzuerhalten, behalten sich Moderatoren das Recht vor, jeden Inhalten und jedes Benutzerkonto jederzeit aus irgendeinem Grund zu entfernen. Moderatoren sehen neue Beiträge in keiner Weise früher; die Moderatoren und die Seitenbetreiber übernehmen keine Verantwortung für jeglichen Inhalt, der in der Community geschrieben wird.
+      Um unsere Community aufrechtzuerhalten, behalten sich Moderatoren das Recht vor, jeden Inhalten und jedes Benutzerkonto jederzeit aus irgendeinem Grund zu entfernen. Moderatoren sehen neue Beiträge in keiner Weise früher; die Moderatoren und die Sitebetreiber übernehmen keine Verantwortung für jeglichen Inhalt, der in der Community geschrieben wird.
 
       <a name="be-civil"></a>
 
@@ -2308,26 +2323,26 @@ de:
 
       Nichts sabotiert einen gesunden Dialog so sehr wie Unhöflichkeit.
 
-      *   Sei höflich. Schreibe nicht, das eine vernünftige Person als anstößig, beleidigend oder, als Hasstirade auffassen würde.
+      *   Sei höflich. Schreibe nichts, was eine vernünftige Person als anstößig, beleidigend oder als Hasstirade auffassen würde.
-      *   Halte den Platz sauber. Schreibe nichts, was obszön oder sexuell expizit ist.
+      *   Halte den Platz sauber. Schreibe nichts, was obszön oder sexuell explizit ist.
       *   Lasst uns gegenseitig respektieren. Belästige niemanden, füge niemandem Kummer zu, gib dich nicht als jemand anderes aus und veröffentliche niemandes persönliche Informationen.
       *   Respektiere unser Forum. Schreibe keinen Spam und beschädige das Forum auch sonst in keiner Weise.
 
       Dies sind keine konkreten Bedingungen mit präzisen Definitionen &mdash; vermeide sogar den _Anschein_ von jedem dieser Dinge. Wenn du dir nicht sicher bist, frage dich selbst, wie du dich fühlen würdest, wenn dein Beitrag auf der Titelseite der Frankfurter Allgemeinen Zeitung erscheinen würde.
 
-      Dies ist ein öffentliches Forum, und Suchmaschinen indizieren diese Diskussionen. Halte die Sprache, Links und Bilder sicher für Familie und Freunde.
+      Dies ist ein öffentliches Forum und Suchmaschinen indizieren diese Diskussionen. Halte die Sprache, Links und Bilder sicher für Familie und Freunde.
 
       <a name="keep-tidy"></a>
 
       ## [Halte den Platz sauber](#keep-tidy)
 
-      Betreibe die nötigen Anstrengungen, um Dinge an der richtigen Stelle zu platzieren, damit wir mehr Zeit mit Diskussionen und weniger mit Aufräumen verbringen kann. Daher:
+      Betreibe die nötigen Anstrengungen, um Dinge an der richtigen Stelle zu platzieren, damit wir mehr Zeit mit Diskussionen und weniger mit Aufräumen verbringen können. Daher:
 
-      *   Erstelle keine Themen in der falschen Kategorie.
+      *   Erstelle keine Themen in der falschen Kategorie
-      *   Schreibe Beiträge nicht gleichzeitig in mehreren Themen.
+      *   Schreibe Beiträge nicht gleichzeitig in mehreren Themen
-      *   Schreibe keine leeren Antworten.
+      *   Schreibe keine leeren Antworten
-      *   Lenke nicht vom Thema ab, indem du es mitten drin änderst.
+      *   Lenke nicht vom Thema ab, indem du es mitten drin änderst
-      *   Signiere deine Beiträge nicht &mdash; jedem Beitrag sind deine Profilinformationen beigefügt.
+      *   Signiere deine Beiträge nicht &mdash; jedem Beitrag sind deine Profilinformationen beigefügt
 
       Verwende die „Gefällt mir“-Schaltfläche statt „+1“ oder „Einverstanden“ zu schreiben. Statt ein bestehendes Thema in eine völlig andere Richtung zu lenken, verwende die Funktion „Mit verknüpftem Thema antworten“.
 
@@ -2335,19 +2350,19 @@ de:
 
       ## [Poste nur deine eigenen Sachen](#stealing)
 
-      Du darfst nichts ohne Erlaubnis nichts posten, was jemand anderem gehört. Du darfst keine Beschreibungen, Links oder Methoden schreiben, die geistiges Eigentum verletzen oder gegen geltendes Gesetz verstoßen.
+      Du darfst ohne Erlaubnis nichts schreiben, was jemand anderem gehört. Du darfst keine Beschreibungen von, Links zu oder Methoden beschreiben, die geistiges Eigentum verletzen (Software, Video, Audio, Bilder) oder gegen geltendes Gesetz verstoßen.
 
       <a name="power"></a>
 
       ## [Betrieben von Euch](#power)
 
-      Diese Seite wird von euren [freundlichen Mitarbeitern](/about) und *euch* betrieben, der Community. Wenn du irgendwelche weiteren Fragen dazu hast, wie Dinge hier funktionieren sollten, öffne ein neues Thema in der Kategorie [Feedback zur Seite](/c/site-feedback) und lass es uns diskutieren! Wenn es ein kritisches oder dringendes Problem gibt, dass nicht mit einem Meta-Thema oder einer Meldung behandelt werden, kontaktiere uns über die [Mitarbeiter-Seite](/about).
+      Diese Site wird von euren [freundlichen Mitarbeitern](/about) und *euch* betrieben, der Community. Wenn du irgendwelche weiteren Fragen dazu hast, wie Dinge hier funktionieren sollten, öffne ein neues Thema in der Kategorie [Feedback zur Site](/c/site-feedback) und lass es uns diskutieren! Wenn es ein kritisches oder dringendes Problem gibt, dass nicht mit einem Meta-Thema oder einer Meldung behandelt werden kann, kontaktiere uns über die [Mitarbeiter-Seite](/about).
 
       <a name="tos"></a>
 
       ## [Nutzungsbedingungen](#tos)
 
-      Ja, die rechtliche Seite ist langweilig, aber wir müssen uns selbst schützen &ndash; und im erweiterten Sinne auch dich und deine Daten &ndash; vor unfreundlichen Leuten. Wir haben [Nutzungsbedinugngen](/tos), die deines (und unser) Verhalten und unsere Rechte bezüglich des Inhalts, der Privatsphäre und den Gesetzen beschreiben. Um diesen Dienst zu nutzen, musst du dich mit unseren [Nutzungsbedingungen](/tos) einverstanden erklären.
+      Ja, die rechtliche Seite ist langweilig, aber wir müssen uns selbst schützen &ndash; und im erweiterten Sinne auch dich und deine Daten &ndash; vor unfreundlichen Leuten. Wir haben [Nutzungsbedingungen](/tos), die deines (und unser) Verhalten und unsere Rechte bezüglich des Inhalts, der Privatsphäre und den Gesetzen beschreiben. Um diesen Dienst zu nutzen, musst du dich mit unseren [Nutzungsbedingungen](/tos) einverstanden erklären.
   tos_topic:
     title: "Nutzungsbedingungen"
     body: |
@@ -2705,12 +2720,12 @@ de:
       name: Aktivist
       description: Hat 3 Anwärter (Vertrauensstufe 1) eingeladen
       long_description: |
-        Das Abzeichen wird verliehen, wenn du 3 Leute eingeladen hast, die daraufhin genug Zeit auf der Seite verbracht haben, um Anwärter zu werden. Eine lebendige Community benötigt eine regelmäßige Infusion mit Neulingen, die sich regelmäßig beteiligen und neue Stimmen zum Dialog ergänzen.
+        Das Abzeichen wird verliehen, wenn du 3 Leute eingeladen hast, die daraufhin genug Zeit auf der Site verbracht haben, um Anwärter zu werden. Eine lebendige Community benötigt eine regelmäßige Infusion mit Neulingen, die sich regelmäßig beteiligen und neue Stimmen zum Dialog ergänzen.
     champion:
       name: Verfechter
       description: Hat 5 Mitglieder (Vertrauensstufe 2) eingeladen
       long_description: |
-        Das Abzeichen wird verliehen, wenn du 5 Leute eingeladen hast, die daraufhin genug Zeit auf der Seite verbracht haben, um vollwertige Mitglieder zu werden. Wow! Danke dafür, dass du die Vielfalt unserer Community mit neuen Mitgliedern erweiterst!
+        Das Abzeichen wird verliehen, wenn du 5 Leute eingeladen hast, die daraufhin genug Zeit auf der Site verbracht haben, um vollwertige Mitglieder zu werden. Wow! Danke dafür, dass du die Vielfalt unserer Community mit neuen Mitgliedern erweiterst!
     first_share:
       name: Erste Weitergabe
       description: Hat einen Beitrag geteilt
@@ -2767,17 +2782,17 @@ de:
       long_description: |
         Das Abzeichen wird verliehen, wenn 300 deiner Beiträge mindestens 5 „Gefällt mir“-Angaben erhalten. Wow! Die Community bewundert deine regelmäßigen, hochwertigen Beiträge zu den Dialogen!
     out_of_love:
-      name: Aus Liebe
+      name: Out of Love
       description: Hat 50 „Gefällt mir“-Angaben an einem Tag vergeben
       long_description: |
         Das Abzeichen wird verliehen, wenn du alle deiner 50 täglichen „Gefällt mir“-Angaben nutzt. Daran zu denken, sich einen Moment zu nehmen und die Beiträge mit „Gefällt mir“ zu markieren, die du genießt und schätzt, ermuntert deine Community-Kollegen, in der Zukunft noch großartigere Diskussionen zu erstellen.
     higher_love:
-      name: Mehr als Liebe
+      name: Higher Love
       description: Hat fünfmal je 50 „Gefällt mir“-Angaben an einem Tag vergeben
       long_description: |
         Das Abzeichen wird verliehen, wenn du fünf Tage lang alle deiner 50 täglichen „Gefällt mir“-Angaben nutzt. Danke, dass du dir die Zeit nimmst, die besten Dialoge täglich zu fördern!
     crazy_in_love:
-      name: Total verliebt
+      name: Crazy in Love
       description: Hat 20-mal je 50 „Gefällt mir“-Angaben an einem Tag vergeben
       long_description: |
         Das Abzeichen wird verliehen, wenn du 20 Tage lang alle deiner 50 täglichen „Gefällt mir“-Angaben nutzt. Wow! Du bist ein Vorbild für die regelmäßige Ermunterung deiner Community-Kollegen!

config/locales/server.es.yml

@@ -813,6 +813,7 @@ es:
     tl3_additional_likes_per_day_multiplier: "Incrementar el límite de likes por día para el nivel de confianza 3 (habitual) multiplicando por este número"
     tl4_additional_likes_per_day_multiplier: "Incrementar el límite de likes por día para el nivel de confianza 4 (líder) multiplicando por este número"
     num_spam_flags_to_block_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes por spam de num_users_to_block_new_user diferentes usuarios, se ocultarán todos sus posts y no podrá publicar más en un futuro. Pon 0 para deshabilitar esto."
+    num_users_to_block_new_user: "Si los posts de un nuevo usuario son reportados como spam por num_spam_flags_to_block_new_user usuarios diferentes, ocultar todos sus posts y evitar que publique en el futuro. Poner 0 para desactivar."
     num_tl3_flags_to_block_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes por spam de num_users_to_block_new_user diferentes usuarios, se ocultarán todos sus posts y no podrá publicar más en un futuro. Pon 0 para deshabilitar esto."
     notify_mods_when_user_blocked: "Si un usuario es bloqueado automáticamente, enviar un mensaje a todos los moderadores."
     flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia."
@@ -821,8 +822,11 @@ es:
     post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)."
     must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!"
     pending_users_reminder_delay: "Notificar a los moderadores si hay nuevos usuarios que hayan estado esperando aprbación durante más estas horas. Usa -1 para desactivar estas notificaciones."
+    ga_tracking_code: "El código \"Google analytics (ga.js)\", por ejemplo: UA-12345678-9 es OBSOLETO; leer  http://google.com/analytics"
+    ga_domain_name: "El nombre del dominio para \"Google analytics (ga.js)\" es OBSOLETO, ejemplo: mysite.com; ver http://google.com/analytics"
     ga_universal_tracking_code: "Código de seguimiento de Google Universal Analytics (analytics.js), ejemplo: UA-12345678-9; visita http://google.com/analytics"
     ga_universal_domain_name: "Nombre del dominio establecido en Google Universal Analytics (analytics.js), ejemplo: misitio.com; visita http://google.com/analytics"
+    gtm_container_id: "Google Tag Manager container id. ejempo: GTM-ABCDEF"
     enable_escaped_fragments: "Ir a la API Ajax-Crawling de Google si no se detecta ningún webcrawler. Mira https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     enable_noscript_support: "Habilitar el soporte de motor de búsqueda estándar webcrawler mediante la etiqueta noscript"
     allow_moderators_to_create_categories: "Permitir a los moderadores crear nuevas categorías"
@@ -844,6 +848,7 @@ es:
     redirect_users_to_top_page: "Redirigir automáticamente a los nuevos usuarios y a los ausentes de larga duración a la página de mejores temas."
     top_page_default_timeframe: "Período de tiempo por defecto para la página de temas top"
     show_email_on_profile: "Mostrar el e-mail los usuarios en su perfil (solamente visibles para ellos mismos y el staff)"
+    prioritize_username_in_ux: "Mostrar username primero en la página de usuario, tarjeta de usuario y mensajes (cuando el nombre ha sido desactivado se muestra primero)"
     email_token_valid_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas."
     email_token_grace_period_hours: "Los tokens para restablecer contraseña olvidada / activar cuenta son válidos durante (n) horas de periodo de gracia, después de ser redimidos."
     enable_badges: "Activar el sistema de distintivos"
@@ -895,6 +900,7 @@ es:
     enable_github_logins: "Activar autenticación por Github, requiere una github_client_id y un github_client_secret"
     github_client_id: "Client id para la autenticación por Github, registrado en https://github.com/settings/applications"
     github_client_secret: "Client secret para la autenticación por Github, registrado en https://github.com/settings/applications"
+    readonly_mode_during_backup: "Habilitar el modo de 'solo-lectura' mientras se hace el backup"
     allow_restore: "Permitir restauración, la cual puede sobreescribir TODOS los datos del sitio! Dejela en falso a menos que tenga planeado recuperar sus datos desde una copia de respaldo. "
     maximum_backups: "La cantidad máxima de copias de seguridad a tener en el disco. Las copias de seguridad más antiguas se eliminan automáticamente"
     automatic_backups_enabled: "Ejecutar backups automáticos definidos por la opción de frecuencia de backups"
@@ -926,6 +932,7 @@ es:
     alert_admins_if_errors_per_hour: "Número de errores por hora que activa la alerta a administración. Un valor de 0 desactiva esta funcionalidad. NOTA: requiere reiniciar la instancia."
     suggested_topics: "Número de temas sugeridos mostrados al pie del tema."
     limit_suggested_to_category: "Solo mostrar temas de la categoría actual en los temas sugeridos."
+    suggested_topics_max_days_old: "Los temas sugeridos no deben ser más antiguos de n días."
     clean_up_uploads: "Eliminar subidas huérfanas sin referencia para prevenir hosting ilegal. AVISO: antes de habilitar esta opción quizá quieres hacer un backup de tu directorio de /uploads"
     clean_orphan_uploads_grace_period_hours: "Período de gracia (en horas) antes de que una subida huérfana sea eliminada."
     purge_deleted_uploads_grace_period_days: "Período de gracia (en días) antes de que una subida eliminada sea borrada totalmente."
@@ -939,8 +946,11 @@ es:
     s3_cdn_url: "URL de un CDN a utilizar para todos los activos s3 (por ejemplo: https://cdn.somewhere.com). AVISO: después de cambiar esta opción debes hacer un rebake de todos los posts antiguos."
     avatar_sizes: "Lista de tamaños de avatar generados automáticamente."
     external_system_avatars_enabled: "Usar un servicio externo para los avatares."
+    external_system_avatars_url: "Dirección URL del servicio externo para los avatares. Sustituciones permitidas: {username} {first_letter} {color} {size}"
     default_opengraph_image_url: "URL de la imagen opengraph por defecto."
     allow_all_attachments_for_group_messages: "Permitir todos los archivos adjuntos de email para los mensajes a grupos."
+    convert_pasted_images_to_hq_jpg: "Convertir imágenes pegadas en archivos JPG de alta calidad."
+    convert_pasted_images_quality: "Calidad del archivo JPG convertido  (1 es calidad mínima, 100 es máxima calidad)."
     enable_flash_video_onebox: "Habilitar el embebido de enlaces swf y flv (Adobe Flash) en formato Onebox. AVISO: podría introducir riesgos de seguridad."
     default_invitee_trust_level: "Nivel de confianza por defecto (0-4) para usuarios invitados."
     default_trust_level: "Nivel de confianza por defecto (0-4) para los nuevos usuarios. ¡AVISO! Cambiar esto puede resultar en riesgo por spam."
@@ -958,7 +968,9 @@ es:
     tl3_requires_days_visited: "Mínimo número de días que un usuario necesita haber visitado el sitio en los últimos (tl3 time period) días para poder ser promocionado a nivel de confianza 3. Establece un valor superior para desactivar la posibilidad de subir a nivel de confianza 3. (0 o más)"
     tl3_requires_topics_replied_to: "Mínimo número de temas que un usuario necesita haber respondido en los últimos (tl3 time period) días para poder ser promocionado a nivel de confianza 3. (0 o más)"
     tl3_requires_topics_viewed: "Porcentaje de temas creados en los últimos (tl3 time period) días para que un usuario sea tenido en cuenta para promocionar a nivel de confianza 3. (0 a 100)"
+    tl3_requires_topics_viewed_cap: "El número máximo requerido de temas vistos en los últimos días (tener en cuenta el periodo que usan los usuarios de nivel de confianza 3)."
     tl3_requires_posts_read: "El porcentaje de posts creados en los últimos (tl3 time period) días para que un usuario sea tenido en cuenta para promocionar a nivel de confianza 3. (0 a 100)"
+    tl3_requires_posts_read_cap: "El número máximo requerido de mensajes leídos en los últimos días (tener en cuenta el periodo que usan los usuarios de nivel de confianza 3)."
     tl3_requires_topics_viewed_all_time: "El número total mínimo de temas que un usuario debió de haber visto para calificar a promoción de nivel de confianza 3."
     tl3_requires_posts_read_all_time: "El número mínimo total de posts que un usuario debió de haber leído para calificar a nivel de confianza 3."
     tl3_requires_max_flagged: "El usuario no debe haber tenido más de x posts reportados por x diferentes usuarios en los últimos (tl3 time period) días para poder ser promocionado a nivel de confianza 3, donde x es el valor de esta opción. (0 o más)"
@@ -976,6 +988,7 @@ es:
     newuser_max_mentions_per_post: "Máximo número de menciones a @usuarios que un nuevo usuario puede usar en un post."
     newuser_max_replies_per_topic: "Máximo número de respuestas que un nuevo usuario puede realizar en el mismo tema antes de que alguien responda a su vez a alguna de ellas."
     max_mentions_per_post: "Máximo número de menciones a @usuarios que alguien puede usar en un post."
+    max_users_notified_per_group_mention: "Número de usuarios máximos que serán notificados si un grupo es mencionado (si se llega al límite no se mandarán las notificaciones)"
     create_thumbnails: "Crear miniaturas de imágenes y lightbox cuando estas son demasiado grandes para encajar en un post."
     email_time_window_mins: "Esperar (n) minutos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus posts."
     private_email_time_window_seconds: "Espera (n) segundos antes de enviar cualquier email de notificación, para dar a los usuarios margen con el que editar y finalizar sus mensajes."
@@ -1034,11 +1047,11 @@ es:
     short_email_length: "e-mail corto longitud en Bytes"
     display_name_on_email_from: "Mostrar nombres completos en los campos de remitente de emails"
     unsubscribe_via_email: "Permitir a los usuarios darse de baja de los emails respondiendo con el texto 'unsubscribe' en el asunto o el cuerpo del mensaje"
+    unsubscribe_via_email_footer: "Adjuntar un enlace para darse de baja al pie de los emails enviados"
     delete_email_logs_after_days: "Eliminar logs de email después de (N) días. Si es 0 permanecerán de forma indefinida."
     max_emails_per_day_per_user: "Máximo número de emails a enviar a los usuarios por día. Establece 0 para desactivar el límite"
     enable_staged_users: "Crear cuentas provisionales automáticamente al procesar emails entrantes."
     maximum_staged_users_per_email: "Máximo número de usuarios provisionales creados al procesar un email entrante."
-    auto_generated_whitelist: "Lista de direcciones de email que no serán revisadas para contenido auto-generado."
     block_auto_generated_emails: "Bloquear emails entrantes identificadas como auto generados."
     ignore_by_title: "Ignorar emails entrantes por su título."
     mailgun_api_key: "Mailgun Secret API key utilizada para verificar mensajes vía webhook."
@@ -1486,30 +1499,12 @@ es:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "La copia de seguridad se completo exitosamente"
-      text_body_template: "La copia de seguridad se completó con éxito.\nVisita la sección [admin > backup](%{base_url}/admin/backups) para descargar una nueva copia de seguridad."
     backup_failed:
       subject_template: "La copia de seguridad falló"
-      text_body_template: |
-        La copia de seguridad ha fallado.
-
-        Aquí esta el log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Restauración completada exitosamente."
-      text_body_template: "La restauración fue exitosa."
     restore_failed:
       subject_template: "La restauración falló."
-      text_body_template: |
-        La restauración ha fallado.
-
-        Aquí esta el log:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Invitación masiva procesada con éxito"
       text_body_template: "Tu archivo de invitación masiva ha sido procesado, se han enviado %{sent} invitaciones."
@@ -1573,6 +1568,7 @@ es:
     email_error_notification:
       subject_template: "[%{site_name}] Problema con el correo electrónico -- Error de autenticación POP"
     user_automatically_blocked:
+      subject_template: "Nuevo usuario %{username} bloqueado por las \"banderas\" de la comunidad."
       text_body_template: |
         Este es un mensaje automático.
 
@@ -1591,6 +1587,14 @@ es:
         Por favor, [echa un vistazo al usuario](%{user_url}).
 
         Esto puede ser modificado con los ajustes`newuser_spam_host_threshold` y`white_listed_spam_host_domains`.
+    unblocked:
+      subject_template: "Cuenta no retenida"
+      text_body_template: |
+        Hola,
+
+        Este es un mensaje automático desde %{site_name} para informarte que tu cuenta no se encuentra retenida debido a la revisión de miembros del staff.
+
+        Ahora puedes crear temas, y responder a otros usuarios. Gracias por tu paciencia.
     pending_users_reminder:
       subject_template:
         one: "1 usuario esperando aprobación"
@@ -1602,14 +1606,27 @@ es:
     download_remote_images_disabled:
       subject_template: "Inhabilitar la descarga de imágenes remotas"
       text_body_template: "La opción `download_remote_images_to_local` ha sido inhabilitada porque se ha llegado al límite de espacio en disco configurado en `download_remote_images_threshold`."
+    dashboard_problems:
+      subject_template: "Se han encontrado problemas"
+      text_body_template: |
+        Algunos problemas han sido reportados en el panel de administración.
+
+        [Por favor revisar y corregir](%{base_url}/admin).
   unsubscribe_link: |
     Para darte de baja de estos emails, [haz clic aquí](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
     Para darte de baja de estos emails, [haz clic aquí](%{unsubscribe_url}).
+  unsubscribe_mailing_list: |
+    Estás recibiendo esto porque has activado el modo listado de emails.
+
+    Para cancelar estos emails, [clic aquí](%{unsubscribe_url}).
   subject_re: "Re:"
   subject_pm: "[MP]"
   user_notifications:
     previous_discussion: "Respuestas anteriores"
+    reached_limit:
+      one: "ADVERTENCIA: has superado el límite diario de emails. Las próximas notificaciones de emails serán suprimidas."
+      other: "ADVERTENCIA: has superado el límite de %{count} emails diarios. Las próximas notificaciones de emails serán suprimidas."
     in_reply_to: "En respuesta a"
     unsubscribe:
       title: "Darse de baja"
@@ -1733,6 +1750,16 @@ es:
 
         %{context}
 
+        %{respond_instructions}
+    user_watching_first_post:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
         %{respond_instructions}
     user_posted_pm:
       subject_template: "[%{site_name}] [MP] %{topic_title}"
@@ -1812,8 +1839,20 @@ es:
         %{base_url}/users/authorize-email/%{email_token}
     confirm_old_email:
       subject_template: "[%{site_name}] Confirma tu dirección actual de email"
+      text_body_template: |
+        Antes de cambiar tu dirección de correo electrónico, necesitamos que confirmes que tienes acceso a dicho email. Después de completar este paso, podrás confirmar la nueva dirección de correo electrónico.
+
+        Confirma tu actual correo electrónico para %{site_name} haciendo clic en el siguiente enlace:
+
+        %{base_url}/users/authorize-email/%{email_token}
     notify_old_email:
       subject_template: "[%{site_name}] Tu dirección de email ha sido cambiada"
+      text_body_template: |
+        Este es un mensaje automático que se ha generado para comunicarte que tu email para el sitio %{site_name} ha sido modificado. Si ha habido un error, por favor contacta al administrador.
+
+        Tu email ha sido modificado por:
+
+        %{new_email}
     signup_after_approval:
       subject_template: "¡Tu solicitud ha sido aprobada en %{site_name}!"
       text_body_template: |
@@ -1870,6 +1909,9 @@ es:
       size_not_found: "Lo sentimos, pero no hemos podido determinar el tamaño de la imagen. ¿Quizás el archivo está corrupto?"
   avatar:
     missing: "Lo sentimos, no hemos encontrado un avatar asociado a esa dirección de email. ¿Puedes intentar subirlo de nuevo?"
+  flag_reason:
+    sockpuppet: "Un nuevo usuario ha creado un tema, y otro nuevo usuario con la misma dirección IP  (%{ip_address})  le ha respondido. Mira la opción  <a href='/admin/site_settings/category/spam'>\"flag_sockpuppets\"</a> en la configuración del sitio."
+    spam_hosts: "Un nuevo usuario intentó crear varios temas con enlaces al mismo dominio (%{domain}). Mira la opción  <a href='/admin/site_settings/category/spam'>\"newuser_spam_host_threshold\"</a> en la configuración del sitio."
   email_log:
     post_user_deleted: "El autor de la publicación ha sido eliminado."
     no_user: "No se puede encontrar al usuario con id %{user_id}"

config/locales/server.et.yml

@@ -630,7 +630,6 @@ et:
       subject_template: "Varundamine ebaõnnestus"
     restore_succeeded:
       subject_template: "Taastamine õnnelikult lõpetatud"
-      text_body_template: "Taastamine õnnestus."
     restore_failed:
       subject_template: "Taastamine ebaõnnestus"
     csv_export_failed:
@@ -650,11 +649,51 @@ et:
     title: "Teenuse tingimused"
   privacy_topic:
     title: "Puutumatusnormid"
+  badges:
+    first_share:
+      name: Esimene jagamine
+      description: Jagas postitust
+    first_link:
+      name: Esimene viide
+      description: Lisas teise postitusele viite
+    first_quote:
+      name: Esimene tsitaat
+      description: Tsiteeris postitust
+    read_guidelines:
+      name: Luges juhiseid
+    reader:
+      name: Lugeja
+    popular_link:
+      name: Populaarne viide
+    hot_link:
+      name: Kuum viide
+    famous_link:
+      name: Kuulus viide
+    appreciated:
+      name: Hinnatud
+    respected:
+      name: Respekteeritud
+    admired:
+      name: Imetletud
+    out_of_love:
+      name: Armastus on otsas
+    higher_love:
+      name: Suurem armastus
+    crazy_in_love:
+      name: Hullult armunud
+    thank_you:
+      name: Tänamine
+    first_emoji:
+      name: Esimene emotikon
+    first_mention:
+      name: Esimene mainimine
   admin_login:
     success: "Kiri saadetud"
     error: "Viga!"
     email_input: "Admini kiri"
     submit_button: "Saada kiri"
+  tags:
+    title: "Sildid"
   activemodel:
     errors:
       <<: *errors

config/locales/server.fa_IR.yml

@@ -1074,29 +1074,10 @@ fa_IR:
       subject_template: "پشتیبان گیری با موفقیت انجام شد"
     backup_failed:
       subject_template: "پشتیبان گیری با شکست مواجه شد."
-      text_body_template: |
-        پشتیبان گیری ناموفق شد
-
-        اینجا وارد سیستم شوید:
-
-        ```
-        %{logs}
-
-        ```
     restore_succeeded:
       subject_template: "بازیابی با موفقیت کامل شد "
-      text_body_template: "بازیابی با موفقیت انجام شد. "
     restore_failed:
       subject_template: "بازگردانی ناموفق"
-      text_body_template: |
-        بازگرداندن انجام نشد.
-
-        اینجا وارد شوید:
-
-        ```
-        %{logs}
-
-        ```
     bulk_invite_succeeded:
       subject_template: "دعوت انبوهی کاربر با موفقیت انجام شد"
       text_body_template: "فایل دعوت انبوهی کاربر شما پردازش شد٬  %{sent}  دعوتنامه ها ایمیل شد. "
@@ -1120,6 +1101,7 @@ fa_IR:
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
 
         پیوند زیر برای دانلود فقط برای 48 ساعت اعتبار دارد.
+
     csv_export_failed:
       subject_template: "خارج کردن فایل ها ناموفق شد"
       text_body_template: "ما متاسفیم٬ ولی خارج کردن اطلاعات ناموفق شد. لطفا سیستم را چک کنید یا با یکی از مدیران تماس بگیرید. "

config/locales/server.fi.yml

@@ -247,6 +247,8 @@ fi:
       Tämä ketju on selvästikin tärkeä sinulle – olet kirjoittanut yli %{percent}% vastauksista.
 
       Oletko varma, että annat myös muille riittävästi aikaa jakaa omia näkökulmiaan?
+
+
     too_many_replies: |
       ### Olet saavuttanut rajoituksen uusien vastausten määrästä
 
@@ -290,6 +292,9 @@ fi:
           attributes:
             hex:
               invalid: "ei ole sallittu väri"
+        post_reply:
+          base:
+            different_topic: "Viestin ja siihen liittyvän vastauksen tulee olla samassa ketjussa."
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Minusta -kohta käyttäjäprofiilissasi on vielä täyttämättä,<a href='/users/%{username_lower}/preferences/about-me'>haluaisitko täyttää sen nyt?</a></div>"
@@ -867,6 +872,7 @@ fi:
     enable_sso_provider: "Ota käyttöön Discourse SSO provider -protokolla /session/sso_provider päätepisteessä, vaatii asetuksen sso_secret asettamista."
     sso_url: "Kertakirjautumisen päätepisteen URL (täytyy sisältää http:// tai https://)"
     sso_secret: "Salausavain, jolla todennetaan SSO tiedot, varmista että se on vähintään 10 merkkiä pitkä"
+    sso_overrides_bio: "Syrjäyttää käyttäjän kuvauksen itsestään käyttäjäprofiilissa ja estää sen muokkaamisen"
     sso_overrides_email: "Ohittaa paikallisen sähköpostiosoitteen SSO:n kautta saatavalla ulkopuolisella osoitteella ja estää paikalliset muutokset (VAROITUS: eroavuuksia saattaa syntyä johtuen paikallisten sähköpostiosoitteiden normalisoinnista)"
     sso_overrides_username: "Ohittaa paikallisen käyttäjänimen SSO:n kautta saatavalla ulkopuolisella nimellä ja estää paikalliset muutokset (VAROITUS: eroavuuksia saattaa syntyä johtuen erilaisista vaatimuksista ja pituudesta)"
     sso_overrides_name: "Ohittaa paikallisen koko nimen SSO:n kautta saatavalla ulkopuolisella nimellä jokaisella kirjautumiskerralla ja estää paikalliset muutokset"
@@ -937,9 +943,11 @@ fi:
     s3_cdn_url: "CDN URL, jota käytetään S3:ssa sijaitseville tiedostoille (esimerkiksi https://cdn.jossain.com). VAROITUS: tämän asetuksen muuttamisen jälkeen sinun täytyy rakentaa uudelleen kaikki vanhat viestit."
     avatar_sizes: "Profiilikuvista automaattisesti luotavat koot."
     external_system_avatars_enabled: "Käytä ulkopuolista avatarpalvelua."
+    external_system_avatars_url: "Ulkoisen avatarpalvelun URL. Sallitut vaihdokset ovat {username} {first_letter} {color} {size}"
     default_opengraph_image_url: "Oletuksena käytettävän opengraph-kuvan URL."
     allow_all_attachments_for_group_messages: "Sali kaikki sähköpostiliitteet ryhmäviestessä."
     convert_pasted_images_to_hq_jpg: "Muuta liitetyt kuvat korkealaatuisiksi JPG-tiedostoiksi"
+    convert_pasted_images_quality: "Muunnetun JPG-tiedoston laatu (1 on huonoin laatu, 100 on paras laatu)."
     enable_flash_video_onebox: "Ota käyttöön swf- ja flv-linkkien (Adobe Flash) onebox-tuki. VAROITUS: saattaa lisätä tietoturvariskejä."
     default_invitee_trust_level: "Oletus luottamustaso (0-4) kutsutuille käyttäjille."
     default_trust_level: "Uusien käyttäjien oletusarvoinen luottamustaso (0-4). VAROITUS! Tämän muuttaminen altistaa roskapostille."
@@ -1031,6 +1039,7 @@ fi:
     auto_block_first_post_regex: "Merkkikokoriippumaton regex joka aiheuttaa käyttäjän ensimmäisen viestin estämisen ja lisäämisen hyväksymisjonoon. Esimerkiksi raivoaminen|a[bc]a aiheuttaa kaikkien viestien, joissa on sanat raivoava, aba tai aca estämisen. Vaikuttaa vain ensimmäiseen viestiin."
     reply_by_email_enabled: "Ota käyttöön vastaukset sähköpostin avulla."
     reply_by_email_address: "Saapuvan sähköpostin sapluuna sähköpostivastauksiin, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
+    incoming_email_prefer_html: "Käytä HTMLää tekstin sijaan saapuville sähköposteille. Voi aiheuttaa odottamattomia ongelmia ulkoasussa!"
     disable_emails: "Estä Discoursea lähettämästä mitään sähköpostia"
     strip_images_from_short_emails: "Poista kuvat sähköposteista, joiden koko on alle 2800 tavua"
     short_email_length: "Lyhyen sähköpostin pituus tavuissa"
@@ -1041,12 +1050,15 @@ fi:
     max_emails_per_day_per_user: "Käyttäjälle päivässä lähetettävien sähköpostien enimmäismäärä. Aseta 0, jos et halua rajoittaa."
     enable_staged_users: "Luo automaattisesti käyttäjiä, kun saapuvia sähköposteja käsitellään."
     maximum_staged_users_per_email: "Maksimimäärä automaattisesti luotavia tilejä, kun käsitellään saapuvaa sähköpostia."
-    auto_generated_whitelist: "Lista sähköpostiosoitteista, joiden viestejä ei tarkasteta automaattisesti luodun sisällön osalta."
+    auto_generated_whitelist: "Lista sähköpostiosoitteista, joiden viestejä ei tarkasteta automaattisesti luodun sisällön osalta. Esimerkki: foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Estä saapuvat sähköpostit, jotka tunnistetaan automaattisesti luoduiksi."
     ignore_by_title: "Jätä sähköpostit huomiotta niiden otsikon perusteella."
     mailgun_api_key: "Mailgunin Secret API key, jolla verifioidaan webhook-viestit."
-    bounce_score_threshold: "Pistemäärä, jonka ylityttyä käyttäjälle ei lähetetä sähköpostia."
+    soft_bounce_score: "Lisättävät palautuspisteet, kun hetkellinen palautus tapahtuu."
-    bounce_score_threshold_deactivate: "Pistemäärä, jonka ylityttyä käyttäjätili poistetaan käytöstä."
+    hard_bounce_score: "Lisättävät palautuspisteet, kun pysyvä palautus tapahtuu."
+    bounce_score_threshold: "Palautuspistemäärä, jonka ylityttyä käyttäjälle ei lähetetä sähköpostia."
+    bounce_score_threshold_deactivate: "Palautuspistemäärä, jonka ylityttyä käyttäjätili poistetaan käytöstä."
+    reset_bounce_score_after_days: "Nollaa palautuspisteet X päivä kuluttua."
     manual_polling_enabled: "Työnnä sähköpostit käyttäen sähköpostivastausten APIa."
     pop3_polling_enabled: "Pollaa sähköpostivastaukset POP3:lla."
     pop3_polling_ssl: "Käytä SSL-salausta yhdistettäessä POP3-palvelimeen. (Suositellaan)"
@@ -1450,29 +1462,29 @@ fi:
   new_version_mailer:
     subject_template: "[%{site_name}] Uusi Discourse-versio, päivitys saatavilla"
     text_body_template: |
-      Huraa, uusi versio [Discoursesta](http://www.discourse.org) on saatavilla!
+      Hurraa, uusi versio [Discoursesta](http://www.discourse.org) on saatavilla!
 
       Sinun versiosi: %{installed_version}
       Uusi versio: **%{new_version}**
 
-      - Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä](%{base_url}/admin/upgrade)** selaimessa
+      - Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
 
       - Tarkastele muutoksia [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master)
 
-      - Vieraile osoitteessa [meta.discourse.org](http://meta.discourse.org) saadaksesi englanninkielisiä uutisia, keskustelua ja tukea Discourselle.
+      - Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] päivitys saatavilla"
     text_body_template: |
-      Huraa, uusi versio [Discoursesta](http://www.discourse.org) on saatavilla!
+      Hurraa, uusi versio [Discoursesta](http://www.discourse.org) on saatavilla!
 
       Sinun versiosi: %{installed_version}
       Uusi versio: **%{new_version}**
 
-      - Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä](%{base_url}/admin/upgrade)** selaimessa
+      - Päivitä käyttäen helppoa **[yhden klikkauksen päivitystä selaimessa](%{base_url}/admin/upgrade)**
 
       - Tarkastele muutoksia [GitHubin muutoslokissa](https://github.com/discourse/discourse/commits/master)
 
-      - Vieraile osoitteessa [meta.discourse.org](http://meta.discourse.org) saadaksesi englanninkielisiä uutisia, keskustelua ja tukea Discourselle.
+      - Käy osoitteessa [meta.discourse.org](https://meta.discourse.org) lukemassa uutisia ja keskustelua, tai hae apua Discourseen liittyen
 
       ### Julkaisutiedot
 
@@ -1644,28 +1656,44 @@ fi:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Varmuuskopiointi suoritettu onnistuneesti"
-      text_body_template: "Varmuuskopiointi onnistui.\nSiirry [ylläpito > varmuuskopiot](%{base_url}/admin/backups) ladataksesi varmuuskopion."
+      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: |
         Varmuuskopiointi epäonnistui.
 
-        Tässä on loki:
+        Tässä loki:
 
-        ```
+        ```text
         %{logs}
         ```
     restore_succeeded:
       subject_template: "Palauttaminen suoritettu onnistuneesti"
-      text_body_template: "Palauttaminen onnistui."
+      text_body_template: |
+        Palauttaminen onnistui.
+
+        Tässä loki:
+
+        ```text
+        %{logs}
+        ```
     restore_failed:
       subject_template: "Palauttaminen epäonnistui"
       text_body_template: |
         Palauttaminen epäonnistui.
 
-        Tässä on loki:
+        Tässä loki:
 
-        ```
+        ```text
         %{logs}
         ```
     bulk_invite_succeeded:
@@ -1710,6 +1738,7 @@ fi:
         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.
+
     email_reject_inactive_user:
       subject_template: "[%{site_name}]  Sähköpostiongelma -- Aktivoimaton käyttäjä"
       text_body_template: |
@@ -1742,6 +1771,7 @@ fi:
         Emme löytäneet sähköpostiviestistäsi sisältöä.
 
         Jos saat tämän viestin ja viestisi _sisälsi_ sisältöä, yritä uudestaan yksinkertaisemmalla muotoilulla.
+
     email_reject_parsing:
       subject_template: "[%{site_name}] Sähköpostiongelma -- Tunnistamaton sisältö"
       text_body_template: |
@@ -1776,12 +1806,6 @@ fi:
         %{post_error}
 
         Jos voit korjata ongelman, yritä uudelleen.
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] Sähköpostiongelma -- Rajat"
-      text_body_template: |
-        Pahoittelemme, mutta sähköpostiviesetisi tänne  %{destination} (otsikolla %{former_title}) ei onnistunut.
-
-        Syy: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] Sähköpostiongelma -- Kielletty viestitoiminto"
       text_body_template: |
@@ -1906,7 +1930,7 @@ fi:
   unsubscribe_link_and_mail: |
     Jos et enää halua näitä viestejä, [klikkaa tästä](%{unsubscribe_url}).
   unsubscribe_mailing_list: |
-    Saat näitä viestejä, koska olet postituslistatilassa.
+    Sait tämän viestin, koska olet postituslistatilassa.
 
     Jos et enää halua näitä viestejä, [klikkaa tästä](%{unsubscribe_url}).
   subject_re: "VS:"
@@ -2134,6 +2158,7 @@ fi:
         Vahvista sähköpostiosoitteesti sivustolle %{site_name} klikkaamalla linkkiä:
 
         %{base_url}/users/authorize-email/%{email_token}
+
     notify_old_email:
       subject_template: "[%{site_name}] Sähköpostiosoitteesi on vaihdettu"
       text_body_template: |
@@ -2363,6 +2388,7 @@ fi:
       <li><code>rainbows category:"parks and gardens" in:bookmarks</code> etsii alueelta "parks and gardens" kirjanmerkkeihin lisäämiäsi ketjuja, joissa esiintyy sana "rainbows".</li>
       </ul>
       </p>
+
   badges:
     editor:
       name: Muokkaaja
@@ -2434,11 +2460,13 @@ fi:
       description: Ketjunavaus sai 50 tykkäystä
       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: |
         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:
       name: Erinomainen jako
       description: Jakoi viestin, ja linkin kautta saapui 300 vierailijaa

config/locales/server.fr.yml

@@ -671,7 +671,7 @@ fr:
       xaxis: "Jour"
       yaxis: "Nombre de vues par les utilisateurs non connectés sur mobile"
     http_background_reqs:
-      title: "Arrière plan"
+      title: "Arrière-plan"
       xaxis: "Jour"
       yaxis: "Requêtes de mise à jour en temps réel ou de suivi"
     http_2xx_reqs:
@@ -829,7 +829,6 @@ fr:
     ga_universal_tracking_code: "Code de suivi Google Universal Analytics (analytics.js), par exemple : UA-12345678-9 ; voir http://google.com/analytics"
     ga_universal_domain_name: "Nom de domaine Google Universal Analytics (analytics.js), par exemple : monsite.com ; voir http://google.com/analytics"
     gtm_container_id: "ID du conteneur Google Tag Manager, par exemple : GTM-ABCDEF"
-    gtm_ua_domain_name: "Nom de domaine Universal Analytics via Google Tag Manager. La valeur 'auto' est recommandée."
     enable_escaped_fragments: "Utiliser l'API Ajax-Crawling de Google si aucun robot n'est détecté. Voir https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     enable_noscript_support: "Activer le support des moteurs de recherches standards via le tag noscript"
     allow_moderators_to_create_categories: "Autoriser les modérateurs à créer de nouvelles catégories"
@@ -954,6 +953,7 @@ fr:
     default_opengraph_image_url: "URL de l'image par défaut pour les balises Open Graph."
     allow_all_attachments_for_group_messages: "Autorise toutes les pièces-jointes pour les messages de groupes."
     convert_pasted_images_to_hq_jpg: "Convertir les images copiées en fichier JPEG haute qualité."
+    convert_pasted_images_quality: "Qualité du fichier JPEG converti (1 est la plus faible, 100 est la meilleure)."
     enable_flash_video_onebox: "Activer l'utilisation de swf et flv (Adobe Flash) dans les boites imbriquées. ATTENTION : cela pourrait introduire un risque de sécurité."
     default_invitee_trust_level: "Niveau de confiance par défaut (0-4) pour les invités."
     default_trust_level: "Niveau de confiance par défaut (entre 0 et 4) pour tous les nouveaux utilisateurs. ATTENTION ! Changer ce paramètre peut vous exposer à des spams."
@@ -1038,14 +1038,14 @@ fr:
     max_age_unmatched_ips: "Effacer les adresses IP sous surveillenace sans correspondance après (N) jours"
     num_flaggers_to_close_topic: "Nombre minimum de signalements uniques requis pour automatiquement suspendre un sujet pour intervention"
     num_flags_to_close_topic: "Nombre minimum de signalements uniques requis pour automatiquement suspendre un sujet pour intervention"
-    auto_respond_to_flag_actions: "Activer réponse automatique lors du traitement d'un signalement."
+    auto_respond_to_flag_actions: "Activer la réponse automatique lors du traitement d'un signalement."
     min_first_post_typing_time: "Minimum de temps en millisecondes qu'un utilisateur doit passer à la saisie de son premier commentaire, si le seuil n'est pas atteint, il rejoindra automatiquement la file des commentaires en cours d'approbation. Mettre à 0 pour désactiver (non recommandé)"
     auto_block_fast_typers_on_first_post: "Bloque automatiquement les utilisateurs qui n'ont pas respecté min_first_post_typing_time"
     auto_block_fast_typers_max_trust_level: "Niveau de confiance maximum pour bloquer automatiquement les 'dactylo rapides'"
     auto_block_first_post_regex: "Regex non sensible à la casse qui, si elle est déclenchée, bloquera le premier message de l'utilisateur et l'enverra dans la file d'attente d'approbation.\nExemple: rageux|a[bc]a bloquera les premiers messages contenant rageux ou aba ou aca."
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant; exemple : %{reply_key}@reply.example.com ou replies+%{reply_key}@example.com"
-    alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel."
+    alternative_reply_by_email_addresses: "Liste des templates alternatifs pour les adresses des courriels entrants de la réponse par courriel. Exemple : %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
     incoming_email_prefer_html: "Utiliser le HTML au lieu du texte pour les courriels entrants. Peut causer des problèmes de formatage inattendus !"
     disable_emails: "Désactiver l'envoi de les courriels depuis Discourse."
     strip_images_from_short_emails: "Retirer les images des courriels dont la taille est inférieur à 2800 Octets"
@@ -1057,15 +1057,17 @@ fr:
     max_emails_per_day_per_user: "Nombre maximum de courriels à envoyer aux utilisateurs par jour. 0 pour désactiver la limite"
     enable_staged_users: "Créer automatiquement les utilisateurs en attente lors du traitement des courriels entrants."
     maximum_staged_users_per_email: "Nombre maximum d'utilisateurs créés lors du traitement d'un courriel entrant."
-    auto_generated_whitelist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement."
+    auto_generated_whitelist: "Liste des adresses courriel qui ne seront pas vérifiées pour du contenu généré automatiquement. Exemple : foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "Bloquer les courriels entrants identifiés comme générés automatiquement."
     ignore_by_title: "Ignorer les courriels entrants selon leur titre."
     mailgun_api_key: "Clé API secrète de Mailgun utilisée pour vérifier les messages du webhook."
-    soft_bounce_score: "Score ajouté à l'utilisateur lorsqu'un rejet temporaire se produit."
+    soft_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet temporaire se produit."
-    hard_bounce_score: "Score ajouté à l'utilisateur lorsqu'un rejet permanent se produit."
+    hard_bounce_score: "Score de rejet ajouté à l'utilisateur lorsqu'un rejet permanent se produit."
-    bounce_score_threshold: "Score maximum à partir duquel nous allons arrêter d'envoyer des courriel à un utilisateur."
+    bounce_score_threshold: "Score de rejet maximum à partir duquel nous allons arrêter d'envoyer des courriels à un utilisateur."
-    bounce_score_threshold_deactivate: "Score maximum à partir duquel nous allons désactiver un utilisateur."
+    bounce_score_threshold_deactivate: "Score de rejet maximum à partir duquel nous allons désactiver un utilisateur."
     reset_bounce_score_after_days: "Rétablir automatiquement le score de rejet après X jours."
+    attachment_content_type_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du type de contenu."
+    attachment_filename_blacklist: "Liste des mots-clés utilisés pour filtrer les pièces jointes en fonction du nom de fichier."
     manual_polling_enabled: "Envoyer les courriels en utilisant l'API des réponses par courriel."
     pop3_polling_enabled: "Utiliser POP3 pour les réponses via courriel."
     pop3_polling_ssl: "Utiliser SSL pour les connections au serveur POP3. (Recommandé)"
@@ -1481,7 +1483,8 @@ fr:
 
       - Consultez les nouveautés sur l'historique [GitHub](https://github.com/discourse/discourse/commits/master).
 
-      - Visitez [meta.discourse.org](http://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse.
+      - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse.
+
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] mise à jour disponible"
     text_body_template: |
@@ -1494,7 +1497,7 @@ fr:
 
       - Consultez les nouveautés sur l'historique [GitHub](https://github.com/discourse/discourse/commits/master).
 
-      - Visitez [meta.discourse.org](http://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse.
+      - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse.
 
       ### Notes de version
 
@@ -1522,7 +1525,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é.
@@ -1666,28 +1669,44 @@ fr:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Sauvegarde terminée avec succès"
-      text_body_template: "La sauvegarde a bien réussie.\nVisitez [la section admin > sauvegarde](%{base_url}/admin/backups) pour télécharger votre nouvelle sauvegarde."
+      text_body_template: |
+        La sauvegarde a réussi.
+
+        Visitez [la section admin > sauvegarde](%{base_url}/admin/backups) pour télécharger votre nouvelle sauvegarde.
+
+        Voici le détail :
+
+        ```text
+        %{logs}
+        ```
     backup_failed:
       subject_template: "Échec de la sauvegarde"
       text_body_template: |
-        La sauvegarde a échouée.
+        La sauvegarde a échoué.
 
-        Voici le détail:
+        Voici le détail :
 
-        ```
+        ```text
         %{logs}
         ```
     restore_succeeded:
       subject_template: "Restauration terminée avec succès"
-      text_body_template: "La restauration a été un succès."
+      text_body_template: |
+        La restauration a réussi.
+
+        Voici le détail :
+
+        ```text
+        %{logs}
+        ```
     restore_failed:
       subject_template: "Échec de la restauration"
       text_body_template: |
-        La restauration a échouée.
+        La restauration a échoué.
 
-        Voici le détail:
+        Voici le détail :
 
-        ```
+        ```text
         %{logs}
         ```
     bulk_invite_succeeded:
@@ -1798,13 +1817,6 @@ fr:
         %{post_error}
 
         Si vous pouvez corriger les erreurs, veuillez réessayer.
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] Problème de courriel -- Limitation du débit"
-      text_body_template: |+
-        Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné.
-
-        Raison : %{rate_limit_description}
-
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] Problème de courriel -- Action Post invalide"
       text_body_template: |
@@ -1929,7 +1941,7 @@ fr:
   unsubscribe_link_and_mail: |
     Pour se désabonner de ces courriels, [cliquer ici](%{unsubscribe_url}).
   unsubscribe_mailing_list: |
-    Vous recevez ces courriels car vous avez activé la liste de diffusion.
+    Vous recevez ce courriel car vous avez activé la liste de diffusion.
 
     Pour se désabonner de ces courriels, [cliquer ici](%{unsubscribe_url}).
   subject_re: "Re:"
@@ -2460,7 +2472,7 @@ fr:
       <tr><td><code>posts_count:num</code></td><td><code>before:days or date</code></td><td><code>after:days or date</code></td><td><code>tags:one,two</code></td><td></td></tr>
       </table>
       </p>
-      <h3>Examples</h3>
+      <h3>Exemples</h3>
       <p>
       <ul>
       <li><code>rainbows #parks</code> cherchera les sujets dans la catégorie "parks" qui contiennent le mot "rainbows".</li>
@@ -2470,7 +2482,7 @@ fr:
       </p>
   badges:
     editor:
-      name: Editeur
+      name: Éditeur
       description: Première édition d'un message
       long_description: |
         Ce badge est accordé après la première édition d'un de vos messages. Bien que la possibilité d'éditer un message soit limitée dans le temps, l'édition est toujours une bonne idée — vous pouvez améliorer vos messages, réparer des petites erreurs, ou ajouter des éléments que vous avez oubliés lors de la rédaction. Éditer vos messages pour les rendre encore meilleurs !
@@ -2496,7 +2508,7 @@ fr:
         Ce badge est accordé lorsque vous atteignez le niveau de confiance 4. Vous êtes un meneur choisi par l'équipe dans cette communauté, et vous montrez l'exemple dans vos actions et vos mots. Vous avez la capacité d'éditer tous les messages, utiliser les actions de modérations telles qu'épingler, fermer, cacher, archiver, scinder et fusionner, ainsi que des tonnes de "J'aime" par jour.
     welcome:
       name: Bienvenue
-      description: A reçu un j'aime.
+      description: A reçu un J'aime
       long_description: |
         Ce badge est accordé lorsque vous recevez votre premier "J'aime" sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, cool, ou utile !
     autobiographer:
@@ -2511,32 +2523,32 @@ fr:
         Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message crée dans cette année. Merci d'être resté avec nous et de contribuer ainsi à notre communauté ! Nous n'aurions pas pu le faire sans vous.
     nice_post:
       name: Jolie réponse
-      description: A reçu 10 j'aime sur une réponse.
+      description: A reçu 10 J'aime sur une réponse.
       long_description: |
         Ce badge est accordé quand une réponse obtient 10 j'aime. Votre réponse a vraiment fait impression sur la communauté et a aidé à faire progresser la conversation.
     good_post:
-      name: Bonne Réponse
+      name: Bonne réponse
-      description: A reçu 25 j'aime sur une réponse
+      description: A reçu 25 J'aime sur une réponse
       long_description: |
         Ce badge est accordé quand votre réponse obtient 25 j'aime. Votre réponse est exceptionnel et a rendu la conversation bien mieux pour tout le monde.
     great_post:
-      name: Super Réponse
+      name: Super réponse
-      description: A reçu 50 j'aime sur une réponse
+      description: A reçu 50 J'aime sur une réponse
       long_description: |
         Ce badge est accordé quand une réponse obtient 50 j'aime. Votre réponse était inspirante, fascinante, hilarante, ou pertinente et la communauté l'a adorée.
     nice_topic:
       name: Sujet intéressant
-      description: A reçu 10 j'aime sur un sujet.
+      description: A reçu 10 J'aime sur un sujet.
       long_description: |
         Ce badge est accordé quand un sujet obtient 10 j'aime.  Vous avez commencé une conversation intéressante que la communauté a apprécié !
     good_topic:
       name: Bon sujet
-      description: A reçu 25 j'aime sur un sujet
+      description: A reçu 25 J'aime sur un sujet
       long_description: |
         Ce badge est accordé quand un sujet obtient 25 j'aime. Vous avez lancé une conversation vibrante autour de laquelle la communauté s'est ralliée et elle l'a adorée.
     great_topic:
       name: Super sujet
-      description: A reçu 50 j'aime sur un sujet
+      description: A reçu 50 J'aime sur un sujet
       long_description: |
         Ce badge est accordé quand un sujet obtient 50 j'aime. Vous avez initié une fascinante conversation et la communauté a apprécié la discussion dynamique qui en a résulté !
     nice_share:
@@ -2555,7 +2567,7 @@ fr:
       long_description: |
         Ce badge est accordé après le partage d'un lien qui a été cliqué par 1000 visiteurs extérieurs. Whaou ! Vous avez fait la promotion d'une discussion intéressante auprès d'une nouvelle audience d'envergure et avez aidé notre communauté à grandir de manière significative !
     first_like:
-      name: Premier j'aime
+      name: Premier J'aime
       description: A aimé un message
       long_description: |
         Ce badge est accordé la première fois que vous aimez un message en utilisant le bouton :heart:. Aimer des messages est le moyen parfait pour dire aux autres membres de la communauté que ce qu'ils ont posté était intéressant, utile, cool, ou amusant.
@@ -2621,22 +2633,22 @@ fr:
         Ce badge est accordé quand un lien que vous avez partagé obtient 1000 clics. Whaou ! Vous avez posté un lien qui a notablement amélioré la discussion en ajoutant des détails et des informations essentielles. Bon travail !
     appreciated:
       name: Apprécié
-      description: A recu 1 j'aime sur 20 messages
+      description: A recu 1 J'aime sur 20 messages
       long_description: |
         Ce badge est accordé lorsque vous recevez au moins un J'aime sur 20 messages différents. La communauté apprécie vos contributions aux conversations !
     respected:
       name: Respecté
-      description: A reçu 2 j'aime sur 100 messages
+      description: A reçu 2 J'aime sur 100 messages
       long_description: |
         Ce badge est accordé lorsque vous recevez au moins 2 J'aime sur 100 messages différents. La communauté a de plus en plus de respect pour vos nombreuses contributions aux conversations.
     admired:
       name: Admiré
-      description: A reçu 5 j'aime sur 300 messages
+      description: A reçu 5 J'aime sur 300 messages
       long_description: |
         Ce badge est accordé lorsque vous recevez au moins 5 J'aime sur 300 messages différents. Whaou ! La communauté admire vos fréquentes contributions de haute qualité aux conversations.
     out_of_love:
       name: Trop d'amour
-      description: A utilisé 50 j'aime en une journée
+      description: A utilisé 50 J'aime en une journée
       long_description: |
         Ce badge est accordé lorsque vous utilisez la totalité de vos 50 J'aime quotidiens. Rappelez-vous de prendre un moment pour aimer les messages qui vous plaisent et que vous appréciez. Cela encourage les autres membres de la communauté à créer encore plus de discussions de qualité à l'avenir.
     higher_love:
@@ -2651,17 +2663,17 @@ fr:
         Ce badge est accordé lorsque vous utilisez la totalité vos 50 J'aime par jour pendant 20 jours. Whaou ! Vous êtes un modèle d'encouragement régulier des membres de la communauté !
     thank_you:
       name: 'Merci '
-      description: A 20 messages ayant reçu un j'aime et a donné 10 j'aime
+      description: A 20 messages ayant reçu un J'aime et a donné 10 j'aime
       long_description: |
         Ce badge est accordé quand vous avez reçu 20 J'aime sur vos messages et en avez donné 10 ou plus en retour. Quand quelqu'un aime vos messages, vous trouvez le temps d'aimer ce que les autres postent à leur tour.
     gives_back:
       name: Redonne
-      description: A 100 messages ayant reçu un j'aime et a donné 100 j'aime
+      description: A 100 messages ayant reçu un J'aime et a donné 100 J'aime
       long_description: |
         Ce badge est accordé quand vous avez reçu 100 J'aime et en avez donné 100 ou plus en retour. Whaou ! Merci de rendre ce lieu meilleur !
     empathetic:
       name: Empathique
-      description: A 500 messages ayant reçu un j'aime et a donné 1000 j'aime
+      description: A 500 messages ayant reçu un J'aime et a donné 1000 J'aime
       long_description: |
         Ce badge est accordé quand vous avez reçu 500 J'aime et en avez donné 1000 ou plus en retour. Whaou ! Vous êtes un modèle de générosité et d'amour mutuel :two_hearts:.
     first_emoji:

config/locales/server.id.yml

@@ -301,6 +301,7 @@ id:
         Silahkan sentuh tautan dibawah ini untuk menentukan sandi dari akun baru Anda:
 
         %{base_url}/users/password-reset/%{email_token}
+
     confirm_new_email:
       subject_template: "[%{site_name}] Konfirmasi email baru Anda"
       text_body_template: |

config/locales/server.it.yml

@@ -547,6 +547,7 @@ it:
     description: "La tua iscrizione è stata annullata. Per cambiare le tue impostazioni email <a href='%{url}'>vai alle preferenze utente</a>."
   unsubscribe:
     title: "Annulla iscrizione"
+    stop_watching_topic: "Smetti di osservare questo argomento, %{link}"
   reports:
     visits:
       title: "Visite Utente"
@@ -1137,27 +1138,10 @@ it:
       subject_template: "Backup completato correttamente"
     backup_failed:
       subject_template: "Backup fallito"
-      text_body_template: |
-        Il backup è fallito.
-
-        Questo è il log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Il ripristino è avvenuto con successo."
-      text_body_template: "Il ripristino è avvenuto con successo."
     restore_failed:
       subject_template: "Ripristino fallito"
-      text_body_template: |
-        Il ripristino è fallito.
-
-        Ecco il log:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Invito di massa processato con successo"
       text_body_template: "Il tuo file con l'invito di massa è stato processato, %{sent} inviti spediti."
@@ -1183,6 +1167,7 @@ it:
         Spiacenti, ma il tuo messaggio email a %{destination} (intitolato %{former_title}) non è stato inviato.
 
         Non è stato riconosciuto alcuno degli indirizzi email di destinazione. Assicurati di inviare a indirizzi email validi.
+
     email_reject_topic_not_found:
       subject_template: "[%{site_name}] Problema relativo all'email -- Argomento Non Trovato"
     email_reject_topic_closed:
@@ -1227,30 +1212,106 @@ it:
       subject_template: "[%{site_name}] %{topic_title}"
     user_replied_pm:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_quoted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_linked:
       subject_template: "[%{site_name}] %{topic_title} "
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_group_mentioned:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted:
       subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
+    user_watching_first_post:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted_pm:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
+      text_body_template: |
+        %{header_instructions}
+
+        %{message}
+
+        %{context}
+
+        %{respond_instructions}
     user_posted_pm_staged:
       subject_template: "%{optional_re}%{topic_title}"
+      text_body_template: |
+
+        %{message}
     digest:
       why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}"
+      subject_template: "[%{site_name}] Riepilogo"
       new_activity: "Nuove attività nei tuoi argomenti e messaggi:"
       top_topics: "Messaggi di successo"
       other_new_topics: "Argomenti più attivi"
       unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Per annullare l'iscrizione %{unsubscribe_link}."
       click_here: "clicca qui"
+      from: "%{site_name} riepilogo"
       read_more: "Leggi Altro"
       more_topics: "Ci sono stati %{new_topics_since_seen} altri nuovi argomenti."
       more_topics_category: "Ulteriori nuovi argomenti:"
+    mailing_list:
+      from: "%{site_name} riepilogo"
+      new_topics: "Nuovi argomenti"
+      view_this_topic: "Vedi questo argomento"
+      back_to_top: "Torna in cima"
     forgot_password:
       subject_template: "[%{site_name}] Reimposta password"
       text_body_template: |

config/locales/server.ja.yml

@@ -174,6 +174,7 @@ ja:
       文章を選択し、<b>引用して返信</b>ボタンをクリックすることで、文章を引用して編集することができます。
 
       こまごまと何度も返信するより、まとまって返信をすることで、より見やすく、より話しやすくなります。
+
     dominating_topic: |
       ### 他のユーザも議論に参加させてあげましょう
 
@@ -1015,34 +1016,8 @@ ja:
     subject_template: "[%{site_name}] メール送信テスト"
   new_version_mailer:
     subject_template: "[%{site_name}] Discourseの新しいバージョンがあります。"
-    text_body_template: |
-      最新版の[Discourse](http://www.discourse.org)が利用出来ます！
-
-      現在利用しているバージョン: %{installed_version}
-      新しいバージョン: **%{new_version}**
-
-      - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。
-
-      - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。
-
-      - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] アップデートがあります"
-    text_body_template: |
-      最新版の[Discourse](http://www.discourse.org)が利用出来ます！
-
-      現在利用しているバージョン: %{installed_version}
-      新しいバージョン: **%{new_version}**
-
-      - 更新は**[ワンクリックブラウザ・アップグレード](%{base_url}/admin/upgrade)**から簡単にできます。
-
-      - 更新内容は[GitHubの更新履歴](https://github.com/discourse/discourse/commits/master)をご覧ください。
-
-      - [meta.discourse.org](http://meta.discourse.org)にて、Discourseに関するお知らせ、話し合い、サポートを行っています。
-
-      ### リリースノート
-
-      %{notes}
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} 件の投稿がレビュー待ちです"
@@ -1062,61 +1037,45 @@ ja:
     welcome_user:
       subject_template: "%{site_name} へようこそ!"
       text_body_template: |
-        %{site_name}への参加ありがとうございます。ようこそ！
+        %{site_name}に参加していただきありがとうございます。
+        そしてようこそ！
 
         %{new_user_tips}
 
-        私たちは、[ガイドライン](%{base_url}/guidelines) を常に信じています
+        [ガイドライン](%{base_url}/guidelines) をよく読み、しっかり守りましょう。
 
-        楽しんでください!
+        それでは、楽しんでください！
 
         (もし[スタッフメンバー](%{base_url}/about) に新規ユーザーとして連絡する必要がある場合、このメッセージに返信してください)
     welcome_invite:
       subject_template: "%{site_name}へようこそ!"
       text_body_template: |
-        ようこそ%{site_name} へ！
+        %{site_name}へようこそ！
-        あなたのアカウント**%{username}** を作成して、あなたはログインしています。
+        アカウント **%{username}** を作成し、ログインしています。
-        氏名の変更は [your user profile][prefs] より行ってください。
 
-        次回ログインするときは、
+        名前の変更は [自分のユーザプロフィール][prefs] より行ってください。
 
-        1. かならず招待をうけたメールアドレスを使ってログインしてください。
+        次回からログインする際は、
 
-        2.[your user profile][prefs]でパスワードを設定して、ログインのときはそれを使用してください。
+        1. 招待時に使用したメールアドレスを使用してください。
+
+        2.[自分のユーザプロフィール][prefs]からパスワードを設定して、ログインのときは設定したパスワードを使用してください。
 
         %{new_user_tips} [civilized community behavior](%{base_url}/guidelines)をお守りいただき、健全なコミュニティとなるよう皆様のご協力をお願いいたします。
 
         それではお楽しみください!
 
-        (もし個人的に [staff members](%{base_url}/about) と連絡を取る必要がある場合、このメッセージに返信してください)
+        (もし、[スタッフ](%{base_url}/about) と連絡を取る必要がある場合はこのメッセージに返信してください)
 
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "バックアップは正常に完了しました"
-      text_body_template: "バックアップが成功しました。\n [admin > backup section](%{base_url}/admin/backups) から、バックアップをダウンロードしてください"
     backup_failed:
       subject_template: "バックアップ失敗"
-      text_body_template: |
-        バックアップが失敗しました
-
-        ログ:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "復元が正常に完了しました"
-      text_body_template: "復元が完了しました。"
     restore_failed:
       subject_template: "復元に失敗しました"
-      text_body_template: |
-        リストアが失敗しました
-
-        ログ:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "ユーザの一括招待に成功しました。"
       text_body_template: "ユーザの一括招待が処理され、%{sent}通の招待メールを送信しました"
@@ -1244,6 +1203,23 @@ ja:
         %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "%{site_name} への参加承認完了!"
+      text_body_template: |
+        %{site_name}へようこそ！
+
+        スタッフが%{site_name}でのアカウントを承認しました。
+
+        アカウントを有効にするには以下のリンクをクリックしてください:
+        %{base_url}/users/activate-account/%{email_token}
+
+        上記のURLがクリック出来ない場合は、コピーし、ウェブブラウザのアドレスバーに貼り付けてください。
+
+        %{new_user_tips}
+
+        [ガイドライン](%{base_url}/guidelines)をよく読み、しっかり守りましょう。
+
+        それでは、お楽しみください！
+
+        (もし[スタッフメンバー](%{base_url}/about) に新規ユーザーとして連絡する必要がある場合、このメッセージに返信してください)
     signup:
       subject_template: "[%{site_name}] アカウントの確認"
       text_body_template: |
@@ -1310,6 +1286,35 @@ ja:
     title: "利用規約"
   privacy_topic:
     title: "プライバシーポリシー"
+  static:
+    search_help: |
+      <h3>Tips</h3>
+      <p>
+      <ul>
+      <li>タイトルが優先されます &ndash; わからない時はタイトルで調べてみましょう</li>
+      <li>かぶりにくい単語、調べたいものに近い言葉を使うとピッタリな検索結果が出てきます。</li>
+      <li>カテゴリ、トピック、またはユーザ単位で検索してみましょう</li>
+      </ul>
+      </p>
+      <h3>オプション</h3>
+      <p>
+      <table>
+      <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td><code>order:likes</code></td><td><code>@username</code></td><td><code>user:foo</code></td></tr>
+      <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:single_user</code></td></tr>
+      <tr><td><code>#category-slug</code></td><td><code>category:foo</code></td><td><code>group:foo</code></td><td><code>badge:foo</code></td><td></td></tr>
+      <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
+      <tr><td><code>in:bookmarks</code></td><td><code>in:first</code></td><td><code>in:pinned</code></td><td><code>in:unpinned</code></td><td><code>in:wiki</code></td></tr>
+      <tr><td><code>posts_count:num</code></td><td><code>before:days or date</code></td><td><code>after:days or date</code></td><td><code>tags:one,two</code></td><td></td></tr>
+      </table>
+      </p>
+      <h3>例</h3>
+      <p>
+      <ul>
+      <li><code>rainbows #parks</code> では"parks"のカテゴリから"rainbows"という単語を検索します。</li>
+      <li><code>rainbows category:parks status:open order:latest</code> では"parks"のカテゴリ、"rainbows"という単語を検索し、最後の投稿の日付順に並べ、クローズ/アーカイブされていないトピックを検索します。</li>
+      <li><code>rainbows category:"parks and gardens" in:bookmarks</code> では、ブックマークしている"parks and gardens"カテゴリから、"rainbows"という単語を含むトピックを検索します。</li>
+      </ul>
+      </p>
   badges:
     editor:
       name: 編集者

config/locales/server.ko.yml

@@ -1044,30 +1044,12 @@ ko:
         [사용자 정보 설정]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "백업 성공"
-      text_body_template: "백업이 성공적으로 끝났습니다..\n[관리 > 백업](%{base_url}/admin/backups)에서 새 백업본을 다운로드 받으세요."
     backup_failed:
       subject_template: "백업에 실패했습니다."
-      text_body_template: |
-        백업이 실패하였습니다.
-
-        로그:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "복원 성공"
-      text_body_template: "복원에 성공했습니다."
     restore_failed:
       subject_template: "복원 실패"
-      text_body_template: |
-        복구가 실패하였습니다.
-
-        로그:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "대량 사용자 초대가 성공적으로 진행되었습니다."
       text_body_template: "대량 사용자 초대가 진행되어 %{sent}개의 초대장을 보냈습니다."

config/locales/server.nl.yml

@@ -1239,17 +1239,8 @@ nl:
       subject_template: "Backup succesvol uitgevoerd"
     backup_failed:
       subject_template: "Backup mislukt"
-      text_body_template: |
-        De backup is mislukt.
-
-        Hier is het log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Het terugzetten van de backup is geslaagd."
-      text_body_template: "Het terugzetten van de backup is geslaagd."
     restore_failed:
       subject_template: "Terugzetten van backup is mislukt"
     bulk_invite_succeeded:
@@ -1296,6 +1287,8 @@ nl:
         We konden geen bruikbare tekst in je e-mail vinden.
 
         Als je deze melding krijgt en _wel_ een reactie had gestuurd, kan je het opnieuw proberen met een eenvoudigere opmaak.
+
+
     email_reject_parsing:
       subject_template: "[%{site_name}] E-mailprobleem -- Inhoud niet herkend"
       text_body_template: |
@@ -1322,12 +1315,6 @@ nl:
         %{post_error}
 
         Probeer het opnieuw als je het probleem kan oplossen.
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] E-mailprobleem -- Gelimiteerde snelheid"
-      text_body_template: |
-        Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt.
-
-        Reden: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] E-mailprobleem -- Ongeldige plaatsingsactie"
       text_body_template: |

config/locales/server.pl_PL.yml

@@ -18,6 +18,10 @@ pl_PL:
   date:
     month_names: [null, Styczeń, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Październik, Listopad, Grudzień]
     <<: *datetime_formats
+  time:
+    am: "rano"
+    pm: "po południu"
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Tematy"
   posts: "wpisy"
@@ -32,6 +36,8 @@ pl_PL:
       show_trimmed_content: "Pokaż skróconą zawartość"
       errors:
         no_message_id_error: "Zdarza się kiedy email nie posiada nagłówka 'Message-Id'."
+        inactive_user_error: "Zdarza się kiedy nadawca jest nie aktywny."
+        blocked_user_error: "Zdarza się kiedy nadawca jest zablokowany."
   errors: &errors
     format: '%{attribute} %{message}'
     messages:
@@ -48,6 +54,7 @@ pl_PL:
       exclusion: jest zarezerwowane
       greater_than: musi być większe niż %{count}
       greater_than_or_equal_to: musi być większe lub równe %{count}
+      has_already_been_used: "został już użyty"
       inclusion: nie jest zawarty w liście
       invalid: jest nieprawidłowy
       less_than: musi być mniejszy niż %{count}
@@ -97,6 +104,8 @@ pl_PL:
   not_found: "Żądany URL lub źródło nie mógł zostać znaleziony."
   invalid_access: "Nie jesteś uprawniony, by zobaczyć żądane źródło."
   read_only_mode_enabled: "Strona jest w trybie tylko do odczytu. Możliwość interakcji jest wyłączona."
+  reading_time: "Czas odczytu"
+  likes: "Lajki"
   too_many_replies:
     one: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do 1 odpowiedzi w ramach  jednego tematu."
     few: "Przepraszamy, ale nowi użytkownicy są tymczasowo ograniczeni do %{count} odpowiedzi w ramach  jednego tematu."
@@ -116,6 +125,11 @@ pl_PL:
       one: "1 odpowiedź"
       few: "%{count} odpowiedzi"
       other: "%{count} odpowiedzi"
+  no_mentions_allowed: "Przepraszamy, nie możesz odwoływać się do innych użytkowników."
+  no_mentions_allowed_newuser: "Przepraszamy, nowi użytkownicy nie mogą odwoływać się do innych użytkowników."
+  no_images_allowed: "Przepraszamy, nowi użytkownicy nie mogą dodawać zdjęć do postów."
+  no_attachments_allowed: "Przepraszamy, nowi użytkownicy nie mogą dodawać załączników do postów."
+  no_links_allowed: "Przepraszamy, nowi użytkownicy nie mogą umieszczać linków w wiadomościach."
   spamming_host: "Przepraszamy, nie możesz umieścić linka do tej strony."
   user_is_suspended: "Zawieszeni użytkownicy nie mogą wysyłać wiadomości."
   topic_not_found: "Coś poszło nie tak. Być może temat został zamknięty lub usunięty w międzyczasie?"
@@ -137,14 +151,26 @@ pl_PL:
   rss_description:
     latest: "Ostatnie wątki"
     hot: "Popularne wątki"
+    top: "Najlepsze tematy"
     posts: "Aktualne wpisy"
+    private_posts: "Najnowsze prywatne wiadomości"
+    group_posts: "Ostatni post z %{group_name}"
+    user_posts: "Ostatnie posty @%{username}"
+    user_topics: "Ostatnie tematy @%{username}"
+    tag: "Oznaczone tematy"
   too_late_to_edit: "Ten wpis został utworzony zbyt dawno. Nie może być edytowany ani usunięty."
+  revert_version_same: "Obecna wersja jest taka sama jak w wersja, którą próbujesz przywrócić."
   excerpt_image: "zdjęcie"
   queue:
     delete_reason: "Skasowany z poziomu kolejki moderacji."
   groups:
     errors:
+      can_not_modify_automatic: "Nie można modyfikować automatyczną grupę"
       member_already_exist: "'%{username}' należy już do tej grupy."
+      invalid_domain: "'%{domain}' nie jest poprawną domeną."
+      invalid_incoming_email: "'%{domain}' nie jest poprawną domeną."
+      email_already_used_in_group: "'%{email}' jest już używany przez grupę '%{group_name}'."
+      email_already_used_in_category: "'%{email}' jest już używany przez kategorię '%{category_name}'."
     default_names:
       everyone: "wszyscy"
       admins: "admini"
@@ -170,6 +196,8 @@ pl_PL:
       - Postaraj się umieścić słowa kluczowe w tytule, dzięki czemu inni będą mogli łatwo *wyszukać* temat. Przypisz go do kategorii o pokrewnej tematyce.
 
       Aby dowiedzieć się więcej, [zobacz przewodnik społeczności](/guidelines). Ten panel pojawi się tylko przy pierwszym %{education_posts_text}.
+
+
     new-reply: |
       Witaj na %{site_name} &mdash; **dziękujemy za zaangażowanie!**
 
@@ -219,6 +247,8 @@ pl_PL:
     attributes:
       category:
         name: "Nazwa kategorii"
+      topic:
+        title: 'Tytuł'
       post:
         raw: "Treść"
       user_profile:
@@ -244,6 +274,9 @@ pl_PL:
           attributes:
             hex:
               invalid: "nie jest poprawnym kolorem"
+        post_reply:
+          base:
+            different_topic: "Wpis i odpowiedź muszą należeć do tego samego tematu."
       <<: *errors
   user_profile:
     no_info_me: "<div class='missing-profile'>Pole O mnie w Twoim profilu jest obecnie puste, <a href='/users/%{username_lower}/preferences/about-me'>czy chcesz je wypełnić?</a></div>"
@@ -284,6 +317,9 @@ pl_PL:
       uncategorized_parent: "Inne nie mogą być podkategorią innej kategorii."
       self_parent: "Podkategoria nie może być swoim rodzicem"
       depth: "Nie możesz umieścić subkategorii w innej subkategorii"
+      invalid_email_in: "'%{email}' nie jest poprawnym adresem e-mail."
+      email_already_used_in_group: "'%{email}' jest już używany przez grupę '%{group_name}'."
+      email_already_used_in_category: "'%{email}' jest już używany przez kategorię '%{category_name}'."
     cannot_delete:
       uncategorized: "Nie można usunąć kategorii Inne"
       has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. "
@@ -297,6 +333,10 @@ pl_PL:
       title: "nowy"
     basic:
       title: "początkujący"
+    member:
+      title: "uczestnik"
+    leader:
+      title: "lider"
     change_failed_explanation: "Twoja próba obniżenia poziomu %{user_name} do '%{new_trust_level}' była nieudana. Ten użytkownik posiada już poziom '%{current_trust_level}'. %{user_name} pozostanie na poziomie '%{current_trust_level}' - jeśli chcesz to zmienić, najpierw zablokuj poziom zaufania temu użytkownikowi."
   rate_limiter:
     slow_down: "Powtórzyłeś to działanie zbyt wiele razy, spróbuj ponownie później."
@@ -430,6 +470,9 @@ pl_PL:
     confirmed: "Twój email został zmieniony."
     please_continue: "Przejdź do %{site_name}"
     error: "Podczas próby zmiany Twojego adresu email wystąpił błąd. Być może ten adres jest już używany?"
+    authorizing_old:
+      title: "Dziękujemy za potwierdzenie twojego aktualnego adresu e-mail"
+      description: "Wysyłamy teraz twój nowy adres do potwierdzenia."
   activation:
     action: "Kliknij, by aktywować swoje konto."
     already_done: "Przepraszamy, ten link aktywujący konto jest już nieważny. Być może Twoje konto jest już aktywne ?"
@@ -453,6 +496,7 @@ pl_PL:
       description: 'Ten wpis zawiera treści które umiarkowana osoba może uznać za wulgarne, obraźliwe lub naruszające <a href="/guidelines">wytyczne społeczności</a>.'
       long_form: 'oflagowano jako niewłaściwe'
     notify_user:
+      title: 'Wyślij @{{username}} wiadomość'
       long_form: 'użytkownik został powiadomiony'
       email_title: 'Twój wpis w "%{title}"'
       email_body: "%{link}\n\n%{message}"
@@ -496,6 +540,13 @@ pl_PL:
       message:
         make: "Ten temat został ustawiony jako baner. Będzie pojawiać się na górze każdej strony do czasu zamknięcia przez użytkownika."
         remove: "Ten temat nie jest już banerem. Nie będzie pojawiać się na górze każdej strony."
+  unsubscribe:
+    title: "Wypisz"
+    stop_watching_topic: "Przestań obserwować ten temat, %{link}"
+    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"
+    log_out: "Wyloguj"
   reports:
     visits:
       title: "Wizyty użytkowników"
@@ -730,6 +781,7 @@ pl_PL:
     max_username_length: "Maksymalna długość nazwy użytkownika w znakach."
     reserved_usernames: "Niedozwolone nazwy użytkowników."
     min_password_length: "Minimalna długość hasła."
+    min_admin_password_length: "Minimalna długość hasła dla Admina."
     block_common_passwords: "Nie zezwalaj na hasła znajdujące się w grupie 10 000 najpopularniejszych haseł."
     allow_new_registrations: "Zezwól na rejestrację nowych użytkowników. Odznacz opcję żeby uniemożliwić rejestrację nowych kont."
     enable_signup_cta: "Pokazuj wiadomość dla powracających użytkowników anonimowych, zachęcającą ich do założenia konta."
@@ -745,7 +797,9 @@ pl_PL:
     enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret"
     github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications"
     github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications"
+    readonly_mode_during_backup: "Włącz tryb tylko do odczytu podczas wykonywania kopii zapasowej"
     maximum_backups: "Maksymalna liczba kopii zapasowych do przechowywania na dysku. Starsze kopie zapasowe zostaną automatycznie usunięte."
+    backup_frequency: "Jak często możemy utworzyć kopię zapasową strony, w dniach."
     active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
     verbose_localization: "Wyświetlaj dodatkowe identyfikatory tłumaczeń w treści etykiet"
     previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours"
@@ -763,7 +817,11 @@ pl_PL:
     max_topic_invitations_per_day: "Maksymalna dzienna liczba zaproszeń do tematu, jakie może wysłać użytkownik."
     suggested_topics: "Liczba sugerowanych tematów widocznych na końcu aktualnego tematu."
     limit_suggested_to_category: "Sugeruj tematy jedynie z tej samej kategorii."
+    purge_deleted_uploads_grace_period_days: "Okres karencji (w dniach) przed usunięciem upload zostanie skasowany."
     avatar_sizes: "Lista automatycznie wygenerowanych rozmiarów awatarów."
+    external_system_avatars_enabled: "Użyj zewnętrzny system awatarów."
+    convert_pasted_images_to_hq_jpg: "Konwertuj wklejone obrazy do wysokiej jakości plików JPG."
+    convert_pasted_images_quality: "Jakość konwertowanego pliku JPG (1 to najniższa jakość, 100 to najlepsza jakość)."
     default_invitee_trust_level: "Domyślny poziom zaufania (0-4) dla zaproszonych użytkowników."
     tl1_requires_topics_entered: "Jak wiele tematów musi odwiedzić nowy użytkownik, przed promocją na 1-szy poziom zaufania."
     tl1_requires_read_posts: "Jak wiele postów musi przeczytać nowy użytkownik, przed promocją na 1-szy poziom zaufania."
@@ -776,6 +834,8 @@ pl_PL:
     tl2_requires_likes_given: "Ile lajków musi dać użytkownik, zanim otrzyma promocję na 2 poziom zaufania."
     tl2_requires_topic_reply_count: "Na ile tematów musi odpowiedzieć użytkownik, zanim otrzyma promocję na 2 poziom zaufania."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
+    min_trust_to_edit_wiki_post: "Minimalny poziom zaufania wymagany do edycji posta oznaczonego jako wiki."
+    min_trust_to_send_messages: "Minimalny poziom zaufania wymagany do tworzenia nowych prywatnych wiadomości."
     newuser_max_links: "Ile linków może dodać nowy użytkownik do posta."
     newuser_max_images: "Ile obrazów może dodać nowy użytkownik do posta."
     newuser_max_attachments: "Ile załączników może dodać nowy użytkownik do posta."
@@ -795,10 +855,14 @@ pl_PL:
     staff_like_weight: "O ile większą wagę mają mieć polubienia przyznawane przez członków zespołu?"
     reply_by_email_enabled: "Włącz możliwość odpowiadania na wpisy poprzez email."
     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"
+    ignore_by_title: "Ignoruj przychodzące wiadomości e-mail w oparciu o ich tytuł."
     pop3_polling_ssl: "Używaj SSL podczas łączenia z serwerem POP3. (Rekomendowane)"
     relative_date_duration: "Liczba dni od wysłania wpisu gdy wyświetlana jest data relatywna (7d) zamiast absolutnej (20 Lut)."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
     email_editable: "Allow users to change their e-mail address after registration."
+    allow_uploaded_avatars: "Zezwól użytkownikom na przesyłanie niestandardowych zdjęć profilowych."
+    allow_animated_thumbnails: "Generowanie miniatur animowanych gifów."
+    digest_topics: "Maksymalna liczba tematów do wyświetlenia w podsumowaniu email."
     allow_anonymous_posting: "Zezwól użytkownikom na przechodzenie w tryb anonimowości."
     allow_profile_backgrounds: "Zezwól użytkownikom na przesyłanie obrazu tła dla profilu."
     enable_mobile_theme: "Urządzenia mobilne używają dedykowanego mobilnego szablonu. Wyłącz to, jeśli chcesz użyć własnego, pojedynczego i responsywnego szablonu stylów. "
@@ -936,6 +1000,7 @@ pl_PL:
 
 
       (Jeśli powyższy link wygasł, wybierz "Zapomniałem hasła", logując się za pomocą adresu email.)
+
   test_mailer:
     subject_template: "[%{site_name}] Test dostarczania poczty"
   new_version_mailer:
@@ -962,27 +1027,10 @@ pl_PL:
       subject_template: "Kopia zapasowa jest gotowa"
     backup_failed:
       subject_template: "Kopia zapasowa nieudana"
-      text_body_template: |
-        Tworzenie kopii zapasowej było nieudane.
-
-        Log poniżej:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Przywrócenie udane"
-      text_body_template: "Przywrócenie zakończyło się sukcesem."
     restore_failed:
       subject_template: "Przywracanie nieudane"
-      text_body_template: |
-        Przywrócenie z kopii zapasowej było nieudane.
-
-        Log poniżej:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Przetwarzanie masowej ilości zaproszeń zakończyło się sukcesem."
       text_body_template: "Plik z zaproszeniami został przetworzony. Wysłanych zaproszeń: %{sent}."
@@ -996,6 +1044,8 @@ pl_PL:
         ```
         %{logs}
         ```
+
+
     csv_export_succeeded:
       subject_template: "Zakończono eksport danych"
       text_body_template: |
@@ -1004,6 +1054,7 @@ pl_PL:
         <a class="attachment" href="%{download_link}">%{file_name}</a> (%{file_size})
 
         Powyższy link będzie aktywny przez 48 godzin.
+
     csv_export_failed:
       subject_template: "Nieudany eksport danych"
       text_body_template: "Przepraszamy, ale eksport danych zakończył się niepowodzeniem. Sprawdź logi lub skontaktuj się z operatorami serwisu."
@@ -1080,6 +1131,7 @@ pl_PL:
         Baw się dobrze!
 
         (Jeśli potrzebujesz skontaktować się z [członkiem zespołu](%{base_url}/about) jako nowy użytkownik, odpowiedz na tę wiadomość.)
+
     signup:
       subject_template: "[%{site_name}] Potwierdź swoje nowe konto"
       text_body_template: |
@@ -1136,8 +1188,6 @@ pl_PL:
   performance_report:
     initial_post_raw: 'Ten temat zawiera codzienne raporty wydajności dla twojej witryny. '
     initial_topic_title: 'Testy wydajności witryny. '
-  time:
-    <<: *datetime_formats
   activemodel:
     errors:
       <<: *errors

config/locales/server.pt.yml

@@ -250,12 +250,14 @@ pt:
       Este tópico é claramente importante para si – 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: |
       ### 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.
 
       Em vez de adicionar outra resposta, por favor considere editar as suas respostas anteriores, ou visitar outros tópicos.
+
     reviving_old_topic: |
       ### Reavivar este tópico?
 
@@ -327,6 +329,7 @@ pt:
       (Para mais informação acerca dos Níveis de Confiança, [veja este tópico][confiança]. Por favor tenha conhecimento que apenas membros que continuam a corresponder aos requisitos ao longo do tempo, irão manter-se habituais.)
 
       [confiança]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+
   category:
     topic_prefix: "Acerca da categoria %{category}"
     replace_paragraph: "(Substitua este primeiro parágrafo com uma breve descrição da sua nova categoria. Este guia irá aparecer na área de seleção da categoria, por isso tente mantê-lo abaixo dos 200 caracteres. **Até editar esta descrição ou criar tópicos, esta categoria não irá aparecer na página das categorias.**)"
@@ -1016,7 +1019,6 @@ pt:
     unsubscribe_via_email: "Permitir aos utilizadores cancelar a subscrição de emails enviando um email com \"unsubscribe\" no assunto ou no corpo do email"
     delete_email_logs_after_days: "Apagar registos de email após (N) dias. 0 para os manter indefinidamente"
     max_emails_per_day_per_user: "Número máximo de emails para enviar aos utilizadores. 0 para desligar o limite"
-    auto_generated_whitelist: "Lista de endereços de email que não serão verificados para conteúdo gerado automáticamente."
     block_auto_generated_emails: "Bloquear emails recebidos que sejam identificados como gerados automáticamente."
     ignore_by_title: "Ignorar emails recebidos com base no seu título."
     manual_polling_enabled: "Enviar emails utilizando a API de resposta por email."
@@ -1358,30 +1360,12 @@ pt:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Cópia de segurança completa corretamente"
-      text_body_template: "A cópia de segurança foi bem-sucedida.\nVisite [admin > secção de cópias de segurança](%{base_url}/admin/backups) para descarregar a sua nova cópia de segurança."
     backup_failed:
       subject_template: "A cópia de segurança falhou"
-      text_body_template: |
-        A cópia de segurança falhou.
-
-        Aqui está o registo do log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Restauração completa corretamente"
-      text_body_template: "A restauração foi bem sucedida."
     restore_failed:
       subject_template: "A restauração falhou"
-      text_body_template: |
-        A restauração falhou.
-
-        Aqui está o registo:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Convites de utilizadores em massa processados com sucesso"
       text_body_template: "O seu ficheiro de convites de utilizadores em massa foi processado, %{sent} convites enviados."
@@ -1420,18 +1404,21 @@ pt:
         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: |
         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: |
         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.
+
     email_reject_empty:
       subject_template: "[%{site_name}]  Problema de email -- Sem Conteúdo"
       text_body_template: |
@@ -1466,12 +1453,6 @@ pt:
         %{post_error}
 
         Se conseguir corrigir o problema, tente novamente.
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] Problema de email -- Envios limitados"
-      text_body_template: |
-        Pedimos desculpa mas a sua mensagem de email %{destination} (titled %{former_title}) não funcionou.
-
-        Razão: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] Problema de email -- Acção de Post inválida"
       text_body_template: |

config/locales/server.pt_BR.yml

@@ -24,7 +24,7 @@ pt_BR:
     <<: *datetime_formats
   title: "Discourse"
   topics: "Tópicos"
-  posts: "postagens"
+  posts: "mensagens"
   loading: "Carregando"
   powered_by_html: 'Movido a <a href="http://www.discourse.org">Discourse</a>, melhor visualizado com JavaScript ativado'
   log_in: "Entrar"
@@ -125,7 +125,7 @@ pt_BR:
       other: "%{count} respostas a mais"
     loading: "Carregando Discussão..."
     permalink: "Permalink"
-    imported_from: "Este é um tópico de discussão companheiro para a postagem original em %{link}"
+    imported_from: "Este é um tópico de discussão companheiro para a mensagem original em %{link}"
     in_reply_to: "▶ %{username}"
     replies:
       one: "1 resposta"
@@ -133,19 +133,19 @@ pt_BR:
   no_mentions_allowed: "Desculpe, você não pode mencionar outros usuários."
   too_many_mentions:
     one: "Desculpe, você pode mencionar apenas %{count} usuário em um post."
-    other: "Desculpe, você pode mencionar apenas %{count} usuários em um post."
+    other: "Desculpe, você pode mencionar apenas %{count} usuários em uma mensagem."
   no_mentions_allowed_newuser: "Desculpe, usuários novos não podem mencionar outros usuários."
   too_many_mentions_newuser:
-    one: "Desculpe, usuários novos podem mencionar apenas %{count} usuário em uma postagem."
+    one: "Desculpe, usuários novos podem mencionar apenas um usuário em uma mensagem."
-    other: "Desculpe, usuários novos podem mencionar apenas %{count} usuários em uma postagem."
+    other: "Desculpe, usuários novos podem mencionar apenas %{count} usuários em uma mensagem."
-  no_images_allowed: "Desculpe, usuários novos não podem colocar imagens nas postagens."
+  no_images_allowed: "Desculpe, usuários novos não podem colocar imagens nas mensagens."
   too_many_images:
     one: "Desculpe, usuários novos podem colocar apenas %{count} imagem nas postagens."
-    other: "Desculpe, usuários novos podem colocar apenas %{count} imagens nas postagens."
+    other: "Desculpe, usuários novos podem colocar apenas %{count} imagens nas mensagens."
-  no_attachments_allowed: "Desculpe, novos usuários não podem colocar anexos nas postagens."
+  no_attachments_allowed: "Desculpe, novos usuários não podem colocar anexos nas mensagens."
   too_many_attachments:
     one: "Desculpe, novos usuários podem colocar apenas %{count} anexo nas suas postagens."
-    other: "Desculpe, novos usuários podem colocar apenas %{count} anexos nas suas postagens."
+    other: "Desculpe, novos usuários podem colocar apenas %{count} anexos nas suas mensagens."
   no_links_allowed: "Desculpe, usuários novos não podem colocar links nas postagens."
   too_many_links:
     one: "Desculpe, usuários novos podem colocar apenas %{count} link nas postagens."
@@ -368,6 +368,7 @@ pt_BR:
       create_like: "Você atingiu o número máximo de curtidas hoje. Por favor aguarde% {time_left} antes de tentar novamente."
       create_bookmark: "Você atingiu o número máximo de marcadores hoje. Por favor aguarde% {time_left} antes de tentar novamente."
       edit_post: "Você atingiu o número máximo de edições hoje. Por favor aguarde% {tempo} esquerda antes de tentar novamente."
+      topic_invitations_per_day: "Você atingiu o número máximo de convites para tópicos hoje. Por favor aguarde %{time_left} antes de tentar novamente."
     hours:
       one: "1 hora"
       other: "%{count} horas"
@@ -538,6 +539,15 @@ pt_BR:
       message:
         make: "Este tópico é agora um banner. Ele aparecerá no topo de cada página até que seja julgado improcedente pelo usuário."
         remove: "Este tópico não é mais um banner. Ela deixará de aparecer no topo de todas as páginas."
+  unsubscribed:
+    title: "Desinscrito!"
+    description: "You have been unsubscribed. To change your email settings <a href='%{url}'>visit your user preferences</a>.\n\nVocê se desinscreveu. Para alterar as suas configurações de email"
+  unsubscribe:
+    title: "Desinscrever"
+    stop_watching_topic: "Parar de observar este tópico, %{link}"
+    unwatch_category: "Parar de observar todos os tópicos na categoria  %{category}"
+    mailing_list_mode: "Desativar o modo lista de discussão"
+    log_out: "Sair"
   reports:
     visits:
       title: "Visitas do Usuário"
@@ -645,7 +655,7 @@ pt_BR:
     http_background_reqs:
       title: "Background"
       xaxis: "Dia"
-      yaxis: "Pedidos utilizados para atualização ao vivo e rastreamento"
+      yaxis: "Pedidos utilizados para monitoramento e atualização ao vivo"
     http_2xx_reqs:
       title: "Status 2xx (OK)"
       xaxis: "Dia"
@@ -772,7 +782,7 @@ pt_BR:
     post_menu: "A ordem dos items no menu da postagem."
     post_menu_hidden_items: "Os items de menu a ser escondidos por padrão no menu de postagem, a menos que uma elipse de expansão seja clicada."
     share_links: "Determine quais itens aparecem na caixa de diálogo de compartilhamento, e em qual ordem."
-    track_external_right_clicks: "Rastrear cliques externos que são clicados com o botão direito (ex: abrir em nova aba) desativado por padrão, pois tem que reescrever urls, quebrando a usabilidade"
+    track_external_right_clicks: "Monitorar cliques externos que são clicados com o botão direito (ex: abrir em nova aba) desativado por padrão, pois tem que reescrever urls, quebrando a usabilidade"
     site_contact_username: "Um nome de usuário válido de membro da equipe para enviar todas mensagens automáticas por ele. Se deixado em branco a conta padrão System será utilizada."
     send_welcome_message: "Enviar a todos novos usuários uma mensagem de boas vindas com um guia de início rápido."
     suppress_reply_directly_below: "Não mostrar a contagem de respostas expansível em um post quando há apenas uma única resposta diretamente abaixo deste post."
@@ -785,7 +795,7 @@ pt_BR:
     show_email_on_profile: "Mostrar o email de um usuário em seus perfis (apenas visível a eles mesmos e staff)"
     email_token_valid_hours: "Tokens de Esqueceu senha / ativar conta são válidas por (n) horas."
     email_token_grace_period_hours: "Tokens de esqueceu senha / ativar conta ainda serão válidas por um período extra de (n) horas depois de serem resgatados."
-    enable_badges: "Habilita o sistema de emblemas (experimental)"
+    enable_badges: "Habilita o sistema de emblemas"
     allow_index_in_robots_txt: "Especificar no robots.txt que este site é permitido de ser indexado por sistemas de busca na web."
     email_domains_blacklist: "Lista delimitada por barras (|) de domínios de email que não são permitidos registros de contas. Exemplo: mailinator.com|trashmail.net"
     email_domains_whitelist: "Lista separada por barra (|) de domínios de email que usuários DEVEM usar para registrar contas. CUIDADO: Usuário com domínio de email diferentes da lista não serão permitidos!"
@@ -998,6 +1008,10 @@ pt_BR:
     emoji_set: "Como você gostaria do seu emoji?"
     enforce_square_emoji: "Forçar proporção quadrangular para todos emojis."
     approve_unless_trust_level: "Mensagens para os usuários abaixo deste nível de confiança devem ser aprovados"
+    default_categories_watching: "Lista de categorias que são observadas por padrão."
+    default_categories_tracking: "Lista de categorias que são monitoradas por padrão."
+    default_categories_muted: "Lista de categorias que são silenciadas por padrão."
+    remove_muted_tags_from_latest: "Não exibir na lista de tópicos recentes os tópicos com a etiqueta de Silenciado."
     errors:
       invalid_email: "Endereço de email inválido"
       invalid_username: "Não há nenhum usuário com esse nome de usuário."
@@ -1195,30 +1209,12 @@ pt_BR:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Backup completado com sucesso"
-      text_body_template: "O backup foi bem sucedido. Visite a [admin > seção backup](%{base_url}/admin/backups) para baixar seu novo backup."
     backup_failed:
       subject_template: "O backup falhou"
-      text_body_template: |
-        O backup falhou.
-
-        Aqui está o log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Restauração terminada com sucesso"
-      text_body_template: "A restauração foi bem sucedida."
     restore_failed:
       subject_template: "A restauração falhou"
-      text_body_template: |
-        A restauração falhou.
-
-        Aqui está o log:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Seus convites foram enviados com sucesso."
       text_body_template: "Seus convites foram enviados com sucesso: %{sent}."
@@ -1421,23 +1417,82 @@ pt_BR:
   badges:
     editor:
       name: Editor
+      description: Primeira edição de mensagem
+    basic_user:
+      name: Básico
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Concedido</a> o acesso a todas as funções essenciais da comunidade
     member:
       name: Membro
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Concedido</a> o acesso a enviar convites, mensagens em grupo e mais curtidas
+    regular:
+      name: Habitual
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Concedido</a> o acesso a recategorizar, renomear, seguir links, wiki e mais curtidas
     leader:
       name: Líder
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Concedido</a> o acesso para editar globalmente, fixar, fechar, arquivar, desmembrar e unificar tópicos, além de mais curtidas
     welcome:
-      name: Boas-vindas
+      name: Bem-Vindo
       description: Recebeu uma curtida
+    autobiographer:
+      name: Autobiógrafo
+      description: Preencheu as informações do <a href="/my/preferences">perfil</a>
     anniversary:
       name: Aniversário
+      description: Membro ativo por um ano, postou ao menos uma vez
+    nice_post:
+      name: Resposta Interessante
+      description: Recebeu 10 curtidas em uma resposta
+    good_post:
+      name: Boa Resposta
+      description: Recebeu 25 curtidas em uma resposta
+    great_post:
+      name: Excelente Resposta
+      description: Recebeu 50 curtidas em uma resposta
+    nice_topic:
+      name: Tópico Interessante
+      description: Recebeu 10 curtidas em um tópico
+    good_topic:
+      name: Bom Tópico
+      description: Recebeu 25 curtidas em um tópico
+    great_topic:
+      name: Excelente Tópico
+      description: Recebeu 50 curtidas em um tópico
+    nice_share:
+      name: Compartilhamento Interessante
+      description: Compartilhou uma postagem com 25 visitas únicas
+    good_share:
+      name: Bom Compartilhamento
+      description: Compartilhou uma postagem com 300 visitas únicas
+    great_share:
+      name: Excelente Compartilhamento
+      description: Compartilhou uma postagem com 1000 visitas únicas
+    first_like:
+      name: Primeira Curtida
+      description: Curtiu uma mensagem
+    first_flag:
+      name: Primeira Sinalização
+      description: Sinalizou uma mensagem
+    promoter:
+      name: Promotor
+      description: Convidou um usuário
+    campaigner:
+      name: Ativista
+      description: Convidou 3 usuários básicos
     champion:
       name: Campeão
+      description: Convidou 5 membros
+    first_share:
+      name: Primeiro Compartilhamento
+      description: Compartilhou uma mensagem
     first_link:
       name: Primeiro Link
       description: Adicionou um link para outro tópico
     first_quote:
       name: Primeira Citação
-      description: Citou um post
+      description: Citou uma mensagem
+    read_guidelines:
+      name: Leu as regras
+      description: Leu as <a href="/guidelines">regras da comunidade</a>
     reader:
       name: Leitor
       description: Leu todas as respostas em um tópico com mais de 100 respostas
@@ -1450,21 +1505,33 @@ pt_BR:
     famous_link:
       name: Link Famoso
       description: Postou um link externo com 1000 clicks
+    appreciated:
+      name: Agradecido
+      description: Teve 20 mensagens curtidas
+    respected:
+      name: Respeitado
+      description: Recebeu 2 curtidas em 100 mensagens
     admired:
       name: Admirado
+      description: Recebeu 5 curtidas em 300 mensagens
     out_of_love:
       name: Por Amor
       description: Usou 50 likes no mesmo dia
     higher_love:
-      description: Usou 50 likes em um dia 5 vezes
+      name: Amor Maior
+      description: Deu 50 curtidas no mesmo dia 5 vezes
     crazy_in_love:
       name: Apaixonado
-      description: Usou 50 likes em um dia 20 vezes
+      description: Deu 50 curtidas no mesmo dia 20 vezes
     thank_you:
-      description: Teve 20 posts curtidos e deu 10 likes
+      name: Obrigado
+      description: Teve 20 mensagens curtidas e curtiu 10 mensagens
+    gives_back:
+      name: Retribuidor
+      description: Curtiu 100 mensagens e teve 100 mensagens curtidas
     empathetic:
       name: Empático
-      description: Teve 500 posts curtidos e deu 1000 likes
+      description: Curtiu 1000 mensagens e teve 500 mensagens curtidas
     first_emoji:
       name: Primeiro emoji
       description: Utilizou um emoji em uma publicação
@@ -1472,9 +1539,13 @@ pt_BR:
       name: Primeira menção
       description: Mencionou um usuário em uma publicação
       long_description: Este emblema é concedido na primeira vez em que você menciona o @nomedeusuaio de alguém em uma publicação. Cada menção gera uma notificação para a pessoa de forma que ela saiba o que você publicou. Simplesmente comece a digitar "@" (arroba) para mencionar qualquer usuário ou, caso permitido, um grupo -- é uma maneira conveniente de chamar a atenção de alguém.
+    first_onebox:
+      name: Primeiro Onebox
+      description: Postou um link que foi embutido na mensagem
+      long_description: 'Esse emblema é concedido na primeira vez em que você posta um link que é convertido automaticamente em uma caixa com um título, sumário e uma imagem (se disponível) sumarizando o link. '
     first_reply_by_email:
       name: Primeira Resposta por email
-      description: Respondeu um post por email
+      description: Respondeu uma mensagem por email
   admin_login:
     success: "Email Enviado"
     error: "Erro!"

config/locales/server.ro.yml

@@ -10,10 +10,13 @@ ro:
     short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
     long_date: "MMMM D, YYYY h:mma"
+  time:
+    am: "AM"
+    pm: "PM"
   title: "Discourse"
   topics: "Discuții"
   posts: "postări"
-  loading: "Încarcă"
+  loading: "Se încarcă"
   powered_by_html: 'Prin intermediul <a href="http://www.discourse.org">Discourse</a>, Vizualizare optimă cu JavaScript activat'
   log_in: "Autentificare"
   disable_remote_images_download_reason: "Descărcarea de imagini la distanţă a fost dezactivată deoarece nu mai era spaţiu pe disc suficient."
@@ -23,7 +26,7 @@ ro:
     messages:
       too_long_validation: "este limitat la %{max} de caractere; ați introdus %{length}."
       invalid_boolean: "Valoare logică invalidă."
-      taken: "a fost deja luat."
+      taken: "nu este disponibil"
       accepted: trebuie să fie acceptat
       blank: nu poate fi gol
       present: trebuie să fie gol
@@ -35,7 +38,7 @@ ro:
       greater_than: trebuie să fie mai mare decât %{count}
       greater_than_or_equal_to: trebuie să fie mai mare sau egal cu %{count}
       inclusion: nu este inclus in listă
-      invalid: este invalid
+      invalid: nu este valid
       less_than: trebuie să fie mai mic decât %{count}
       less_than_or_equal_to: trebuie să fie mai mic sau egal cu %{count}
       not_a_number: nu este un număr
@@ -66,8 +69,8 @@ ro:
     file_should_be_csv: "Fișierul încărcat ar trebuii să fie de formatul csv sau txt."
   backup:
     operation_already_running: "O operație este în plină desfășurare. Nu puteți începe alta nouă."
-    backup_file_should_be_tar_gz: "Fișierul de rezervă ar trebuii să fie arhivat cu extensia .tar.gz."
+    backup_file_should_be_tar_gz: "Copia de siguranță ar trebui să fie arhivată cu extensia .tar.gz."
-    not_enough_space_on_disk: "Nu este suficient spațiu pt a încărca aceast fișier de rezervă."
+    not_enough_space_on_disk: "Nu este suficient spațiu pe disc pentru a încărca această copie de siguranță."
   not_logged_in: "trebuie să fii autentificat pentru a executa această acțiune."
   not_found: "Adresa URL sau resursă cerută nu pot fi găsite."
   invalid_access: "Nu aveţi permisiunea să vedeţi această resursă."
@@ -85,15 +88,15 @@ ro:
     imported_from: "Acesta este un subiect de discuție adăugat la discuția originală de la %{link}"
     in_reply_to: "▶ %{username}"
     replies:
-      one: "1 răspuns"
+      one: "Un răspuns"
-      few: "răspunsuri"
+      few: "%{count} răspunsuri"
-      other: "%{count} răspunsuri"
+      other: "%{count} de răspunsuri"
-  spamming_host: "Ne pare rău, nu puteți adăuga o adresă acestei gazde."
+  spamming_host: "Nu poți adăuga un link pentru acest domeniu."
   user_is_suspended: "Utilizatorii suspendați nu au dreptul de a posta."
   just_posted_that: "este prea similar cu ceea ce ați postat recent"
   invalid_characters: "conține caractere invalide"
   is_invalid: "este invalid; încercați o descriere mai detaliată"
-  next_page: "urmatoarea pagină →"
+  next_page: "pagina următoare →"
   prev_page: "← pagina precedentă"
   page_num: "Pagina %{num}"
   home_title: "Acasă"
@@ -117,19 +120,19 @@ ro:
       member_already_exist: "'%{username}' este deja membru al acestui grup"
     default_names:
       everyone: "toată lumea"
-      admins: "admini"
+      admins: "administratori"
       moderators: "moderatori"
       staff: "personal"
-      trust_level_0: "trust_level_0"
+      trust_level_0: "nivel_de_încredere_0"
       trust_level_1: "nivel_de_încredere_1"
       trust_level_2: "nivel_de_încredere_2"
       trust_level_3: "nivel_de_încredere_3"
       trust_level_4: "nivel_de_încredere_4"
   education:
     until_posts:
-      one: "1 mesaj"
+      one: "O postare"
       few: "%{count} postări"
-      other: "%{count} postări"
+      other: "%{count} de postări"
     new-reply: |
       Bine ai venit la %{site_name} &mdash; **Mulțumim pentru contribuție!**
 
@@ -155,7 +158,7 @@ ro:
     reviving_old_topic: |
       ### Reînvie această discuție?
 
-      Ultimul răspuns la această discuție a fost dat acum %{days} de zile. Răspunsul tăuva merge în capătul listei și toată lumea ce a fost implicată în discuție va fi notificată.
+      Ultimul răspuns la această discuție a fost dat acum %{days} de zile. Toată lumea ce a fost implicată în discuție va fi notificată iar discuția va fi ajunge pe prima pagină.
 
       Ești sigur că dorești să continui această conversație?
   activerecord:
@@ -543,7 +546,7 @@ ro:
     fixed_category_positions: "Dacă e bifat, veți putea aranja categoriile într-o ordine fixă. Dacă e nebifat, categoriile sunt listate în ordinea activității."
     add_rel_nofollow_to_user_content: "Adaugă atributul rel nofollow la contextul acceptat de utilizator, în afară de adresele de uz intern (incluzând domeniile părinte). Dacă se schimbă, postările trebuiesc refăcute cu: \"rake posts:rebake\""
     post_excerpt_maxlength: "Lungimea maximă a unui extras / sumar dintr-o postare."
-    post_onebox_maxlength: "Lungimea maximă a postării discursului-scurt în caractere."
+    post_onebox_maxlength: "Limgimea maximă a unui post afișat în Onebox (în caractere)"
     onebox_domains_whitelist: "O listă de domenii permise pentru discursul-scurt; aceste domenii ar trebuii să permită OpenGraph sau oEmbed. Testați-le la http://iframely.com/debug"
     apple_touch_icon_url: "Iconiță folosită pentru dispozitivele Apple. Mărimea recomandată este 144px pe 144px."
     notification_email: "Adresa autorului emailu-ului este folosită când se trimit emailuri esențiale de sistem. Domeniul specificat aici trebuie să aibă SPF, DKIM și rapoarte PTR inversate, setate corect pentru că email-ul să ajungă la destinație."
@@ -552,10 +555,6 @@ ro:
     summary_posts_required: "Minimul de postări într-o discuție înainte de 'Sumarul acestei discuții' este activat"
     summary_likes_required: "Minimul de aprecieri într-o discuție înainte de 'Sumarul acestei discuții' este activat"
     summary_percent_filter: "Când un utilizator face click pe 'Sumarul acestei discuții', arată primele % de postări"
-    enable_long_polling: "Indicatorul de mesaje folosit pentru notificări poate folosi sondaj"
-    long_polling_interval: "Intervalul înainte de sondaj este dat în milisecunde "
-    polling_interval: "Cât de des e intervalul de sondaj în milisecunde al utilizatorilor autentificați"
-    anon_polling_interval: "Cat de des e intervalul de sondaj în milisecunde al clienților anonimi"
     cooldown_minutes_after_hiding_posts: "Numărul de minute pr care un utilizator trebuie să le aștepte până când poate edita sau ascunde o postare prin marcajele comune"
     notify_mods_when_user_blocked: "Dacă un utilizator este blocat automat , trimite un mesaj tuturor moderatorilor."
     flag_sockpuppets: "Dacă un utilizator nou răspunde unei discuții de la același IP ca utilizatorul ce a pornit discuția, marchează ambele postări ca potențial spam."
@@ -575,7 +574,7 @@ ro:
     email_token_valid_hours: "Parola uitată / activează tokenii de cont valizi pentru (n) ore."
     email_token_grace_period_hours: "Parola uitată / activează tokenii de cont ce sunt încă valizi pe o perioadă de (n) ore după ce au fost redobândiți."
     enable_badges: "Activează sistemul insigna (experimental)"
-    version_checks: "Permite actualizarea Discourse Hub pentru versiuni mai noi și arată mesajele de versiune pe /spațiul de lucru admin"
+    version_checks: "Verifică Hub-ul Discourse pentru actualizări și arată mesaje pentru versiuni mai noi în Spatiul de lucru"
     new_version_emails: "Trimite un email la adresa de contact_email când o nouă versiune de Discourse este disponibilă."
     port: "PENTRU DEVELOPER! ATENȚIE! Folosiți acest port HTTP decât cel din oficiu , portul 80. lăsați liber pentru portul 80."
     force_hostname: "PENTRU DEVELOPER! ATENȚIE! Specificați un nume de gazdă âne URL. Lăsați liber pentru cel din oficiu."
@@ -600,10 +599,9 @@ ro:
     enable_github_logins: "Activează autentificarea cu Github, requires github_client_id and github_client_secret"
     github_client_id: "ID-ul clientului pentru autentificarea cu Github, înregistrat la https://github.com/settings/applications"
     github_client_secret: "Secretul clientului pentru autentificarea cu Github, înregistrat la https://github.com/settings/applications"
-    allow_restore: "Permite rescrierea, ceea ce poate înlocuii TOATE datele din site! Lasăți necompletat decât dacă doriți să reluați o rezervă"
+    allow_restore: "Bifează-l doar dacă dorești să restaurezi o copie de siguranță. Atenție, restaurarea poate șterge/înlocui TOATE datele din site!"
-    maximum_backups: "Maximul de rezerve de pe disc. Rezervele vechi sunt șterse automat"
+    maximum_backups: "Maximul de copii de siguranță păstrate. Copiile de siguranță vechi sunt șterse automat"
-    enable_s3_backups: "Încarcă rezervele pe s3 când sunt complete. Fiți sigur că ați completat acreditarea s3."
+    enable_s3_backups: "Încarcă copiile de siguranță pe s3 când sunt complete. IMPORTANT: sunt necesare date de autentificare valide pentru S3 în secțiunea FIȘIERE."
-    s3_backup_bucket: "Folosește compartimentul de legătură pentru a ține rezerve. Atenție: Asigurați-vă că este un compartiment privat."
     active_user_rate_limit_secs: "Cât de de se actializează câmpul 'last_seen_at', în secunde"
     previous_visit_timeout_hours: "Cât de mult durează o vizită până când e considerată vizita'precedentă', în ore"
     rate_limit_create_topic: "După crearea unei discuții, utilizatorul trebuie să aștepte (n) secunde înainte de a începe una nouă."
@@ -617,7 +615,6 @@ ro:
     max_topics_per_day: "Numărul maxim de discuții pe care un utilizator le poare crea zilnic."
     suggested_topics: "Numărul de discuții sugerate la sfârșitul unei discuții."
     limit_suggested_to_category: "Arată doar discuțiile din aceiași categoriie în cele sugerate."
-    clean_up_uploads: "eliminați încărcările orfane și fără referință pentru a prevenii găzduirea ilegală. ATENȚIE: Poate ați dorii să creați o rezervă a /directorului de încărcări înainte de a activa opțiunea."
     clean_orphan_uploads_grace_period_hours: "Perioada de grație (în ore) înainte ca o reîncarcare orfană să fie ștearsă."
     purge_deleted_uploads_grace_period_days: "Perioada de grație (în zile) înainte ca o încărcare ștearsă să fie eliminată."
     enable_s3_uploads: "Pune încărcările pe spațiul Amazon S3."
@@ -648,7 +645,7 @@ ro:
     max_image_size_kb: "Mărimea maximă a unei imagini încărcate în kB. Aceasta trebuie configurată în nginx (client_max_body_size) / apache sau proxy."
     max_attachment_size_kb: "arimea maximă a unui atașament de fișiere încărcate în Kb. Aceasta trebuie configurata în nginx (client_max_body_size) / apache sau proxy."
     authorized_extensions: "O listă de extensii de fișiere permise pentru încărcare (folosiți '*' to pentru activarea tuturor tipurilor de fișiere)"
-    max_similar_results: "Câte discuții similare să apară deasupra editorului la compunerea unei noi discuții? Comparația se face pe titlu și conținut."
+    max_similar_results: "Câte discuții similare vor fi afișate atunci când se începe o discuție nouă? Comparația se face pe titlu și pe conținut."
     title_prettify: "Preveniți greșelile comune și erorile , incluzând toate majuscule, literă mică pentru primul caracter, multtiple ! și ?, extra . la sfârșit, etc."
     topic_views_heat_low: "După atât de multe vizualizări, discuția este parțial luminată."
     topic_views_heat_medium: "După atât de multe vizualizări, discuția este moderat luminată."

config/locales/server.ru.yml

@@ -1274,30 +1274,12 @@ ru:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Резервное копирование успешно завершено"
-      text_body_template: "Резервная копия создана.\nПерейдите в [Админку > Резервные копии](%{base_url}/admin/backups), чтобы её скачать."
     backup_failed:
       subject_template: "Резервное копирование не удалось"
-      text_body_template: |
-        Не удалось сделать резервную копию.
-
-        Детали:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Восстановление данных успешно завершено"
-      text_body_template: "Восстановление выполнено успешно."
     restore_failed:
       subject_template: "Восстановление данных не удалось"
-      text_body_template: |
-        Восстановление не удалось.
-
-        Детали:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Массовое приглашение пользователей успешно выполнено"
       text_body_template: "Ваш файл для массового приглашения пользователей был успешно обработан, отослано приглашений - %{sent}."

config/locales/server.sk.yml

@@ -1243,30 +1243,12 @@ sk:
       subject_template: "Vitajte na %{site_name}!"
     backup_succeeded:
       subject_template: "Záloha skončila úspešne"
-      text_body_template: "Záloha bola úspešná.\nNavštívte [admin > sekcia záloha](%{base_url}/admin/backups) na stiahnutie Vašej novej zálohy."
     backup_failed:
       subject_template: "Záloha sa nepodarila"
-      text_body_template: |
-        Zaloha sa nepodarila.
-
-        Tu je zápis:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Obnova skončila úspešne"
-      text_body_template: "Obnova bola úspešná."
     restore_failed:
       subject_template: "Obnova zlyhala"
-      text_body_template: |
-        Obnova zlyhala.
-
-        Tu je zápis:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Zpracovanie pozvania viacerých používateľov bolo úspešné"
       text_body_template: "Váš súbor na hromadné pozvanie používateľov bol zpracovaný, emailom bolo poslaných %{sent} prihlášok."
@@ -1444,6 +1426,7 @@ sk:
     boolean_no: "Nie"
   static_topic_first_reply: |
     Upravte prvý príspevok v téme pre zmenu obsahu %{page_name} stránky.
+
   guidelines_topic:
     title: "FAQ/Pravidlá"
     body: |

config/locales/server.sq.yml

@@ -15,9 +15,14 @@ sq:
       short: "%m-%d-%Y"
       short_no_year: "%B %-d"
       date_only: "%B %-d, %Y"
+      long: "%B %-d, %Y, %l:%M%P"
   date:
     month_names: [null, Janar, Shkurt, Mars, Prill, Maj, Qershor, Korrik, Gusht, Shtator, Tetor, Nëntor, Dhjetor]
     <<: *datetime_formats
+  time:
+    am: "pd"
+    pm: "md"
+    <<: *datetime_formats
   title: "Discourse"
   topics: "Tema"
   posts: "postime"
@@ -70,6 +75,8 @@ sq:
         other: '%{count} errors prohibited this %{model} from being saved'
     embed:
       load_from_remote: "Postimi nuk mundi të ngarkohet. Riprovoheni!"
+    site_settings:
+      default_categories_already_selected: "Nuk mund të zgjidhni një kategori të përdorur në një tjetër listë."
   bulk_invite:
     file_should_be_csv: "Skedari duhet të jete i formatit csv ose txt"
   backup:
@@ -142,17 +149,17 @@ sq:
       one: "1 postim"
       other: "%{count} postime"
     new-topic: |
-      Welcome to %{site_name} &mdash; **thanks for starting a new conversation!**
+      Mirë se vini te %{site_name} &mdash; **faleminderit që nisët një bisedë të re!**
 
-      - Does the title sound interesting if you read it out loud? Is it a good summary?
+      - A ju duket tërheqës titulli nëse e lexoni me zë të lartë? A është e mirë përmbledhja?
 
-      - Who would be interested in this? Why does it matter? What kind of responses do you want?
+      - Kush do të tërhiqej nga kjo temë? Përse ka rëndësi? Çfarë reagimi prisni?
 
-      - Include commonly used words in your topic so others can *find* it. To group your topic with related topics, select a category.
+      - Përfshini fjalë të përdorura zakonisht në temën tuaj kështu që të tjerët mund **ta gjejnë** atë. Për të grupuar temën tuaj me të ngjashmet, zgjidhni një kategori.
 
-      For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
+      Për më tepër, [lexoni porositë e bashkësisë](/guidelines). Ky panel do t'ju shfaqet vetëm gjatë %{education_posts_text} tuaj të parë.
     new-reply: |
-      Mirë se vini tek %{site_name} &mdash; **faleminderit për kontributin!**
+      Mirë se vini tek %{site_name} &mdash; **faleminderit për ndihmën!**
 
       - Does your reply improve the conversation in some way?
 
@@ -316,11 +323,11 @@ sq:
         one: "1d"
         other: "%{count}d"
       about_x_months:
-        one: "1mon"
+        one: "1muaj"
-        other: "%{count}mon"
+        other: "%{count}muaj"
       x_months:
-        one: "1mon"
+        one: "1muaj"
-        other: "%{count}mon"
+        other: "%{count}muaj"
       about_x_years:
         one: "1y"
         other: "%{count}y"
@@ -351,11 +358,11 @@ sq:
         one: "1 day ago"
         other: "%{count} days ago"
       about_x_months:
-        one: "about 1 month ago"
+        one: "rreth 1 muaj më parë"
-        other: "about %{count} months ago"
+        other: "rreth %{count} muaj më parë"
       x_months:
-        one: "1 month ago"
+        one: "1 muaj më parë"
-        other: "%{count} months ago"
+        other: "%{count} muaj më parë"
       about_x_years:
         one: "about 1 year ago"
         other: "about %{count} years ago"
@@ -371,7 +378,7 @@ sq:
     choose: "Ju lutem, zgjidhni një fjalëkalim"
     update: 'Rifresko Fjalëkalimin'
     save: 'Vendos Fjalëkalim'
-    title: 'Reseto Fjalëkalimin'
+    title: 'Rivendos Fjalëkalimin'
     success: "You successfully changed your password and are now logged in."
     success_unapproved: "You successfully changed your password."
     continue: "Vazhdo tek %{site_name}"
@@ -380,8 +387,9 @@ sq:
     please_continue: "Vazhdo tek %{site_name}"
     error: "There was an error changing your email address. Perhaps the address is already in use?"
   activation:
+    action: "Klikoni këtu për të aktivizuar llogarinë tuaj"
     already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?"
-    please_continue: "Your new account is confirmed; you will be redirected to the home page."
+    please_continue: "Llogaria juaj e re u konfirumua; ju po ridrejtoheni për tek faqja kryesore."
     continue_button: "Vazhdo tek %{site_name}"
     welcome_to: "Mirë se vini tek %{site_name}!"
     approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!"
@@ -468,9 +476,9 @@ sq:
       xaxis: "Ditë"
       yaxis: "Number of new likes"
     flags:
-      title: "Flags"
+      title: "Sinjalizime"
       xaxis: "Ditë"
-      yaxis: "Number of flags"
+      yaxis: "Numri i sinjalizimeve"
     bookmarks:
       title: "Bookmarks"
       xaxis: "Ditë"
@@ -700,7 +708,7 @@ sq:
     login_required: "Require authentication to read content on this site, disallow anonymous access."
     reserved_usernames: "Usernames for which signup is not allowed."
     min_password_length: "Minimum password length."
-    block_common_passwords: "Don't allow passwords that are in the 10,000 most common passwords."
+    block_common_passwords: "Mos lejo fjalëkalimet që gjenden në 10,000 fjalëkalimet më të përdorshme."
     enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)"
     enable_sso_provider: "Implement Discourse SSO provider protocol at the /session/sso_provider endpoint, requires sso_secret to be set"
     sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer"
@@ -870,6 +878,8 @@ sq:
     suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists."
     global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)."
     disable_edit_notifications: "Disables edit notifications by the system user when 'download_remote_images_to_local' is active."
+    automatically_unpin_topics: "Çngjiti temat automatikisht kur përdoruesi arrin fundin e faqes."
+    read_time_word_count: "Numërimi i fjalëve për minutë për të llogaritur kohën e vlerësuar të leximit."
     full_name_required: "Full name is a required field of a user's profile."
     enable_names: "Show the user's full name on their profile, user card, and emails. Disable to hide full name everywhere."
     display_name_on_posts: "Show a user's full name on their posts in addition to their @username."
@@ -897,6 +907,9 @@ sq:
     emoji_set: "How would you like your emoji?"
     enforce_square_emoji: "Force a square aspect ratio to all emojis."
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
+    auto_close_messages_post_count: "Numri më i lartë i lejueshëm i postimeve të lejuara në një mesazh përpara se të mbyllet automatikisht (0 për ta çaktivizuar)"
+    auto_close_topics_post_count: "Numri më i lartë i lejueshëm i postimeve të lejuara në një temë përpara se të mbyllet automatikisht (0 për ta çaktivizuar)"
+    default_topics_automatic_unpin: "Çngjiti temat automatikisht kur përdoruesi arrin fundin e faqes, e paracaktuar."
     errors:
       invalid_email: "Invalid email address."
       invalid_username: "There's no user with that username."
@@ -943,6 +956,12 @@ sq:
     archived_disabled: "This topic is now unarchived. It is no longer frozen, and can be changed."
     closed_enabled: "This topic is now closed. New replies are no longer allowed."
     closed_disabled: "This topic is now opened. New replies are allowed."
+    autoclosed_message_max_posts:
+      one: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje."
+      other: "Ky mesazh u mbyll automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve."
+    autoclosed_topic_max_posts:
+      one: "Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të 1 përgjigjeje."
+      other: "Kjo temë është mbyllur automatikisht pasi arriti kufirin e lejueshëm të %{count} përgjigjeve."
     autoclosed_enabled_days:
       one: "This topic was automatically closed after 1 day. New replies are no longer allowed."
       other: "This topic was automatically closed after %{count} days. New replies are no longer allowed."
@@ -1007,8 +1026,8 @@ sq:
       max_new_accounts_per_registration_ip: "New registrations are not allowed from your IP address (maximum limit reached). Contact a staff member."
   flags_reminder:
     subject_template:
-      one: "1 flag waiting to be handled"
+      one: "1 sinjalizim në pritje për t'u trajtuar"
-      other: "%{count} flags waiting to be handled"
+      other: "%{count} sinjalizime në pritje për t'u trajtuar"
   invite_mailer:
     subject_template: "%{invitee_name} invited you to '%{topic_title}' on %{site_domain_name}"
     text_body_template: |
@@ -1028,16 +1047,43 @@ sq:
 
       This invitation is from a trusted user, so you can reply to the discussion immediately.
   invite_forum_mailer:
-    subject_template: "%{invitee_name} invited you to join %{site_domain_name}"
+    subject_template: "%{invitee_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
+    text_body_template: |
+      %{invitee_name} ju ka ftuar të bëheni pjesë e
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Nëse jeni i interesuar, klikoni lidhjen e mëposhtme:
+      %{invite_link}
+
+      Kjo ftesë vjen nga një përdorues i besuar, si rrjedhojë një llogari do të krijohet automatikisht për ju.
+  custom_invite_forum_mailer:
+    subject_template: "%{invitee_name} ju ka ftuar të bëheni pjesë e %{site_domain_name}"
+    text_body_template: |
+      %{invitee_name} ju ka ftuar të bëheni pjesë e
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      Mesazhi nga %{invitee_name}:
+
+      %{user_custom_message}
+
+      Nëse jeni i interesuar, klikoni lidhjen e mëposhtme:
+      %{invite_link}
+
+      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: |
-      Thanks for accepting your invitation to %{site_name} -- welcome!
+      Faleminderit që pranuat ftesën tek %{site_name} -- mirësevini!
 
-      Click this link to choose a password now:
+      Klikoni këtë lidhje për të zgjedhur një fjalëkalim tani:
       %{base_url}/users/password-reset/%{email_token}
 
-      (If the link above has expired, choose "I forgot my password" when logging in with your email address.)
+      (Nëse lidhjes së mësipërme i ka mbaruar afati, zgjidhni "Kam harruar fjalëkalimin" kur të hyni me adresën tuaj email.)
+
   test_mailer:
     subject_template: "[%{site_name}] Email Deliverability Test"
   new_version_mailer:
@@ -1059,20 +1105,113 @@ sq:
     disagreed: "Thanks for letting us know. We're looking into it."
     deferred: "Thanks for letting us know. We're looking into it."
     deferred_and_deleted: "Thanks for letting us know. We've removed the post."
-  temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags."
+  temporarily_closed_due_to_flags: "Kjo temë është përkohësisht e mbyllur për shkak të një numri të madh sinjalizimesh nga bashkësia."
   system_messages:
+    usage_tips:
+      text_body_template: |
+        Ja ca këshilla të shpejta sa për t'ia filluar:
+
+        ## Leximi
+
+        Për të lexuar më shumë, **thjesht vazhdo të zbresësh poshtë!**
+
+        Ndërsa përgjigje apo tema të reja vazhdojnë të vinë, ato do të shfaqen automatikisht - pa nevojën për të rifreskuar faqen.
+
+        ## Lundrimi
+
+        Për kërkimin, faqen tënde të përdoruesit, apo <kbd>☰</kbd> menunë, përdor **butonat ikonë lart në të djathtë**.
+
+        - Kur zgjedh një titull teme do të shkosh gjithmonë tek **përgjigja jote e radhës e palexuar** në atë temë. Për të kaluar në krye apo në fund, zgjidh numrin e përgjigjeve ose datën e përgjigjes së fundit.
+
+        <img src="%{base_url}/images/welcome/topic-list-select-areas-2x.png" width="593" height="59">
+
+        - Ndërkohë që lexon një temë, përdor treguesin kohor në të djathtë për të kaluar në krye, fund apo në vendndodhjen e fundit të leximit. Në ekranë të vegjël, zgjidh shiritin e progresit në fund djathtas për ta shpalosur atë:
+
+        <img src="%{base_url}/images/welcome/progress-bar-2x.png" width="153" height="181">
+
+        Gjithashtu mund të shtypni <kbd>?</kbd> në tastierën tuaj për një listë shkurtoresh super-të-shpejta.
+
+        ## Përgjigjet
+
+        Për të shtuar një citim, zgjidhni tekstin që dëshironi të citoni, pastaj shtypni një nga butonat Përgjigju <img src="%{base_url}/images/welcome/reply-post-2x.png" width="25" height="23"> për të hapur kutinë e shkrimit. Përsëriteni për citime të shumta.
+
+        <img src="%{base_url}/images/welcome/quote-reply-2x.png" width="326" height="128">
+
+        Mund të vazhdoni të lexoni sa herë që shkruani përgjigjen tuaj, ne do të ruajmë boca sa herë që shtypni.
+
+        Për të njoftuar dikë rreth përgjigjes tuaj, përmendni emrin e tyre. Shtypni `@` për të vazhduar me përzgjedhjen e emrit të përdoruesit.
+
+        <img src="%{base_url}/images/welcome/username-completion-2x.png" width="191" height="125">
+
+        Për të përdorur [standard Emoji](http://www.emoji.codes/), thjesht shtypni `:` për ta gjetur sipas emrit, ose përdorni ikonat e zakonshme `;)`
+
+        <img src="%{base_url}/images/welcome/emoji-completion-2x.png" width="144" height="153">
+
+        Për të nxjerrë një përmbledhje për një lidhje, ngjiteni atë në një rresht të vetin:
+
+        <img src="%{base_url}/images/welcome/link-oneboxing-animation.gif" width="480" height="228">
+
+        Përgjigjja juaj mund të trajtohet duke përdorur HTML të thjeshtë, BBCode, ose [Markdown](http://commonmark.org/help/):
+
+        Kjo është **me gërma të trasha**.
+        Kjo është <b>me gërma të trasha</b>.
+        Kjo është [b]me gërma të trasha[/b].
+
+        Për më tepër këshilla trajtimi teksti, [provo praktikën tonë ndërvepruese dhe argëtuese veç 10 minuta!](http://commonmark.org/help/tutorial/)
+
+        ## Veprimet
+
+        Gjenden butona veprimi në fund të çdo postimi:
+
+        <img src="%{base_url}/images/welcome/like-link-flag-bookmark-2x.png" width="162" height="42">
+
+        - Për t'ia bërë të ditur dikujt që ju pëlqeu apo e vlerësuat postimin e tyre, përdorni butonin **pëlqen**. Shpërndaj dashuri!
+
+        - Kap një lidhje të kopjueshme dhe të ngjitshme të secilës përgjigje apo temë me anë të butonit **lidhje**.
+
+        - Përdor butonin <kbd>&hellip;</kbd> më shumë për të shfaqur veprime të tjera.**Sinjalizo** që t'ia bësh të ditur privatish autorit, apo [stafit tonë](%{base_url}/about), rreth ndonjë problemi. **Shëno** për ta gjetur këtë postim më vonë në faqen tënde të profilit.
+
+        ## Njoftimet
+
+        Kur dikush të përgjigjet, citon postimin tënd, përmend `@username` tënd, apo dhe vetëm bën një lidhje tek postimi yt, një numër do të shfaqet menjëherë lart në të djathtë të faqes. Zgjidhe për t'iu qasur **njoftimeve** të tua.
+
+        <img src="%{base_url}/images/welcome/notification-panel-2x.png" width="160" height="54">
+
+        Mos u shqetësoni për ndonjë përgjigje të palexuar - do të njoftoheni me email për çdo njoftim që mbërrin kur jeni larg faqes.
+
+        ## Pëlqimet
+
+        - Të gjitha temat më të vjetra se sa **2 ditë** quhen të reja.
+
+        - Çdo temë ku keni marrë pjesë në mënyrë aktive (duke e krijuar atë, duke u përgjigjur, apo duke e lexuar për një periudhë të gjatë) do të gjurmohen për ju.
+
+        Do të shihni numrat tregues për të rejat dhe të palexuarat krahas këtyre temave:
+
+        <img src="%{base_url}/images/welcome/topics-new-unread-2x.png" width="341" height="106">
+
+        Ju mund t'i ndryshoni këto njoftime për cilëndo temë me anë të butonit të kontrollit të njoftimeve në fund, dhe në të djathtë të secilës temë.
+
+        <img src="%{base_url}/images/welcome/topic-notification-control-2x.png" width="608" height="312">
+
+        Gjithashtu mund të caktoni gjendjen e njoftimit për kategorinë, nëse dëshironi të heshtur çdo temë në një kategori të veçantë.
+
+        Për të ndryshuar ndonjë nga këto rregullime, shikoni [pëlqimet tuaja të përdoruesit](%{base_url}/my/preferences).
+
+        ## Mirëbesim Komuniteti
+
+        Është kënaqësi t'ju takoj! Ndërsa merrni pjesë këtu, me kalimin e kohës do kemi mundësi t'ju njohim, dhe kufizimet e përkohshme si përdorues i ri do të hiqen. Vazhdoni merrni pjesë, dhe me kalimin e kohës ju do të fitoni [nivele të reja mirëbesimi](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) që përfshijnë mundësi të veçanta për të na ndihmuar në drejtimin e komunitetit tonë së bashku.
     welcome_user:
       subject_template: "Mirë se vini tek %{site_name}!"
       text_body_template: |
-        Thanks for joining %{site_name}, and welcome!
+        Faleminderit që iu bashkuat %{site_name}, dhe mirësevini!
 
         %{new_user_tips}
 
-        We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
+        Ne besojmë në [sjelljen e qytetëruar të komunitetit](%{base_url}/guidelines) kurdoherë.
 
-        Enjoy your stay!
+        Shijojeni qëndrimin tuaj!
 
-        (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.)
+        (Nëse ju duhet të komunikoni me [anëtarët e stafit](%{base_url}/about) si një anëtar i ri, thjesht përgjigjuni këtij mesazhi.)
     welcome_invite:
       subject_template: "Mirë se vini tek %{site_name}!"
       text_body_template: |
@@ -1097,30 +1236,12 @@ sq:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Backup completed successfully"
-      text_body_template: "The backup was successful.\nVisit the [admin > backup section](%{base_url}/admin/backups) to download your new backup."
     backup_failed:
       subject_template: "Backup failed"
-      text_body_template: |
-        The backup has failed.
-
-        Here's the log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Restore completed successfully"
-      text_body_template: "The restore was successful."
     restore_failed:
       subject_template: "Restore failed"
-      text_body_template: |
-        The restore has failed.
-
-        Here's the log:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Bulk user invite processed successfully"
       text_body_template: "Your bulk user invite file was processed, %{sent} invites mailed."
@@ -1304,26 +1425,26 @@ sq:
       top_topics: "Popular posts"
       other_new_topics: "Popular topics"
       click_here: "click here"
-      read_more: "Read More"
+      read_more: "Më Shumë"
       more_topics: "There were %{new_topics_since_seen} other new topics."
       more_topics_category: "More new topics:"
     forgot_password:
-      subject_template: "[%{site_name}] Password reset"
+      subject_template: "[%{site_name}] Rivendosje fjalëkalimi"
       text_body_template: |
-        Somebody asked to reset your password on [%{site_name}](%{base_url}).
+        Dikush kërkoi për të rivendosur fjalëkalimin tuaj tek [%{site_name}](%{base_url}).
 
-        If it was not you, you can safely ignore this email.
+        Nëse nuk ishit ju, mund të mos e merrni parasysh këtë email pa asnjë problem.
 
-        Click the following link to choose a new password:
+        Klikoni lidhjen e mëtejshme për të zgjedhur një fjalëkalim të ri:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Set Password"
       text_body_template: |
-        Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address.
+        Dikush kërkoi për të shtuar një fjalëkalim tek [%{site_name}](%{base_url}). Nga ana tjetër, mund të hyni në sistem duke përdorur një nga shërbimet online që mbështeten (Google, Facebook, etj) i cili është i lidhur me këtë adresë email.
 
-        If you did not make this request, you can safely ignore this email.
+        Nëse nuk e bëtë ju këtë kërkesë, mund të mos e merrni parasysh këtë email pa asnjë problem.
 
-        Click the following link to choose a password:
+        Klikoni lidhjen e mëtejshme për të zgjedhur një fjalëkalim:
         %{base_url}/users/password-reset/%{email_token}
     admin_login:
       subject_template: "[%{site_name}] Login"
@@ -1337,38 +1458,47 @@ sq:
     account_created:
       subject_template: "[%{site_name}] Your New Account"
       text_body_template: |
-        A new account was created for you at %{site_name}
+        Një llogari e re u krijua për ju tek %{site_name}
 
-        Click the following link to choose a password for your new account:
+        Klikoni lidhjen e mëtejshme për të zgjedhur një fjalëkalim për llogarinë tuaj të re:
         %{base_url}/users/password-reset/%{email_token}
+    confirm_old_email:
+      text_body_template: |
+        Përpara se sa ta ndryshoni adresën tuaj email, nevojitet të konfirmoni që jeni i
+        zoti i saj. Pasi ta përmbushni këtë hap, ne
+        do të miratojmë adresën tuaj të re email.
+
+        Konfirmoni adresën tuaj të tanishme email për %{site_name} duke klikuar lidhjen e mëtejshme:
+
+        %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
       subject_template: "You've been approved on %{site_name}!"
       text_body_template: |
-        Welcome to %{site_name}!
+        Mirësevini tek %{site_name}!
 
-        A staff member approved your account on %{site_name}.
+        Një anëtar stafi miratoi llogarinë tuaj në %{site_name}.
 
-        Click the following link to confirm and activate your new account:
+        Klikoni lidhjen e mëtejshme për të konfirmuar dhe aktivizuar llogarinë tuaj të re:
         %{base_url}/users/activate-account/%{email_token}
 
-        If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
+        Nëse lidhja e mësipërme nuk punon, mundohuni ta kopjoni dhe hapni atë në shfletuesin tuaj web.
 
         %{new_user_tips}
 
-        We believe in [civilized community behavior](%{base_url}/guidelines) at all times.
+        Ne besojmë në [sjelljen e qytetëruar të komunitetit](%{base_url}/guidelines) kurdoherë.
 
-        Enjoy your stay!
+        Shijojeni qëndrimin tuaj!
 
-        (If you need to communicate with [staff members](%{base_url}/about) as a new user, just reply to this message.)
+        (Nëse ju duhet të komunikoni me [anëtarët e stafit](%{base_url}/about) si një anëtar i ri, thjesht përgjigjuni këtij mesazhi.)
     signup:
-      subject_template: "[%{site_name}] Confirm your new account"
+      subject_template: "[%{site_name}] Konfirmoni llogarinë tuaj të re"
       text_body_template: |
-        Welcome to %{site_name}!
+        Mirësevini tek %{site_name}!
 
-        Click the following link to confirm and activate your new account:
+        Klikoni lidhjen e mëtejshme dhe aktivizoni llogarinë tuaj të re:
         %{base_url}/users/activate-account/%{email_token}
 
-        If the above link is not clickable, try copying and pasting it into the address bar of your web browser.
+        Nëse lidhja e mësipërme nuk punon, mundohuni ta kopjoni dhe hapni atë në shfletuesin tuaj web.
   page_not_found:
     popular_topics: "Popular"
     recent_topics: "Recent"
@@ -1679,8 +1809,6 @@ sq:
   performance_report:
     initial_post_raw: This topic includes daily performance reports for your site.
     initial_topic_title: Raportet e performancës se faqes
-  time:
-    <<: *datetime_formats
   activemodel:
     errors:
       <<: *errors

config/locales/server.sv.yml

@@ -1036,7 +1036,6 @@ sv:
     auto_block_first_post_regex: "Skriftlägeskänsligt regex som om godkänt kommer att orsaka att första inlägget av en användare blockeras och skickas till kön för saker som behöver granskas. Exempel: raging|a[bc]a kommer att orsaka att alla inlägg som börjar med raging eller aba eller aca blockeras vid första försöket. Gäller endast användarens första inlägg. "
     reply_by_email_enabled: "Aktivera möjlighet att svara på ämnen via e-post."
     reply_by_email_address: "Mall för inkommande e-postadress för svar via e-post, till exempel: %{reply_key}@svar.exempel.se eller svar+%{reply_key}@exempel.se"
-    alternative_reply_by_email_addresses: "Lista av alternativa mallar för inkommande e-postadresser för svar via e-post."
     incoming_email_prefer_html: "Använd HTML istället för texten för inkommande e-post. Kan orsaka oväntade formatteringsproblem!"
     disable_emails: "Förhindra Discourse från att skicka någon form av e-post"
     strip_images_from_short_emails: "Rensa bilder från e-post som har mindre storlek än 2800 bytes."
@@ -1048,10 +1047,11 @@ sv:
     max_emails_per_day_per_user: "Högsta antal e-postmeddelanden att skicka till användare per dag. Ange 0 för att inaktivera gränsen"
     enable_staged_users: "Skapa automatiskt arrangerade användare vid bearbetning av inkommande e-post."
     maximum_staged_users_per_email: "Högsta antal arrangerade användare skapade vid bearbetning av inkommande e-post."
-    auto_generated_whitelist: "Lista av e-postadresser som inte undersöks för autogenererat innehåll."
     block_auto_generated_emails: "Blockera inkommande e-post som identifieras som autogenererat."
     ignore_by_title: "Ignorera inkommande e-post baserat på dess rubrik."
     mailgun_api_key: "Mailgun Secret API-nyckel att använda för att verifiera webhook-meddelanden."
+    attachment_content_type_blacklist: "lista av fraser som används till att svartlista bilagor baserade på innehållstyper"
+    attachment_filename_blacklist: "Lista över fraser som används till att svartlista bilagor baserade på filnamnet"
     pop3_polling_enabled: "Poll via POP3 för e-postsvar."
     pop3_polling_ssl: "Använd SSL vid anslutning till POP3-servern. (Rekommenderat)"
     pop3_polling_period_mins: "Tidsintervall i minuter mellan varje kontroll av POP3-kontot för e-post. OBS: kräver omstart."
@@ -1403,34 +1403,8 @@ sv:
     subject_template: "[%{site_name}] E-postlevereringstest"
   new_version_mailer:
     subject_template: "[%{site_name}] Ny version av Discourse, uppdatering tillgänglig"
-    text_body_template: |
-      Hurra, en ny version av [Discourse](http://www.discourse.org) är tillgänglig!
-
-      Din version: %{installed_version}
-      Ny version: **%{new_version}**
-
-      - Uppgradera genom att använda den enkla **[uppgraderingsknappen](%{base_url}/admin/upgrade)** i din webbläsare.
-
-      - Se uppdateringarna i [GitHubs ändringslogg](https://github.com/discourse/discourse/commits/master)
-
-      - Besök [meta.discourse.org](http://meta.discourse.org) för att läsa de senaste nyheterna, diskutera och besöka kundtjänsten för Discourse
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] uppdatering tillgänglig"
-    text_body_template: |
-      Hurra, en ny version av [Discourse](http://www.discourse.org) är tillgänglig!
-
-      Din version: %{installed_version}
-      Ny version: **%{new_version}**
-
-      - Uppgradera genom att använda den enkla **[uppgraderingsknappen](%{base_url}/admin/upgrade)** i din webbläsare.
-
-      - Se uppdateringarna i [GitHubs ändringslogg](https://github.com/discourse/discourse/commits/master)
-
-      - Besök [meta.discourse.org](http://meta.discourse.org) för att läsa de senaste nyheterna, diskutera och få support för Discourse
-
-      ### Versionsinformation
-
-      %{notes}
   queued_posts_reminder:
     subject_template:
       one: "[%{site_name}] 1 användare väntar på att granskas"
@@ -1595,29 +1569,12 @@ sv:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Säkerhetskopia skapades utan problem"
-      text_body_template: "Säkerhetskopieringen lyckades.\nBesök [admin > säkerhetskopiering](%{base_url}/admin/backups) för att hämta den nya säkerhetskopian."
     backup_failed:
       subject_template: "Säkerhetskopiering misslyckades"
-      text_body_template: |
-        Säkerhetskopieringen misslyckades.
-
-        Här är loggen:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Återställningen lyckades!"
-      text_body_template: "Återställningen lyckades."
     restore_failed:
       subject_template: "Återställningen misslyckades"
-      text_body_template: |
-        Återställningen misslyckades.
-
-        Här är loggen:
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Massinbjudning av användare behandlades utan fel "
       text_body_template: "Din massinbjudning av användare behandlades, %{sent} inbjudningar skickades."
@@ -1726,12 +1683,6 @@ sv:
         %{post_error}
 
         Om du kan åtgärda problemet, var vänlig försök igen.
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] E-postfel -- Begränsningsgrad"
-      text_body_template: |
-        Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas.
-
-        Orsak: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] E-postfel -- Ogiltig poståtgärd"
       text_body_template: |
@@ -1855,10 +1806,6 @@ sv:
     [Klicka här ](%{unsubscribe_url}) för att avprenumerera från de här e-postmeddelandena.
   unsubscribe_link_and_mail: |
     [Klicka här ](%{unsubscribe_url}) för att avprenumerera från de här e-postmeddelandena.
-  unsubscribe_mailing_list: |
-    Du mottar de här e-postmeddelandena för att du har aktiverat utskicksläge.
-
-    [Klicka här](%{unsubscribe_url}) för att avprenumerera från de här e-postmeddelandena.
   subject_re: "Sv:"
   subject_pm: "[PM]"
   user_notifications:
@@ -2280,6 +2227,8 @@ sv:
       ## [Användarvillkor](#tos)
 
       Ja, vi vet att juristspråk är tråkigt men vi måste skydda oss själva – och i förlängningen du och din data – mot otrevliga människor. Vi har [användarvillkor](/tos) som beskriver din (och våra) uppföranden och rättigheter relaterat till innehåll, integritet och lagar. För att använda den här tjänsten måste du samtycka till våra [användarvillkor](/tos).
+
+
   tos_topic:
     title: "Villkor"
   privacy_topic:
@@ -2462,6 +2411,8 @@ sv:
     famous_link:
       name: Berömd länk
       description: Lade upp en extern länk med 1000 klick
+      long_description: |
+        Den här utmärkelsen beviljas när en länk som du har delat får 1000 klick. Wow! Du delade en länk som förbättrade konversationen avsevärt genom att addera en väsentlig detalj, ett bra sammanhang och bättre informering. Bra jobbat!
     appreciated:
       name: Uppskattad
       description: Fick 1 gillning på 20 inlägg

config/locales/server.tr_TR.yml

@@ -1200,35 +1200,12 @@ tr_TR:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Yedekleme başarıyla tamamlandı"
-      text_body_template: "Yedekleme işlemi başarıyla tamamlandı.\nYeni yedeğinizi [Yönetici Paneli > Yedekler](%{base_url}/admin/backups) adresinden indirebilirsiniz."
     backup_failed:
       subject_template: "Yedekleme başarısız"
-      text_body_template: |
-        Yedekleme başarısız oldu.
-
-        Kayıtlar burada:
-
-        ```
-
-        %{logs}
-
-        ```
-
     restore_succeeded:
       subject_template: "Geri alma başarıyla tamamlandı"
-      text_body_template: "Geri alma başarıyla tamamlandı."
     restore_failed:
       subject_template: "Geri alma başarısız"
-      text_body_template: |
-        Geri alma başarısız oldu.
-
-        Kayıtlar burada:
-
-        ```
-
-        %{logs}
-
-        ```
     bulk_invite_succeeded:
       subject_template: "Toplu davet gönderimi başarıyla tamamlandı"
       text_body_template: "Toplu davet dosyanız işlendi, %{sent} davetiye gönderildi. "

config/locales/server.vi.yml

@@ -901,7 +901,7 @@ vi:
     email_time_window_mins: "Chờ (n) phút trước khi gửi bất kỳ một email thông báo nào, để cung cấp cho người dùng cơ hội để chỉnh sửa và hoàn tất bài viết của họ."
     private_email_time_window_seconds: "Đợi (n) giây trước khi gửi bất kỳ thông báo email nào, để cho thành viên cơ hội để chỉnh sửa và hoàn thiện các thông điệp của họ."
     email_posts_context: "Có bao nhiêu trả lời trước được kèm theo như là bối cảnh trong email thông báo."
-    flush_timings_secs: "Tần suất tuôn dữ liệu thời gan tới server, theo giây."
+    flush_timings_secs: "Tần suất tuôn dữ liệu thời gian tới server, theo giây."
     title_max_word_length: "Chiều dài tối đa chữ cho phép, tính theo ký tự, trong một tiêu đề chủ đề."
     title_min_entropy: "Entropy tối thiểu (ký tự độc đáo, số từ phi tiếng Anh) cần thiết cho tên chủ đề."
     body_min_entropy: "Entropy tối thiểu (ký tự độc đáo, số từ phi tiếng Anh) cần thiết cho nội dung bài viết."
@@ -1269,30 +1269,12 @@ vi:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Sản sao lưu hoàn tất thành công"
-      text_body_template: "Bản sao lưu đã được tạo thành công.\nTruy cập [admin > backup section](%{base_url}/admin/backups) để download bản sao lưu mới."
     backup_failed:
       subject_template: "Sao lưu lỗi."
-      text_body_template: |
-        Sao lưu lỗi.
-
-        Đây là log:
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "Phục hồi thành công"
-      text_body_template: "Phục hồi đã thành công."
     restore_failed:
       subject_template: "Phục hồi thất bại."
-      text_body_template: |
-        Phục hồi thất bại.
-
-        Đây là log:
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "Mời thành viên hàng loạt đã được thực hiện thành công"
       text_body_template: "File mời thành viên hàng loạt của bạn đã được thực hiện, %{sent} lời mời đã được gửi."
@@ -1395,12 +1377,6 @@ vi:
         %{post_error}
 
         Nếu bạn có thể khắc phục sự cố, xin hãy thử lại.
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] Sự cố email -- Tỷ lệ giới hạn"
-      text_body_template: |
-        Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện.
-
-        Lý do: %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] Sự cố email -- Hành động gửi bài không hợp lệ"
       text_body_template: |

config/locales/server.zh_CN.yml

@@ -49,7 +49,7 @@ zh_CN:
         insufficient_trust_level_error: "用户尝试在用户等级不满足分类要求时发帖。"
         reply_user_not_matching_error: "回复邮箱地址与通知发送至的邮件地址不同。"
         topic_not_found_error: "回复到已经删除的主题。"
-        topic_closed_error: "回复到已经关闭的主题。"
+        topic_closed_error: "回复到已经锁定的主题。"
         bounced_email_error: "邮件是投递失败的错误报告。"
         screened_email_error: "发件人邮箱已经被封禁。"
   errors: &errors
@@ -518,9 +518,9 @@ zh_CN:
     topic_description: "点击链接 %{link} 重新订阅，或是使用主题底部或右侧的通知控制。"
   unsubscribe:
     title: "退订"
-    stop_watching_topic: "停止关注该主题，%{link}"
+    stop_watching_topic: "停止监看该主题，%{link}"
-    mute_topic: "屏蔽该主题的所有通知，%{link}"
+    mute_topic: "关闭此主题的所有通知，%{link}"
-    unwatch_category: "停止关注%{category}分类中的所有主题"
+    unwatch_category: "停止监看%{category}分类中的所有主题"
     mailing_list_mode: "停用邮件列表模式"
     disable_digest_emails: "不要给我发送摘要邮件"
     all: "不要从%{sitename}给我发送任何邮件"
@@ -782,14 +782,13 @@ zh_CN:
     allow_html_tables: "允许在输入 Markdown 文本时使用表格 HTML 标签。标签 TABLE、THEAD、TD、TR、TH 将被允许使用，即白名单这些标签（需要重置所有包含表格的老帖子的 HTML）"
     post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数"
     must_approve_users: "新用户在被允许访问站点前需要由管理人员批准。警告：在运行的站点中启用将解除所有非管理人员用户的访问权限！"
-    pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置-1关闭通知。"
+    pending_users_reminder_delay: "如果新用户等待批准时间超过此小时设置则通知版主。设置 -1 关闭通知。"
     maximum_session_age: "用户自访问后可维持登录 n 小时"
     ga_tracking_code: "废弃：Google 分析追踪代码（ga.js），例如：UA-12345678-9。参考 http://google.com/analytics"
     ga_domain_name: "废弃：Google 分析域名（ga.js），例如：mysite.com；参考 http://google.com/analytics"
     ga_universal_tracking_code: "Google 通用分析追踪代码（analytics.js）追踪代码，例如：UA-12345678-9；参考 http://google.com/analytics"
     ga_universal_domain_name: "Google 通用分析域名（analytics.js）追踪代码，例如：mysite.com；参考 http://google.com/analytics"
     gtm_container_id: "Google Tag Manager 容器 id。例如：GTM-ABCDEF"
-    gtm_ua_domain_name: "在 Google Tag manager 域名下的 Universal Analytics。推荐使用 “auto”。"
     enable_escaped_fragments: "如未侦测到爬虫回退到使用 Google Ajax-Crawling API。参见 https://developers.google.com/webmasters/ajax-crawling/docs/learn-more"
     enable_noscript_support: "通过 no script 标签启用对标准爬虫的支持。"
     allow_moderators_to_create_categories: "允许版主创建新的分类"
@@ -1005,7 +1004,6 @@ zh_CN:
     auto_block_first_post_regex: "大小写不相关的正则表达式，如果匹配成功，会导致该用户不能发表第一帖，而是进入审核队列。例如：求下载|谢谢楼[主猪]，会阻止包含求下载、谢谢楼主或谢谢楼猪的帖子。该选项只适用于首贴。"
     reply_by_email_enabled: "启用通过邮件回复。"
     reply_by_email_address: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com 或 replies+%{reply_key}@example.com"
-    alternative_reply_by_email_addresses: "其他通过邮件回复的回复地址模板列表。例如：%{reply_key}@reply.example.com|replies+%{reply_key}@example.com。"
     incoming_email_prefer_html: "对进站邮件优先使用 HTML 而不是纯文本。可能导致格式问题。"
     disable_emails: "禁止 Discourse 发送任何邮件"
     strip_images_from_short_emails: "忽略邮件中小于 2800 字节的图片"
@@ -1017,14 +1015,9 @@ zh_CN:
     max_emails_per_day_per_user: "每日发送给用户的最大帖子数量。设置为 0 禁止限制"
     enable_staged_users: "处理进站邮件时自动创建暂存用户。"
     maximum_staged_users_per_email: "处理进站邮件时可创建的最大暂存用户量。"
-    auto_generated_whitelist: "跳过自动生成内容检测的邮件类别。例如：foo@bar.com|discourse@bar.com"
     block_auto_generated_emails: "阻止被检测为自动生成的进站邮件。"
     ignore_by_title: "使用正则表达式根据标题忽略进站邮件。"
     mailgun_api_key: "用以验证 webhook 消息的 Mailgun 密钥 API。"
-    soft_bounce_score: "当临时拒信时，增加用户的累计退信分值。"
-    hard_bounce_score: "当长时拒信时，增加用户的累计退信分值。"
-    bounce_score_threshold: "停止给用户发信的累计退信分值。"
-    bounce_score_threshold_deactivate: "取消激活用户的累计退信分值。"
     reset_bounce_score_after_days: "自动在 X 天后重置累计退信分值。"
     manual_polling_enabled: "用 API 推送邮件回复。"
     pop3_polling_enabled: "轮询 POP3 收取邮件回复。"
@@ -1111,7 +1104,7 @@ zh_CN:
     approve_unless_trust_level: "该信任等级之下的用户的帖子必须被审核"
     notify_about_queued_posts_after: "如果帖子在设定的小时数后仍在等候处理，发送一封邮件至 contact_email。设为 0 将禁用这些邮件。"
     auto_close_messages_post_count: "消息中贴子数上限，达到后自动关闭消息（0 为禁用）"
-    auto_close_topics_post_count: "主题中贴子数上限，达到后自动关闭主题（0 为禁用）"
+    auto_close_topics_post_count: "主题中贴子数上限，达到后自动关闭主题 ( 0 为禁用 )"
     code_formatting_style: "编辑器中的代码格式化按钮设置的默认格式"
     default_email_digest_frequency: "用户收到摘要邮件的默认频率。"
     default_include_tl0_in_digests: "在摘要邮件中默认包含新用户帖子。用户可以自行在参数设置中更改这个设置。"
@@ -1146,7 +1139,7 @@ zh_CN:
     staff_tags: "只可由管理人员使用的标签列表"
     min_trust_level_to_tag_topics: "给主题加标签的最小信任等级"
     suppress_overlapping_tags_in_list: "如果在列表视图中，主题标题包含标签，则隐藏标签"
-    remove_muted_tags_from_latest: "最新主题列表中不显示包含已屏蔽标签的主题。"
+    remove_muted_tags_from_latest: "在最新主题列表中，不显示有静音标签的主题。"
     errors:
       invalid_email: "电子邮箱地址无效。"
       invalid_username: "没有这个用户名的用户。"
@@ -1208,24 +1201,24 @@ zh_CN:
   topic_statuses:
     archived_enabled: "本主题已归档，即已经冻结，无法修改。"
     archived_disabled: "本主题已被解除归档，即不再冻结，可以修改。"
-    closed_enabled: "本主题已关闭，不再接受新的回复。"
+    closed_enabled: "该主题现已关闭，不再允许新的回复。"
     closed_disabled: "本主题已开放，可以发表新的回复。"
     autoclosed_message_max_posts:
-      other: "消息中回复已经达到上限 %{count}，自动关闭。"
+      other: "消息中回复已经达到上限 %{count}，自动锁定。"
     autoclosed_topic_max_posts:
       other: "主题中回复已经达到上限 %{count}，自动关闭。"
     autoclosed_enabled_days:
-      other: "本主题在创建%{count}天后自动关闭。不再允许添加新回复。"
+      other: "该主题在创建%{count}天后自动关闭。不再允许添加新回复。"
     autoclosed_enabled_hours:
-      other: "本主题在创建%{count}小时后自动关闭。不再允许添加新回复。"
+      other: "该主题在创建%{count}小时后自动关闭。不再允许新的回复。"
     autoclosed_enabled_minutes:
-      other: "本主题在创建%{count}分钟后自动关闭。不再允许添加新回复。"
+      other: "该主题在创建%{count}分钟后自动关闭。不再允许新的回复。"
     autoclosed_enabled_lastpost_days:
-      other: "本主题在最后一个回复创建后%{count}天后自动关闭。不再允许添加新回复。"
+      other: "该主题在最后一个回复创建后%{count}天后自动关闭。不再允许新的回复。"
     autoclosed_enabled_lastpost_hours:
-      other: "本主题在最后一个回复创建后%{count}小时后自动关闭。不再允许添加新回复。"
+      other: "该主题在最后一个回复创建后%{count}小时后自动关闭。不再允许添加新回复。"
     autoclosed_enabled_lastpost_minutes:
-      other: "本主题在最后一个回复创建后%{count}分钟后自动关闭。不再允许添加新回复。"
+      other: "本主题在最后一个回复创建后%{count}分钟后自动锁定。不再允许添加新回复。"
     autoclosed_disabled: "本主题是开放的，可以添加新的回复。"
     autoclosed_disabled_lastpost: "本主题现在开放了。可以添加新的回复。"
     pinned_enabled: "本主题已置顶，它将始终显示在它所属分类的顶部。可由管理人员对所有人解除置顶，或者由用户自己取消置顶。"
@@ -1418,34 +1411,8 @@ zh_CN:
       [mt]: http://www.mail-tester.com/
   new_version_mailer:
     subject_template: "[%{site_name}] 有新的 Discourse 版本，可供升级"
-    text_body_template: |
-      哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升级！
-
-      你的版本：%{installed_version}
-      新的版本：**%{new_version}**
-
-      - 浏览器访问[浏览器更新工具](%{base_url}/admin/upgrade) 升级。
-
-      - 查看[GitHub 改动日志（英文）](https://github.com/discourse/discourse/commits/master)中更新的内容。
-
-      - 访问 [meta.discourse.org（英文）](https://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](https://meta.discoursecn.org) 获得支持。
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] 可以升级"
-    text_body_template: |
-      哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升级！
-
-      你的版本：%{installed_version}
-      新的版本：**%{new_version}**
-
-      - 浏览器访问[浏览器更新工具](%{base_url}/admin/upgrade) 升级。
-
-      - 查看[GitHub 改动日志（英文）](https://github.com/discourse/discourse/commits/master)中更新的内容。
-
-      - 访问 [meta.discourse.org（英文）](https://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](https://meta.discoursecn.org) 获得支持。
-
-      ### 发行注记
-
-      %{notes}
   queued_posts_reminder:
     subject_template:
       other: "[%{site_name}] %{count} 个帖子等待审核"
@@ -1609,30 +1576,12 @@ zh_CN:
         [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "备份成功完成"
-      text_body_template: "备份成功。\n\n访问[管理 > 备份](%{base_url}/admin/backups)下载你的新备份文件。"
     backup_failed:
       subject_template: "备份失败"
-      text_body_template: |
-        备份已经失败了。
-
-        以下是日志：
-
-        ```
-        %{logs}
-        ```
     restore_succeeded:
       subject_template: "恢复成功完成"
-      text_body_template: "恢复已经成功。"
     restore_failed:
       subject_template: "恢复失败"
-      text_body_template: |
-        恢复失败。
-
-        以下是日志：
-
-        ```
-        %{logs}
-        ```
     bulk_invite_succeeded:
       subject_template: "批量用户邀请成功完成"
       text_body_template: "你的批量邀请用户已经完成，发送了 %{sent} 个邀请。"
@@ -1725,6 +1674,7 @@ zh_CN:
         我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
 
         邮件发至的分类只接受来自合法帐户且邮件地址已确认的用户的有邮件。如果你有异议，联系管理人员。
+
     email_reject_invalid_post:
       subject_template: "[%{site_name}] 邮件问题 -- 发布时错误"
       text_body_template: |
@@ -1741,12 +1691,6 @@ zh_CN:
         %{post_error}
 
         如果你能解决错误，请再试一次。
-    email_reject_rate_limit_specified:
-      subject_template: "[%{site_name}] 电子邮件错误 -- 频率限制"
-      text_body_template: |
-        我们很抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。
-
-        原因： %{rate_limit_description}
     email_reject_invalid_post_action:
       subject_template: "[%{site_name}] 电子邮件错误 -- 无发表权限"
       text_body_template: |
@@ -1774,9 +1718,9 @@ zh_CN:
     email_reject_topic_closed:
       subject_template: "[%{site_name}] 邮件问题 -- 主题已关闭"
       text_body_template: |
-        我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。
+        我们很抱歉，但是你发送至 %{destination} ( 名为 %{former_title} )的邮件出问题了。
 
-        你回复的主题已经被锁定，不允许回复。如果你有异议，联系管理人员。
+        你回复的主题已经被关闭，不允许回复。如果你有异议，联系管理人员。
     email_reject_auto_generated:
       subject_template: "[%{site_name}] 邮件问题 -- 自动生成的回复"
       text_body_template: |
@@ -1868,10 +1812,6 @@ zh_CN:
   unsubscribe_link: |
     要退订这些邮件，[点击这里](%{unsubscribe_url})。
   unsubscribe_link_and_mail: |
-    要退订这些邮件，[点击这里](%{unsubscribe_url})。
-  unsubscribe_mailing_list: |
-    你启用了邮件列表模式，所以收到了这些邮件。
-
     要退订这些邮件，[点击这里](%{unsubscribe_url})。
   subject_re: "回复："
   subject_pm: "[私信]"
@@ -2565,9 +2505,9 @@ zh_CN:
         该徽章授予给达到用户等级 3 的你。感谢你在这几个月持续地参与社群。你现在是我们之中最活跃的读者之一了，你持续的贡献极大地帮助了我们的社群。你现在可以社群待了几周，真正融入到了社群中。你现在可以重新分类或者重命名主题、使用能力强大的垃圾标记功能以及访问隐藏的贵宾分类了。而且每天你可以点更多次赞了。
     leader:
       name: 资深
-      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">授予</a>全局编辑、固定、关闭、存档、分割、合并和更多的赞
+      description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">授予</a>全局编辑、固定、锁定、存档、分割、合并和更多的赞
       long_description: |
-        该徽章授予给达到用户等级 4 的你。你被管理人员选作了社群的领导力量，你用你的行动和言辞为社群树立了正面的形象。你现在可以修改所有帖子，使用常见的版主的主题管理功能，比如置顶、关闭、隐藏、存档、分割和合并功能。你每天可以点更多的赞了。
+        该徽章授予给达到用户等级 4 的你。你被管理人员选作了社群的领导力量，你用你的行动和言辞为社群树立了正面的形象。你现在可以修改所有帖子，使用常见的版主的主题管理功能，比如置顶、锁定、隐藏、存档、分割和合并功能。你每天可以点更多的赞了。
     welcome:
       name: 欢迎
       description: 得到一个赞
@@ -2628,6 +2568,7 @@ zh_CN:
       description: 分享了一个有 1000 个独立访问者的帖子
       long_description: |
         该徽章授予给分享链接给 1000 个其他访客的你。哇！你把一个有意思的讨论推广给了广大的读者们，并且帮助社群前进了一大步！
+
     first_like:
       name: 首次赞
       description: 已赞过了一个帖子
@@ -2648,6 +2589,7 @@ zh_CN:
       description: 已邀请了 3 个初级用户
       long_description: |
         该徽章授予给邀请了 3 人加入社群的你，你的朋友在站点上度过了很长的时间，已经成为了基础用户。活跃的社区需要新鲜的血液日常参与，并为交流带来多元视点。
+
     champion:
       name: 外交官
       description: 已邀请了 5 个成员
@@ -2659,7 +2601,7 @@ zh_CN:
       long_description: |
         该徽章授予给第一次用分享按钮分享了回复或者主题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社群增长。
     first_link:
-      name: 首次链接
+      name: 首个链接
       description: 已链接了另一个主题
       long_description: |
         该徽章授予给第一次链接到另一个主题的你。联结主题会在各个主题的右侧显示链接和标题，这可以帮助阅读者迅速地找到相关讨论。多链接一些主题吧！

config/locales/server.zh_TW.yml

@@ -796,7 +796,6 @@ zh_TW:
       subject_template: "備份失敗"
     restore_succeeded:
       subject_template: "恢復成功完成"
-      text_body_template: "這次恢復成功。"
     restore_failed:
       subject_template: "復原失敗"
     bulk_invite_succeeded:

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

@@ -9,33 +9,48 @@ ar:
   js:
     poll:
       voters:
-        zero: "لا يوجد مصوتون."
+        zero: "لا أحد صوّت"
-        one: "مصوت."
+        one: "واحد صوّت"
-        two: "مصوتان."
+        two: "إثنان صوّتا"
-        few: "مصوتون قليلون."
+        few: "صوّتوا"
-        many: "مصوتون كثيرون."
+        many: "صوّتوا"
-        other: "المصوتون"
+        other: "صوّتوا"
-      average_rating: "متوسط التقييم: <strong>%{average}</strong> "
+      average_rating: "متوسط التقييمات: <strong>%{average}</strong> "
       public:
-        title: "الأصوات للعموم."
+        title: "الأصوات تظهر للعموم."
       multiple:
         help:
           at_least_min_options:
-            zero: "لا تختار أي خيار"
+            zero: "لا تختر شيئا"
             one: "اختر خيارًا واحدًا على الأقل"
-            two: "اختر خيارين اثنين على الأقل"
+            two: "اختر خيارين إثنين على الأقل"
             few: "اختر <strong>%{count}</strong> خيارات على الأقل"
-            many: "اختر <strong>%{count}</strong> خيارات على الأقل"
+            many: "اختر <strong>%{count}</strong> خيارا على الأقل"
-            other: "اختر <strong>%{count}</strong> خيارات على الأقل"
+            other: "اختر <strong>%{count}</strong> خيار على الأقل"
+          up_to_max_options:
+            zero: "لا تختر شيئا"
+            one: "اختر خيارا <strong>واحدا</strong>"
+            two: "اختر ما حدّه <strong>خيارين</strong>"
+            few: "اختر ما حدّه <strong>%{count}</strong> خيارات"
+            many: "اختر ما حدّه <strong>%{count}</strong> خيارا"
+            other: "اختر ما حدّه <strong>%{count}</strong> خيار"
+          x_options:
+            zero: "لا تختر شيئا"
+            one: "اختر خيار <strong>واحد</strong>"
+            two: "اختر <strong>خيارين</strong>"
+            few: "اختر <strong>%{count}</strong> خيارات"
+            many: "اختر <strong>%{count}</strong> خيارا"
+            other: "اختر <strong>%{count}</strong> خيار"
+          between_min_and_max_options: "اختر بين <strong>%{min}</strong> و <strong>%{max}</strong> خيارات"
       cast-votes:
-        title: "إدراج صوتك."
+        title: "أدلِ بصوتك"
         label: "صوّت اﻵن!"
       show-results:
         title: "اعرض نتائج التصويت"
         label: "أظهر النتائج"
       hide-results:
-        title: "العودة إلى أصواتك."
+        title: "عُد إلى أصواتك"
-        label: "أخف النتائج"
+        label: "أخفِ النتائج"
       open:
         title: "افتح التّصويت"
         label: "افتح"
@@ -44,15 +59,24 @@ ar:
         title: "أغلق التّصويت"
         label: "أغلق"
         confirm: "أمتأكد من إغلاق هذا التّصويت؟"
-      error_while_toggling_status: "آسفون، حصلت مشكلة في تبديل حالة هذا التّصويت."
+      error_while_toggling_status: "آسفون، حدثت مشكلة في تبديل حالة هذا التّصويت."
-      error_while_fetching_voters: "آسفون، حصل خطأ في عرض المصوّتين."
+      error_while_casting_votes: "آسفون، حدث خطأ في الإدلاء بأصواتك."
+      error_while_fetching_voters: "آسفون، حدث خطأ في عرض المصوّتين."
       ui_builder:
-        insert: أدرج تصويتا
+        title: ابنِ تصويتا
+        insert: أدرج التصويت
         help:
           options_count: أدخل خيارين على الأقل
         poll_type:
           label: النوع
+          regular: اختيار من متعدد
+          multiple: عدّة خيارات
+          number: تقييم عددي
+        poll_config:
+          max: الأقصى
+          min: الأدنى
+          step: الخطوة
         poll_public:
           label: أظهر المصوّتون
         poll_options:
-          label: أدخل خيارًا واحدًا في كلّ سطر
+          label: أدخل خيارًا واحدًا في كل سطر

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

@@ -15,6 +15,19 @@ da:
         one: "afgiven stemme"
         other: "afgivne stemmer"
       average_rating: "Gennemsnitlig rating: <strong>%{average}</strong>."
+      public:
+        title: "Stemmer er offentlige."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Vælg mindst <strong>1</strong> mulighed"
+            other: "Vælg mindst <strong>%{count}</strong> muligheder"
+          up_to_max_options:
+            one: "Vælg op til <strong>1</strong> mulighed"
+            other: "Vælg op til <strong>%{count}</strong> muligheder"
+          x_options:
+            one: "Vælg <strong>1</strong> mulighed"
+            other: "Vælg <strong>%{count}</strong> muligheder"
       cast-votes:
         title: "Afgiv dine stemmer"
         label: "Stem nu!"
@@ -32,3 +45,23 @@ da:
         title: "Luk afstemningen"
         label: "Luk"
         confirm: "Er du sikker på, at du vil lukke denne afstemning?"
+      error_while_toggling_status: "Undskyld, der var en fejl i skifte status på denne afstemning."
+      error_while_casting_votes: "Undskyld, der var en fejl i din stemmeafgivning."
+      error_while_fetching_voters: "Beklager, der opstod en fejl med at vise deltagerne."
+      ui_builder:
+        title: Opret afstemning
+        insert: Indsæt afstemning
+        help:
+          options_count: Vælg mindst 2 muligheder
+        poll_type:
+          label: Type
+          regular: Enkelt valg
+          multiple: Flere valg
+          number: Nummerbedømmelse
+        poll_config:
+          max: Maks
+          min: Min
+        poll_public:
+          label: Vis hvem der stemte
+        poll_options:
+          label: Indtast en afstemning pr. linje

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

@@ -15,6 +15,20 @@ et:
         one: "häält kokku"
         other: "hääli kokku"
       average_rating: "Keskmine hinnang: <strong>%{average}</strong>."
+      public:
+        title: "Antud hääled on avalikud."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Tee vähemalt <strong>1</strong> valik"
+            other: "Tee vähemalt <strong>%{count}</strong> valikut"
+          up_to_max_options:
+            one: "Võid teha <strong>1</strong> valiku"
+            other: "Võid teha kuni <strong>%{count}</strong> valikut"
+          x_options:
+            one: "Tee <strong>1</strong> valik"
+            other: "Tee <strong>%{count}</strong> valikut"
+          between_min_and_max_options: "Tee <strong>%{min}</strong> kuni <strong>%{max}</strong> valikut"
       cast-votes:
         title: "Anna oma hääl"
         label: "Hääleta nüüd!"
@@ -32,3 +46,24 @@ et:
         title: "Sulge hääletus"
         label: "Sulge"
         confirm: "Kas sa oled kindel, et sa tahad antud hääletuse sulgeda?"
+      error_while_toggling_status: "Kahjuks tekkis postituse staatuse ümberlülitamisel tõrge."
+      error_while_casting_votes: "Kahjuks tekkis hääletamise käigus tõrge."
+      error_while_fetching_voters: "Kahjuks tekkis hääletajate näitamise käigus tõrge."
+      ui_builder:
+        title: Koosta hääletus
+        insert: Sisesta hääletus
+        help:
+          options_count: Sisesta vähemalt 2 valikut
+        poll_type:
+          label: Tüüp
+          regular: Üks valik
+          multiple: Mitu valikut
+          number: Numbriline vastus
+        poll_config:
+          max: Maksimum
+          min: Miinumum
+          step: Samm
+        poll_public:
+          label: Näita vastajaid
+        poll_options:
+          label: Sisesta üks küsitluse valik rea kohta

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

@@ -62,7 +62,7 @@ fi:
         poll_config:
           max: Enint.
           min: Väh.
-          step: Vaihe
+          step: Askelväli
         poll_public:
           label: Näytä äänestäneet
         poll_options:

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

@@ -20,13 +20,13 @@ he:
       multiple:
         help:
           at_least_min_options:
-            one: "בחרו לפחות <strong>1</strong> אפשרויות"
+            one: "בחרו לפחות אפשרות אחת"
             other: "בחרו לפחות <strong>%{count}</strong> אפשרויות"
           up_to_max_options:
-            one: "בחרו עד <strong>1</strong>  אפשרויות"
+            one: "בחרו לכל היותר אפשרות אחת."
             other: "בחרו עד <strong>%{count}</strong> אפשרויות"
           x_options:
-            one: "בחרו <strong>1</strong> אפשרויות"
+            one: "בחרו אפשרות אחת"
             other: "בחרו <strong>%{count}</strong> אפשרויות"
           between_min_and_max_options: "בחרו בין <strong>%{min}</strong> ל-<strong>%{max}</strong> אפשרויות"
       cast-votes:
@@ -45,7 +45,7 @@ he:
       close:
         title: "סגירת הסקר"
         label: "סגירה"
-        confirm: "האם את/ה בטוח/ה שאת/ה רוצה לסגור סקר זה?"
+        confirm: "האם אתם בטוחים שאתם רוצים לסגור סקר זה?"
       error_while_toggling_status: "מצטערים, חלה שגיאה בשינוי המצב של סקר זה."
       error_while_casting_votes: "מצטערים, ארעה שגיאה בהצבעתכם."
       error_while_fetching_voters: "מצטערים, ארעה שגיאה בהצגת המצביעים."

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

@@ -25,6 +25,15 @@ pl_PL:
             one: "Wybierz co najmniej <strong>1</strong> opcję"
             few: "Wybierz co najmniej <strong>%{count}</strong> opcji"
             other: "Wybierz co najmniej <strong>%{count}</strong> opcji"
+          up_to_max_options:
+            one: "Wybierz co najwyżej <strong>1</strong> opcję"
+            few: "Wybierz co najwyżej <strong>%{count}</strong> opcji"
+            other: "Wybierz co najwyżej <strong>%{count}</strong> opcji"
+          x_options:
+            one: "Wybierz <strong>1</strong> opcję"
+            few: "Wybierz <strong>%{count}</strong> opcji"
+            other: "Wybierz <strong>%{count}</strong> opcji"
+          between_min_and_max_options: "Wybierz pomiędzy <strong>%{min}</strong> a <strong>%{max}</strong> opcjami"
       cast-votes:
         title: "Oddaj głos"
         label: "Oddaj głos!"
@@ -42,7 +51,24 @@ pl_PL:
         title: "Zamknij ankietę"
         label: "Zamknij"
         confirm: "Czy na pewno chcesz zamknąć tę ankietę?"
+      error_while_toggling_status: "Przepraszamy, wystąpił błąd podczas przełączania statusu w tej ankiecie."
+      error_while_casting_votes: "Przepraszamy, wystąpił błąd podczas oddawania głosów."
+      error_while_fetching_voters: "Przepraszamy, wystąpił błąd podczas wyświetlania głosujących."
       ui_builder:
         title: Utwórz ankietę
+        insert: Wstaw ankietę
         help:
           options_count: Wprowadź przynajmniej 2 opcje
+        poll_type:
+          label: Typ
+          regular: Pojedynczy wybór
+          multiple: Wielokrotny wybór
+          number: Liczba ocen
+        poll_config:
+          max: Max
+          min: Min
+          step: Krok
+        poll_public:
+          label: Pokaż kto głosował
+        poll_options:
+          label: Wprowadź jedną opcję ankiety w jednej linii

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

@@ -17,19 +17,21 @@ ro:
         few: "total voturi"
         other: "total voturi"
       average_rating: "Media: <strong>%{average}</strong>."
+      public:
+        title: "Voturile sunt publice."
       cast-votes:
-        title: "Exprimaţi-vă votul"
+        title: "Exprimă-ți votul"
         label: "Votează acum!"
       show-results:
         title: "Afişează rezultatele sondajului"
-        label: "Afișare rezultate"
+        label: "Afișează rezultate"
       hide-results:
-        title: "Înapoi la votul dvs."
+        title: "Înapoi la voturile tale"
         label: "Ascunde rezultate"
       open:
-        title: "Deschide sondaj"
+        title: "Deschide sondajul"
-        label: "Redeschide sondajul"
+        label: "Deschide sondajul"
-        confirm: "Sunteţi sigur că doriţi să deschideţi acest sondaj?"
+        confirm: "Ești sigur că vrei să deschizi acest sondaj?"
       close:
         title: "Închide sondajul"
         label: "Închide sondajul"

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

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

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

@@ -15,6 +15,20 @@ sq:
         one: "total vota"
         other: "totali votave"
       average_rating: "Vlerësimi mesatar: <strong>%{average}</strong>."
+      public:
+        title: "Votat janë publike."
+      multiple:
+        help:
+          at_least_min_options:
+            one: "Zgjidhni të paktën <strong>1</strong> alternativë"
+            other: "Zgjidhni të paktën <strong>%{count}</strong> alternativa"
+          up_to_max_options:
+            one: "Zgjidhni deri në <strong>1</strong> alternativë"
+            other: "Zgjidhni deri në <strong>%{count}</strong> alternativa"
+          x_options:
+            one: "Zgjidhni <strong>1</strong> alternativë"
+            other: "Zgjidhni <strong>%{count}</strong> alternativa"
+          between_min_and_max_options: "Zgjidhni midis <strong>%{min}</strong> dhe <strong>%{max}</strong> alternativash"
       cast-votes:
         title: "Jepni votën tuaj"
         label: "Voto Tani"
@@ -23,7 +37,7 @@ sq:
         label: "Shfaq rezultatet"
       hide-results:
         title: "Back to your votes"
-        label: "Hide results"
+        label: "Fshihni rezultatet"
       open:
         title: "Fillo një Sondazh"
         label: "Fillo"
@@ -32,3 +46,24 @@ sq:
         title: "Mbyll sondazhin"
         label: "Mbyll"
         confirm: "Jeni të sigurt për të mbyllur këtë sondazh?"
+      error_while_toggling_status: "Ndjesë, u has në një gabim kur u ndryshua gjendja e këtij sondazhi."
+      error_while_casting_votes: "Ndjesë, u has në një gabim duke mbledhur votat tuaja."
+      error_while_fetching_voters: "Ndjesë, u has në një gabim duke shfaqur votuesit."
+      ui_builder:
+        title: Krijo Sondazh
+        insert: Shto Sondazh
+        help:
+          options_count: Zgjidh të paktën 2 alternativa
+        poll_type:
+          label: Lloji
+          regular: Pa Alternativa
+          multiple: Me Alternativa
+          number: Vlerësim Numrash
+        poll_config:
+          max: Maksimumi
+          min: Minimumi
+          step: Hapi
+        poll_public:
+          label: Shfaq votuesit
+        poll_options:
+          label: Shto një alternativë për çdo rresht

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

@@ -9,6 +9,7 @@ ar:
   site_settings:
     poll_enabled: "أيمكن للمستخدمين إنشاء تصويتات؟"
     poll_maximum_options: "أقصى عدد للخيارات في كلّ تصويت."
+    poll_edit_window_mins: "عدد الدقائق المسموح فيها تعديل التصويتات بعد نشر المشاركة."
   poll:
     multiple_polls_without_name: "توجد بضعة تصويتات بلا اسم. استخدم خاصية '<code>name</code>' لتمييزها."
     multiple_polls_with_same_name: "توجد بضعة تصويتات بالاسم <strong>%{name}</strong> نفسه. استخدم خاصية '<code>name</code>' لتمييزها."
@@ -33,9 +34,12 @@ ar:
     default_poll_with_multiple_choices_has_invalid_parameters: "للتصويت متعدد الخيارات معلمات غير صالحة."
     named_poll_with_multiple_choices_has_invalid_parameters: "للتصويت متعدد الخيارات ذو الاسم <strong>%{name}</strong> معلمات غير صالحة."
     requires_at_least_1_valid_option: "عليك اختيار خيار واحد صالح على الأقل."
-    cannot_change_polls_after_5_minutes: "لا يمكنك إضافة تصويتات، أو حذفها أو إعادة تسميتها بعد مضي 5 دقائق."
+    default_cannot_be_made_public: "التصويت المدرج به اصوات لا يمكن أن يكون مفتوح للجميع."
-    op_cannot_edit_options_after_5_minutes: "لا يمكنك إضافة تصويتات، أو حذفها أو إعادة تسميتها بعد مضي 5 دقائق. من فضلك راسل مشرفا إن احتجت إلى تعديل أحد خيارات التصويت."
+    named_cannot_be_made_public: "التصويت <strong>%{name}</strong> مدرج بة أصوات ولا يمكن فتحة للجميع."
-    staff_cannot_add_or_remove_options_after_5_minutes: "لا يمكنك إضافة تصويتات، أو حذفها أو إعادة تسميتها بعد مضي 5 دقائق. عليك إغلاق هذا الموضوع وإنشاء آخر بدله."
+    edit_window_expired:
+      cannot_change_polls: "لا يمكنك اضافة أو حذف أو اعادة تسمية تصويت بعد الدقائق %{minutes}  اﻷولى."
+      op_cannot_edit_options: "لا يمكنك إضافة تصويتات، أو حذفها أو إعادة تسميتها بعد مضي %{minutes}  دقائق. من فضلك راسل مشرفا إن احتجت إلى تعديل أحد خيارات التصويت."
+      staff_cannot_add_or_remove_options: "لا يمكنك إضافة تصويتات، أو حذفها أو إعادة تسميتها بعد مضي %{minutes}  دقائق. عليك إغلاق هذا الموضوع وإنشاء آخر بدله."
     no_polls_associated_with_this_post: "لا تصويتات مرتبطة مع هذه المشاركة."
     no_poll_with_this_name: "لا تصويت بالاسم <strong>%{name}</strong> مرتبط مع هذه المشاركة."
     post_is_deleted: "لا شيء تفعله مع مشاركة محذوفة. "

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

@@ -29,9 +29,6 @@ cs:
     requires_at_least_1_valid_option: "Musíte vybrat alespoň jednu platnou odpověď."
     default_cannot_be_made_public: "Hlasování s hlasy nemůže být zveřejněno."
     named_cannot_be_made_public: "Hlasování <strong>%{name}</strong> s hlasy nemůže být zveřejněno."
-    cannot_change_polls_after_5_minutes: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních 5 minutách."
-    op_cannot_edit_options_after_5_minutes: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních 5 minutách. Prosím kontaktujte moderátora pokud potřebujete upravit odpověď v hlasování."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Nemůžete přidávat, odebírat nebo přejmenovávat hlasování po prvních 5 minutách. Zavřete toto téma a místo něj vytvořte nové."
     no_polls_associated_with_this_post: "Tento příspěvek nemá žádné hlasování. "
     no_poll_with_this_name: "Tento příspěvek nemá žádné hlasování se jménem <strong>%{name}</strong>. "
     post_is_deleted: "Operaci na smazaném příspěvku nelze provést."

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

@@ -9,6 +9,7 @@ da:
   site_settings:
     poll_enabled: "Tillad at brugere opretter afstemninger?"
     poll_maximum_options: "Maksimalt antal valgmuligheder i en afstemning."
+    poll_edit_window_mins: "Antal af minutter efter oprettelse af et indlæg hvor en afstemning kan redigeres."
   poll:
     multiple_polls_without_name: "Der er flere afstemninger uden navn. Brug attributten '<code>name</code>' for at identificere dine afstemninger."
     multiple_polls_with_same_name: "Der er flere afstemninger med samme navn <strong>%{name}</strong>. Brug attributten '<code>name</code>' for at identificere dine afstemninger."
@@ -25,9 +26,11 @@ da:
     default_poll_with_multiple_choices_has_invalid_parameters: "Afstemning med flere valgmuligheder har ugyldige parametre."
     named_poll_with_multiple_choices_has_invalid_parameters: "Afstemningen <strong>%{name}</strong> med flere valgmuligheder har ugyldige parametre."
     requires_at_least_1_valid_option: "Du skal vælge mindst 1 gyldig mulighed."
-    cannot_change_polls_after_5_minutes: "Du kan ikke tilføje, fjerne eller omdøbe afstemninger efter de første 5 minutter."
+    default_cannot_be_made_public: "En afstemning med stemmer kan ikke gøres offentlig."
-    op_cannot_edit_options_after_5_minutes: "Du kan ikke tilføje eller fjerne afstemningsmuligheder efter de første 5 minutter. Kontakt venligst en moderator hvis du har brug for at rette en mulighed."
+    named_cannot_be_made_public: "Afstemningen <strong>%{name}</strong> har stemmer og kan ikke gøres offentlig."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Du kan ikke tilføje eller fjerne afstemningsmuligheder efter de første 5 minutter. Du kan lukke emnet og oprette et nyt istedet."
+    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."
     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."

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

@@ -9,6 +9,7 @@ de:
   site_settings:
     poll_enabled: "Benutzern das Erstellen von Umfragen erlauben?"
     poll_maximum_options: "Maximale Anzahl der in einer Umfrage erlaubten Optionen."
+    poll_edit_window_mins: "Anzahl Minuten nach der Erstellung eines Beitrags, in denen Umfragen bearbeitet werden können."
   poll:
     multiple_polls_without_name: "Es gibt mehrere namenlose Umfragen. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
     multiple_polls_with_same_name: "Es gibt mehre Umfragen mit dem selben Namen: <strong>%{name}</strong>. Benutze das Attribute '<code>name</code>', um deine Umfragen eindeutig identifizierbar zu machen."
@@ -27,9 +28,10 @@ de:
     requires_at_least_1_valid_option: "Du musst mindestens eine gültige Option auswählen."
     default_cannot_be_made_public: "Umfragen mit abgegebenen Stimmen können nicht öffentlich gemacht werden."
     named_cannot_be_made_public: "Die Umfrage <strong>%{name}</strong> hat Stimmen und kann nicht öffentlich gemacht werden."
-    cannot_change_polls_after_5_minutes: "Du kannst Umfragen nur in den ersten 5 Minuten hinzufügen, entfernen oder umbenennen."
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "Du kannst Umfrageoptionen nur in den ersten 5 Minuten hinzufügen oder entfernen. Kontaktiere bitte einen Moderator, wenn du Optionen ändern möchtest."
+      cannot_change_polls: "Du kannst Umfragen nur in den ersten %{minutes} Minuten hinzufügen, entfernen oder umbenennen."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Du kannst Umfrageoptionen nur in den ersten 5 Minuten hinzufügen oder entfernen. Du solltest dieses Thema schließen und stattdessen ein neues erstellen."
+      op_cannot_edit_options: "Du kannst Umfrageoptionen nur in den ersten %{minutes} Minuten hinzufügen oder entfernen. Kontaktiere bitte einen Moderator, wenn du Optionen ändern möchtest."
+      staff_cannot_add_or_remove_options: "Du kannst Umfrageoptionen nur in den ersten %{minutes} Minuten hinzufügen oder entfernen. Du solltest dieses Thema schließen und stattdessen ein neues erstellen."
     no_polls_associated_with_this_post: "Diesem Beitrag sind keine Umfragen zugeordnet."
     no_poll_with_this_name: "Diesem Beitrag ist keine Umfrage mit dem Namen <strong>%{name}</strong> zugeordnet."
     post_is_deleted: "Die Aktion kann nicht durchgeführt werden, da der Beitrag gelöscht wurde."

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

@@ -9,6 +9,7 @@ es:
   site_settings:
     poll_enabled: "¿Permitir la creación de encuestas?"
     poll_maximum_options: "Número máximo de opciones permitidas en una encuesta."
+    poll_edit_window_mins: "Número de minutos tras la creación del mensaje durante los cuales las encuestas pueden ser editadas."
   poll:
     multiple_polls_without_name: "Hay varias encuestas sin nombre. Usa la etiqueta '<code>name</code>' para diferenciar tus encuestas."
     multiple_polls_with_same_name: "Hay varias encuestas con el mismo nombre: <strong>%{name}</strong>. Usa la etiqueta '<code>name</code>' para diferenciar tus encuestas."
@@ -27,9 +28,10 @@ es:
     requires_at_least_1_valid_option: "Debes escoger al menos 1 opción válida."
     default_cannot_be_made_public: "La encuesta con votos ya registrados no puede hacerse pública."
     named_cannot_be_made_public: "La encuesta llamada <strong>%{name}</strong> tiene votos ya registrados por lo que no puede hacerse pública."
-    cannot_change_polls_after_5_minutes: "No se puede modificar, eliminar o renombrar una encuesta una vez transcurridos 5 minutos después de su creación. "
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "No se puede modificar, eliminar o renombrar una encuesta una vez transcurridos 5 minutos después de su creación. Por favor, contacta un moderador si necesitas editar las opciones de la encuesta."
+      cannot_change_polls: "No se puede modificar, quitar o renombrar encuestas transcurridos %{minutes} minutos."
-    staff_cannot_add_or_remove_options_after_5_minutes: "No se pueden añadir o eliminar opciones de una encuesta después de los primeros 5 minutos. Podrías cerrar este tema y crear uno nuevo."
+      op_cannot_edit_options: "No se puede modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. Por favor, contacta con un moderador si necesitas editar las opciones de la encuesta."
+      staff_cannot_add_or_remove_options: "No se puede modificar o eliminar las opciones de la encuesta transcurridos %{minutes} minutos. En su lugar, deberías cerrar este tema y abrir uno nuevo."
     no_polls_associated_with_this_post: "No hay encuestas asociadas a este post."
     no_poll_with_this_name: "No hay ninguna encuesta llamada <strong>%{name}</strong> asociada con este post."
     post_is_deleted: "No se puede actuar en un post eliminado."

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

@@ -9,6 +9,7 @@ et:
   site_settings:
     poll_enabled: "Lubada kasutajatel küsitlusi koostada?"
     poll_maximum_options: "Maksimaalne valikute arv, mis on küsitluses lubatud."
+    poll_edit_window_mins: "Minutite arv peale loomist, mille jooksul saab küsitlust veel muuta."
   poll:
     multiple_polls_without_name: "Mitmed küsitlused on ilma nimeta. Kasuta atribuuti '<code>name</code>' küsitluse unikaalsuse tagamiseks."
     multiple_polls_with_same_name: "Mitu küsitlust on sama nimega: <strong>%{name}</strong>. Kasuta atribuuti '<code>name</code>' küsitluse unikaalsuse tagamiseks."
@@ -25,9 +26,12 @@ et:
     default_poll_with_multiple_choices_has_invalid_parameters: "Erinevate valikutega küsitlusel pole korrektsed parameetrid."
     named_poll_with_multiple_choices_has_invalid_parameters: "Mitme valikuga küsitlusel nimega <strong>%{name}</strong> on vigaseid parameetreid."
     requires_at_least_1_valid_option: "Pead tegema vähemalt 1 korrektse valiku."
-    cannot_change_polls_after_5_minutes: "Peale esimest 5 minutit ei saa küsitlust enam lisada, eemaldada ega ümber nimetada."
+    default_cannot_be_made_public: "Küsitlust millel on vastused, ei saa muuta avalikuks."
-    op_cannot_edit_options_after_5_minutes: "Peale esimest 5 minutit ei saa küsitluse valikuid lisada ega eemaldada. Palun võta ühendust moderaaatoriga, kui soovid küsitluse valikut muuta."
+    named_cannot_be_made_public: "Küsitlus nimega <strong>%{name}</strong> sisaldab hääli ja seda ei saa teha avalikuks."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Peale esimest 5 minutit ei saa küsitluse valikuid lisada ega eemaldada. Peaksid antud teema sulgema ja uue looma."
+    edit_window_expired:
+      cannot_change_polls: "Peale %{minutes} minutit ei saa küsitlusi lisada, eemaldada ja ringi nimetada."
+      op_cannot_edit_options: "Pärast %{minutes} minutit ei saa küsitluse valikuid lisada ega eemaldada. Palun võta administraatoriga ühendust, kui on vaja küsitluse valikuid muuta."
+      staff_cannot_add_or_remove_options: "Pärast %{minutes} minutit ei saa küsitluse valikuid lisada ega eemaldada. Peaksid teema sulgema ning uue tegema."
     no_polls_associated_with_this_post: "Postitusega pole seotud ühtegi küsitlust."
     no_poll_with_this_name: "Küsitlust nimega <strong>%{name}</strong> pole selle teemaga seotud."
     post_is_deleted: "Kustutatud postitusega ei saa midagi teha."

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

@@ -23,9 +23,6 @@ fa_IR:
     default_poll_with_multiple_choices_has_invalid_parameters: "در نظرسنجی چند گزینه‌ای پارامترهای نامعتبری وجود دارد."
     named_poll_with_multiple_choices_has_invalid_parameters: "در نظرسنجی چند گزینه‌ای با نام <strong>%{name}</strong> پارامترهای نامعتبری وجود دارد."
     requires_at_least_1_valid_option: "You must select at least 1 valid option."
-    cannot_change_polls_after_5_minutes: "You cannot add, remove or rename polls after the first 5 minutes."
-    op_cannot_edit_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. Please contact a moderator if you need to edit a poll option."
-    staff_cannot_add_or_remove_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. You should close this topic and create a new one instead."
     no_polls_associated_with_this_post: "هیچ نظرسنجی با این نوشته در تماس نیستند. "
     no_poll_with_this_name: "هیچ نظرسنجی اسم گزاری نشده  <strong>%{name}</strong> در تماس به این نوشته نیست. "
     post_is_deleted: "این کار را نمی‌توان روی یک نوشته حذف شده انجام داد."

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

@@ -9,6 +9,7 @@ fi:
   site_settings:
     poll_enabled: "Annetaanko käyttäjien luoda äänestyskyselyitä?"
     poll_maximum_options: "Äänestysvaihtoehtojen suurin sallittu määrä."
+    poll_edit_window_mins: "Kuinka monta minuuttia on aikaa muokata äänestystä sen luomisen jälkeen."
   poll:
     multiple_polls_without_name: "Viesti sisältää useamman nimettömän äänestyskyselyn. Nimeä ne '<code>name</code>'-määreellä."
     multiple_polls_with_same_name: "Useamman kyselyn nimi on <strong>%{name}</strong>. Anna kaikille eri nimet '<code>name</code>'-määreellä."
@@ -27,9 +28,10 @@ fi:
     requires_at_least_1_valid_option: "Sinun täytyy valita vähintään 1 vaihtoehto."
     default_cannot_be_made_public: "Kyselyä, johon on vastattu, ei voi muuttaa julkiseksi."
     named_cannot_be_made_public: "Äänestys <strong>%{name}</strong> on ääniä, joita ei voi julkistaa."
-    cannot_change_polls_after_5_minutes: "Et voi lisätä, poistaa tai muuttaa kyselyn vaihtoehtoja ensimmäisen 5 minuutin jälkeen."
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "Et voi lisätä, poistaa tai muuttaa kyselyn vaihtoehtoja ensimmäisen 5 minuutin jälkeen. Ota yhteyttä valvojaan, jos sinun täytyy muokata kyselyn vaihtoehtoja."
+      cannot_change_polls: "Äänestyksiä ei enää voi lisätä, poistaa tai uudelleennimetä, kun on kulunut %{minutes} minuuttia."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Et voi lisätä, poistaa tai muuttaa kyselyn vaihtoehtoja ensimmäisen 5 minuutin jälkeen. Sinun tulee poistaa tämä ketju ja luoda uusi sen sijaan."
+      op_cannot_edit_options: "Vastausvaihtoehtoja ei enää voi lisätä tai poistaa, kun on kulunut %{minutes} minuuttia. Ota yhteyttä valvojaan, jos vastausvaihtoehtoa tulisi muokata."
+      staff_cannot_add_or_remove_options: "Vastausvaihtoehtoja ei enää voi lisätä tai poistaa, kun on kulunut %{minutes} minuuttia. Ketju tulisi sulkea ja uusi ketju avata sen sijaan."
     no_polls_associated_with_this_post: "Tämä viesti ei sisällä äänestyskyselyä."
     no_poll_with_this_name: "Tämä viesti ei sisällä äänestyskyselyä nimeltä <strong>%{name}</strong>."
     post_is_deleted: "Ei voi tehdä poistetulle viestille"

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

@@ -9,6 +9,7 @@ fr:
   site_settings:
     poll_enabled: "Autoriser les utilisateurs à créer des sondages ?"
     poll_maximum_options: "Nombre maximum d'options autorisées dans un sondage."
+    poll_edit_window_mins: "Nombre de minutes après la création du message durant lesquelles les sondages peuvent être modifiés."
   poll:
     multiple_polls_without_name: "Plusieurs sondages n'ont pas de nom. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
     multiple_polls_with_same_name: "Plusieurs sondages ont le même noms : <strong>%{name}</strong>. Utilisez l'attribut '<code>name</code>' pour donner un identifiant unique aux sondages."
@@ -27,9 +28,10 @@ fr:
     requires_at_least_1_valid_option: "Vous devez sélectionner au moins une des options valables."
     default_cannot_be_made_public: "Un sondage avec des votes ne peut pas être rendu public."
     named_cannot_be_made_public: "Le sondage <strong>%{name}</strong> a des votes et ne peut être rendu public."
-    cannot_change_polls_after_5_minutes: "Vous ne pouvez pas ajouter, supprimer ou renommer les sondages après cinq minutes."
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "Vous ne pouvez pas ajouter ou supprimer les options d'un sondage après cinq minutes. Merci de contacter un modérateur si vous avez besoin de le faire."
+      cannot_change_polls: "Vous ne pouvez pas ajouter, supprimer ou renommer les sondages après les %{minutes} premières minutes."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Vous ne pouvez pas ajouter ou supprimer des options dans un sondage après cinq minutes. Vous devez fermer ce sujet et en créer un nouveau à la place."
+      op_cannot_edit_options: "Vous nous pouvez pas ajouter ou supprimer d'options de sondage après les %{minutes} premières minutes. Veuillez contacter un modérateur si vous avez besoin de le faire."
+      staff_cannot_add_or_remove_options: "Vous nous pouvez pas ajouter ou supprimer d'options de sondage après les %{minutes} premières minutes. Vous devriez plutôt fermer ce sujet et en créer un nouveau."
     no_polls_associated_with_this_post: "Aucun sondage n'est associé à ce message."
     no_poll_with_this_name: "Aucun sondage nommé <strong>%{name}</strong> n'est associé avec ce message."
     post_is_deleted: "Impossible d'agir sur un message supprimé."

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

@@ -25,9 +25,6 @@ gl:
     default_poll_with_multiple_choices_has_invalid_parameters: "A enquisa con varios apartados ten parámetros incorrectos."
     named_poll_with_multiple_choices_has_invalid_parameters: "A enquisa chamada <strong>%{name}</strong> con varios apartados ten parámetros incorrectos."
     requires_at_least_1_valid_option: "Debes seleccionar alomenos 1 opción válida."
-    cannot_change_polls_after_5_minutes: "Non podes engadir, retirar ou renomear enquisas despois dos primeiros 5 minutos."
-    op_cannot_edit_options_after_5_minutes: "Non podes engadir nin retirar opcións da enquisa despois de 5 minutos. Contacta cun moderador se precisas editar unha opción da enquisa."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Non podes engadir nin retirar opcións da enquisa despois de 5 minutos. Deberías pechar este tema e crear outro novo para substituílo."
     no_polls_associated_with_this_post: "Non hai enquisas asociadas con esta publicación."
     no_poll_with_this_name: "Non hai ningunha enquisa chamada <strong>%{name}</strong> asociada con esta publicación."
     post_is_deleted: "Non se pode actuar sobre unha publicación eliminada."

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

@@ -9,6 +9,7 @@ he:
   site_settings:
     poll_enabled: "אפשר למשתמשים ליצור סקרים?"
     poll_maximum_options: "מספר אפשרויות מירבי המותר בסקר"
+    poll_edit_window_mins: "מספר דקות אחרי יצירת פוסט במהלכן ניתן לערוך סקרים."
   poll:
     multiple_polls_without_name: "יש מספר סקרים ללא שם. השתמש במאפיין '<code>name</code>'  לזהות באופן יחודי את הסקרים שלך. "
     multiple_polls_with_same_name: "יש מספר סקרים עם אותו שם <strong>%{name}</strong>. השתמש במאפיין '<code>name</code>'  לזהות באופן יחודי את הסקרים שלך. "
@@ -18,8 +19,8 @@ he:
       one: "לסקר חייב להיות פחות מאפשרות אחת."
       other: "לסקר חייב להיות פחות מ-%{count} אפשרויות."
     named_poll_must_have_less_options:
-      one: "לסקר בשם <strong>%{name}</strong> צריך להיות פחות מאפשרות אחת."
+      one: "לסקר בשם <strong>%{name}</strong> צריכה להיות פחות מאפשרות אחת."
-      other: "לסקר בשם <strong>%{name}</strong> צריך להיות פחות מ-%{count} אפשרויות."
+      other: "לסקר בשם <strong>%{name}</strong> צריכות להיות פחות מ-%{count} אפשרויות."
     default_poll_must_have_different_options: "לסקר צריך שיהיה אפשרויות שונות. "
     named_poll_must_have_different_options: "לסקר בשם <strong>%{name}</strong>  צריך שיהיו אפשרויות שונות. "
     default_poll_with_multiple_choices_has_invalid_parameters: "לסקר עם  בחירה מרובה יש פרמטרים לא תקינים. "
@@ -27,9 +28,10 @@ he:
     requires_at_least_1_valid_option: "עליך לבחור לפחות אפשרות אחת תקינה. "
     default_cannot_be_made_public: "לא ניתן להפוך סקרים עם הצבעות קיימות לפומביים."
     named_cannot_be_made_public: "הסקר <strong>%{name}</strong> מכיל הצבעות ולא יכול להפוך לפומבי."
-    cannot_change_polls_after_5_minutes: "אינכם יכולים להוסיף, להסיר או לשנות שם לסקרים 5 דקות לאחר פרסומם."
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "לא ניתן להוסיך או להסיר אפשרויות מהסקר לאחר 5 דקות מפרסומו. צרו קשר עם מנהל אם אתם צריכים לערוך אפשרות בסקר."
+      cannot_change_polls: "אינכם יכולים להוסיף, להסיר, או לשנות שם לסקרים לאחר %{minutes} הדקות הראשונות."
-    staff_cannot_add_or_remove_options_after_5_minutes: "לא ניתן להוסיף או להסיר אפשרויות מסקרים לאחר 5 דקות מפרסום הסקר. ניתן לסגור את הנושא הזה ולפתוח אחד חדש במקומו."
+      op_cannot_edit_options: "אינכם יכולים להוסיף או להסיר אופציות סקרים אחרי %{minutes} הדקות הראשונות. אנא פנו למנחה אם אתם צריכים לערוך אופציית סקר."
+      staff_cannot_add_or_remove_options: "אינכם יכולים להוסיף או להסיר אופציית סקר לאחר %{minutes} הדקות הראשונות. עליכם לסגור את הנושא וליצור אחד חדש במקום."
     no_polls_associated_with_this_post: "אין סקרים שמקושרים לפרסום הזה."
     no_poll_with_this_name: "אין סקר בשם  <strong>%{name}</strong> שמקושר לפרסום הזה. "
     post_is_deleted: "לא ניתן לפעול על הודעה שנמחקה."

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

@@ -23,9 +23,6 @@ id:
     default_poll_with_multiple_choices_has_invalid_parameters: "Polling dengan pilihan ganda parameternya tidak benar."
     named_poll_with_multiple_choices_has_invalid_parameters: "Polling dengan nama <strong>%{name}</strong> dengan pilihan ganda parameternya tidak benar."
     requires_at_least_1_valid_option: "Anda harus memilih setidaknya 1 pilihan yang benar."
-    cannot_change_polls_after_5_minutes: "Anda tidak dapat menambah, menghapus atau merename polling setelah 15 menit pertama."
-    op_cannot_edit_options_after_5_minutes: "Anda tidak dapat menambah atau menghapus pilihan polling setelah 15 menit pertama. Silahkan kontak moderator jika anda ingin merubah pilihan pada sebuah polling."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Anda tidak dapat menambah atau menghapus pilihan polling setelah 15 menit pertama. Anda harus menutup topik ini dan membuat yang baru."
     no_polls_associated_with_this_post: "Tidak ada polling yang terkait dengan pos ini."
     no_poll_with_this_name: "Tidak ada pollig <strong>%{name}</strong> yang terkait dengan pos ini."
     post_is_deleted: "Tidak dapat beraksi pada sebuah pos yang dihapus."

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

@@ -27,9 +27,6 @@ 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."
-    cannot_change_polls_after_5_minutes: "Non puoi aggiungere, cancellare o rinominare i sondaggi dopo i primi 5 minuti."
-    op_cannot_edit_options_after_5_minutes: "Non puoi aggiungere o rimuovere opzioni ad un sondaggio dopo i primi 5 minuti. Per favore contatta un moderatore se devi modificare un'opzione del sondaggio."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Non puoi aggiungere o rimuovere opzioni ad un sondaggio dopo i primi 5 minuti. Dovresti chiudere questo argomento e crearne un altro."
     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."

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

@@ -23,9 +23,6 @@ ja:
     default_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票に無効なパラメータがあります。"
     named_poll_with_multiple_choices_has_invalid_parameters: "複数の選択肢をもつ投票 <strong>%{name}</strong> に無効なパラメータがあります。"
     requires_at_least_1_valid_option: "少なくとも1つの有効なオプションを選択する必要があります。"
-    cannot_change_polls_after_5_minutes: "最初の5分を経過すると、投票の追加、削除や名前変更はできません。"
-    op_cannot_edit_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。投票オプションの編集が必要であれば、モデレータに連絡してください。"
-    staff_cannot_add_or_remove_options_after_5_minutes: "最初の5分を経過すると投票オプションの追加や削除はできません。このトピックを閉じて新しいトピックを作成してください。"
     no_polls_associated_with_this_post: "この投稿に関連付けられた投票はありません。"
     no_poll_with_this_name: "この投稿に関連付けられた投票 <strong>%{name}</strong> はありません。"
     post_is_deleted: "削除された投稿を操作する事はできません。"

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

@@ -19,9 +19,6 @@ ko:
     default_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 설문조사가 잘못된 매개변수를 가지고 있습니다."
     named_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 <strong>%{name}</strong> 설문조사가 잘못된 매개변수를 가지고 있습니다."
     requires_at_least_1_valid_option: "적어도 올바른 항목 1개를 선택해야 합니다."
-    cannot_change_polls_after_5_minutes: "작성 후 5분이 지난 뒤에는 설문조사 추가, 삭제, 이름변경을 할 수 없습니다."
-    op_cannot_edit_options_after_5_minutes: "작성 후 5분이 지난 뒤에는 설문조사 추가, 삭제를 할 수 없습니다. 설문 항목을 바꾸고 싶다면 관리자에게 문의하세요."
-    staff_cannot_add_or_remove_options_after_5_minutes: "작성 후 5분이 지난 뒤에는 설문조사 추가, 삭제를 할 수 없습니다. 대신에 이 토픽을 닫고 새 설문조사를 만들어야 합니다."
     no_polls_associated_with_this_post: "이 게시글과 연결된  설문조사가 없습니다."
     no_poll_with_this_name: "이 게시글과 연결된 <strong>%{name}</strong> 설문조사가 없습니다."
     post_is_deleted: "지워진 글에는 불가능합니다."

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

@@ -19,9 +19,6 @@ nb_NO:
     default_poll_with_multiple_choices_has_invalid_parameters: "Spørreundersøkelsen med flere svaralternativer har ugyldige parametere."
     named_poll_with_multiple_choices_has_invalid_parameters: "Spørresundersøkelsen <strong>%{name}</strong> med flere svaralternativer har ugyldige parametere."
     requires_at_least_1_valid_option: "Du må velge minst 1 gyldig alternativ."
-    cannot_change_polls_after_5_minutes: "Du kan ikke legge til, fjerne eller omdøpe spørreundersøkelser etter de første 5 minuttene."
-    op_cannot_edit_options_after_5_minutes: "Du kan ikke legge til eller fjerne svaralternativer i løpet av de første 5 minuttene. Venligst kontakt en moderator hvis du har behov for å redigere et svaralternativ."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Du kan ikke legge til eller fjerne svaralternativer etter de første 5 minuttene. Du bør stenge dette emnet og opprette en ny istedet."
     no_polls_associated_with_this_post: "Ingen spørreunderøkelser er assosiert med dette innlegget."
     no_poll_with_this_name: "Ingen undersøkelse med navnet <strong>%{name}</strong> er assosiert med dette innlegget."
     post_is_deleted: "Kan ikke agere på et slettet innlegg."

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

@@ -27,9 +27,6 @@ nl:
     requires_at_least_1_valid_option: "Kies ten minste 1 geldige optie."
     default_cannot_be_made_public: "Poll met stemmen kan niet openbaar gemaakt worden."
     named_cannot_be_made_public: "De poll genaamd <strong>%{name}</strong> heeft stemmen die niet openbaar gemaakt kunnen worden"
-    cannot_change_polls_after_5_minutes: "Je kunt polls niet toevoegen, verwijderen of hernoemen na de eerste 5 minuten."
-    op_cannot_edit_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. Neem a.u.b. contact op met een moderator als u een poll optie moet wijzigen."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. In plaats daarvan kun je dit topic sluiten en een nieuwe maken."
     no_polls_associated_with_this_post: "Er bestaan geen polls voor dit bericht."
     no_poll_with_this_name: "Er bestaat geen poll met de naam <strong>%{name}</strong> voor dit bericht."
     post_is_deleted: "Dit kan niet bij een verwijderd bericht."

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

@@ -9,6 +9,7 @@ pl_PL:
   site_settings:
     poll_enabled: "Pozwolić użytkownikom na tworzenie ankiet?"
     poll_maximum_options: "Maksymalna ilość dozwolonych opcji w ankiecie."
+    poll_edit_window_mins: "Liczba minut po utworzeniu postu, podczas którego można edytować ankietę."
   poll:
     multiple_polls_without_name: "Istnieje kilka nienazwanych ankiet. Uzyj atrybutu '<code>name</code>', aby umożliwić ich jednoznaczną identyfikację."
     multiple_polls_with_same_name: "Istnieje kilka ankiet o tej samej nazwie: <strong>%{name}</strong>. Użyj atrybutu '<code>name</code>', aby umożliwić ich jednoznaczną identyfikację."
@@ -27,9 +28,12 @@ pl_PL:
     default_poll_with_multiple_choices_has_invalid_parameters: "Ankieta wielokrotnego wyboru posiada nieprawidłowe parametry."
     named_poll_with_multiple_choices_has_invalid_parameters: "Ankieta wielokrotnego wyboru o nazwie <strong>%{name}</strong> posiada nieprawidłowe parametry."
     requires_at_least_1_valid_option: "Musisz wybrać co najmniej 1 poprawną opcje."
-    cannot_change_polls_after_5_minutes: "Po upływie 5 minut ankiety nie mogą być zmieniane."
+    default_cannot_be_made_public: "Ankieta z głosami nie może być publiczna."
-    op_cannot_edit_options_after_5_minutes: "Po upływie 5 minut  nie można dodawać lub usuwać opcji wyboru w ankietach. Skontaktuj się z moderatorem jeśli naprawdę musisz zmienić opcję w tej ankiecie."
+    named_cannot_be_made_public: "Ankieta o nazwie <strong>% {name} </ strong> posiadająca głosy nie może być publiczna."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Po upływie 5 minut  nie można dodawać lub usuwać opcji wyboru w ankietach. Jeśli mimo wszystko chcesz wprowadzić tak drastyczne zmiany, zamknij/usuń ten temat i utwórz poprawną ankietę w nowym."
+    edit_window_expired:
+      cannot_change_polls: "Po upływie pierwszych %{minutes} minut nie można dodawać, usuwać lub zmieniać ankiet."
+      op_cannot_edit_options: "Po upływie pierwszych %{minutes} minut nie można dodawać lub usuwać opcji wyboru w ankietach. Skontaktuj się z moderatorem jeśli naprawdę musisz zmienić opcję w tej ankiecie."
+      staff_cannot_add_or_remove_options: "Po upływie pierwszych %{minutes} minut nie można dodawać lub usuwać opcji wyboru w ankietach. Należy zamknąć ten temat i utworzyć zamiast tego nowy temat."
     no_polls_associated_with_this_post: "Wskazany wpis nie posiada przypisanych ankiet."
     no_poll_with_this_name: "Ankieta <strong>%{name}</strong> nie jest przypisana do tego wpisu."
     post_is_deleted: "Nie można wykonywać akcji na usuniętym wpisie."

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

@@ -25,9 +25,6 @@ pt:
     default_poll_with_multiple_choices_has_invalid_parameters: "Votação com escolha múltipla tem parâmetros inválidos."
     named_poll_with_multiple_choices_has_invalid_parameters: "Votação com o nome <strong>%{name}</strong> com escolha múltipla tem parâmetros inválidos."
     requires_at_least_1_valid_option: "Deve selecionar pelo menos 1 opção válida."
-    cannot_change_polls_after_5_minutes: "Não pode adicionar, remover ou renomear votações após os primeiros 5 minutos."
-    op_cannot_edit_options_after_5_minutes: "Não pode adicionar ou remover opções da votação após os primeiros 5 minutos. Por favor contacte um moderador se necessitar de editar opções da votação."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Não pode adicionar ou remover opções da votação após os primeiros 5 minutos. Deve fechar este tópico e criar um novo."
     no_polls_associated_with_this_post: "Nenhuma votação está associada a esta mensagem."
     no_poll_with_this_name: "Nenhuma votação com o nome <strong>%{name}</strong> está associada a esta mensagem."
     post_is_deleted: "Não é possível realizar ações em mensagens eliminadas."

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

@@ -9,6 +9,7 @@ pt_BR:
   site_settings:
     poll_enabled: "Permitir que usuários criem enquetes?"
     poll_maximum_options: "Número máximo de opções permitidas em uma enquete."
+    poll_edit_window_mins: "Número de minutos após a criação de uma postagem em que as enquetes podem ser editadas."
   poll:
     multiple_polls_without_name: "Existem várias enquetes sem nome. Use o atributo '<code>name</code>' para identificar suas enquetes."
     multiple_polls_with_same_name: "Existem várias enquetes com o mesmo nome: <strong>%{name}</strong>. Use o atributo '<code>name</code>' para identificar suas enquetes."
@@ -27,9 +28,10 @@ pt_BR:
     requires_at_least_1_valid_option: "Você deve selecionar pelo menos 1 opção válida."
     default_cannot_be_made_public: "Enquetes com votos não podem ser tornadas públicas."
     named_cannot_be_made_public: "A enquete de nome <strong>%{name}</strong> tem votos e não pode se tornar pública."
-    cannot_change_polls_after_5_minutes: "Você não pode adicionar, remover ou renomear enquetes depois dos primeiros 5 minutos."
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros 5 minutos. Por favor contate um moderador se você precisar editar uma opção da enquete."
+      cannot_change_polls: "Você não pode adicionar, remover ou renomear enquetes depois dos primeiros %{minutes} minutos."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros 5 minutos. Você deve fechar este tópico e criar um novo."
+      op_cannot_edit_options: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros %{minutes} minutos. Por favor contate um moderador se você precisar editar uma opção da enquete."
+      staff_cannot_add_or_remove_options: "Você não pode adicionar ou remover opções das enquetes depois dos primeiros %{minutes} minutos. Você deve fechar este tópico e criar um novo."
     no_polls_associated_with_this_post: "Não há votações associadas com esta mensagem."
     no_poll_with_this_name: "Nenhuma enquete com o nome <strong>%{nome}</strong> associada com esta mensagem."
     post_is_deleted: "Não pode agir numa mensagem apagada."

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

@@ -11,25 +11,24 @@ ro:
     poll_maximum_options: "Numărul maxim admis de opțiuni într-un sondaj"
   poll:
     multiple_polls_without_name: "Există mai multe sondaje fără nume. Folosește atributul '<code>name</code>' pentru a identifica sondajele proprii"
-    multiple_polls_with_same_name: "Există mai multe sondaje cu același nume: <strong>%{name}</strong>. Folosește atributul '<code>name</code>' pentru a identifica sondajele proprii."
+    multiple_polls_with_same_name: "Există mai multe sondaje cu același nume: <strong>%{name}</strong>. Folosește atributul '<code>name</code>' pentru a identifica sondajele."
     default_poll_must_have_at_least_2_options: "Sondajul trebuie să aibă cel puțin 2 opțiuni."
     named_poll_must_have_at_least_2_options: "Sondajul numit <strong>%{name}</strong> trebuie să aibă cel puțin 2 opțiuni."
     default_poll_must_have_less_options:
-      one: "Sondajul trebuie să aibă mai puțin de 1 opțiune."
+      one: "Sondajul trebuie să aibă mai puțin de o opțiune."
       few: "Sondajul trebuie să conțină cel mult %{count} opțiuni."
-      other: "Sondajul trebuie să aibă mai puțin de %{count} opțiuni."
+      other: "Sondajul trebuie să conțină cel mult %{count} de opțiuni."
     named_poll_must_have_less_options:
-      one: "Sondajul numit <strong>%{name}</strong> trebuie să aibă cel mult 1 opțiune."
+      one: "Sondajul <strong>%{name}</strong> trebuie să aibă cel mult o opțiune."
-      few: "Sondajul numit <strong>%{name}</strong> trebuie să aibă mai puțin de %{count} opțiuni."
+      few: "Sondajul <strong>%{name}</strong> trebuie să aibă cel mult %{count} opțiuni."
-      other: "Sondajul numit <strong>%{name}</strong> trebuie să aibă cel mult %{count} opțiuni."
+      other: "Sondajul <strong>%{name}</strong> trebuie să aibă cel mult %{count} de opțiuni."
     default_poll_must_have_different_options: "Sondajul trebuie să aibă opțiuni diferite."
     named_poll_must_have_different_options: "Sondajul numit <strong>%{name}</strong> trebuie să aibă opțiuni diferite."
     default_poll_with_multiple_choices_has_invalid_parameters: "Sondajul cu opțiuni multiple are parametri invalizi."
     named_poll_with_multiple_choices_has_invalid_parameters: "Sondajul numit <strong>%{name}</strong> cu opțiuni multiple are parametri invalizi."
     requires_at_least_1_valid_option: "Trebuie să selectezi cel puțin o opțiune validă."
-    cannot_change_polls_after_5_minutes: "Nu poți adăuga, elimina sau redenumi sondaje după primele 5 minute."
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "Nu poți adăuga sau elimina opțiuni ale unui sondaj după primele 5 minute. Te rugăm contactează un moderator pentru a edita o opțiune din sondaj."
+      cannot_change_polls: "Nu poți adăuga, șterge sau redenumi sondaje după primele %{minutes}  minute."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Nu poți adăuga sau elimina opțiuni ale unui sondaj după primele 5 minute. Ar trebui să închizi discuția și să creezi alta în loc."
     no_polls_associated_with_this_post: "Nu există sondaje asociate acestei postări."
     no_poll_with_this_name: "Nu există nici un sondaj cu numele <strong>%{name}</strong> asociat acestei postări."
     post_is_deleted: "Postările șterse nu se pot modifica."

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

@@ -9,6 +9,7 @@ ru:
   site_settings:
     poll_enabled: "Разрешить пользователям создавать опросы?"
     poll_maximum_options: "Максимальное колличество вариантов ответов, допустимых в одном опросе."
+    poll_edit_window_mins: "Количество минут с момента создания сообщения, в течение которых разрешено редактирование опросов."
   poll:
     multiple_polls_without_name: "Обнаружено несколько опросов в одном сообщении. Чтобы система могла их различать между собой, используйте атрибут <code>name</code>' для каждого опроса. Например: <code>[poll name=A1]</code>"
     multiple_polls_with_same_name: "Обнаружено несколько опросов с одним и тем же названием: <strong>%{name}</strong>. Чтобы система могла  различать опросы между собой, придумайте разные значения для атрибута <code>name</code>' - для каждого опроса своё."
@@ -31,9 +32,10 @@ ru:
     requires_at_least_1_valid_option: "Выберите хотя бы 1 вариант ответа."
     default_cannot_be_made_public: "Опросы, в которых уже голосовали, не могут быть преобразованы в публичные."
     named_cannot_be_made_public: "В опрос под названием named <strong>%{name}</strong> уже записаны чьи-то голоса, потому он не может быть преобразован в публичный."
-    cannot_change_polls_after_5_minutes: "Запрещается добавлять, удалять или переименовывать опросы через 5 минут после их создания."
+    edit_window_expired:
-    op_cannot_edit_options_after_5_minutes: "Запрещается добавлять или удалять варианты ответов в опросах по истечении 5 минут после их создания. Если необходимо внести изменения в ответы, пожалуйста, свяжитесь с модератором."
+      cannot_change_polls: "Нельзя добавлять, удалять или переименовывать опросы через %{minutes} минут(ы) после их создания."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Запрещается добавлять или удалять варианты ответов в опросах по истечении 5 минут после их создания. Если нужно изменить набор ответов, следует закрыть данную тему и создать новую."
+      op_cannot_edit_options: "Нельзя добавлять или удалять варианты ответов через %{minutes} минут(ы) после создания опроса. Чтобы отредактировать варианты ответа, обратитесь к модератору."
+      staff_cannot_add_or_remove_options: "Нельзя добавлять или удалять варианты ответов через %{minutes} минут(ы) после создания опроса. Чтобы изменить опрос, закройте эту тему и создайте новую с нужным опросом."
     no_polls_associated_with_this_post: "В данном сообщении нет опросов."
     no_poll_with_this_name: "В данном сообщении нет опроса под названием <strong>%{name}</strong>."
     post_is_deleted: "Невозможно совершить действие над удаленным сообщением."

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

@@ -27,9 +27,6 @@ sk:
     default_poll_with_multiple_choices_has_invalid_parameters: "Hlasovanie s viac možnosťami má nesprávne parametre."
     named_poll_with_multiple_choices_has_invalid_parameters: "Hlasovanie s názvom <strong>%{name}</strong> s viac možnosťami má nesprávne parametre."
     requires_at_least_1_valid_option: "Musite vybrať aspoň 1 platnú možnosť."
-    cannot_change_polls_after_5_minutes: "Po prvých 5 minútach už nemôžete pridať, odstrániť alebo premenovať hlasovanie."
-    op_cannot_edit_options_after_5_minutes: "Po prvých 5 minútach už nemôžete pridať alebo odstrániť možnosti hlasovania. Ak potrebujete upraviť možnosti hlasovania prosím kontaktujte moderátora."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Po prvých 5 minútach už nemôžete pridať alebo odstrániť možnosti hlasovania. Miesto toho by ste mali uzavrieť túto tému a miesto nej vytvoriť inú."
     no_polls_associated_with_this_post: "S týmto príspevkom nie sú spojené žiadne hlasovania."
     no_poll_with_this_name: "S týmto príspevkom nie je spojené žiadne hlasovanie s názvom <strong>%{name}</strong>."
     post_is_deleted: "Na vymazanom príspevku nie je možné vykonať."

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

@@ -9,6 +9,7 @@ sq:
   site_settings:
     poll_enabled: "Lejo anëtarët të hapin sondazhe?"
     poll_maximum_options: "Numri maksimal i opsioneve të lejuara në një sondazh."
+    poll_edit_window_mins: "Numri i minutave pas krijimit të postimit gjatë të cilave sondazhet mund të ndryshohen."
   poll:
     multiple_polls_without_name: "There are multiple polls without a name. Use the '<code>name</code>' attribute to uniquely identify your polls."
     multiple_polls_with_same_name: "There are multiple polls with the same name: <strong>%{name}</strong>. Use the '<code>name</code>' attribute to uniquely identify your polls."
@@ -25,9 +26,12 @@ sq:
     default_poll_with_multiple_choices_has_invalid_parameters: "Sondazhi me zgjedhje ka disa parametra të pavlefshme."
     named_poll_with_multiple_choices_has_invalid_parameters: "Poll named <strong>%{name}</strong> with multiple choice has invalid parameters."
     requires_at_least_1_valid_option: "You must select at least 1 valid option."
-    cannot_change_polls_after_5_minutes: "You cannot add, remove or rename polls after the first 5 minutes."
+    default_cannot_be_made_public: "Sondazhet me vota nuk mund të jenë publikë."
-    op_cannot_edit_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. Please contact a moderator if you need to edit a poll option."
+    named_cannot_be_made_public: "Sondazhi me emrin <strong>%{name}</strong> ka vota që nuk mund të bëhen publike."
-    staff_cannot_add_or_remove_options_after_5_minutes: "You cannot add or remove poll options after the first 5 minutes. You should close this topic and create a new one instead."
+    edit_window_expired:
+      cannot_change_polls: "Nuk mund të shtoni, hiqni apo riemërtoni sondazhet pas %{minutes} minutave të para."
+      op_cannot_edit_options: "Nuk mund të shtoni apo hiqni alternativat e një sondazhi pas %{minutes} minutave të para. Ju lutem kontaktoni një moderues nëse keni nevojë të ndryshoni alternativat e një sondazhi."
+      staff_cannot_add_or_remove_options: "Nuk mund të shtoni apo hiqni alternativat e një sondazhi pas %{minutes} minutave të para. Ju duhet ta mbyllni këtë temë dhe të krijoni një të re."
     no_polls_associated_with_this_post: "Asnjë sondazh nuk është bashkangjitur me këtë postim."
     no_poll_with_this_name: "No poll named <strong>%{name}</strong> associated with this post."
     post_is_deleted: "S'mund të veproj në një postim të eliminuar."

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

@@ -27,9 +27,6 @@ sv:
     requires_at_least_1_valid_option: "Du måste välja minst 1 giltigt alternativ."
     default_cannot_be_made_public: "Omröstning med röster kan inte offentliggöras."
     named_cannot_be_made_public: "Omröstning med namnet <strong>%{name}</strong> har röster och kan inte offentliggöras."
-    cannot_change_polls_after_5_minutes: "Du kan inte lägga till, ta bort eller byta namn på omröstningar efter de första 5 minutrarna."
-    op_cannot_edit_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter det första 5 minutrarna. Vänligen kontakta en moderator om du behöver redigera ett omröstningsalternativ."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter de första 5 minutrarna. Du får stänga detta ämne och skapa ett nytt i sådana fall."
     no_polls_associated_with_this_post: "Inga omröstningar är knutet till detta inlägg."
     no_poll_with_this_name: "Ingen omröstning med namnet <strong>%{name}</strong> är knuten till detta inlägg."
     post_is_deleted: "Kan inte göra något med ett raderat inlägg."

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

@@ -25,9 +25,6 @@ tr_TR:
     requires_at_least_1_valid_option: "En az 1 geçerli seçim yapmalısınız."
     default_cannot_be_made_public: "Oy içeren oylamalar genel olamaz. "
     named_cannot_be_made_public: "<strong>%{name}</strong> isimli ankette oylamalar herkese açık yapılamaz."
-    cannot_change_polls_after_5_minutes: "Anketler, ilk 5 dakikadan sonra eklenemez, çıkartılamaz ya da yeniden isimlendirilemez."
-    op_cannot_edit_options_after_5_minutes: "Anketler ilk 5 dakikadan sonra eklenemez ya da çıkartılamaz. Eğer bir anket seçeneğini değiştirmeniz gerekiyorsa herhangi bir moderatör ile iletişime geçin."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Anketler ilk 5 dakikadan sonra eklenemez ya da çıkartılamaz. Bu konuyu kapatıp, yerine yeni bir konu oluşturmalısınız."
     no_polls_associated_with_this_post: "Bu gönderiyle alakalı bir anket yok."
     no_poll_with_this_name: "Bu gönderiyle alakalı <strong>%{name}</strong> isimli bir anket yok."
     post_is_deleted: "Silinmiş konu üzerinde işlem yapamazsınız."

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

@@ -15,7 +15,6 @@ uk:
     default_poll_must_have_different_options: "Голосування повинно мати різні варіанти."
     named_poll_must_have_different_options: "Голосування під назвою <strong>%{name}</strong> повинно мати різні варіанти."
     requires_at_least_1_valid_option: "Ви маєте обрати щонайменше 1 валідний варіант."
-    cannot_change_polls_after_5_minutes: "Ви не можете додавати, видаляти або перейменовувати голосування протягом перших 5 хвилин."
     no_polls_associated_with_this_post: "Для цього допису голосування відсутні."
     no_poll_with_this_name: "Для цього допису відсутнє голосування під назвою <strong>%{name}</strong>."
     topic_must_be_open_to_vote: "Тема має бути відкрита для голосування."

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

@@ -23,9 +23,6 @@ vi:
     default_poll_with_multiple_choices_has_invalid_parameters: "Thăm dò ý kiến ​​với nhiều sự lựa chọn có các tham số không hợp lệ."
     named_poll_with_multiple_choices_has_invalid_parameters: "Thăm dò <strong>%{name}</strong> ​​với nhiều sự lựa chọn có các tham số không hợp lệ. "
     requires_at_least_1_valid_option: "Bạn phải chọn ít nhất 1 lựa chọn hợp lệ."
-    cannot_change_polls_after_5_minutes: "Bạn không thể thêm, xóa hoặc đổi tên các cuộc thăm dò 5 phút đầu tiên."
-    op_cannot_edit_options_after_5_minutes: "Bạn không thể thêm hoặc loại bỏ các bình chọn sau khi 5 phút đầu tiên. Hãy liên hệ với người điều hành nếu bạn cần chỉnh sửa một bình chọn nào đó."
-    staff_cannot_add_or_remove_options_after_5_minutes: "Bạn không thể thêm hoặc loại bỏ các bình chọn sau khi 5 phút đầu tiên. Bạn nên đóng chủ đề này và tạo ra một cái mới để thay thế."
     no_polls_associated_with_this_post: "Không có cuộc thăm dò được liên kết với bài này."
     no_poll_with_this_name: "Không có thăm dò có tên <strong>%{name}</strong> liên kết với bài viết này."
     post_is_deleted: "Không thể thực hiện trên bài viết đã xóa."

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

@@ -25,9 +25,6 @@ zh_CN:
     requires_at_least_1_valid_option: "你必须选择至少 1 个有效的选项。"
     default_cannot_be_made_public: "投票调查不能公开。"
     named_cannot_be_made_public: "投票“<strong>%{name}</strong>”有投票不能公开。"
-    cannot_change_polls_after_5_minutes: "你不能在创建 5 分钟后添加、删除或重命名投票。"
-    op_cannot_edit_options_after_5_minutes: "你不能在创建 5 分钟后添加或删除投票选项。如果你需要修改投票选项请联系版主。"
-    staff_cannot_add_or_remove_options_after_5_minutes: "你不能在创建 5 分钟后添加或删除投票选项。你应该关闭这个主题并创建一个新的。"
     no_polls_associated_with_this_post: "这个帖子中没有投票。"
     no_poll_with_this_name: "投票“<strong>%{name}</strong>”没有被关联到帖子。"
     post_is_deleted: "帖子已经删除，无法操作。"

public/403.sq.html

@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Nuk mund ta bëni (403)</title>
+<title>Nuk mund ta bëni atë (403)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
     body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
@@ -20,7 +20,7 @@
     <h1>403</h1>
     <p>Nuk mund ta shikoni burimin!</p>
 
-    <p>Kjo do të zëvendësohet nga një faqe personalizuar e Discourse 403.</p>
+    <p>Kjo do të zëvendësohet nga një faqe e personalizuar 403 e Discourse-it.</p>
   </div>
 </body>
 </html>

public/422.sq.html

@@ -19,7 +19,7 @@
   <!-- This file lives in public/422.html -->
   <div class="dialog">
     <h1>Ndryshimet që donit të bënit u refuzuan.</h1>
-    <p>Mbase po mundoheni të ndryshoni diçka që nuk keni të drejtë hyrje.</p>
+    <p>Mbase po mundoheni të ndryshoni diçka për të cilën nuk keni të drejtë ta bëni.</p>
   </div>
 </body>
 </html>

public/500.ar.html

@@ -1,12 +1,12 @@
 <html>
 <head>
-<title>عذرا - خطأ 500</title>
+<title>آخ - الخطأ 500</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>عذرا</h1>
+    <h1>آخ</h1>
     <p>البرمجية وراء منصة المناقشة هذه واجهت مشكلة غير متوقعة. نعتذر عن الإزعاج.</p>
-    <p>خُزّنت معلومات مفصلة عن الخطأ، ووُلّد إشعار آلي. سنفحص ونرى المشكلة.</p>
+    <p>خُزّنت معلومات مفصلة عن الخطأ، ووُلّد إشعار آلي. سنفحص المعلومات ونرى ما المشكلة.</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>لا حاجة لاتخاذ أي إجراء آخر. ولكن لو استمر حدوث الخطأ، فيمكنك توفير تفاصيل إضافية أهمها الخطوات المتبعة لتكرار حدوث الخطأ، ونشرها بعد ذلك في موضوع في فئة المشاكل والأخطاء داخل الموقع.</p>
 </body>
 </html>

public/500.de.html

@@ -7,6 +7,6 @@
     <h1>Hoppla</h1>
     <p>Die von diesem Diskussionforum verwendete Software ist auf ein unerwartetes Problem gestoßen. Wir entschuldigen uns für die Unannehmlichkeit.</p>
     <p>Detaillierte Informationen über den Fehler wurden gespeichert und eine automatische Benachrichtigung wurde generiert. Wir werden uns darum kümmern.</p>
-    <p>Du musst nichts Weiteres tun. Falls der Fehler jedoch bestehen bleibt, kannst du zusätzliche Details inkl. Schritte zur Reproduktion des Fehlers melden, indem du ein neues Thema in der Kategorie Feedback der Seite.</p>
+    <p>Du musst nichts Weiteres tun. Falls der Fehler jedoch bestehen bleibt, kannst du zusätzliche Details inkl. Schritte zur Reproduktion des Fehlers melden, indem du ein neues Thema in der Feedback-Kategorie der Site eröffnest.</p>
 </body>
 </html>

public/500.pl_PL.html

@@ -7,6 +7,6 @@
     <h1>Ups!</h1>
     <p>Oprogramowanie zasilające to forum dyskusyjne napotkało nieoczekiwany problem. Przepraszamy za niedogodności.</p>
     <p>Szczegółowe informacje dotyczące tego błędu zostały zapisane, a automatyczne powiadomienie wysłane. Wkrótce się tym zajmiemy.</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>Nie są konieczne dalsze działania. Jednakże, jeśli błąd ciągle występuje, możesz podać dodatkowe szczegóły, zawierające instrukcję odtworzenia błędu, rozpoczynając nowy temat na stronie w kategorii opinie.</p>
 </body>
 </html>

public/500.sq.html

@@ -1,12 +1,12 @@
 <html>
 <head>
-<title>Oops - Gabim 500</title>
+<title>Ndjesë - Gabim 500</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Oops</h1>
+    <h1>Ndjesë</h1>
-    <p>Aplikacioni që fuqizon këtë forum u ndesh në një problem. Na vjen keq për këtë të papritur.</p>
+    <p>Programi që fuqizon këtë forum bisedash hasi në një problem të papritur. Kërkojmë ndjesë për shqetësimin.</p>
-    <p>Informacionet e detajuara rreth gabimit u regjistruan dhe një njoftim automatik u krijua. Në do ta shohim sa më parë.</p>
+    <p>Të dhënat e hollësishme rreth gabimit u regjistruan, dhe një njoftim automatik u krijua. Ne do ta shohim sa më parë atë.</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>Nuk nevojitet veprim i mëtejshëm. Sidoqoftë, nëse gabimi vazhdon, ju mund të jepni detaje shtesë, që përfshijnë hapat për të riprodhuar gabimin, duke postuar një temë në kategorinë e reagimeve të faqes së internetit.</p>
 </body>
 </html>

public/500.tr_TR.html

@@ -7,6 +7,6 @@
     <h1>Oops</h1>
     <p>Bu tartışma forumunu çalıştıran yazılım beklenmeyen bir problem ile karşılaştı. Verdiğimiz rahatsızlık için özür dileriz.</p>
     <p>Hata ile ilgili detaylı bilgiler kaydedildi ve bize otomatik olarak bildirildi. İnceleyeceğiz. </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>Daha fazla bir işlem yapmanız gerekmiyor. Hata oluşmaya devam ederse sitenin geri bildirim kategorisinde bir tartışma konusu oluşturarak hatayı yeniden tekrarlama adımları dahil detaylı bilgiye ulaşabilirsiniz.</p>
 </body>
 </html>

public/500.vi.html

@@ -7,6 +7,6 @@
     <h1>Ối</h1>
     <p>Phần mềm chạy diễn đàn thảo luận này bất ngờ gặp sự cố không mong muốn. Chúng tôi rất xin lỗi vì sự bất tiện này.</p>
     <p>Thông tin chi tiết về lỗi đã được ghi lại và thông báo tự động đã được tạo. Chúng tôi sẽ xem xét lỗi này.</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>Không cần tiến hành bất cứ hành động nào. Tuy nhiên, nếu lỗi này vẫn tiếp tục, bạn có thể cung cấp thêm thông tin chi tiết bao gồm các bước để tái tạo lỗi bằng cách tạo một thảo luận trên chuyên mục site feedback.</p>
 </body>
 </html>

public/503.sq.html

@@ -1,10 +1,10 @@
 <html>
 <head>
-<title>Faqja është në një fazë mirëmbajtje.</title>
+<title>Faqja është në Në Mirëmbajtje - Discourse.org.</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Siç e kishim planifikuar, faqja është në një fazë mirëmbajtje.</h1>
+    <h1>Siç e kishim planifikuar, faqja është në mirëmbajtje.</h1>
     <p>Ju lutem na vizitoni pas <span id="when-to-check-back">disa minutash</span>.</p>
     <p id="apology">Na vjen keq për shqetësimin!</p>
 </body>

vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.sq.yml

@@ -7,6 +7,6 @@
 
 sq:
   site_settings:
-    enable_imgur: "Aktivizo imgur api për ngarkimin, filet nuk mbështeten në host local"
+    enable_imgur: "Aktivizo api-n e imgur për ngarkimin, skedarët nuk mbarten lokalisht"
-    imgur_client_id: "Për ngarkimit e fileve në imgur.com kërkohet client ID"
+    imgur_client_id: "Për ngarkimit e fileve në imgur.com kërkohet ID-ja juaj e klientit"
-    imgur_client_secret: "Client sekret juaj për imgur.com. Nuk është e domosdoshme, por mund të nevojitet në të ardhmen."
+    imgur_client_secret: "Kyçi juaj sekret për imgur.com. Nuk është e domosdoshme për ngarkimin e imazheve, por mund të nevojitet në të ardhmen."