Merge pull request #2829 from techAPJ/update-translations

Update Translations

config/locales/client.cs.yml

@@ -286,6 +286,7 @@ cs:
       other_accounts: Další účty s touto IP adresou
       no_other_accounts: (žádné)
     user:
+      said: "{{username}}:"
       profile: "Profil"
       mute: "Ignorovat"
       edit: "Upravit nastavení"
@@ -366,6 +367,7 @@ cs:
         title: "Pozadí profilu"
       email:
         title: "Emailová adresa"
+        instructions: "Nikdy nebude zveřejněno."
         ok: "To vypadá dobře. Zašleme vám email s potvrzením."
         invalid: "Prosím zadejte platnou emailovou adresu."
         authenticated: "Vaše emailová adresa byla autorizována přes službu {{provider}}."
@@ -377,6 +379,7 @@ cs:
         ok: "Vaše jméno vypadá dobře"
       username:
         title: "Uživatelské jméno"
+        instructions: "Unikátní, bez mezer, krátké."
         short_instructions: "Ostatní vás mohou zmínit pomocí @{{username}}."
         available: "Toto uživatelské jméno je volné."
         global_match: "Emailová adresa odpovídá registrovaného uživatelskému jménu."
@@ -464,6 +467,7 @@ cs:
         too_short: "Vaše heslo je příliš krátké."
         common: "Toto heslo je používané moc často."
         ok: "Vaše heslo je v pořádku."
+        instructions: "Alespo %{count} znaků."
       ip_address:
         title: "Poslední IP adresa"
       registration_ip_address:
@@ -537,7 +541,6 @@ cs:
     created: 'Vytvořeno'
     created_lowercase: 'vytvořeno'
     trust_level: 'Důvěryhodnost'
-    search_hint: 'uživatelské jméno nebo email'
     create_account:
       title: "Vytvořit nový účet"
       failed: "Něco se nepovedlo, možná je tato e-mailová adresa již použita. Zkuste použít formulář pro obnovení hesla."
@@ -964,7 +967,6 @@ cs:
       post_number: "příspěvek č. {{number}}"
       in_reply_to: "Odpovědět"
       last_edited_on: "příspěvek naposledy upraven"
-      reply_as_new_topic: "Odpovědět přes nové téma"
       continue_discussion: "Pokračující diskuze z {{postLink}}:"
       follow_quote: "přejít na citovaný příspěvek"
       show_full: "Zobrazit celý příspěvek"
@@ -1029,6 +1031,7 @@ cs:
         convert_to_moderator: "Přidejte Staff Color"
         revert_to_regular: "Odstraňte Staff Color"
         rebake: "Obnovit HTML"
+        unhide: "Odkrýt"
       actions:
         flag: 'Nahlásit'
         it_too:
@@ -1196,7 +1199,6 @@ cs:
       email_in_disabled: "Přidávání nových témat před email je zakázáno v Nastavení fóra. K povolení nových témat přes email,"
       edit_permissions: "Upravit oprávnění"
       add_permission: "Přidat oprávnění"
-      everyone_permission: "všichni"
       this_year: "letos"
       position: "umístění"
       default_position: "Výchozí umístění"
@@ -1304,6 +1306,7 @@ cs:
           other: "Nepřečtená ({{count}})"
         lower_title_with_count:
           one: "1 nepřečtený"
+          other: "{{count}} nepřečtených"
       new:
         lower_title_with_count:
           one: "1 nový"
@@ -1534,6 +1537,7 @@ cs:
         override_default: "Přetížit výchozí?"
         enabled: "Zapnuto?"
         preview: "náhled"
+        undo_preview: "odstranit náhled"
         rescue_preview: "výchozí styl"
         save: "Uložit"
         new: "Nové"
@@ -1552,6 +1556,8 @@ cs:
           new_name: "Nové barevné schéma"
           copy_name_prefix: "Kopie"
           undo: "zpět"
+          highlight:
+            name: 'zvýraznit'
           danger:
             name: 'nebezpečí'
           success:
@@ -1694,6 +1700,7 @@ cs:
           one: "Failed to reject 1 user."
           few: "Failed to reject %{count} users."
           other: "Failed to reject %{count} users."
+        not_verified: "Neověřeno"
       user:
         suspend_failed: "Nastala chyba při zakazování uživatele {{error}}"
         unsuspend_failed: "Nastala chyba při povolování uživatele {{error}}"
@@ -1726,6 +1733,7 @@ cs:
         reputation: Reputace
         permissions: Oprávnění
         activity: Aktivita
+        last_100_days: 'Za posledních 100 dní'
         private_topics_count: Počet soukromách témat
         posts_read_count: Přečteno příspěvků
         post_count: Vytvořeno příspěvků
@@ -1770,10 +1778,6 @@ cs:
           days: "dní"
           topics_replied_to: "Odpovědí na témata"
           flagged_posts: "Nahlášené příspěvky"
-      site_text:
-        none: "Zvolte typ obsahu a můžete začít editovat."
-        title: 'Obsah webu'
-        edit: "Editovat obsah webu"
       site_settings:
         show_overriden: 'Zobrazit pouze změněná nastavení'
         title: 'Nastavení'
@@ -1857,7 +1861,6 @@ cs:
         star: '<b>f</b> Star topic'
         share_topic: '<b>shift s</b> Sdílet téma'
         share_post: '<b>s</b> Share post'
-        reply_as_new_topic: '<b>t</b> Reply as new topic'
         reply_topic: '<b>shift r</b> Odpovědět na téma'
         reply_post: '<b>r</b> Odpovědět na příspěvek'
         quote_post: '<b>q</b> Citovat příspěvek'

config/locales/client.da.yml

@@ -500,7 +500,6 @@ da:
     created: 'Oprettet'
     created_lowercase: 'Oprettet'
     trust_level: 'Tillidsniveau'
-    search_hint: 'brugernavn eller email'
     create_account:
       title: "Opret konto"
       failed: "Noget gik galt. Måske er e-mail-adressen allerede registreret – prøv “Jeg har glemt min adgangskode”-linket"
@@ -899,7 +898,6 @@ da:
       post_number: "indlæg {{number}}"
       in_reply_to: "som svar til"
       last_edited_on: "indlæg sidst redigeret den"
-      reply_as_new_topic: "Svar som nyt emne"
       continue_discussion: "Fortsætter debatten fra {{postLink}}:"
       follow_quote: "gå til det citerede indlæg"
       show_full: "Vis hele emnet"
@@ -1748,7 +1746,6 @@ da:
           likes_given: "Likes givet"
           likes_received: "Likes modtaget"
           qualifies: "Krav for tillidsniveau 3"
-          will_be_promoted: "Vil blive forfremmet indenfor 24 timer."
           does_not_qualify: "Ikke kvalificeret til tillids niveau 3."
         sso:
           title: "Single Sign On"
@@ -1757,10 +1754,6 @@ da:
           external_name: "Navn"
           external_email: "Email"
           external_avatar_url: "Avatar URL"
-      site_text:
-        none: "Vælg en indholdstype for at begynde at redigere."
-        title: 'Indhold'
-        edit: "Redigér indhold"
       site_settings:
         show_overriden: 'Vis kun tilsidesatte'
         title: 'Indstillinger'
@@ -1864,7 +1857,6 @@ da:
         star: '<b>f</b> Markér emne som favorit'
         share_topic: '<b>shift s</b> Del emne'
         share_post: '<b>s</b> Del opslag'
-        reply_as_new_topic: '<b>t</b> Svar som nyt emne'
         reply_topic: '<b>shift r</b> Svar på emnet'
         reply_post: '<b>r</b> Svar på kommentaren'
         quote_post: '<b>q</b> Citer emne'

config/locales/client.de.yml

@@ -259,6 +259,7 @@ de:
       other_accounts: Andere Konten mit dieser IP-Adresse
       no_other_accounts: (keine)
     user:
+      said: "{{username}}:"
       profile: "Profil"
       mute: "Stummschalten"
       edit: "Einstellungen bearbeiten"
@@ -288,7 +289,7 @@ de:
       watched_categories: "Beobachtet"
       watched_categories_instructions: "Du wirst in diesen Kategorien automatisch alle neuen Themen beobachten. Du wirst über alle neuen Beiträge und Themen benachrichtigt werden. Außerdem wird die Anzahl der ungelesenen und neuen Beiträge neben dem Eintrag in der Themenliste angezeigt."
       tracked_categories: "Verfolgt"
-      tracked_categories_instructions: "Du wirst automatisch alle neuen Themen dieser Kategorie folgen. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema angezeigt."
+      tracked_categories_instructions: "Du wirst in diesen Kategorien automatisch allen neuen Themen folgen. Die Anzahl der ungelesenen und neuen Beiträge wird neben dem Thema angezeigt."
       muted_categories: "Stummgeschaltet"
       muted_categories_instructions: "Du erhältst keine Benachrichtigungen über neue Themen in diesen Kategorien und sie werden nicht in deiner Liste ungelesener Themen aufscheinen."
       delete_account: "Lösche mein Benutzerkonto"
@@ -339,6 +340,7 @@ de:
         title: "Profilhintergrund"
       email:
         title: "E-Mail"
+        instructions: "Wird niemals öffentlich angezeigt."
         ok: "Schaut gut aus. Wir schicken dir eine E-Mail zur Bestätigung."
         invalid: "Bitte gib eine gültige E-Mail-Adresse ein."
         authenticated: "Deine E-Mail-Adresse wurde von {{provider}} bestätigt."
@@ -350,6 +352,7 @@ de:
         ok: "Dein Name schaut gut aus."
       username:
         title: "Benutzername"
+        instructions: "Eindeutig, keine Leerzeichen, kurz."
         short_instructions: "Andere Benutzer können dich mit @{{username}} erwähnen."
         available: "Dein Benutzername ist verfügbar."
         global_match: "Die E-Mail-Adresse stimmt mit dem registrierten Benutzernamen überein."
@@ -433,6 +436,8 @@ de:
         too_short: "Dein Passwort ist zu kurz."
         common: "Das Passwort wird zu häufig verwendet."
         ok: "Dein Passwort sieht gut aus."
+        instructions: "Mindestens %{count} Zeichen."
+      associated_accounts: "Zugehörige Konten"
       ip_address:
         title: "Letzte IP-Adresse"
       registration_ip_address:
@@ -506,7 +511,6 @@ de:
     created: 'Erstellt'
     created_lowercase: 'erstellt'
     trust_level: 'Vertrauensstufe'
-    search_hint: 'Benutzername oder E-Mail-Adresse'
     create_account:
       title: "Neues Benutzerkonto erstellen"
       failed: "Etwas ist fehlgeschlagen. Vielleicht ist diese E-Mail-Adresse bereits registriert. Versuche den 'Passwort vergessen'-Link."
@@ -687,6 +691,7 @@ de:
         actions: "Massenoperationen"
         change_category: "Kategorie ändern"
         close_topics: "Themen schließen"
+        archive_topics: "Themen archivieren"
         notification_level: "Benachrichtigungsstufe ändern"
         selected:
           one: "Du hast <b>ein</b> Thema ausgewählt."
@@ -798,7 +803,7 @@ de:
           title: "Beobachten"
         tracking_pm:
           title: "Verfolgen"
-          description: "Die Anzahl der ungelesenen und neuen Nachrichten wird neben dem Thema. Du wirst nur dann benachrichtigt, wenn jemand deinen @Namen erwähnt oder deine Nachricht beantwortet."
+          description: "Die Anzahl der ungelesenen und neuen Nachrichten wird neben dem Thema angezeigt. Du wirst nur dann benachrichtigt, wenn jemand deinen @Namen erwähnt oder deine Nachricht beantwortet."
         tracking:
           title: "Verfolgen"
         regular:
@@ -914,7 +919,6 @@ de:
       post_number: "Beitrag {{number}}"
       in_reply_to: "als Antwort auf"
       last_edited_on: "Beitrag zuletzt bearbeitet am"
-      reply_as_new_topic: "Mit Themenwechsel antworten"
       continue_discussion: "Fortsetzung der Diskussion von {{postLink}}:"
       follow_quote: "springe zum zitierten Beitrag"
       show_full: "Zeige ganzen Beitrag"
@@ -941,6 +945,7 @@ de:
         upload_not_authorized: "Entschuldige, die Datei, die du hochladen wolltest, ist nicht erlaubt (erlaubte Endungen: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Entschuldige, neue Benutzer dürfen keine Bilder hochladen."
         attachment_upload_not_allowed_for_new_user: "Entschuldige, neue Benutzer dürfen keine Dateien hochladen."
+        attachment_download_requires_login: "Du musst eingeloggt sein, um Dateien herunterladen zu können."
       abandon:
         confirm: "Möchtest du deinen Beitrag wirklich verwerfen?"
         no_value: "Nein, beibehalten"
@@ -974,6 +979,7 @@ de:
         convert_to_moderator: "Mitarbeiter-Einfärbung hinzufügen"
         revert_to_regular: "Mitarbeiter-Einfärbung entfernen"
         rebake: "HTML erneuern"
+        unhide: "Einblenden"
       actions:
         flag: 'Melden'
         defer_flags:
@@ -1132,7 +1138,6 @@ de:
       allow_badges_label: "Erlaube das Verleihen von Abzeichen in dieser Kategorie"
       edit_permissions: "Berechtigungen bearbeiten"
       add_permission: "Berechtigung hinzufügen"
-      everyone_permission: "jeder"
       this_year: "dieses Jahr"
       position: "Position"
       default_position: "Standardposition"
@@ -1785,7 +1790,6 @@ de:
           likes_given: "Abgegebene Likes"
           likes_received: "Erhaltene Likes"
           qualifies: "Erfüllt die Anforderungen für Vertrauensstufe 3."
-          will_be_promoted: "Wird innerhalb der nächsten 24 Stunden befördert."
           does_not_qualify: "Erfüllt nicht die Anforderungen für Vertrauensstufe 3."
         sso:
           title: "Single Sign-on"
@@ -1794,10 +1798,22 @@ de:
           external_name: "Name"
           external_email: "E-Mail"
           external_avatar_url: "Avatar URL"
+      user_fields:
+        title: "Benutzerfelder"
+        create: "Benutzerfeld erstellen"
+        untitled: "Unbetitelt"
+        name: "Feldname"
+        type: "Feldtyp"
+        save: "Speichern"
+        edit: "Bearbeiten"
+        delete: "Löschen"
+        cancel: "Abbrechen"
+        delete_confirm: "Sind Sie sicher, dass Sie dieses Textfeld löschen möchten?"
+        field_types:
+          text: 'Textfeld'
+          confirm: 'Bestätigung'
       site_text:
-        none: "Wähle einen Inhaltstyp, um mit dem Bearbeiten zu beginnen."
-        title: 'Inhalt'
-        edit: "Website-Inhalte bearbeiten"
+        title: 'Textinhalt'
       site_settings:
         show_overriden: 'Zeige nur geänderte Einstellungen'
         title: 'Einstellungen'
@@ -1918,7 +1934,6 @@ de:
         star: '<b>f</b> Thema favorisieren'
         share_topic: '<b>⇧ Umsch</b> + <b>s</b> Thema teilen'
         share_post: '<b>s</b> Beitrag teilen'
-        reply_as_new_topic: '<b>t</b> Mit Themenwechsel antworten'
         reply_topic: '<b>⇧ Umsch</b> + <b>r</b> Auf Thema antworten'
         reply_post: '<b>r</b> Auf Beitrag antworten'
         quote_post: '<b>q</b> Beitrag zitieren'

config/locales/client.es.yml

@@ -259,6 +259,7 @@ es:
       other_accounts: Otras cuentas con esta dirección IP
       no_other_accounts: (ninguna)
     user:
+      said: "{{username}}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar Preferencias"
@@ -339,6 +340,7 @@ es:
         title: "Fondo de perfil"
       email:
         title: "Email"
+        instructions: "Nunca se mostrará públicamente."
         ok: "De acuerdo. Te enviaremos un email para confirmar."
         invalid: "Por favor ingresa una dirección de email válida."
         authenticated: "Tu email ha sido autenticado por {{provider}}."
@@ -350,6 +352,7 @@ es:
         ok: "Tu nombre es válido."
       username:
         title: "Nombre de usuario"
+        instructions: "Debe ser único, sin espacios y conciso."
         short_instructions: "La gente puede mencionarte como @{{username}}."
         available: "Tu nombre de usuario está disponible."
         global_match: "El email coincide con el nombre de usuario registrado."
@@ -433,6 +436,7 @@ es:
         too_short: "Tu contraseña es demasiado corta."
         common: "Esa contraseña es demasiado común."
         ok: "Tu contraseña es válida."
+        instructions: "Debe contener al menos %{count} caracteres."
       ip_address:
         title: "Última dirección IP"
       registration_ip_address:
@@ -506,7 +510,6 @@ es:
     created: 'Creado'
     created_lowercase: 'Creado'
     trust_level: 'Nivel de confianza'
-    search_hint: 'usuario o email'
     create_account:
       title: "Crear nueva cuenta"
       failed: "Algo ha salido mal, tal vez este email ya fue registrado, intenta con el enlace 'olvidé la contraseña'"
@@ -687,6 +690,7 @@ es:
         actions: "Acciones en bloque"
         change_category: "Cambiar categoria"
         close_topics: "Cerrar temas"
+        archive_topics: "Archivar temas"
         notification_level: "Cambiar el nivel de notificación"
         selected:
           one: "Has seleccionado <b>1</b> tema."
@@ -921,7 +925,6 @@ es:
       post_number: "post {{number}}"
       in_reply_to: "responder a"
       last_edited_on: "post editado por última ven en"
-      reply_as_new_topic: "Responder como nuevo tema"
       continue_discussion: "Continuando la discusión desde {{postLink}}:"
       follow_quote: "ir al post citado"
       show_full: "Mostrar todo el post"
@@ -982,6 +985,7 @@ es:
         convert_to_moderator: "Convertir a post de staff"
         revert_to_regular: "Eliminar el formato de post de staff"
         rebake: "Reconstruir HTML"
+        unhide: "Deshacer ocultar"
       actions:
         flag: 'Reportar'
         defer_flags:
@@ -1140,7 +1144,6 @@ es:
       allow_badges_label: "Permitir conceder distintivos en esta categoria"
       edit_permissions: "Editar permisos"
       add_permission: "Añadir permisos"
-      everyone_permission: "todos"
       this_year: "este año"
       position: "posición"
       default_position: "Posición predeterminada"
@@ -1798,7 +1801,6 @@ es:
           likes_given: "Likes dados"
           likes_received: "Likes recibidos"
           qualifies: "Califica para el nivel de confianza 3."
-          will_be_promoted: "Será promocionado en 24 horas."
           does_not_qualify: "No califica para el nivel de confianza 3."
         sso:
           title: "Single Sign On"
@@ -1807,10 +1809,6 @@ es:
           external_name: "Nombre"
           external_email: "Email"
           external_avatar_url: "URL del avatar"
-      site_text:
-        none: "Elige un tipo de contenido para empezar a editar."
-        title: 'Contenido'
-        edit: "Editar contenido del sitio"
       site_settings:
         show_overriden: 'Sólo mostrar lo personalizado'
         title: 'Ajustes del sitio'
@@ -1934,7 +1932,6 @@ es:
         star: '<b>f</b> Añadir tema a favoritos'
         share_topic: '<b>shift s</b> Compartir tema'
         share_post: '<b>s</b> Compartir post'
-        reply_as_new_topic: '<b>t</b> Responder como nuevo tema'
         reply_topic: '<b>shift r</b> Responder al tema'
         reply_post: '<b>r</b> Responder al post'
         quote_post: '<b>q</b> Citar post'

config/locales/client.fi.yml

@@ -168,7 +168,7 @@ fi:
     topic_count_new:
       one: "{{count}} uusi ketju."
       other: "{{count}} uutta ketjua."
-    click_to_show: "Klikkaa avataksesi."
+    click_to_show: "Klikkaa nähdäksesi."
     preview: "esikatselu"
     cancel: "peruuta"
     save: "Tallenna muutokset"
@@ -259,6 +259,7 @@ fi:
       other_accounts: Muut tilit samasta IP osoitteesta
       no_other_accounts: (ei mitään)
     user:
+      said: "{{username}}:"
       profile: "Profiili"
       mute: "Vaimenna"
       edit: "Muokkaa asetuksia"
@@ -339,6 +340,7 @@ fi:
         title: "Profiilin taustakuva"
       email:
         title: "Sähköposti"
+        instructions: "Ei tule julkiseksi."
         ok: "Hyvältä näyttää. Lähetämme sinulle sähköpostin varmistukseksi."
         invalid: "Ole hyvä ja anna toimiva sähköpostiosoite."
         authenticated: "{{provider}} on todentanut sähköpostisi."
@@ -350,6 +352,7 @@ fi:
         ok: "Nimesi vaikuttaa hyvältä."
       username:
         title: "Käyttäjätunnus"
+        instructions: "Uniikki, lyhyt ja ilman välilyöntejä."
         short_instructions: "Muut käyttäjät voivat viitata sinuun nimellä @{{username}}."
         available: "Käyttäjätunnuksesi on vapaana."
         global_match: "Sähköposti vastaa rekisteröityä käyttäjänimeä."
@@ -433,6 +436,8 @@ fi:
         too_short: "Salasanasi on liian lyhyt."
         common: "Annettu salasana on liian yleinen."
         ok: "Salasana vaikuttaa hyvältä."
+        instructions: "Vähintään %{count} merkkiä."
+      associated_accounts: "Liittyvät käyttäjätilit"
       ip_address:
         title: "Viimeinen IP-osoite"
       registration_ip_address:
@@ -506,7 +511,6 @@ fi:
     created: 'Luotu'
     created_lowercase: 'luotu'
     trust_level: 'Luottamustaso'
-    search_hint: 'käyttäjänimi tai sähköposti'
     create_account:
       title: "Luo uusi tunnus"
       failed: "Jotain meni pieleen. Ehkäpä tämä sähköpostiosoite on jo rekisteröity, kokeile salasana unohtui -linkkiä."
@@ -687,6 +691,7 @@ fi:
         actions: "Massatoiminnot"
         change_category: "Vaihda aluetta"
         close_topics: "Sulje ketjut"
+        archive_topics: "Arkistoi ketjut"
         notification_level: "Vaihda ilmoitusasetusta"
         selected:
           one: "Olet valinnut <b>yhden</b> ketjun."
@@ -729,7 +734,7 @@ fi:
       unread_topics:
         one: '1 lukematon ketju'
         other: '{{count}} lukematonta ketjua'
-      title: 'Ketju'
+      title: 'Aihe'
       loading_more: "Ladataan lisää ketjuja..."
       loading: 'Ladataan ketjua...'
       invalid_access:
@@ -921,14 +926,14 @@ fi:
       post_number: "viesti {{number}}"
       in_reply_to: "vastauksena"
       last_edited_on: "viestin viimeinen muokkausaika"
-      reply_as_new_topic: "Vastaa uudessa ketjussa"
+      reply_as_new_topic: "Aloita uusi yhdistetty ketju"
       continue_discussion: "Jatkoa ketjulle {{postLink}}:"
       follow_quote: "siirry lainattuun viestiin"
       show_full: "Näytä koko viesti"
       show_hidden: 'Näytä piilotettu sisältö.'
       deleted_by_author:
-        one: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jo se liputetaan)"
-        other: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jo se liputetaan)"
+        one: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti tunnin kuluttua, paitsi jos se liputetaan)"
+        other: "(kirjoittaja on perunut viestin ja se poistetaan automaattisesti %{count} tunnin kuluttua, paitsi jos se liputetaan)"
       expand_collapse: "laajenna/pienennä"
       gap:
         one: "1 piilotettu viesti"
@@ -982,6 +987,7 @@ fi:
         convert_to_moderator: "Lisää henkilökunnan taustaväri"
         revert_to_regular: "Poista henkilökunnan taustaväri"
         rebake: "Tee HTML uudelleen"
+        unhide: "Poista piilotus"
       actions:
         flag: 'Liputa'
         defer_flags:
@@ -1140,7 +1146,6 @@ fi:
       allow_badges_label: "Salli arvomerkkien myöntäminen tältä alueelta"
       edit_permissions: "Muokkaa oikeuksia"
       add_permission: "Lisää oikeus"
-      everyone_permission: "kaikki"
       this_year: "tänä vuonna"
       position: "asema"
       default_position: "Oletuspaikka"
@@ -1205,8 +1210,8 @@ fi:
         help: "Tämä ketju on arkistoitu; se on jäädytetty eikä sitä voi muuttaa"
       invisible:
         help: "Tämä ketju on poistettu listauksista; sitä ei näytetä ketjujen listauksissa ja siihen pääsee vain suoralla linkillä"
-    posts: "Viestit"
-    posts_lowercase: "viestit"
+    posts: "Viestejä"
+    posts_lowercase: "viestejä"
     posts_long: "tässä ketjussa on {{number}} viestiä"
     posts_likes_MF: |
       Tässä ketjussa on {count, plural, one {1 viesti, jolla on} other {# viestiä, joilla on}} {ratio, select,
@@ -1798,7 +1803,6 @@ fi:
           likes_given: "Annettuja tykkäyksiä"
           likes_received: "Saatuja tykkäyksiä"
           qualifies: "Täyttää luottamustaso 3:n vaatimukset."
-          will_be_promoted: "Ylennetään 24 tunnin sisällä."
           does_not_qualify: "Ei täytä luottamustaso 3:n vaatimuksia."
         sso:
           title: "Kertakirjautuminen"
@@ -1807,10 +1811,24 @@ fi:
           external_name: "Nimi"
           external_email: "Sähköposti"
           external_avatar_url: "Avatarin URL"
+      user_fields:
+        title: "Käyttäjäkentät"
+        description: "Käyttäjiltä vaaditaan rekisteröitymisen yhteydessä vastaus kaikiin kenttiin, jotka lisätään tähän"
+        create: "Luo käyttäjäkenttä"
+        untitled: "Nimetön"
+        name: "Kentän nimi"
+        type: "Kentän tyyppi"
+        save: "Tallenna"
+        edit: "Muokkaa"
+        delete: "Poista"
+        cancel: "Peruuta"
+        delete_confirm: "Oletko varma, että haluat poistaa tämän käyttäjäkentän?"
+        field_types:
+          text: 'Tekstikenttä'
+          confirm: 'Vahvistus'
       site_text:
-        none: "Valitse sivuston osa aloittaaksesi muokkaamisen."
-        title: 'Sisältö'
-        edit: "Muokkaa sivuston osia"
+        none: "Valitse sisällön tyyppi aloittaaksesi muokkaamisen."
+        title: 'Tekstin sisältö'
       site_settings:
         show_overriden: 'Näytä vain muokatut'
         title: 'Asetukset'
@@ -1934,7 +1952,7 @@ fi:
         star: '<b>f</b> Merkitse ketju tähdellä'
         share_topic: '<b>shift s</b> Jaa ketju'
         share_post: '<b>s</b> Jaa viesti'
-        reply_as_new_topic: '<b>t</b> Vastaa uudessa ketjussa'
+        reply_as_new_topic: '<b>t</b> Aloita uusi yhdistetty ketju'
         reply_topic: '<b>shift r</b> Vastaa ketjuun'
         reply_post: '<b>r</b> Vastaa viestiin'
         quote_post: '<b>q</b> Lainaa viesti'

config/locales/client.fr.yml

@@ -259,6 +259,7 @@ fr:
       other_accounts: Autres comptes utilisant cette adresse IP
       no_other_accounts: (aucun)
     user:
+      said: "{{username}} :"
       profile: "Profil"
       mute: "Silencieux"
       edit: "Modifier les préférences"
@@ -339,6 +340,7 @@ fr:
         title: "Arrière plan du profil"
       email:
         title: "Courriel"
+        instructions: "Ne sera jamais visible publiquement."
         ok: "Cela semble correct. Un courriel de confirmation sera envoyé."
         invalid: "Merci de saisir une adresse de courriel valide."
         authenticated: "Votre adresse de courriel a été authentifiée par {{provider}}."
@@ -350,6 +352,7 @@ fr:
         ok: "Votre nom semble correct."
       username:
         title: "Pseudo"
+        instructions: "Unique, sans espace, court."
         short_instructions: "Les utilisateurs peuvent vous mentionner avec @{{username}}."
         available: "Votre pseudo est disponible."
         global_match: "L'adresse de courriel correspond au pseudo enregistré."
@@ -433,6 +436,8 @@ fr:
         too_short: "Votre mot de passe est trop court."
         common: "Ce mot de passe est trop commun."
         ok: "Votre mot de passe semble correct."
+        instructions: "Au moins %{count} caractères."
+      associated_accounts: "Comptes associés"
       ip_address:
         title: "Dernières adresses IP"
       registration_ip_address:
@@ -506,7 +511,6 @@ fr:
     created: 'Créé'
     created_lowercase: 'créé'
     trust_level: 'Niveau de confiance'
-    search_hint: 'pseudo ou courriel'
     create_account:
       title: "Créer un nouveau compte"
       failed: "Quelque chose s'est mal passé, peut-être que cette adresse de courriel est déjà enregistrée, essayez le lien Mot de passe oublié."
@@ -687,6 +691,7 @@ fr:
         actions: "Actions sur sélection multiple"
         change_category: "Changer la Catégorie"
         close_topics: "Fermer les sujets"
+        archive_topics: "Sujets archivés"
         notification_level: "Changer le niveau de notification"
         selected:
           one: "Vous avez sélectionné <b>1</b> sujet."
@@ -708,6 +713,7 @@ fr:
           unread: '<p>Vos sujets non-lus apparaissent ici</p><p>Par défaut, les sujets sont considérés comme non-lus et 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épondu</li><li>Que vous avez lu 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>'
+          starred: '<p>Vos sujets favoris apparaissent ici.</p><p>Pour ajouter ou retirer un favoris :</p><ul><li>Cliquez sur <i class="fa fa-star"></i> à coté du titre du sujet</li><li>Via le bouton <kbd>Favoris</kbd> en bas de chaque sujet</li></ul>'
       bottom:
         latest: "Il n'y a plus de sujet à lire."
         hot: "Il n'y a plus de sujet populaire à lire."
@@ -924,7 +930,7 @@ fr:
       post_number: "message {{number}}"
       in_reply_to: "répondre à"
       last_edited_on: "message dernièrement édité le"
-      reply_as_new_topic: "Répondre en créant un nouveau sujet"
+      reply_as_new_topic: "Répondre en créant un sujet lié"
       continue_discussion: "Suite du sujet {{postLink}}:"
       follow_quote: "Voir le message cité"
       show_full: "Voir le message en entier"
@@ -985,6 +991,7 @@ fr:
         convert_to_moderator: "Ajouter la couleur modérateur"
         revert_to_regular: "Retirer la couleur modérateur"
         rebake: "Reconstruire l'HTML"
+        unhide: "Afficher"
       actions:
         flag: 'Signaler'
         defer_flags:
@@ -1143,7 +1150,6 @@ fr:
       allow_badges_label: "Autoriser les badges à être accordé dans cette catégorie"
       edit_permissions: "Éditer les permissions"
       add_permission: "Ajouter une Permission"
-      everyone_permission: "tout le monde"
       this_year: "cette année"
       position: "position"
       default_position: "Position par défaut"
@@ -1801,7 +1807,6 @@ fr:
           likes_given: "J'aimes donnés"
           likes_received: "J'aimes reçus"
           qualifies: "Admissible au niveau de confiance 3."
-          will_be_promoted: "Sera promu dans les 24 heures."
           does_not_qualify: "Non admissible au niveau de confiance 3."
         sso:
           title: "Authentification unique (SSO)"
@@ -1810,10 +1815,24 @@ fr:
           external_name: "Nom"
           external_email: "Courriel"
           external_avatar_url: "URL Avatar"
+      user_fields:
+        title: "Champs utilisateurs"
+        description: "Tous les champs ajoutés ici seront requis lors de l'enregistrement d'un utilisateur."
+        create: "Créer un champ utilisateur"
+        untitled: "Sans titre"
+        name: "Nom du champ"
+        type: "Type du champ"
+        save: "Sauvegarder"
+        edit: "Modifier"
+        delete: "Supprimer"
+        cancel: "Annuler"
+        delete_confirm: "Etes vous sur de vouloir supprimer ce champ utilisateur ?"
+        field_types:
+          text: 'Zone de texte'
+          confirm: 'Confirmation'
       site_text:
-        none: "Choisissez un type de contenu afin de commencer l'édition."
+        none: "Choisissez un type de contenu pour commencer l'édition."
         title: 'Contenu'
-        edit: "Modifier le contenu du site"
       site_settings:
         show_overriden: 'Ne montrer que ce qui a été changé'
         title: 'Paramètres'
@@ -1937,7 +1956,7 @@ fr:
         star: '<b>f</b> Sujet Favoris'
         share_topic: '<b>shift s</b> Partager un sujet'
         share_post: '<b>s</b> Partager un message'
-        reply_as_new_topic: '<b>t</b> Répondre en créant un nouveau sujet'
+        reply_as_new_topic: '<b>t</b> Répondre en créant un sujet lié'
         reply_topic: '<b>shift r</b> Répondre au sujet'
         reply_post: '<b>r</b> Répondre à un message'
         quote_post: '<b>q</b> Citer un message'

config/locales/client.he.yml

@@ -506,7 +506,6 @@ he:
     created: 'נוצר'
     created_lowercase: 'נוצר/ו'
     trust_level: 'רמת אמון'
-    search_hint: 'שם משתמש/ת או כתובת דוא"ל'
     create_account:
       title: "יצירת חשבון חדש"
       failed: "משהו לא בסדר, אולי כבר קיימת כתובת דואר אלקטרוני כזו. נסה את קישור שכחתי סיסמה."
@@ -909,7 +908,6 @@ he:
       post_number: "הודעה {{number}}"
       in_reply_to: "השב ל"
       last_edited_on: "הודעה נערכה לאחרונה ב"
-      reply_as_new_topic: "תגובה כנושא חדש"
       continue_discussion: "ממשיך את הדיון מ {{postLink}}:"
       follow_quote: "מעבר להודעה המצוטטת"
       show_full: "הראה הודעה מלאה"
@@ -1760,7 +1758,6 @@ he:
           likes_given: "לייקים שהוענקו"
           likes_received: "לייקים שהתקבלו"
           qualifies: "דרישות עבור רמת אמון 3"
-          will_be_promoted: "יקודם בתוך 24 שעות."
           does_not_qualify: "אין עומד בדרישות עבור רמת אמון 3."
         sso:
           title: "התחברות חד פעמית"
@@ -1769,10 +1766,6 @@ he:
           external_name: "שם"
           external_email: "כתובת דוא\"ל"
           external_avatar_url: "כתובת URL של אווטר"
-      site_text:
-        none: "בחר סוג תוכן לפני תחילת העריכה."
-        title: 'תוכן'
-        edit: "ערוך תוכן אתר"
       site_settings:
         show_overriden: 'הצג רק הגדרות ששונו'
         title: 'הגדרות'

config/locales/client.it.yml

@@ -84,13 +84,13 @@ it:
           other: "%{count} giorni fa"
     share:
       topic: 'Condividi un link a questa conversazione'
-      post: 'Condividi un link al post #%{postNumber}'
+      post: 'Condividi un collegamento al messaggio n°%{postNumber}'
       close: 'chiudi'
       twitter: 'Condividi questo link su Twitter'
       facebook: 'Condividi questo link su Facebook'
       google+: 'Condividi questo link su Google+'
       email: 'invia questo collegamento via email'
-    edit: 'modifica titolo e categoria del topic'
+    edit: 'modifica titolo e categoria dell''argomento'
     not_implemented: "Spiacenti! Questa funzione non è stata ancora implementata."
     no_value: "No"
     yes_value: "Sì"
@@ -185,17 +185,17 @@ it:
     banner:
       close: "Nascondi questo banner."
     choose_topic:
-      none_found: "Nessun topic trovato."
+      none_found: "Nessun argomento trovato."
       title:
         search: "Cerca conversazioni per nome, indirizzo o numero:"
         placeholder: "digita il titolo della conversazione"
     user_action:
-      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ha pubblicato questo <a href='{{topicUrl}}'>topic</a>"
-      you_posted_topic: "<a href='{{userUrl}}'>Tu</a> hai pubblicato questo <a href='{{topicUrl}}'>topic</a>"
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> ha pubblicato <a href='{{topicUrl}}'>l'argomento</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>Tu</a> hai pubblicato <a href='{{topicUrl}}'>l'argomento</a>"
       user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> ha risposto a <a href='{{postUrl}}'>{{post_number}}</a>"
       you_replied_to_post: "<a href='{{userUrl}}'>Tu</a> hai risposto a <a href='{{postUrl}}'>{{post_number}}</a>"
-      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ha risposto a questo <a href='{{topicUrl}}'>topic</a>"
-      you_replied_to_topic: "<a href='{{userUrl}}'>You</a> hai risposto a questo <a href='{{topicUrl}}'>topic</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ha risposto <a href='{{topicUrl}}'>all'argomento</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>You</a> hai risposto <a href='{{topicUrl}}'>all'argomento</a>"
       user_mentioned_user: "<a href='{{user1Url}}'>Tu</a> hai menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
       user_mentioned_you: "<a href='{{user1Url}}'>Tu</a> hai menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
       you_mentioned_user: "<a href='{{user1Url}}'>Tu</a> hai menzionato <a href='{{user2Url}}'>{{another_user}}</a>"
@@ -221,8 +221,8 @@ it:
       '1': "Mi piace - Assegnati"
       '2': "Mi piace - Ricevuti"
       '3': "Segnalibri"
-      '4': "Topic"
-      '5': "Post"
+      '4': "Argomenti"
+      '5': "Messaggi"
       '6': "Risposte"
       '7': "Menzioni"
       '9': "Citazioni"
@@ -259,10 +259,11 @@ it:
       other_accounts: Altri account con questo indirizzo IP
       no_other_accounts: (nessuno)
     user:
+      said: "{{username}}:"
       profile: "Profilo"
       mute: "Ignora"
       edit: "Modifica opzioni"
-      download_archive: "scarica lo storico dei miei post"
+      download_archive: "scarica lo storico dei miei messaggi"
       private_message: "Messaggio privato"
       private_messages: "Messaggi"
       activity_stream: "Attività"
@@ -270,7 +271,7 @@ it:
       bookmarks: "Segnalibri"
       bio: "Su di me"
       invited_by: "Invitato Da"
-      trust_level: "Livello Attendibilità"
+      trust_level: "Livello Esperienza"
       notifications: "Notifiche"
       disable_jump_reply: "Non saltare al nuovo messaggio dopo la risposta"
       dynamic_favicon: "Mostra la notifica dei messaggi in arrivo nella favicon (funzione sperimentale)"
@@ -339,6 +340,7 @@ it:
         title: "Sfondo Profilo"
       email:
         title: "Email"
+        instructions: "Mai mostrato pubblicamente."
         ok: "Tutto a posto! Ti manderemo una email di conferma."
         invalid: "Inserisci un indirizzo email valido."
         authenticated: "{{provider}} ha autenticato la tua email."
@@ -350,7 +352,8 @@ it:
         ok: "Il nome è adeguato."
       username:
         title: "Nome utente"
-        short_instructions: "Gli utenti possono citarti scrivendo \"@{{username}}\"."
+        instructions: "Deve essere univoco, senza spazi e breve."
+        short_instructions: "Gli utenti possono citarti scrivendo @{{username}}."
         available: "Il nome utente è disponibile."
         global_match: "L'email corrisponde allo nome utente registrato."
         global_mismatch: "Già registrato. Prova {{suggestion}}?"
@@ -433,6 +436,8 @@ it:
         too_short: "La password è troppo breve."
         common: "Questa password è troppo comune."
         ok: "La password è adeguata"
+        instructions: "Minimo %{count} caratteri."
+      associated_accounts: "Account associati"
       ip_address:
         title: "Ultimo indirizzo IP"
       registration_ip_address:
@@ -505,8 +510,7 @@ it:
     last_seen: 'Ultima visita'
     created: 'Creato'
     created_lowercase: 'creato'
-    trust_level: 'Livello Attendibilità'
-    search_hint: 'username o email'
+    trust_level: 'Livello Esperienza'
     create_account:
       title: "Crea Nuovo Account"
       failed: "Qualcosa non ha funzionato. Forse questa email è già registrata, prova a usare il link di recupero password"
@@ -622,7 +626,7 @@ it:
       help: "Aiuto Inserimento Markdown"
       toggler: "nascondi o mostra il pannello di editing"
       admin_options_title: "Impostazioni dello staff opzionali per l'argomento"
-      auto_close_label: "Tempo di chiusura automatica del topic:"
+      auto_close_label: "Tempo di chiusura automatica dell'argomento:"
       auto_close_units: "(n° ore, un'orario, o un timestamp)"
       auto_close_examples: 'inserisci orario assoluto o numero di ore - 24, 17:00, 2013-11-22 14:00'
       auto_close_error: "Per favore immetti un valore valido."
@@ -689,7 +693,7 @@ it:
         close_topics: "Chiudi Argomenti"
         notification_level: "Cambia Livello Notifiche"
         selected:
-          one: "Hai selezionato <b>1</b> topic."
+          one: "Hai selezionato <b>1</b> argomento."
           other: "Hai selezionato <b>{{count}}</b> argomenti."
       none:
         starred: "Non hai argomenti preferiti."
@@ -704,7 +708,7 @@ it:
         educate:
           new: '<p>Qui compaiono i tuoi nuovi argomenti.</p><p>Per difetto, gli argomenti creati negli ultimi 2 giorni saranno considerati nuovi e mostreranno l''indicatore <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">nuovo</span>.</p><p>Puoi cambiare questa configurazione nelle tue <a href="%{userPrefsUrl}">preferenze</a>.</p>'
           unread: '<p>Qui compaiono i tuoi argomenti non letti.</p><p>Per difetto, gli argomenti sono considerati non letti e mostrano un conteggio di non lettura <span class="badge new-posts badge-notification">1</span> se hai:</p><ul><li>Creato l''argomento</li><li>Risposto all''argomento</li><li>Letto l''argomento per più di 4 minuti</li></ul><p>Oppure se hai esplicitamente impostato l''argomento come Seguito o Osservato usando il pannello di controllo delle notifiche in fondo ad ogni argomento.</p><p>Puoi cambiare questa configurazione nelle tue <a href="%{userPrefsUrl}">preferenze</a>.</p>'
-          starred: '<p>Qui compaiono i tuoi argomenti preferiti.</p><p>Per aggiungere o rimuovere un argomento dai preferiti, usa:</p><ul><li>la <i class="fa fa-star"></i> vicino al titolo di ogni argomento</li><li>il bottone Stella in fondo ad ogni argomento</li></ul>'
+          starred: '<p>Qui compaiono i tuoi argomenti preferiti.</p><p>Per aggiungere o rimuovere un argomento dai preferiti, usa:</p><ul><li>la <i class="fa fa-star"></i> vicino al titolo di ogni argomento</li><li>il bottone Preferito in fondo ad ogni argomento</li></ul>'
       bottom:
         latest: "Non ci sono altri argomenti più recenti."
         hot: "Non ci sono altri argomenti caldi."
@@ -724,10 +728,10 @@ it:
       new: 'nuovo argomento'
       unread: 'non letto'
       new_topics:
-        one: '1 nuovo topic'
+        one: '1 nuovo argomento'
         other: '{{count}} nuovi argomenti'
       unread_topics:
-        one: '1 topic non letto'
+        one: '1 argomento non letto'
         other: '{{count}} argomenti non letti'
       title: 'Argomento'
       loading_more: "Caricamento di altri argomenti..."
@@ -746,13 +750,13 @@ it:
         one: "c'è un post non letto in questa discussione"
         other: "hai {{count}} messagi non letti in questo argomento"
       unread_posts:
-        one: "Hai 1 post non letto in questo topic"
+        one: "Hai 1 vecchio messaggio non letto in questo argomento"
         other: "hai {{count}} vecchi messaggi non letti in questo argomento"
       new_posts:
-        one: "1 nuovo post in questo topic dal tuo ultimo accesso"
-        other: "ci sono {{count}} nuovi messaggi in questo argomento dal tuo ultimo accesso"
+        one: "c'è 1 nuovo messaggio in questo argomento dalla tua ultima lettura"
+        other: "ci sono {{count}} nuovi messaggi in questo argomento dalla tua ultima lettura"
       likes:
-        one: "C'è 1 nuovo \"Mi piace\" in questo topic"
+        one: "c'è 1 \"Mi piace\" in questo argomento"
         other: "ci sono {{count}} \"Mi piace\" in questo argomento"
       back_to_list: "Torna alla Lista Argomenti"
       options: "Opzioni Argomento"
@@ -821,7 +825,7 @@ it:
           title: "Ignorato"
           description: "Non ti verrà notificato nulla di questo argomento e non comparirà nella tab dei non letti."
       actions:
-        recover: "Ripristina l'argomento"
+        recover: "Ripristina Argomento"
         delete: "Cancella l'argomento"
         open: "Apri l'argomento"
         close: "Chiudi l'argomento"
@@ -921,7 +925,6 @@ it:
       post_number: "messaggio {{number}}"
       in_reply_to: "rispondi a"
       last_edited_on: "ultima modifica al messaggio:"
-      reply_as_new_topic: "Rispondi come nuovo Messaggio"
       continue_discussion: "Continua la discussione da {{postLink}}:"
       follow_quote: "vai al messaggio citato"
       show_full: "Mostra Messaggio Completo"
@@ -955,7 +958,7 @@ it:
         yes_value: "Si, abbandona"
       via_email: "questo messaggio è arrivato via email"
       wiki:
-        about: "questo messaggio è una guida; gli utenti normali possono modificarla"
+        about: "questo messaggio è una guida; gli utenti base possono modificarla"
       archetypes:
         save: 'Opzioni di salvataggio'
       controls:
@@ -1140,7 +1143,6 @@ it:
       allow_badges_label: "Permetti che le targhette vengano assegnate in questa categoria"
       edit_permissions: "Modifica Permessi"
       add_permission: "Aggiungi Permesso"
-      everyone_permission: "chiunque"
       this_year: "quest'anno"
       position: "posizione"
       default_position: "Posizione di default"
@@ -1218,7 +1220,7 @@ it:
     views: "Visualizzazioni"
     views_lowercase: "visualizzazioni"
     replies: "Risposte"
-    views_long: "questo topic è stato visualizzato {{number}} volte"
+    views_long: "questo argomento è stato visualizzato {{number}} volte"
     activity: "Attività"
     likes: "Mi piace"
     likes_lowercase: "mi piace"
@@ -1277,8 +1279,8 @@ it:
           other: "{{categoryName}} ({{count}})"
         help: "ultimi argomenti nella categoria {{categoryName}}"
       top:
-        title: "Alto"
-        help: "gli argomenti più attive nell'ultimo anno, mese, settimana o giorno"
+        title: "Di Punta"
+        help: "gli argomenti più attivi nell'ultimo anno, mese, settimana o giorno"
         yearly:
           title: "Migliori dell'anno"
         monthly:
@@ -1621,7 +1623,7 @@ it:
           deleted: "Nessun nuovo valore. Il registro è stato cancellato."
           actions:
             delete_user: "cancella l'utente"
-            change_trust_level: "cambia livello attendibilità"
+            change_trust_level: "cambia livello esperienza"
             change_site_setting: "modifica le impostazioni del sito"
             change_site_customization: "modifica la personalizzazione del sito"
             delete_site_customization: "cancella la personalizzazione del sito"
@@ -1681,11 +1683,11 @@ it:
           active: 'Utenti Attivi'
           new: 'Nuovi Utenti'
           pending: 'Revisione degli utenti in sospeso'
-          newuser: 'Utenti con Livello Attendibilità 0 (Nuovo Utente)'
-          basic: 'Utenti con Livello Attendibilità 1 (Utente Base)'
-          regular: 'Utenti al Livello Esperienza 2 (Base)'
-          leader: 'Utenti al Livello Esperienza 3 (Assiduo)'
-          elder: 'Utenti al Livello Esperienza 4 (Esperto)'
+          newuser: 'Utenti con Livello Esperienza 0 (Nuovo)'
+          basic: 'Utenti con Livello Esperienza 1 (Base)'
+          regular: 'Utenti al Livello Esperienza 2 (Assiduo)'
+          leader: 'Utenti al Livello Esperienza 3 (Esperto)'
+          elder: 'Utenti al Livello Esperienza 4 (Veterano)'
           admins: 'Utenti Amministratori'
           moderators: 'Moderatori'
           blocked: 'Utenti Bloccati'
@@ -1775,12 +1777,12 @@ it:
         deactivate_explanation: "Un utente disattivato deve riconvalidare la propria email."
         suspended_explanation: "Un utente sospeso non può fare il login."
         block_explanation: "Un utente bloccato non può pubblicare messaggi o iniziare argomenti."
-        trust_level_change_failed: "C'è stato un problema nel cambio di livello di attendibilità di questo utente.  "
+        trust_level_change_failed: "C'è stato un problema nel cambio di livello di esperienza di questo utente.  "
         suspend_modal_title: "Sospendi Utente"
-        trust_level_2_users: "Utenti con Livello Attendibilità 2"
-        trust_level_3_requirements: "Requisiti per Livello Attendibilità 3"
+        trust_level_2_users: "Utenti con Livello Esperienza 2"
+        trust_level_3_requirements: "Requisiti per Livello Esperienza 3"
         tl3_requirements:
-          title: "Requisiti per Livello Attendibilità 3"
+          title: "Requisiti per Livello Esperienza 3"
           table_title: "Negli ultimi 100 giorni:"
           value_heading: "Valore"
           requirement_heading: "Requisito"
@@ -1795,9 +1797,8 @@ it:
           flagged_by_users: "Utenti Segnalatori"
           likes_given: "Mi piace - Assegnati"
           likes_received: "Mi piace - Ricevuti"
-          qualifies: "Requisiti per Livello Attendibilità 3."
-          will_be_promoted: "Verrà promosso entro 24 ore."
-          does_not_qualify: "Non ha i requisiti per il Livello Attendibilità 3."
+          qualifies: "Requisiti per livello esperienza 3."
+          does_not_qualify: "Non ha i requisiti per il livello esperienza 3."
         sso:
           title: "Single Sign On"
           external_id: "ID Esterno"
@@ -1805,10 +1806,6 @@ it:
           external_name: "Nome"
           external_email: "Email"
           external_avatar_url: "URL dell'Avatar"
-      site_text:
-        none: "Scegli un tipo di contenuto per iniziare a scrivere."
-        title: 'Contenuto'
-        edit: "Modifica Contenuto Sito"
       site_settings:
         show_overriden: 'Mostra solo i sovrascritti'
         title: 'Impostazioni'
@@ -1824,7 +1821,7 @@ it:
           posting: 'Pubblicazione'
           email: 'Email'
           files: 'File'
-          trust: 'Livelli Attendibilità'
+          trust: 'Livelli Esperienza'
           security: 'Sicurezza'
           onebox: "Onebox"
           seo: 'SEO'
@@ -1875,7 +1872,7 @@ it:
           none: "Aggiorna giornalmente"
           post_action: "Quando un utente agisce su un messaggio"
           post_revision: "Quando un utente modifica o crea un messaggio"
-          trust_level_change: "Quando un utente cambia livello di attendibilità"
+          trust_level_change: "Quando un utente cambia livello di esperienza"
           user_change: "Quando un utente viene modificato o creato"
         preview:
           link_text: "Anteprima targhette guadagnate"
@@ -1899,7 +1896,7 @@ it:
     keyboard_shortcuts_help:
       title: 'Scorciatoie da tastiera'
       jump_to:
-        title: 'Vai A'
+        title: 'Vai A (G)'
         home: '<b>g</b>, <b>h</b> Home (Ultimi)'
         latest: '<b>g</b>, <b>l</b> Ultimi'
         new: '<b>g</b>, <b>n</b> Nuovi'
@@ -1930,7 +1927,6 @@ it:
         star: '<b>f</b> Metti l''argomento nei preferiti'
         share_topic: '<b>shift s</b> Condividi argomento'
         share_post: '<b>s</b> Condividi messaggio'
-        reply_as_new_topic: '<b>t</b> Rispondi come nuovo argomento'
         reply_topic: '<b>shift r</b> Rispondi all''argomento'
         reply_post: '<b>r</b> Rispondi al messaggio'
         quote_post: '<b>q</b> Cita messaggio'
@@ -1940,7 +1936,7 @@ it:
         edit: '<b>e</b> Modifica il messaggio'
         delete: '<b>d</b> Cancella il messaggio'
         mark_muted: '<b>m</b>, <b>m</b> Ignora argomento'
-        mark_regular: '<b>m</b>, <b>r</b> Ripristina (default) argomento'
+        mark_regular: '<b>m</b>, <b>r</b> Argomento normale (default)'
         mark_tracking: '<b>m</b>, <b>t</b> Segui argomento'
         mark_watching: '<b>m</b>, <b>w</b> Osserva argomento'
     badges:
@@ -1952,19 +1948,19 @@ it:
         other: "%{count} Targhette"
       more_badges:
         one: "+1 Più"
-        other: "+%{count} Più"
+        other: "+ altri %{count}"
       granted:
         one: "1 assegnato"
         other: "%{count} assegnate"
-      select_badge_for_title: Scegli una targhetta da usare come tuo titolo
-      no_title: "<no title>"
+      select_badge_for_title: Scegli una targhetta da usare come titolo
+      no_title: "<nessun titolo>"
       badge_grouping:
         getting_started:
           name: Per Iniziare
         community:
           name: Comunità
         trust_level:
-          name: Livello Attendibilità
+          name: Livello Esperienza
         other:
           name: Altro
         posting:
@@ -1977,10 +1973,10 @@ it:
           name: Base
           description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Assegnate</a> tutte le funzioni essenziali della comunità
         member:
-          name: Membro
+          name: Assiduo
           description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Assegnata</a> inviti
         regular:
-          name: Assiduo
+          name: Esperto
           description: '<a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Concessi</a> i permessi di: ricategorizzare, rinominare, collegamenti seguiti e Lounge'
         leader:
           name: Leader
@@ -2034,8 +2030,8 @@ it:
           name: Prima Citazione
           description: Ha citato un utente
         read_guidelines:
-          name: Leggi le Linee Guida
-          description: Leggi le <a href="/guidelines">linee guida della comunità</a>
+          name: Linee Guida Lette
+          description: Hai letto le <a href="/guidelines">linee guida della comunità</a>
         reader:
           name: Lettore
           description: Leggi tutti i messaggi in un argomento con più di 100 messaggi

config/locales/client.ja.yml

@@ -310,6 +310,7 @@ ja:
         title: "プロフィール背景"
       email:
         title: "メールアドレス"
+        instructions: "Eメールアドレスは外部に公開されません。"
         ok: "メールアドレス OK。確認用のメールを送ります。"
         invalid: "正しいメールアドレスを入力してください。"
         authenticated: "あたなのメールは {{provider}} により認証されました。"
@@ -321,6 +322,7 @@ ja:
         ok: "名前 OK。"
       username:
         title: "ユーザ名"
+        instructions: "空白を含まないユニークな名前を入力してください。"
         short_instructions: "他のユーザはあなたを @{{username}} でタグ付けできます。"
         available: "ユーザ名は利用可能です。"
         global_match: "メールアドレスが登録済のユーザ名と一致しました。"
@@ -470,7 +472,6 @@ ja:
     created: '作成'
     created_lowercase: '作成'
     trust_level: 'トラストレベル'
-    search_hint: 'ユーザーメールかEメールアドレス'
     create_account:
       title: "アカウントの作成"
       failed: "エラーが発生しました。既にこのメールアドレスは使用中かもしれません。「パスワードを忘れました」リンクを試してみてください"
@@ -864,7 +865,6 @@ ja:
       post_number: "ポスト{{number}}"
       in_reply_to: "こちらへの回答"
       last_edited_on: "ポストの最終編集日"
-      reply_as_new_topic: "新規トピックとして回答"
       continue_discussion: "{{postLink}} からの議論を継続:"
       follow_quote: "引用ポストに移動"
       show_full: "全て表示"
@@ -1006,6 +1006,9 @@ ja:
           side_by_side:
             title: "差分を横に並べて表示"
             button: '<i class="fa fa-columns"></i> HTML'
+          side_by_side_markdown:
+            title: "ソース文書で表示する"
+            button: 'ソース文書'
         details:
           edited_by: "編集者"
     category:
@@ -1629,17 +1632,12 @@ ja:
           likes_given: "与えた「いいね！」"
           likes_received: "もらった「いいね！」"
           qualifies: "トラストレベル3の条件を満たしています。"
-          will_be_promoted: "24時間内プロモートする予定"
           does_not_qualify: "トラストレベル3の条件を満たしていません。"
         sso:
           external_username: "ユーザ名"
           external_name: "名前"
           external_email: "メール"
           external_avatar_url: "アバターURL"
-      site_text:
-        none: "編集するコンテンツのタイプを選択してください。"
-        title: 'コンテンツ'
-        edit: "サイトのコンテンツを編集"
       site_settings:
         show_overriden: '上書き部分のみ表示'
         title: '設定'
@@ -1735,7 +1733,6 @@ ja:
         star: '<b>f</b> お気に入りトピック'
         share_topic: '<b>shift s</b> トピックをシェアする'
         share_post: '<b>s</b> 投稿をシェアする'
-        reply_as_new_topic: '<b>t</b> 新規トピックとして回答する'
         reply_topic: '<b>shift r</b> トピックに返信'
         reply_post: '<b>r</b> 投稿に返信'
         quote_post: '<b>q</b> 投稿を引用する'
@@ -1813,10 +1810,10 @@ ja:
           description: サイト内投稿のリンクを挿入した
         first_quote:
           name: 最初の投稿
-          description: このユーザーにタグ付けをする
+          description: ユーザーにタグ付けました
         read_guidelines:
-          name: ガイドラインを読む
-          description: <a href="/guidelines">community guidelines</a>を読む
+          name: ガイドラインを読んだ
+          description: <a href="/guidelines">community guidelines</a>を読みました
         reader:
           name: 閲覧者
           description: 100以上の投稿があるトピック内の投稿をすべて読みました。

config/locales/client.ko.yml

@@ -232,6 +232,7 @@ ko:
       other_accounts: 이 IP 주소로 접속한 다른 계정
       no_other_accounts: (없음)
     user:
+      said: "{{username}}:"
       profile: "프로필"
       mute: "음소거"
       edit: "편집"
@@ -261,6 +262,7 @@ ko:
       watched_categories: "모든 알림 받기"
       watched_categories_instructions: "이 카테고리들에 있는 모든 새로운 토픽에 대한 알림을 켭니다. 새로운 글과 토픽이 작성될 때마다 알림이 오고, 읽지 않은 글과 새로운 글 수가 토픽의 리스트에 나타납니다."
       tracked_categories: "새 글 표시하기"
+      tracked_categories_instructions: "현재 카테고리에 있는 모든 토픽을 추적합니다. 읽지 않은 글과 새로운 글 수가 나타납니다."
       muted_categories: "알림 끄기"
       muted_categories_instructions: "이 카테고리들에 새로 작성되는 새로운 토픽에 대한 알림이 오지 않도록 합니다. '읽지 않은'탭에서도 보이지 않게 됩니다."
       delete_account: "내 계정 삭제"
@@ -269,9 +271,11 @@ ko:
       delete_yourself_not_allowed: "지금은 당신의 계정을 삭제할 수 없습니다. 관리자에게 당신의 계정을 삭제해달라고 연락해보세요."
       unread_message_count: "메시지"
       staff_counters:
+        flags_given: "유용한 신고"
         flagged_posts: "신고된 게시글"
         deleted_posts: "삭제된 글"
         suspensions: "정지시킨 계정"
+        warnings_received: "경고"
       messages:
         all: "전체"
         mine: "내가 보낸 메세지"
@@ -309,6 +313,7 @@ ko:
         title: "프로필 배경"
       email:
         title: "이메일"
+        instructions: "절대로 공개되지 않습니다."
         ok: "완료. 확인 이메일을 보냈습니다."
         invalid: "사용하고 계시는 이메일 주소를 입력해주세요."
         authenticated: "당신의 이메일은 {{provider}}에 의해 인증되었습니다."
@@ -320,6 +325,7 @@ ko:
         ok: "사용가능합니다."
       username:
         title: "아이디"
+        instructions: "중복될 수 없으며 띄어쓰기 사용이 불가합니다. 짧을 수록 좋아요."
         short_instructions: "@{{username}}으로 언급이 가능합니다."
         available: "아이디\x1D로 사용가능합니다."
         global_match: "이메일이 등록된 아이디와 일치합니다."
@@ -351,6 +357,7 @@ ko:
         bi_weekly: "격주"
       email_direct: "누군가가 게시물에 @사용자이름 또는 답글을 달 경우에 이메일을 받습니다."
       email_private_messages: "누군가 당신에게 메세지를 보낼 때 이메일을 받습니다."
+      email_always: "싸이트에 방문 중 일 때 이메일 알림을 보내지 마세요."
       other_settings: "추가 사항"
       categories_settings: "카테고리"
       new_topic_duration:
@@ -390,6 +397,7 @@ ko:
         bulk_invite:
           none: "아직 아무도 초대하지 않았습니다. 초대장을 각각 보내거나, <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>uploading a bulk invite file</a>을 이용하여 단체 초대를 보낼 수 있습니다."
           text: "파일로 대량 초대하기"
+          uploading: "업로드 중..."
           success: "파일이 성공적으로 업로드되었습니다. 곧 진행 상황을 알려드리겠습니다."
           error: "'{{filename}}': {{message}} 업로드중 에러가 있었습니다."
       password:
@@ -397,6 +405,8 @@ ko:
         too_short: "암호가 너무 짧습니다."
         common: "That password is too common."
         ok: "적절한 암호입니다."
+        instructions: "글자 수가 %{count}자 이상이어야 합니다."
+      associated_accounts: "관련된 계정"
       ip_address:
         title: "마지막 IP 주소"
       registration_ip_address:
@@ -424,6 +434,7 @@ ko:
         network: "접속상태를 확인해주세요."
         network_fixed: "문제가 해결된 것으로 보입니다."
         server: "에러 코드: {{status}}"
+        forbidden: "볼 수 있도록 허용되지 않았습니다."
         unknown: "문제가 발생했습니다."
       buttons:
         back: "뒤로가기"
@@ -449,6 +460,7 @@ ko:
     last_post: 최근 게시물
     last_post_lowercase: 마지막 글
     summary:
+      enabled_description: "현재 토픽에서 가장 인기 있는 몇 개의 글들을 보고 있습니다."
       description: "<b>{{count}}</b>개의 답글이 있습니다."
       description_time: "총 <b>{{count}}</b>개의 댓글이 있습니다. 예상 소요 시간은 <b>{{readingTime}}분</b>입니다.."
       enable: '이 토픽을 요약'
@@ -468,7 +480,6 @@ ko:
     created: '생성'
     created_lowercase: '최초 글'
     trust_level: '신뢰도'
-    search_hint: 'username 혹은 email'
     create_account:
       title: "회원 가입"
       failed: "뭔가 잘못되었습니다. 이 메일은 등록이 되어있습니다. 비밀번호를 잊으셨다면 비밀번호 찾기를 눌러주세요."
@@ -479,6 +490,10 @@ ko:
       reset: "암호 재설정"
       complete_username: "당신의 계정이  <b>%{username}</b>와 일치한다면, 곧 비밀번호 초기화 방법과 관련된 안내 메일을 받게 됩니다."
       complete_email: "만약 계정이 <b>%{email}</b>과 일치한다면, 비밀번호를 재설정하는 방법에 대한 이메일을 곧 받게 됩니다."
+      complete_username_found: "<b>%{username}</b>과 일치하는 계정을 찾았습니다. 비밀번호를 초기화하는 방법이 담긴 메일을 발송하였으니 확인하여 주십시요."
+      complete_email_found: "<b>%{email}</b>과 일치하는 계정을 찾았습니다. 비밀번호를 초기화하는 방법이 담긴 메일을 발송하였으니 확인하여 주십시요."
+      complete_username_not_found: "<b>%{username}</b>과 일치하는 계정이 없습니다."
+      complete_email_not_found: "<b>%{email}</b>과 일치하는 계정이 없습니다."
     login:
       title: "로그인"
       username: "사용자"
@@ -517,6 +532,7 @@ ko:
         title: "GitHub"
         message: "GitHub 인증 중(팝업 차단을 해제 하세요)"
     composer:
+      add_warning: "공식적인 경고입니다."
       posting_not_on_topic: "어떤 토픽에 답글을 작성하시겠습니까?"
       saving_draft_tip: "저장 중..."
       saved_draft_tip: "저장 완료"
@@ -599,6 +615,7 @@ ko:
       invitee_accepted: "<i title='accepted your invitation' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='moved post' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
       linked: "<i title='linked post' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
+      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>'{{description}}' 뱃지를 받았습니다.</p>"
     upload_selector:
       title: "이미지 추가하기"
       title_with_attachments: "이미지 또는 파일 추가하기"
@@ -643,6 +660,7 @@ ko:
         actions: "일괄 적용"
         change_category: "카테고리 변경"
         close_topics: "토픽 닫기"
+        archive_topics: "토픽 보관하기"
         notification_level: "알림 설정 변경"
         selected:
           other: "<b>{{count}}</b>개의 토픽이 선택되었습니다."
@@ -656,6 +674,10 @@ ko:
         hot: "인기있는 토픽이 없습니다."
         category: "{{category}}에 토픽이 없습니다."
         top: "Top 토픽이 없습니다."
+        educate:
+          new: '<p>새로운 토픽은 여기에서 볼 수 있습니다.</p><p>기본 설정으로 2일 이내에 생성된 토픽은 새로운 것으로 간주되며 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">new</span> 표시가 나타납니다.</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>'
+          starred: '<p>즐겨찾기한 토픽은 여기에서 볼 수 있습니다.</p><p>즐겨찾기를 하거나 취소하는 방법 :</p><ul><li>토픽 주제 옆에 <i class="fa fa-star"></i>를 누른다.</li><li>각 토픽 아래에 표시된 별표 버튼을 누른다.</li></ul>'
       bottom:
         latest: "더 이상 읽을 최신 토픽이 없습니다"
         hot: "더 이상 읽을 인기있는 토픽이 없습니다"
@@ -743,13 +765,16 @@ ko:
           '0': '당신은 이 토픽에 관한 모든 알림을 무시합니다.'
         watching_pm:
           title: "알림 : 주시 중"
+          description: "개인 메시지의 새로운 게시글은 항상 알림이 동작합니다. 읽지 않은 글의 수는 토픽 옆에 표시됩니다."
         watching:
           title: "주시 중"
+          description: "이 토픽의 새로운 게시글은 항상 알림이 동작합니다. 읽지 않은 글의 수는 토픽 옆에 표시됩니다."
         tracking_pm:
           title: "알림 : 새 글 표시 중"
           description: "읽지 않은 글과 새로운 게시물 수를 볼 수 있습니다. 누군가 당신의 @name을 언급했거나 당신의 글에 답글을 작성하면 알림을 받습니다."
         tracking:
           title: "새 글 표시 중"
+          description: "읽지 않은 게시글의 수는 토픽 옆에 표시됩니다. 당신의 @이름 을 언급하거나 당신의 게시글에 답글을 작성한 경우에 알림이 작동합니다."
         regular:
           title: "알림: 일반"
           description: "누군가가 게시물에 @사용자이름 또는 답글을 달 경우에 알림을 받게 됩니다."
@@ -775,6 +800,8 @@ ko:
         pin_globally: "전체 공지글로 설정하기"
         unarchive: "보관 안된 토픽"
         archive: "보관된 토픽"
+        invisible: "목록에서 제외하기"
+        visible: "목록에 넣기"
         reset_read: "값 재설정"
         multi_select: "게시글 이동을 위한 다중 선택"
       reply:
@@ -856,7 +883,7 @@ ko:
       post_number: "{{number}}번째 게시물"
       in_reply_to: "답글 to"
       last_edited_on: "마지막으로 편집:"
-      reply_as_new_topic: "새로운 토픽으로 답글 달기"
+      reply_as_new_topic: "링크된 토픽으로 답글 작성하기"
       continue_discussion: "{{postLink}}에서 토론을 계속:"
       follow_quote: "인용 글로 이동"
       show_full: "전체 글 보기"
@@ -880,6 +907,7 @@ ko:
         upload_not_authorized: "업로드 하시려는 파일 확장자는 사용이 불가능합니다 (사용가능 확장자: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 이미지를 업로드 하실 수 없습니다."
         attachment_upload_not_allowed_for_new_user: "죄송합니다. 새로운 유저는 파일 첨부를 업로드 하실 수 없습니다."
+        attachment_download_requires_login: "죄송합니다. 첨부 파일을 받으려면 로그인이 필요합니다."
       abandon:
         confirm: "게시물 작성을 취소 하시겠습니까?"
         no_value: "아니오"
@@ -909,7 +937,10 @@ ko:
         admin: "관리자 기능"
         wiki: "위키 만들기"
         unwiki: "위키 제거하기"
+        convert_to_moderator: "스태프 색상 추가하기"
+        revert_to_regular: "스태프 색상 제거하기"
         rebake: "HTML 다시 빌드하기"
+        unhide: "숨기지 않기"
       actions:
         flag: '신고'
         defer_flags:
@@ -1005,6 +1036,7 @@ ko:
             title: "Show the rendered output diffs side-by-side"
             button: '<i class="fa fa-columns"></i> HTML'
           side_by_side_markdown:
+            title: "Raw source diff를 양쪽으로 보기"
             button: '<i class="fa fa-columns"></i> Raw'
         details:
           edited_by: "Edited by"
@@ -1027,7 +1059,7 @@ ko:
       topic: "카테고리 토픽"
       logo: "카테고리 로고 이미지"
       background_image: "카테고리 백그라운드 이미지"
-      badge_colors: "훈장 색상"
+      badge_colors: "뱃지 색상"
       background_color: "배경 색상"
       foreground_color: "글씨 색상"
       name_placeholder: "짧고 간결해야합니다"
@@ -1049,16 +1081,19 @@ ko:
       allow_badges_label: "뱃지가 이 카테고리에서 주어질 수 있도록 허용"
       edit_permissions: "권한 수정"
       add_permission: "권한 추가"
-      everyone_permission: "누구나"
       this_year: "올해"
       position: "위치"
       default_position: "Default Position"
+      position_disabled: "카테고리는 활동량에 따라서 표시됩니다. 목록 내의 카테고리 순서를 지정하하려면"
+      position_disabled_click: '"카테고리 위치 고정" 설정을 활성화 시키십시요.'
       parent: "부모 카테고리"
       notifications:
         watching:
           title: "주시 중"
+          description: "이 카테고리 내의 새로운 토픽들을 지켜보도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다."
         tracking:
           title: "새 글 표시 중"
+          description: "이 카테고리 내의 새로운 토픽들을 추적하도록 자동으로 설정됩니다. 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다."
         regular:
           title: "알림: 일반"
           description: "누군가 당신의 @name 으로 언급했거나 당신의 글에 답글이 달릴 때만 알림을 받게 됩니다."
@@ -1107,6 +1142,8 @@ ko:
         help: "이 토픽은 고정되었습니다. 카테고리의 상단에 표시됩니다."
       archived:
         help: "이 토픽은 보관중입니다. 고정되어 변경이 불가능합니다."
+      invisible:
+        help: "이 토픽은 목록에서 제외됩니다. 토픽 목록에 표시되지 않으며 링크를 통해서만 접근 할 수 있습니다."
     posts: "게시물"
     posts_lowercase: "게시글"
     posts_long: "이 토픽의 게시물 수는 {{number}}개 입니다."
@@ -1149,6 +1186,7 @@ ko:
           zero: "읽지 않은"
           one: "읽지 않은(1)"
           other: "읽지 않은({{count}})"
+        help: "지켜보거나 추적 중인 읽지 않은 토픽 "
         lower_title_with_count:
           one: "1개의 읽지 않은 글"
           other: "{{count}}개의 읽지 않은 글"
@@ -1161,6 +1199,7 @@ ko:
           zero: "새로운"
           one: "새로운(1)"
           other: "새로운({{count}})"
+        help: "며칠 내에 만들어진 토픽"
       posted:
         title: "내 게시물"
         help: "당신이 게시한 글"
@@ -1172,6 +1211,7 @@ ko:
         help: "{{categoryName}}카테고리의 최신 토픽"
       top:
         title: "인기"
+        help: "작년 또는 지난 달, 지난 주, 어제에 활발했던 토픽"
         yearly:
           title: "연간 인기글"
         monthly:
@@ -1185,6 +1225,7 @@ ko:
         this_week: "이번 주"
         today: "오늘"
         other_periods: "더 많은 인기 토픽 보기"
+    browser_update: '안타깝게도 <a href="http://www.discourse.org/faq/#browser">사용하시는 브라우저가 오래되어서 이 사이트를 이용하기 어렵습니다.</a>. <a href="http://browsehappy.com">브라우저를 업그레이드 하시기 바랍니다.</a>.'
     permission_types:
       full: "생성 / 답글 / 보기"
       create_post: "답글 / 보기"
@@ -1236,20 +1277,36 @@ ko:
         old: "지난"
         active: "활성화된"
         agree: "동의"
+        agree_title: "이 신고가 올바르고 타당한지 확인하세요."
         agree_flag_modal_title: "동의 및 ..."
         agree_flag_hide_post: "동의 (포스트 숨기기 + 개인 메시지 보내기)"
         agree_flag_hide_post_title: "이 게시물을 숨기고 자동으로 해당 사용자에게 이 게시물의 편집을 요청하는 개인 메시지를 보냄"
+        agree_flag_restore_post: "동의하기(게시글 복원)"
+        agree_flag_restore_post_title: "게시글을 복원하기"
+        agree_flag: "신고에 동의함"
+        agree_flag_title: "신고에 동의하며 게시글이 수정되지 않도록 유지하기"
         defer_flag: "연기"
+        defer_flag_title: "신고 제거하기. 현재 어떠한 행위를 할 필요 없음"
         delete: "삭제"
+        delete_title: "신고에서 언급된 게시글 삭제하기"
+        delete_post_defer_flag: "게시글을 삭제하고 신고에 결정을 따름"
+        delete_post_defer_flag_title: "게시글을 삭제하고 첫번째 게시글이면 토픽 삭제하기"
+        delete_post_agree_flag: "게시글을 삭제하고 신고에 동의함"
+        delete_post_agree_flag_title: "게시글을 삭제하고 첫번째 게시글이면 토픽 삭제하기"
         delete_flag_modal_title: "삭제하고.."
         delete_spammer: "스패머 삭제"
+        delete_spammer_title: "사용자와 사용자가 작성한 모든 토픽과 게시글을 삭제함 "
         disagree_flag_unhide_post: "Disagree (글 감추기 취소)"
+        disagree_flag_unhide_post_title: "게시글의 모든 신고를 삭제하고 게시글을 볼 수 있도록 변경"
         disagree_flag: "Disagree"
+        disagree_flag_title: "신고를 유효하지 않거나 올바르지 않은 것으로 거부함"
         clear_topic_flags: "완료"
         clear_topic_flags_title: "이 토픽을 조사하였고 이슈는 해결되었습니다. 플래그를 지우기 위해 완료를 클리하세요"
+        more: "(더 많은 답글...)"
         dispositions:
           agreed: "agreed"
           disagreed: "disagreed"
+          deferred: "유예 중인"
         flagged_by: "신고 한 사람"
         resolved_by: "해결 by"
         took_action: "처리하기"
@@ -1259,6 +1316,8 @@ ko:
         no_results: "신고가 없습니다."
         topic_flagged: "이 <strong>토픽</strong>은 신고 되었습니다."
         visit_topic: "처리하기 위해 토픽으로 이동"
+        was_edited: "첫 신고 이후에 게시글이 수정되었음"
+        previous_flags_count: "이 게시글은 이미 {{count}}번 이상 신고 되었습니다."
         summary:
           action_type_3:
             other: "off-topic x{{count}}"
@@ -1297,6 +1356,7 @@ ko:
         confirm_revoke: "API 키를 폐지하겠습니까?"
         info_html: "당신의 API 키는 JSON콜을 이용하여 토픽을 생성하거나 수정할 수 있습니다."
         all_users: "전체 유저"
+        note_html: "이 키의 <strong>보안에 특별히 주의</strong>하세요. 이 키를 아는 모든 사용자는 다른 사용자의 이름으로 게시물을 작성할 수 있습니다."
       backups:
         title: "백업"
         menu:
@@ -1317,6 +1377,8 @@ ko:
           filename: "파일명"
           size: "크기"
         upload:
+          text: "업로드"
+          uploading: "업로드 중..."
           success: "'{{filename}}' 파일이 성공적으로 업로드 되었습니다."
           error: "'{{filename}}' 파일 업로드중 에러가 발생하였습니다. ({{message}})"
         operations:
@@ -1329,6 +1391,7 @@ ko:
           backup:
             text: "백업"
             title: "백업 생성"
+            confirm: "새로운 백업을 시작할까요?"
             without_uploads: "네 (업로드 없이)"
           download:
             text: "다운로드"
@@ -1453,6 +1516,7 @@ ko:
             user_placeholder: "사용자명"
             address_placeholder: "name@example.com"
             type_placeholder: "다이제스트, 가입..."
+            reply_key_placeholder: "답글 키"
             skipped_reason_placeholder: "이유"
       logs:
         title: "로그"
@@ -1492,8 +1556,8 @@ ko:
             delete_site_customization: "사이트 커스텀화 삭제"
             suspend_user: "suspend user"
             unsuspend_user: "unsuspend user"
-            grant_badge: "훈장 부여"
-            revoke_badge: "훈장 회수"
+            grant_badge: "뱃지 부여"
+            revoke_badge: "뱃지 회수"
         screened_emails:
           title: "블락된 이메일들"
           description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다."
@@ -1519,6 +1583,9 @@ ko:
             add: "추가"
         logster:
           title: "에러 로그"
+      impersonate:
+        title: "이 사용자 행세하기"
+        help: "디버깅 목적으로 사용자 계정으로 로그인 할 수 있습니다. 사용이 끝나면 로그아웃하여야 합니다."
       users:
         title: '사용자'
         create: '관리자 사용자 추가'
@@ -1544,6 +1611,9 @@ ko:
           pending: '검토가 필요한 사용자'
           newuser: '사용자 신뢰도 0 (새로운 사용자)'
           basic: '사용자 신뢰도 1 (초보 사용자)'
+          regular: '사용자 신뢰도 2 (회원)'
+          leader: '사용자 신뢰도 3 (정규)'
+          elder: '사용자 신뢰도 4 (지도자)'
           admins: '관리자 사용자 목록'
           moderators: '운영자'
           blocked: '블락된 사용자들'
@@ -1552,6 +1622,7 @@ ko:
           other: "성공적으로 ${count}명의 사용자를 거절하였습니다."
         reject_failures:
           other: "%{count}명의 사용자를 거부하는데 실패했습니다."
+        not_verified: "확인되지 않은"
       user:
         suspend_failed: "이 사용자를 접근 금지하는데 오류 발생 {{error}}"
         unsuspend_failed: "이 사용자를 접근 허용 하는데 오류 발생 {{error}}"
@@ -1595,6 +1666,7 @@ ko:
         topics_entered: 읽은 토픽 수
         flags_given_count: 작성한 신고
         flags_received_count: 받은 신고
+        warnings_received_count: 받은 경고
         flags_given_received_count: '준/받은 신고'
         approve: '승인'
         approved_by: "승인자"
@@ -1647,7 +1719,6 @@ ko:
           likes_given: "선사한  '좋아요'"
           likes_received: "받은 '좋아요'"
           qualifies: "신뢰 등급 3의 조건에 부합합니다."
-          will_be_promoted: "24시간 내에 승급됩니다."
           does_not_qualify: "신뢰 등급 3의 조건에 부합하지 않습니다."
         sso:
           title: "Single Sign On"
@@ -1656,10 +1727,24 @@ ko:
           external_name: "Name"
           external_email: "Email"
           external_avatar_url: "Avatar URL"
+      user_fields:
+        title: "사용자 필드"
+        description: "사용자가 가입할 때 입력하여야 하는 필드를 여기에 추가하세요."
+        create: "사용자 필드 생성하기"
+        untitled: "무제"
+        name: "필드명"
+        type: "필드 속성"
+        save: "저장"
+        edit: "편집"
+        delete: "삭제"
+        cancel: "취소"
+        delete_confirm: "사용자 필드를 삭제할까요?"
+        field_types:
+          text: '텍스트 필드'
+          confirm: '확인'
       site_text:
-        none: "편집을 시작하려는 컨텐츠의 타입을 선택하세요."
-        title: '사이트 컨텐츠'
-        edit: "사이트 컨텐츠를 편집"
+        none: "편집할 콘텐츠 유형을 선택하세요."
+        title: '텍스트 콘텐츠'
       site_settings:
         show_overriden: '수정된 것만 표시'
         title: '사이트 설정'
@@ -1688,14 +1773,14 @@ ko:
           backups: "백업"
           login: "로그인"
       badges:
-        title: 훈장
-        new_badge: 새로운 훈장
+        title: 뱃지
+        new_badge: 새로운 뱃지
         new: 새 훈장
         name: 이름
-        badge: 훈장
+        badge: 뱃지
         display_name: 표시 이름
         description: 설명
-        badge_type: 훈장 종류
+        badge_type: 뱃지 종류
         badge_grouping: 그룹
         badge_groupings:
           modal_title: 뱃지 그룹으로 나누기
@@ -1703,24 +1788,24 @@ ko:
         granted_at: 훈장 수여일
         save: 저장
         delete: 삭제
-        delete_confirm: 정말로 이 훈장을 삭제하시겠습니까?
+        delete_confirm: 정말로 이 뱃지를 삭제하시겠습니까?
         revoke: 회수
-        revoke_confirm: 정말로 이 훈장을 회수하시겠습니까?
-        edit_badges: 훈장 수정
-        grant_badge: 훈장 부여
-        granted_badges: 부여된 훈장
+        revoke_confirm: 정말로 이 뱃지를 회수하시겠습니까?
+        edit_badges: 뱃지 수정
+        grant_badge: 뱃지 부여
+        granted_badges: 부여된 뱃지
         grant: 부여
-        no_user_badges: "%{name}님은 어떤 훈장도 받지 못했습니다."
-        no_badges: 받을 수 있는 훈장이 없습니다.
-        allow_title: 훈장을 제목으로 사용가능하도록 허용
+        no_user_badges: "%{name}님은 수여받은 뱃지가 없습니다."
+        no_badges: 받을 수 있는 뱃지가 없습니다.
+        allow_title: 뱃지를 칭호로 사용 가능하도록 허용
         multiple_grant: 중복 부여할 수 있도록 허용
-        listable: 공개 훈장 페이지에 표시되는 배지입니다.
-        enabled: 훈장 기능 사용
+        listable: 공개 뱃지 페이지에 표시되는 뱃지입니다.
+        enabled: 뱃지 기능 사용
         icon: 아이콘
-        query: 훈장 Query(SQL)
+        query: 뱃지 Query(SQL)
         target_posts: 포스트들을 타겟으로 하는 query
         auto_revoke: 매일 회수 query를 실행한다.
-        show_posts: 훈장 페이지에서 훈장을 받게한 포스트를 보여줍니다.
+        show_posts: 뱃지 페이지에서 뱃지를 받게한 게시글을 보여줍니다.
         trigger: Trigger
         trigger_type:
           none: "매일 업데이트"
@@ -1729,8 +1814,18 @@ ko:
           trust_level_change: "사용자의 신뢰도가 변했을 떄"
           user_change: "사용자가 수정되거나 생성되었을 때"
         preview:
+          link_text: "수여된 뱃지 미리보기"
+          plan_text: "Query plan 미리보기"
+          modal_title: "뱃지 Query 미리보기"
+          sql_error_header: "Query에 오류가 있습니다."
+          error_help: "뱃지 query의 도움말을 보려면 다음의 링크를 확인하세요."
           bad_count_warning:
             header: "주의!"
+            text: "사라진 뱃지 샘플이 있습니다. 뱃지 query가 존재하지 않는 user ID나 post ID를 반환할 경우 발생합니다. 예상하지 못한 결과를 일으킬 수 있으니 query를 다시 한번 확인하세요."
+          grant_count:
+            zero: "할당된 뱃지가 없습니다."
+            one: "<b>1</b>개의 뱃지가 할당됨."
+            other: "<b>%{count}</b>개의 뱃지가 할당됨."
           sample: "샘플:"
           grant:
             with: <span class="username">%{username}</span>
@@ -1749,23 +1844,31 @@ ko:
         unread: '<b>g</b>, <b>u</b> 읽지 않은'
         starred: '<b>g</b>, <b>f</b> 즐겨찾기'
         categories: '<b>g</b>, <b>c</b> 카테고리'
+        top: '<b>g</b>, <b>t</b> 인기'
       navigation:
         title: 'Navigation'
+        jump: '<b>#</b> 게시글 번호로'
         back: '<b>u</b> Back'
+        up_down: '<b>k</b>/<b>j</b> 선택된 게시글 이동 &uarr; &darr;'
         open: '<b>o</b> or <b>Enter</b> 선택한 토픽에 들어갑니다.'
         next_prev: '<b>shift j</b>/<b>shift k</b> 다음/이전 섹션'
       application:
         title: 'Application'
         create: '<b>c</b> 새 토픽을 만듭니다.'
         notifications: '<b>n</b> Open notifications'
+        site_map_menu: '<b>=</b> 사이트 메뉴 열기'
+        user_profile_menu: '<b>p</b> 사용자 메뉴 열기'
+        show_incoming_updated_topics: '<b>.</b> 갱신된 토픽 보기'
         search: '<b>/</b> Search'
+        help: '<b>?</b> 키보드 도움말 열기'
         dismiss_new_posts: '<b>x</b>, <b>r</b> 새글을 읽은 상태로 표시하기'
+        dismiss_topics: '<b>x</b>, <b>t</b> 토픽 무시하기'
       actions:
         title: 'Actions'
         star: '<b>f</b> 별표시 토픽'
         share_topic: '<b>shift s</b> 토픽 공유'
         share_post: '<b>s</b> 게시글 공유'
-        reply_as_new_topic: '<b>t</b> 새 토픽으로 답글 작성하기'
+        reply_as_new_topic: '<b>t</b> 링크된 토픽으로 답글 작성하기'
         reply_topic: '<b>shift r</b> 토픽에 답변 달기'
         reply_post: '<b>r</b> 게시글에 답글 달기'
         quote_post: '<b>q</b> 인용 글'
@@ -1779,16 +1882,16 @@ ko:
         mark_tracking: '<b>m</b>, <b>t</b> 토픽 알람 : 추적하기'
         mark_watching: '<b>m</b>, <b>w</b> 토픽 알람 : 주시하기'
     badges:
-      title: 훈장
-      allow_title: "훈장을 제목으로 사용가능하도록 허용중인가요?"
+      title: 뱃지
+      allow_title: "뱃지를 칭호로 사용 가능하도록 허용할까요?"
       multiple_grant: "중복해서 부여할 수 있나요?"
       badge_count:
-        other: "%{count} 훈장"
+        other: "뱃지 %{count}개"
       more_badges:
         other: "+%{count} More"
       granted:
         other: "%{count} 개 부여"
-      select_badge_for_title: 호칭으로 사용할 훈장을 선택하세요
+      select_badge_for_title: 칭호로 사용할 뱃지를 선택하세요
       no_title: "호칭 없음"
       badge_grouping:
         getting_started:
@@ -1825,13 +1928,13 @@ ko:
           description: 사용자의 <a href="/my/preferences">프로필</a> 정보를 작성함
         nice_post:
           name: 괜찮은 글
-          description: 작성한 글이 좋아요를 10개 받았습니다. 이 훈장은 중복 수여 가능합니다.
+          description: 작성한 글이 좋아요를 10개 받았습니다. 이 뱃지는 중복 수여 가능합니다.
         good_post:
           name: 좋은 글
-          description: 작성한 글이 좋아요를 25개 받았습니다. 이 훈장은 중복 수여 가능합니다.
+          description: 작성한 글이 좋아요를 25개 받았습니다. 이 뱃지는 중복 수여 가능합니다.
         great_post:
           name: 굉장히 좋은 글
-          description: 작성한 글이 좋아요를 50개 받았습니다. 이 훈장은 중복 수여 가능합니다.
+          description: 작성한 글이 좋아요를 50개 받았습니다. 이 뱃지는 중복 수여 가능합니다.
         nice_topic:
           name: Nice 토픽
           description: 10개의 '좋아요'를 받았습니다. 이 뱃지는 여러번 받을 수 있습니다.

config/locales/client.nb_NO.yml

@@ -60,6 +60,7 @@ nb_NO:
           one: "1år"
           other: "%{count}år"
         date_month: "D MMM"
+        date_year: "MMM 'YY"
       medium:
         x_minutes:
           one: "1 minutt"
@@ -241,6 +242,9 @@ nb_NO:
         one: "%{count} nytt emner de siste %{unit}."
         other: "%{count} nye emner de siste %{unit}."
       post_stats: "Antall nye innlegg."
+      post_stat_sentence:
+        one: "%{count} nye innlegg den siste %{unit}."
+        other: "%{count} nye innlegg de siste %{unit}."
     ip_lookup:
       title: Slå opp IP Addresse
       hostname: Hostname
@@ -251,6 +255,7 @@ nb_NO:
       other_accounts: Andre kontoer med denne IP addressen
       no_other_accounts: (ingen)
     user:
+      said: "{{username}}:"
       profile: "Profil"
       mute: "Mute"
       edit: "Edit Preferences"
@@ -280,6 +285,7 @@ nb_NO:
       watched_categories: "Så"
       watched_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategoriene. Du vil bli varslet om alle nye innlegg og emner samt at antallet uleste og nye innlegg vil vises sammen med emneoppføringen."
       tracked_categories: "Følger"
+      tracked_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategoriene. Antallet uleste og nye emner vil vises ved siden av emnet."
       muted_categories: "Dempet"
       muted_categories_instructions: "Du vil ikke bli varslet om nye emner i disse kategoriene og de vil ikke vises i listen over ulest innhold."
       delete_account: "Slett kontoen min"
@@ -288,9 +294,11 @@ nb_NO:
       delete_yourself_not_allowed: "Kontoen din kan ikke slettes akkurat nå. Kontakt en administrator til å slette kontoen for deg."
       unread_message_count: "Meldinger"
       staff_counters:
+        flags_given: "nyttige flagg"
         flagged_posts: "rapporterte innlegg"
         deleted_posts: "slettede innlegg"
         suspensions: "suspenderinger"
+        warnings_received: "advarsler"
       messages:
         all: "Alle"
         mine: "Mine"
@@ -328,16 +336,19 @@ nb_NO:
         title: "Profilbakgrunn"
       email:
         title: "Email"
+        instructions: "Vises aldri offentlig"
         ok: "Ser bra ut. Vi sender deg en email for å bekrefte."
         invalid: "Vennligst skriv inn en gyldig emailaddresse."
         authenticated: "Din email har blitt autentisert av {{provider}}."
         frequency: "Vi sender deg bare en email om vi ikke har sett deg nylig og du har ikke allerede sett tingen vi varslet deg om."
       name:
         title: "Naavn"
+        instructions: "Ditt fulle navn."
         too_short: "Navnet ditt er for kort."
         ok: "Navnet ditt ser bra ut."
       username:
         title: "Brukernavn"
+        instructions: "Unikt, kort og uten mellomrom."
         short_instructions: "Folk kan nevne deg som @{{username}}."
         available: "Ditt brukernavn er tilgjengelig."
         global_match: "Email matcher det registrerte brukernavnet."
@@ -411,6 +422,9 @@ nb_NO:
         account_age_days: "Kontoalder i dager"
         create: "Send en invitasjon"
         bulk_invite:
+          none: "Du har ikke invitert noen hit enda. Du kan sende individuelle invitasjoner, eller invitere en gruppe folk på en gang ved å <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>laste opp en fil med flere invitasjoner</a>."
+          text: "Masseinvitasjon fra fil"
+          uploading: "Laster opp..."
           success: "Filen har blitt lastet opp. Du vil bli varslet om kort tid om fremgangen."
           error: "En feil oppsto ved opplastingen av '{{filename}}': {{message}}"
       password:
@@ -418,6 +432,7 @@ nb_NO:
         too_short: "Passordet ditt er for kort"
         common: "Det passordet er for vanlig."
         ok: "Passordet ditt ser bra ut"
+        instructions: "Minst %{count} tegn."
       ip_address:
         title: "Siste IP Addresse"
       registration_ip_address:
@@ -435,6 +450,7 @@ nb_NO:
         the_topic: "emnet"
     loading: "Laster..."
     errors:
+      prev_page: "ved lasting"
       reasons:
         network: "Nettverksfeil"
         server: "Serverfeil"
@@ -444,6 +460,7 @@ nb_NO:
         network: "Venligst verifiser nettverkstilkoblingen din"
         network_fixed: "Ser ut som om den er tilbake."
         server: "Feilkode: {{status}}"
+        forbidden: "Du har ikke tilgang til dette."
         unknown: "Noe gikk galt."
       buttons:
         back: "Gå tilbake"
@@ -489,7 +506,6 @@ nb_NO:
     created: 'Opprettet'
     created_lowercase: 'opprettet'
     trust_level: 'Tillitsnivå'
-    search_hint: 'brukernavn eller e-mail'
     create_account:
       title: "Opprett ny konto"
       failed: "Something went wrong, perhaps this email is already registered, try the forgot password link"
@@ -500,6 +516,10 @@ nb_NO:
       reset: "Tilbakestill Passord"
       complete_username: "Hvis en konto med brukernavn <b>%{username}</b> finnes vil du motta en epost om kort tid med instruksjoner om hvordan du kan tilbakestille passordet."
       complete_email: "Hvis en konto med epostaddressen <b>%{email}</b> eksisterer i systemet vil du om kort tid motta en epost med instruksjoner om hvordan du kan tilbakestille passordet."
+      complete_username_found: "Vi fant en konto med brukernavn <b>%{username}</b>. Du mottar om litt en epost med instruksjoner for hovrdan du tilbakestiller passordet."
+      complete_email_found: "Vi fant en konto med epostaddressen <b>%{email}</b>. Du mottar om litt en epost med instruksjoner for hvordan du tilbakestiller passordet."
+      complete_username_not_found: "Ingen konto har med brukernavnet <b>%{username}</b> er registrert"
+      complete_email_not_found: "Ingen konto med epostadressen <b>%{email}</b> er registrert"
     login:
       title: "Logg Inn"
       username: "Bruker"
@@ -537,6 +557,7 @@ nb_NO:
         title: "med GitHub"
         message: "Autentiserer med GitHub (sørg for at du tillater pop-up vindu)"
     composer:
+      add_warning: "Dette er en offisiell advarsel."
       posting_not_on_topic: "Du svarer på emnet \"{{title}}\", men for øyeblikket ser du på et annet emne."
       saving_draft_tip: "lagrer"
       saved_draft_tip: "lagret"
@@ -717,6 +738,9 @@ nb_NO:
       not_found:
         title: "Emnet kunne ikke bli funnet"
         description: "Beklager, vi kunne ikke finne det emnet. Kanskjer det ble fjernet av en moderator?"
+      total_unread_posts:
+        one: "du har 1 ulest innlegg i dette emnet"
+        other: "du har {{count}} uleste innlegg i dette emnet"
       unread_posts:
         one: "du har 1 ulest gammelt innlegg innen dette emnet"
         other: "du har {{count}} uleste gamle innlegg innen dette emnet"
@@ -805,6 +829,7 @@ nb_NO:
         unarchive: "Uarkiver Emne"
         archive: "Arkiver Emne"
         invisible: "Skjul Emnet"
+        visible: "Vist Emnet"
         reset_read: "Tilbakestill Lesedata"
         multi_select: "Velg for Sammenslåing/Oppdeling"
       reply:
@@ -826,6 +851,7 @@ nb_NO:
         email_or_username: "Invitertes email eller brukernavn."
         email_or_username_placeholder: "email eller brukernavn."
         action: "Inviter"
+        success: "Vi har invitert den brukeren til å delta i denne private meldingen."
         error: "Beklager, det oppstod en feil ved å invitere den brukeren."
         group_name: "gruppenavn"
       invite_reply:
@@ -881,7 +907,6 @@ nb_NO:
       post_number: "post {{number}}"
       in_reply_to: "svar til"
       last_edited_on: "innlegg sist redigert"
-      reply_as_new_topic: "Svar som et nytt Emne"
       continue_discussion: "Fortsetter diskusjonen fra {{postLink}}:"
       follow_quote: "gå til det siterte innlegget"
       show_full: "Vis hele posten"
@@ -893,6 +918,8 @@ nb_NO:
       gap:
         one: "Ett innlegg skjult"
         other: "{{count}} innlegg skjult"
+      more_links: "{{count}} flere..."
+      unread: "Innlegget er ulest"
       has_replies:
         one: "Svar"
         other: "Svar"
@@ -940,6 +967,7 @@ nb_NO:
         convert_to_moderator: "Legg til stabsfarge"
         revert_to_regular: "Fjern stabsfarge"
         rebake: "Gjenoppbygg HTML"
+        unhide: "Vis"
       actions:
         flag: 'Markering'
         it_too:
@@ -1269,6 +1297,7 @@ nb_NO:
         agree_flag_modal_title: "Godta og..."
         agree_flag_hide_post: "Godta (skjul innlegg + send PM)"
         agree_flag_hide_post_title: "Skjul dette innlegget og automatisk send brukeren en privat melding med oppfordring om redigering"
+        agree_flag_restore_post: "Gi medhold (gjenopprett innlegg)"
         delete: "Slett"
         delete_flag_modal_title: "Slett og..."
         clear_topic_flags: "Ferdig"
@@ -1288,6 +1317,7 @@ nb_NO:
         topic_flagged: "Dette emnet har blitt rapportert."
         visit_topic: "Besøk emnet for å utføre handling"
       groups:
+        primary: "Primærgruppe"
         title: "Grupper"
         edit: "Rediger Grupper"
         refresh: "Last inn på nytt"
@@ -1328,6 +1358,8 @@ nb_NO:
           filename: "Filnavn"
           size: "Størrelse"
         upload:
+          text: "Last Opp"
+          uploading: "Laster opp..."
           success: "'{{filename}}' har blitt lastet opp."
           error: "Det oppsto en feil ved opplastingen av '{{filename}}': {{message}}"
         operations:
@@ -1423,6 +1455,7 @@ nb_NO:
         reply_key: "Svar ID"
         logs:
           filters:
+            title: "Filtrer"
             user_placeholder: "brukernavn"
             address_placeholder: "navn@eksempel.com"
       logs:
@@ -1534,6 +1567,7 @@ nb_NO:
         edit_title: "Rediger Tittel"
         save_title: "Lagre Tittel"
         refresh_browsers: "Tving nettleser refresh"
+        refresh_browsers_message: "Melding sent til alle klienter!"
         show_public_profile: "Vis Offentlig Profil"
         impersonate: 'Gi deg ut for å være en annen'
         ip_lookup: "IP Lookup"
@@ -1556,6 +1590,7 @@ nb_NO:
         topics_entered: Emner Opprettet
         flags_given_count: Markeringer Gitt
         flags_received_count: Markeringer Mottatt
+        warnings_received_count: Advarsler mottatt
         approve: 'Godta'
         approved_by: "Godtatt Av"
         approve_success: "Brukeren er godkjent og epost med aktiveringsinstruksjoner er sendt."
@@ -1601,7 +1636,6 @@ nb_NO:
           likes_given: "Likes Avgitt"
           likes_received: "Likes Mottatt"
           qualifies: "Kvalifiserer til tillitsnivå 3."
-          will_be_promoted: "Vil bli forfremmet innen 24 timer."
           does_not_qualify: "Kvalifiserer ikke til tillitsnivå 3."
         sso:
           title: "Single Sign On"
@@ -1610,10 +1644,14 @@ nb_NO:
           external_name: "Navn"
           external_email: "Epost"
           external_avatar_url: "URL til profilbilde"
+      user_fields:
+        save: "Lagre"
+        edit: "Endre"
+        delete: "Slett"
+        cancel: "Avbryt"
+        delete_confirm: "Er du sikker på at du vil fjerne brukerfeltet?"
       site_text:
-        none: "Velg et type innhold du vil begynne å redigere."
-        title: 'Innhold'
-        edit: "Rediger Sideinnhold"
+        title: 'Tekstinnhold'
       site_settings:
         show_overriden: 'Bare vis overstyrte'
         title: 'Innstillinger'
@@ -1626,13 +1664,17 @@ nb_NO:
           required: 'Påkrevd'
           basic: 'Grunnleggende oppsett'
           users: 'Brukere'
+          posting: 'Posting'
           email: 'E-post'
           files: 'Filer'
           trust: 'Tillitsnivå'
           security: 'Sikkerhet'
+          onebox: "Onebox"
           seo: 'SEO'
           spam: 'Spam'
+          rate_limits: 'Frekvensbegresninger'
           developer: 'Utvikler'
+          embedding: "Embedding"
           legal: "Juridisk"
           uncategorized: 'Annet'
           backups: "Sikkerhetskopier"
@@ -1672,13 +1714,23 @@ nb_NO:
         preview:
           bad_count_warning:
             header: "ADVARSEL!"
+          grant_count:
+            zero: "Ingen merker klare for tildeling"
+            one: "<b>1</b> merke kan bli tildelt."
+            other: "<b>%{count}</b> merker kan bli tildelt."
           sample: "Eksempel:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> for innlegg i %{link}
+            with_post_time: <span class="username">%{username}</span> for innlegg i %{link} - <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> - <span class="time">%{time}</span>
     lightbox:
       download: "last ned"
     keyboard_shortcuts_help:
       title: 'Tastatursnarveier'
       jump_to:
         title: 'Hopp til'
+        home: '<b>g</b>, <b>h</b> Hjem (Siste)'
         latest: '<b>g</b>, <b>l</b> Siste'
         new: '<b>g</b>, <b>n</b> Nye'
         unread: '<b>g</b>, <b>u</b> Ules'
@@ -1690,13 +1742,20 @@ nb_NO:
         back: '<b>u</b> Tilbake'
       application:
         title: 'Applikasjon'
+        create: '<b>c</b> Opprett nytt emne'
+        notifications: '<b>n</b> Åpne varslinger'
+        site_map_menu: '<b>=</b> Åpne nettsidemenyen'
+        user_profile_menu: '<b>p</b> Åpne brukermenyen'
+        show_incoming_updated_topics: '<b>.</b> Vis oppdaterte emner'
         search: '<b>/</b> Søk'
+        help: '<b>?</b> Åpne tastaturhjelp'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Avvis Nye/Innlegg'
+        dismiss_topics: '<b>x</b>, <b>t</b> Avvis Emner'
       actions:
         title: 'Handlinger'
         star: '<b>f</b> Favoriser emne'
         share_topic: '<b>shift s</b> Del emne'
         share_post: '<b>s</b> Del innlegg'
-        reply_as_new_topic: '<b>t</b> Svar som nytt emne'
         reply_topic: '<b>shift r</b> Svar på emne'
         reply_post: '<b>r</b> Svar på innlegg'
         quote_post: '<b>q</b> Siter innlegg'
@@ -1712,20 +1771,30 @@ nb_NO:
           name: Nettsamfunn
         trust_level:
           name: Tillitsnivå
+        other:
+          name: Annet
+        posting:
+          name: Posting
       badge:
         editor:
           name: Redaktør
           description: Første redigering av innlegg
+        basic_user:
+          name: Basic
+          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Tildelt</a> alle essentielle forumfunksjoner
         member:
           name: Medlem
+          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">Tildeles</a> invitasjonsmulighet
         regular:
           name: Aktivt Medlem
         leader:
           name: Leder
+          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Tildelt</a> global redigering, pin, lukking, arkivering, split og sammensmelting
         welcome:
           name: Velkommen
           description: Mottok en Like
         autobiographer:
+          name: Selvbiograf
           description: Fylte ut informasjon om <a href="/my/preferences">brukerprofilen</a>
         nice_post:
           name: Fint innlegg
@@ -1736,6 +1805,24 @@ nb_NO:
         great_post:
           name: Flott Innlegg
           description: Mottok 50 Likes for et innlegg. Dette merket kan bli utstedt flere ganger
+        nice_topic:
+          name: Fint emne
+          description: Mottatt 10 likes for et emne. Dette merket kan tildeles flere ganger
+        good_topic:
+          name: Godt emne
+          description: Mottatt 25 likes for et emne. Dette merket kan tildeles flere ganger
+        great_topic:
+          name: Fantastisk emne
+          description: Mottatt 50 likes for et emne. Dette merket kan tildeles flere ganger
+        nice_share:
+          name: Fin deling
+          description: Delte et innlegg med 25 unike besøkende
+        good_share:
+          name: God deling
+          description: Delte et innlegg med 300 unike besøkende
+        great_share:
+          name: Fantastisk Deling
+          description: Delte et innlegg med 1000 unike besøkende
         first_like:
           name: Første Like
           description: Likte et innlegg

config/locales/client.nl.yml

@@ -259,6 +259,7 @@ nl:
       other_accounts: Andere accounts met dit IP-adres
       no_other_accounts: (geen)
     user:
+      said: "{{username}}:"
       profile: "Profiel"
       mute: "Negeer"
       edit: "Wijzig voorkeuren"
@@ -288,6 +289,7 @@ nl:
       watched_categories: "In de gaten gehouden"
       watched_categories_instructions: "Je krijgt bericht van alle nieuwe berichten en topics in deze categoriën, daarnaast zal het aantal ongelezen en nieuwe berichten naast de topiclijst verschijnen."
       tracked_categories: "Gevolgd"
+      tracked_categories_instructions: "Het aantal ongelezen en nieuwe berichten in deze categoriën zal naast de topiclijst verschijnen"
       muted_categories: "Genegeerd"
       muted_categories_instructions: "Je zal geen notificaties krijgen over nieuwe topics en berichten in deze categoriën"
       delete_account: "Verwijder mijn account"
@@ -296,9 +298,11 @@ nl:
       delete_yourself_not_allowed: "Je kan je account nu niet verwijderen. Neem contact op met een admin om je account te laten verwijderen."
       unread_message_count: "Berichten"
       staff_counters:
+        flags_given: "behulpzame markeringen"
         flagged_posts: "gemarkeerde berichten"
         deleted_posts: "verwijderde berichten"
         suspensions: "schorsingen"
+        warnings_received: "waarschuwingen"
       messages:
         all: "Alle"
         mine: "Mijn"
@@ -336,16 +340,19 @@ nl:
         title: "Profielachtergrond"
       email:
         title: "E-mail"
+        instructions: "Je e-mail adres zal nooit publieklijk zichtbaar zijn."
         ok: "Prima. We zullen je een e-mail sturen ter bevestiging."
         invalid: "Vul een geldig e-mailadres in."
         authenticated: "Je e-mailadres is bevestigd door {{provider}}."
         frequency: "We zullen je alleen maar mailen als we je een tijd niet gezien hebben, en als je toevallig hetgeen waarover we je mailen nog niet hebt gezien op onze site."
       name:
         title: "Naam"
+        instructions: "Je volledige naam."
         too_short: "Je naam is te kort."
         ok: "Je naam ziet er prima uit."
       username:
         title: "Gebruikersnaam"
+        instructions: "Je gebruikersnaam moet uniek zijn en mag geen spaties bevatten."
         short_instructions: "Mensen kunnen naar je verwijzen als @{{username}}."
         available: "Je gebruikersnaam is beschikbaar."
         global_match: "Je e-mailadres komt overeen met je geregistreerde gebruikersnaam."
@@ -358,6 +365,7 @@ nl:
         prefilled: "E-mail hoort bij deze gebruikersnaam."
       locale:
         title: "Interfacetaal"
+        instructions: "De taal van de foruminterface. Deze verandert als je de pagina herlaadt"
         default: "(standaard)"
       password_confirmation:
         title: "Nogmaals het wachtwoord"
@@ -376,6 +384,7 @@ nl:
         bi_weekly: "elke twee weken"
       email_direct: "Ontvang een mail wanneer iemand je citeert, reageert op je bericht of je @gebruikersnaam noemt."
       email_private_messages: "Ontvang een mail wanneer iemand je een privébericht heeft gestuurd."
+      email_always: "Notificaties niet onderdrukken als ik actief ben op de site"
       other_settings: "Overige"
       categories_settings: "Categorieën"
       new_topic_duration:
@@ -419,6 +428,7 @@ nl:
         bulk_invite:
           none: "Je hebt nog niemand uitgenodigd. Je kan individueel uitnodigen of een groep mensen tegelijk door <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>een groepsuitnodiging-bestand te uploaden</a>"
           text: "Groepsuitnodiging van bestan"
+          uploading: "Uploaden..."
           success: "Het uploaden van het bestand is gelukt, over enkele momenten krijg je meer informatie over de voortgang"
           error: "Het uploaden van '{{filename}}' is niet gelukt: {{message}}"
       password:
@@ -426,6 +436,7 @@ nl:
         too_short: "Je wachtwoord is te kort."
         common: "Dat wachtwoord wordt al te vaak gebruikt."
         ok: "Je wachtwoord ziet er goed uit."
+        instructions: "Minimaal %{count} tekens."
       ip_address:
         title: "Laatste IP-adres"
       registration_ip_address:
@@ -446,10 +457,14 @@ nl:
       prev_page: "tijdens het uploaden"
       reasons:
         network: "Netwerk Fout"
+        server: "Server Fout"
+        forbidden: "Toegang Gewijgerd"
         unknown: "Fout"
       desc:
         network: "Controleer je verbinding"
         network_fixed: "Het lijkt er op dat het terug is"
+        server: "Fout code: {{status}}"
+        forbidden: "Dat mag je niet zien."
         unknown: "Er is iets mis gegaan"
       buttons:
         back: "Ga terug"
@@ -460,6 +475,7 @@ nl:
     read_only_mode:
       enabled: "Dit forum is in read-only modus. Je kan rondkijken, maar sommige elementen zullen mogelijk niet goed werken."
       login_disabled: "Zolang de site in read-only modus is, kan er niet ingelogd worden."
+    too_few_topics_notice: "Maak ten minste 5 openbare discussies en %{posts} openbare berichten om de discussie te starten. Nieuwe gebruikers zullen geen vertrouwensniveau's kunnen verdienen tenzij er berichten zijn die zij kunnen lezen. Dit bericht wordt alleen getoond aan de beheerders."
     learn_more: "leer meer..."
     year: 'jaar'
     year_desc: 'topics die in de afgelopen 365 dagen gemaakt zijn'
@@ -474,6 +490,7 @@ nl:
     last_post: Laatste bericht
     last_post_lowercase: laatste bericht
     summary:
+      enabled_description: "Je leest een samenvatting van dit topic: alleen de meeste interessante berichten bepaald door de community. "
       description: "Er zijn <b>{{count}}</b> reacties."
       description_time: "Er zijn <b>{{count}}</b> reacties met een gemiddelde leestijd van <b>{{readingTime}} minuten</b>."
       enable: 'Samenvatting van topic'
@@ -493,7 +510,6 @@ nl:
     created: 'Gemaakt'
     created_lowercase: 'gemaakt'
     trust_level: 'Trustlevel'
-    search_hint: 'gebruikersnaam of e-mail'
     create_account:
       title: "Maak een nieuw account"
       failed: "Er ging iets mis, wellicht is het e-mailadres al geregistreerd. Probeer de 'Wachtwoord vergeten'-link."
@@ -504,6 +520,10 @@ nl:
       reset: "Herstel wachtwoord"
       complete_username: "Als er een account gevonden kan worden met gebruikersnaam <b>%{username}<b/> dan zul je in een ogenblik een wachtwoord-herstel-mail ontvangen."
       complete_email: "Als er een account gevonden kan worden met het emailadres <b>%{email}<b/> dan zul je in een ogenblik een wachtwoord-herstel-mail ontvangen."
+      complete_username_found: "We hebben een account met gebruikersnaam <b>%{username}</b> gevonden, je zult in een ogenblik een wachtwoord-herstel-mail ontvangen."
+      complete_email_found: "We hebben een account gevonden met het emailadres <b>%{email}<b/> je zult in een ogenblik een wachtwoord-herstel-mail ontvangen."
+      complete_username_not_found: "Er is geen account met gebruikersnaam <b>%{username}</b>"
+      complete_email_not_found: "Geen account voor <b>%{email}</b>"
     login:
       title: "Inloggen"
       username: "Gebruiker"
@@ -520,6 +540,7 @@ nl:
       awaiting_approval: "Je account is nog niet goedgekeurd door iemand van de staf. Je krijgt van ons een mail wanneer dat gebeurd is."
       requires_invite: "Toegang tot dit forum is alleen op uitnodiging."
       not_activated: "Je kan nog niet inloggen. We hebben je een activatie-mail gestuurd (naar <b>{{sentTo}}</b>). Volg de instructies in die mail om je account te activeren."
+      not_allowed_from_ip_address: "Je kunt niet inloggen vanaf dat IP adres."
       resend_activation_email: "Klik hier om de activatiemail opnieuw te ontvangen."
       sent_activation_email_again: "We hebben een nieuwe activatiemail gestuurd naar <b>{{currentEmail}}</b>. Het kan een aantal minuten duren voor deze aan komt. Check ook je spamfolder."
       google:
@@ -541,6 +562,7 @@ nl:
         title: "met Github"
         message: "Inloggen met een Githubaccount (zorg ervoor dat je popup blocker uit staat)"
     composer:
+      add_warning: "Dit is een officiële waarschuwing."
       posting_not_on_topic: "In welke topic wil je je antwoord plaatsen?"
       saving_draft_tip: "wordt opgeslagen"
       saved_draft_tip: "opgeslagen"
@@ -623,6 +645,7 @@ nl:
       invitee_accepted: "<i title='heeft jouw uitnodiging geaccepteerd' class='fa fa-user'></i><p><span>{{username}}</span> accepted your invitation</p>"
       moved_post: "<i title='heeft bericht verplaatst' class='fa fa-sign-out'></i><p><span>{{username}}</span> moved {{description}}</p>"
       linked: "<i title='gelinkt bericht' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
+      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>'{{description}}' gekregen</p>"
     upload_selector:
       title: "Voeg een afbeelding toe"
       title_with_attachments: "Voeg een afbeelding of bestand toe"
@@ -640,6 +663,7 @@ nl:
       title: "zoek naar topics, berichten, gebruikers of categorieën"
       no_results: "Geen resultaten gevonden."
       searching: "Zoeken..."
+      post_format: "#{{post_number}} door {{username}}"
       context:
         user: "Zoek berichten van @{{username}}"
         category: "Zoek door de \"{{category}}\" categorie"
@@ -666,11 +690,13 @@ nl:
         actions: "Bulk Acties"
         change_category: "Wijzig categorie"
         close_topics: "Sluit topics"
+        archive_topics: "Archiveer Topics"
         notification_level: "Wijzig notificatielevel"
         selected:
           one: "Je hebt <b>1</b> topic geselecteerd."
           other: "Je hebt <b>{{count}}</b> topics geselecteerd."
       none:
+        starred: "Je hebt nog geen topics met een ster."
         unread: "Je hebt geen ongelezen topics."
         new: "Je hebt geen nieuwe topics."
         read: "Je hebt nog geen topics gelezen."
@@ -890,7 +916,6 @@ nl:
       post_number: "bericht {{number}}"
       in_reply_to: "reageer op"
       last_edited_on: "bericht gewijzig op"
-      reply_as_new_topic: "Reageer in een nieuwe topic"
       continue_discussion: "Voortzetting van de discussie {{postLink}}:"
       follow_quote: "ga naar het geciteerde bericht"
       show_full: "Bekijk hele bericht"
@@ -917,6 +942,7 @@ nl:
         upload_not_authorized: "Sorry, je mag dat type bestand niet uploaden (toegestane extensies: {{authorized_extensions}})."
         image_upload_not_allowed_for_new_user: "Sorry, nieuwe gebruikers mogen nog geen afbeeldingen uploaden."
         attachment_upload_not_allowed_for_new_user: "Sorry, nieuwe gebruikers mogen nog geen bestanden uploaden."
+        attachment_download_requires_login: "Sorry, maar je moet ingelogd zijn om bijlages te downloaden."
       abandon:
         confirm: "Weet je zeker dat je dit bericht wil afbreken?"
         no_value: "Nee, behouden"
@@ -944,6 +970,9 @@ nl:
           yes_value: "Ja, verwijder deze antwoorden ook"
           no_value: "Nee, alleen dit bericht"
         admin: "adminacties voor bericht"
+        wiki: "Maak Wiki"
+        unwiki: "Verwijder Wiki"
+        unhide: "Toon"
       actions:
         flag: 'Markeer'
         it_too:
@@ -1053,6 +1082,9 @@ nl:
           side_by_side:
             title: "Toon de wijzigingen in het gerenderde bericht naast elkaar"
             button: '<i class="fa fa-columns"></i> HTML'
+          side_by_side_markdown:
+            title: "Bekijk de bron verschillen naast elkaar"
+            button: '<i class="fa fa-columns"></i> Bron'
         details:
           edited_by: "Gewijzigd door"
     category:
@@ -1138,6 +1170,8 @@ nl:
         one: "1 click"
         other: "%{count} clicks"
     topic_statuses:
+      warning:
+        help: "Dit is een officiële waarschuwing."
       locked:
         help: "Deze topic is gesloten; reageren is niet meer mogelijk"
       unpinned:
@@ -1154,19 +1188,29 @@ nl:
     posts: "Berichten"
     posts_lowercase: "berichten"
     posts_long: "er zijn {{number}} berichten in deze topic"
+    posts_likes_MF: |
+      Dit topic heeft {count, plural, one {1 post} other {# posts}} {ratio, select,
+        low {met een hoge likes per post verhouding}
+        med {met een erg hoge likes per post verhouding}
+        high {met een zeer hoge likes per post verhouding}
+        other {}}
     original_post: "Originele bericht"
     views: "Bekeken"
+    views_lowercase: "weergaves"
     replies: "Reacties"
     views_long: "deze topic is {{number}} keer bekeken"
     activity: "Activiteit"
     likes: "Leuk"
     likes_long: "er zijn {{count}} likes in deze topic"
     users: "Gebruikers"
+    users_lowercase: "leden"
     category_title: "Categorie"
     history: "Geschiedenis"
     changed_by: "door {{author}}"
     categories_list: "Categorielijst"
     filters:
+      with_topics: "%{filter} topics"
+      with_category: "%{filter} %{category} topics"
       latest:
         title: "Recent"
         help: "topics met recente reacties"
@@ -1188,6 +1232,10 @@ nl:
           zero: "Ongelezen"
           one: "Ongelezen (1)"
           other: "Ongelezen ({{count}})"
+        help: "topics die je volgt of bijhoudt met ongelezen berichten"
+        lower_title_with_count:
+          one: "1 ongelezen"
+          other: "{{count}} ongelezen"
       new:
         lower_title_with_count:
           one: "1 nieuwe"
@@ -1197,6 +1245,7 @@ nl:
           zero: "Nieuw"
           one: "Nieuw (1)"
           other: "Nieuw ({{count}})"
+        help: "topics gemaakt in de afgelopen dagen"
       posted:
         title: "Mijn berichten"
         help: "topics waarin je een bericht hebt geplaatst"
@@ -1208,6 +1257,7 @@ nl:
         help: "recente topics in de categorie {{categoryName}}"
       top:
         title: "Top"
+        help: "de meest actieve topics van het afgelopen jaar, maand of dag"
         yearly:
           title: "Jaarlijkse top"
         monthly:
@@ -1276,6 +1326,8 @@ nl:
         agree_flag_modal_title: "Akkoord en ... "
         agree_flag_hide_post: "Akkoord (verberg bericht en stuur privébericht)"
         agree_flag_hide_post_title: "Verberg dit bericht en stuur de gebruiker automatisch een privébericht met het verzoek om het bericht aan te passen. "
+        agree_flag_restore_post: "Eens (herstel bericht)"
+        agree_flag_restore_post_title: "Herstel dit bericht"
         agree_flag: "Akkoord met melding"
         agree_flag_title: "Akkoord met melding en het bericht ongewijzigd laten"
         defer_flag: "Negeer"
@@ -1573,6 +1625,11 @@ nl:
             label: "Nieuw:"
             ip_address: "IP-adres"
             add: "Voeg toe"
+        logster:
+          title: "Fout Logs"
+      impersonate:
+        title: "Log in als gebruiker"
+        help: "Gebruik dit hulpmiddel om in te loggen als een gebruiker voor debug-doeleinden. Je moet uitloggen als je klaar bent."
       users:
         title: 'Leden'
         create: 'Voeg beheerder toe'
@@ -1600,6 +1657,9 @@ nl:
           pending: 'Nog niet geaccepteerde leden'
           newuser: 'Leden met Trust Level 0 (Nieuw lid)'
           basic: 'Leden met Trust Level 1 (Lid)'
+          regular: 'Leden op Trust Level 2 (Lid)'
+          leader: 'Leden op Trust Level 3 (Vaste bezoeker)'
+          elder: 'Leden op Trust Level 4 (Leider)'
           admins: 'Administrators'
           moderators: 'Moderators'
           blocked: 'Geblokkeerde leden'
@@ -1610,6 +1670,7 @@ nl:
         reject_failures:
           one: "Weigering van 1 gebruiker is niet gelukt"
           other: "Weigering van %{count} gebruikers is niet gelukt"
+        not_verified: "Niet geverifieerd"
       user:
         suspend_failed: "Er ging iets fout met het blokkeren van deze gebruiker: {{error}}"
         unsuspend_failed: "Er ging iets fout bij het deblokkeren van deze gebruiker: {{error}}"
@@ -1653,6 +1714,7 @@ nl:
         topics_entered: Topics bekeken
         flags_given_count: Meldingen gedaan
         flags_received_count: Meldigen ontvangen
+        warnings_received_count: Waarschuwingen Ontvangen
         flags_given_received_count: 'Meldingen gedaan / ontvangen'
         approve: 'Accepteer'
         approved_by: "Geaccepteerd door"
@@ -1708,17 +1770,12 @@ nl:
           likes_given: "'Vind ik leuks' gegeven"
           likes_received: "'Vind ik leuks' ontvangen"
           qualifies: "Komt in aanmerking voor Trust Level 3"
-          will_be_promoted: "Zal over 24 uur gepromoveerd worden."
           does_not_qualify: "Komt niet in aanmerking voor Trust Level 3"
         sso:
           external_username: "Gebruikersnaam"
           external_name: "Naam"
           external_email: "E-mail"
           external_avatar_url: "URL voor profielfoto"
-      site_text:
-        none: "Selecteer een tekst om deze te bewerken"
-        title: 'Teksten'
-        edit: "Bewerk teksten"
       site_settings:
         show_overriden: 'Bekijk alleen bewerkte instellingen'
         title: 'Instellingen'
@@ -1774,19 +1831,35 @@ nl:
         listable: Badge op de publieke badges pagina tonen
         enabled: Badge aanzetten
         icon: Icoon
+        trigger_type:
+          none: "Dagelijks bijwerken"
+        preview:
+          bad_count_warning:
+            header: "LET OP!"
+          sample: "Voorbeeld:"
     lightbox:
       download: "download"
     keyboard_shortcuts_help:
+      title: 'Sneltoetsen'
       jump_to:
         title: 'Spring naar'
+        home: '<b>g</b>, <b>h</b> Home (Laatste)'
+        latest: '<b>g</b>, <b>l</b> Laatste'
+        new: '<b>g</b>, <b>n</b> Nieuw'
+        unread: '<b>g</b>, <b>u</b> Ongelezen'
+        starred: '<b>g</b>, <b>f</b> Ster'
+        categories: '<b>g</b>, <b>c</b> Categoriën'
+        top: '<b>g</b>, <b>t</b> Top'
       navigation:
         title: 'Navigatie'
+        jump: '<b>#</b> Ga naar bericht #'
         back: '<b>u</b> Terug'
         open: '<b>o</b> of <b>Enter</b> Open geselecteerde topic'
       application:
         title: 'Applicatie'
         create: '<b>c</b> Maak nieuwe topic'
         notifications: '<b>n</b> Open notificaties'
+        show_incoming_updated_topics: '<b>.</b> Toon gewijzigde topics'
         search: '<b>/</b> Zoek'
       actions:
         title: 'Acties'
@@ -1819,6 +1892,8 @@ nl:
       badge_grouping:
         getting_started:
           name: Aan De Slag
+        trust_level:
+          name: Trust Level
         other:
           name: Overige
       badge:
@@ -1827,6 +1902,10 @@ nl:
           description: Eerste berichtwijziging
         basic_user:
           name: Basis
+        member:
+          name: Lid
+        regular:
+          name: Vaste bezoeker
         leader:
           name: Leider
         welcome:
@@ -1843,6 +1922,21 @@ nl:
         great_post:
           name: Fantastisch bericht
           description: 50 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend.
+        nice_topic:
+          name: Leuk Topic
+        good_topic:
+          name: Goed Topic
+        great_topic:
+          name: Geweldig Topic
+        nice_share:
+          name: Leuk Gedeeld
+          description: Een bericht met 25 unieke bezoekers gedeeld
+        good_share:
+          name: Goed Gedeeld
+          description: Een bericht met 300 unieke bezoekers gedeeld
+        great_share:
+          name: Geweldig Gedeeld
+          description: Een bericht met 1000 unieke bezoekers gedeeld
         first_like:
           name: Eerste like
           description: Hebt een bericht ge-vind-ik-leukt

config/locales/client.pl_PL.yml

@@ -286,6 +286,7 @@ pl_PL:
       other_accounts: Inne konta z tym adresem IP
       no_other_accounts: (brak)
     user:
+      said: "{{username}}:"
       profile: "Profil"
       mute: "Wycisz"
       edit: "Edytuj ustawienia"
@@ -366,6 +367,7 @@ pl_PL:
         title: "Tło profilu"
       email:
         title: "Email"
+        instructions: "Nie będzie publicznie widoczny."
         ok: "Wygląda dobrze. Wyślemy Ci wiadomość do potwierdzenia."
         invalid: "Podaj poprawny adres email."
         authenticated: "Twój adres email został potwierdzony przez {{provider}}."
@@ -377,6 +379,7 @@ pl_PL:
         ok: "Twoja nazwa jest poprawna."
       username:
         title: "Nazwa użytkownika"
+        instructions: "Unikalna, krótka i bez spacji."
         short_instructions: "Aby o tobie wspomnieć, wystarczy napisać @{{username}}."
         available: "Nazwa jest dostępna."
         global_match: "Email zgadza się z zarejestrowaną nazwą użytkownika."
@@ -464,6 +467,7 @@ pl_PL:
         too_short: "Hasło jest za krótkie."
         common: "To hasło jest zbyt popularne."
         ok: "Twoje hasło jest poprawne."
+        instructions: "Co najmniej %{count} znaków."
       ip_address:
         title: "Ostatni adres IP"
       registration_ip_address:
@@ -537,7 +541,6 @@ pl_PL:
     created: 'Utworzono'
     created_lowercase: 'utworzono'
     trust_level: 'Poziom zaufania'
-    search_hint: 'nazwa użytkownika lub email'
     create_account:
       title: "Utwórz Konto"
       failed: "Coś poszło nie tak, możliwe, że wybrany adres email jest już zarejestrowany, spróbuj użyć odnośnika przypomnienia hasła"
@@ -718,6 +721,7 @@ pl_PL:
         actions: "Operacje grupowe"
         change_category: "Zmień kategorię"
         close_topics: "Zamknij wpisy"
+        archive_topics: "Zarchiwizuj tematy"
         notification_level: "Poziom powiadomień o zmianach"
         selected:
           one: "Zaznaczono <b>1</b> temat."
@@ -966,7 +970,6 @@ pl_PL:
       post_number: "wpis {{number}}"
       in_reply_to: "w odpowiedzi na"
       last_edited_on: "ostatnia edycja wpisu"
-      reply_as_new_topic: "Odpowiedz w nowym temacie"
       continue_discussion: "Kontynuując dyskusję z {{postLink}}:"
       follow_quote: "idź do cytowanego wpisu"
       show_full: "Pokaż pełny wpis"
@@ -1031,6 +1034,7 @@ pl_PL:
         convert_to_moderator: "Włącz kolor moderatora"
         revert_to_regular: "Wyłącz kolor moderatora"
         rebake: "Odśwież HTML"
+        unhide: "Wycofaj ukrycie"
       actions:
         flag: 'Oflaguj'
         defer_flags:
@@ -1207,7 +1211,6 @@ pl_PL:
       allow_badges_label: "Włącz przyznawanie odznak na podstawie aktywności w tej kategorii"
       edit_permissions: "Edytuj uprawnienia"
       add_permission: "Dodaj uprawnienie"
-      everyone_permission: "wszyscy"
       this_year: "ten rok"
       position: "pozycja"
       default_position: "Domyślna pozycja"
@@ -1872,7 +1875,6 @@ pl_PL:
           likes_given: "Polubień danych"
           likes_received: "Polubień otrzymanych"
           qualifies: "Kwalifikuje się do 3 poziomu zaufania."
-          will_be_promoted: "Zwiększenie zaufania wejdzie w życie w ciągu 24 godzin."
           does_not_qualify: "Nie kwalifikuje się do 3 poziomu zaufania."
         sso:
           title: "Single Sign On"
@@ -1881,10 +1883,6 @@ pl_PL:
           external_name: "Nazwa"
           external_email: "Email"
           external_avatar_url: "URL awatara"
-      site_text:
-        none: "Wybierz typ zawartości których chcesz zacząć edytować."
-        title: 'Teksty'
-        edit: "Edytuj zawartość strony"
       site_settings:
         show_overriden: 'Pokaż tylko nadpisane'
         title: 'Ustawienia'
@@ -2008,7 +2006,6 @@ pl_PL:
         star: '<b>f</b> oznacz temat gwiazdką'
         share_topic: '<b>shift s</b> udostępnij temat'
         share_post: '<b>s</b> udostępnij wpis'
-        reply_as_new_topic: '<b>t</b> odpowiedz w nowym temacie'
         reply_topic: '<b>shift r</b> odpowiedz w temacie'
         reply_post: '<b>r</b> odpowiedz na wpis'
         quote_post: '<b>q</b> cytuj wpis'

config/locales/client.pt.yml

@@ -506,7 +506,6 @@ pt:
     created: 'Criado'
     created_lowercase: 'criado'
     trust_level: 'Nível de confiança'
-    search_hint: 'nome de utilizador ou e-mail'
     create_account:
       title: "Criar Conta Nova"
       failed: "Houve um erro, talvez este email já esteja registado, tente usar o link Esqueci-me da Palavra-chave."
@@ -916,7 +915,6 @@ pt:
       post_number: "mensagem {{number}}"
       in_reply_to: "responder a"
       last_edited_on: "mensagem editada pela última vez em"
-      reply_as_new_topic: "Responder como um novo Tópico"
       continue_discussion: "Continuar a discussão desde {{postLink}}:"
       follow_quote: "ir para a mensagem citada"
       show_full: "Mostrar Post Completo"
@@ -1133,7 +1131,6 @@ pt:
       allow_badges_label: "Permitir a atribuição de medalhas nesta categoria"
       edit_permissions: "Editar Permissões"
       add_permission: "Adicionar Permissões"
-      everyone_permission: "todos"
       this_year: "este ano"
       position: "posição"
       default_position: "Posição Padrão"
@@ -1789,7 +1786,6 @@ pt:
           likes_given: "Gostos Dados"
           likes_received: "Gostos Recebidos"
           qualifies: "Qualifica-se para nível 3 de confiança."
-          will_be_promoted: "Será promovido dentro de 24 horas."
           does_not_qualify: "Não se qualifica para o nível 3 de confiança."
         sso:
           title: "Single Sign On"
@@ -1798,10 +1794,6 @@ pt:
           external_name: "Nome"
           external_email: "Email"
           external_avatar_url: "URL do Avatar"
-      site_text:
-        none: "Escolher um tipo de conteúdo para começar a editar."
-        title: 'Conteúdo'
-        edit: "Editar Conteúdo do Site"
       site_settings:
         show_overriden: 'Apenas mostrar valores alterados'
         title: 'Configurações do Site'
@@ -1924,7 +1916,6 @@ pt:
         star: '<b>f</b> Adicionar tópico aos favoritos'
         share_topic: '<b>shift s</b> Partilhar tópico'
         share_post: '<b>s</b> Partilhar tópico'
-        reply_as_new_topic: '<b>t</b> Responder com um novo tópico'
         reply_topic: '<b>shift r</b> Responder ao tópico'
         reply_post: '<b>r</b> Responder ao post'
         quote_post: '<b>q</b> Citar post'

config/locales/client.pt_BR.yml

@@ -96,10 +96,10 @@ pt_BR:
     yes_value: "Sim"
     generic_error: "Pedimos desculpa, ocorreu um erro."
     generic_error_with_reason: "Ocorreu um erro: %{error}"
-    sign_up: "Sign Up"
-    log_in: "Log In"
+    sign_up: "Registrar"
+    log_in: "Entrar"
     age: "Idade"
-    joined: "ingressou"
+    joined: "Aderiu"
     admin_title: "Admin"
     flags_title: "Sinalizações"
     show_more: "mostrar mais"
@@ -259,6 +259,7 @@ pt_BR:
       other_accounts: Outras contas com esse endereço de IP
       no_other_accounts: (nenhum)
     user:
+      said: "{{username}}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar Preferências"
@@ -339,6 +340,7 @@ pt_BR:
         title: "Fundo do perfil"
       email:
         title: "Email"
+        instructions: "Não visível publicamente."
         ok: "Parece ok. Vamos enviar um email para você confirmar."
         invalid: "Por favor, coloque um email válido."
         authenticated: "O seu email foi autenticado por {{provider}}."
@@ -350,6 +352,7 @@ pt_BR:
         ok: "O seu nome parece ok."
       username:
         title: "Nome de Usuário"
+        instructions: "Único, sem espaços e curto."
         short_instructions: "As pessoas podem mencionar você usando @{{username}}."
         available: "O seu Nome de Usuário está disponível."
         global_match: "O email corresponde ao Nome de Usuário registado."
@@ -433,6 +436,8 @@ pt_BR:
         too_short: "A sua senha é muito curta."
         common: "Essa senha é muito comum."
         ok: "A sua senha parece boa."
+        instructions: "Deve ter pelo menos %{count} caracteres."
+      associated_accounts: "Contas associadas"
       ip_address:
         title: "Último endereço IP"
       registration_ip_address:
@@ -506,7 +511,6 @@ pt_BR:
     created: 'Criado'
     created_lowercase: 'criado'
     trust_level: 'Nível de confiança'
-    search_hint: 'Nome de Usuário ou email'
     create_account:
       title: "Criar nova conta"
       failed: "Alguma coisa deu errado, talvez este email já esteja registrado, tente usar o Esqueci a Senha."
@@ -687,6 +691,7 @@ pt_BR:
         actions: "Ações em Massa"
         change_category: "Mudar Categoria"
         close_topics: "Fechar Tópicos"
+        archive_topics: "Arquivar Tópicos"
         notification_level: "Modificar Nível de Notificação"
         selected:
           one: "Você selecionou <b>1</b> tópico."
@@ -921,7 +926,7 @@ pt_BR:
       post_number: "resposta {{number}}"
       in_reply_to: "responder para"
       last_edited_on: "resposta editada pela última vez em"
-      reply_as_new_topic: "Responder como um novo tópico"
+      reply_as_new_topic: "Responder como um Tópico linkado"
       continue_discussion: "Continuando a discussão do {{postLink}}:"
       follow_quote: "ir para a resposta citada"
       show_full: "Exibir mensagem completa"
@@ -982,6 +987,7 @@ pt_BR:
         convert_to_moderator: "Converter para Moderação"
         revert_to_regular: "Remover da Moderação"
         rebake: "Reconstruir HTML"
+        unhide: "Revelar"
       actions:
         flag: 'Sinalização'
         defer_flags:
@@ -1140,7 +1146,6 @@ pt_BR:
       allow_badges_label: "Permitir emblemas serem concedidos nessa categoria"
       edit_permissions: "Editar Permissões"
       add_permission: "Adicionar Permissões"
-      everyone_permission: "todos"
       this_year: "este ano"
       position: "posição"
       default_position: "Posição Padrão"
@@ -1150,8 +1155,10 @@ pt_BR:
       notifications:
         watching:
           title: "Observar"
+          description: "Você vai acompanhar automaticamente todos os novos tópicos dessas categorias. Você será notificado de todas as novas mensagens e tópicos.  Além disso, a contagem de mensagens não lidas e novas também aparecerá ao lado a lista do tópico."
         tracking:
           title: "Monitorar"
+          description: "Automaticamente monitora todos novos tópicos nestas categorias. Uma contagem de posts não lidos e novos aparecerá próximo ao tópico."
         regular:
           title: "Normal"
           description: "Você receberá notificações apenas se alguém mencionar o seu @nome ou responder ao seu post."
@@ -1201,6 +1208,8 @@ pt_BR:
         help: "Este tópico está fixo; irá ser mostrado no topo da sua categoria"
       archived:
         help: "Este tópico está arquivado; está congelado e não pode ser alterado"
+      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_lowercase: "posts"
     posts_long: "há {{number}} mensagens neste tópico"
@@ -1288,6 +1297,7 @@ pt_BR:
         this_week: "Nesta semana"
         today: "Hoje"
         other_periods: "veja mais tópicos em alta"
+    browser_update: 'Infelizmente, <a href="http://www.discourse.org/faq/#browser">seu navegador é muito antigo para ser utilizado neste site</a>. Por favor <a href="http://browsehappy.com">atualize seu navegador</a>.'
     permission_types:
       full: "Criar / Responder / Ver"
       create_post: "Responder / Ver"
@@ -1423,6 +1433,7 @@ pt_BR:
         confirm_revoke: "Tem a certeza que quer revogar essa chave?"
         info_html: "Sua chave de API permitirá a criação e edição de tópicos usando requests JSON."
         all_users: "Todos os Usuários"
+        note_html: "Guarde esta chave <strong>secretamente</strong>, todos usuários que tiverem acesso a ela poderão criar posts arbritários no forum como qualquer usuário."
       backups:
         title: "Backups"
         menu:
@@ -1582,6 +1593,7 @@ pt_BR:
             user_placeholder: "Nome de usuário"
             address_placeholder: "nome@exemplo.com"
             type_placeholder: "resenha, cadastro..."
+            reply_key_placeholder: "tecla de resposta"
             skipped_reason_placeholder: "motivo"
       logs:
         title: "Logs"
@@ -1650,6 +1662,7 @@ pt_BR:
           title: "Registro de erros"
       impersonate:
         title: "Personificar"
+        help: "Utilize esta ferramenta para personificar uma conta de usuário para efeitos de depuração. Você terá que sair dela assim que terminar."
       users:
         title: 'Usuários'
         create: 'Adicionar Usuário Admin'
@@ -1790,7 +1803,6 @@ pt_BR:
           likes_given: "Curtidas dados"
           likes_received: "Curtidas recebidos"
           qualifies: "Qualificado para o nível 3 de confiança."
-          will_be_promoted: "Será promovido dentro de 24 horas."
           does_not_qualify: "Não qualificado para o nível 3 de confiança."
         sso:
           title: "Único Login"
@@ -1799,10 +1811,24 @@ pt_BR:
           external_name: "Nome"
           external_email: "Email"
           external_avatar_url: "URL do Avatar"
+      user_fields:
+        title: "Campos de Usuários"
+        description: "Qualquer campo adicionado aqui será requerido dos usuários quando eles criarem uma conta."
+        create: "Criar Campo de Usuário"
+        untitled: "Sem título"
+        name: "Nome do Campo"
+        type: "Tipo do Campo"
+        save: "Salvar"
+        edit: "Editar"
+        delete: "Apagar"
+        cancel: "Cancelar"
+        delete_confirm: "Tem certeza que quer apagar este campo de usuário?"
+        field_types:
+          text: 'Campo Texto'
+          confirm: 'Confirmação'
       site_text:
-        none: "Escolhar um tipo de conteúdo para começar a editar."
-        title: 'Conteúdo'
-        edit: "Editar Conteúdo do Site"
+        none: "Escolha um tipo de conteúdo para começar a editar."
+        title: 'Conteúdo do Texto'
       site_settings:
         show_overriden: 'Exibir apenas valores alterados'
         title: 'Configurações'
@@ -1876,9 +1902,20 @@ pt_BR:
           plan_text: "Prever com plano de busca"
           modal_title: "Preview da Busca de Medalhas"
           sql_error_header: "Houve um erro com a busca."
+          error_help: "Veja os seguintes links para ajuda com consulta de emblemas."
           bad_count_warning:
             header: "CUIDADO!"
+            text: "Faltam amostras de concessão. Isso acontece quando a consulta de emblemas retorna IDs de usuários ou IDs de postagens que não existem. Isso pode causar resultados inesperados futuramente - por favor verifique novamente a sua consulta."
+          grant_count:
+            zero: "Sem emblemas para serem atribuídos."
+            one: "<b>1</b> emblema para ser atribuído."
+            other: "<b>%{count}</b> emblemas para serem atribuídos."
           sample: "Exemplo:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: <span class="username">%{username}</span> for post in %{link}
+            with_post_time: <span class="username">%{username}</span> por postar em %{link} às <span class="time">%{time}</span>
+            with_time: <span class="username">%{username}</span> às <span class="time">%{time}</span>
     lightbox:
       download: "download"
     keyboard_shortcuts_help:
@@ -1891,20 +1928,31 @@ pt_BR:
         unread: '<b>g</b>, <b>u</b> Não Lidos'
         starred: '<b>g</b>, <b>f</b> Marcados'
         categories: '<b>g</b>, <b>c</b> Categorias'
+        top: '<b>g</b>, <b>t</b> Topo'
       navigation:
         title: 'Navegação'
+        jump: '<b>#</b> Ir para a resposta #'
         back: '<b>u</b> Voltar'
+        up_down: '<b>k</b>/<b>j</b> Move seleção &uarr; &darr;'
         open: '<b>o</b> ou <b>Enter</b> Abre tópico selecionado'
+        next_prev: '<b>shift j</b>/<b>shift k</b> Sessão próxima/anterior'
       application:
         title: 'Aplicação'
         create: '<b>c</b> Cria um novo tópico'
         notifications: '<b>n</b> Abre notificações'
+        site_map_menu: '<b>=</b> Abrir menu do site'
+        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'
       actions:
         title: 'Ações'
         star: '<b>f</b> Tópico favorito'
         share_topic: '<b>shift 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 r</b> Responder ao tópico'
         reply_post: '<b>r</b> Responder a mensagem'
         quote_post: '<b>q</b> Citar resposta'
@@ -1929,7 +1977,7 @@ pt_BR:
         other: "+%{count} Mais"
       granted:
         one: "1 emblema concedido"
-        other: "%{count} emblemas condedidos"
+        other: "%{count} emblemas concedidos"
       select_badge_for_title: Selecione um emblema para usar como título
       no_title: "<no title>"
       badge_grouping:
@@ -1952,10 +2000,13 @@ pt_BR:
           description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">Concedido</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> envio de convites
         regular:
           name: Regular
+          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">Concedido</a> recategorizar, renomear, seguir links e sala de lazer
         leader:
           name: Líder
+          description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Concedido</a> edição global, fixar, fechar, arquivar, dividir e mesclar
         welcome:
           name: Bem-Vindo
           description: Recebeu uma curtida
@@ -1971,6 +2022,24 @@ pt_BR:
         great_post:
           name: Ótimo Post
           description: Recebeu 50 curtidas em uma resposta. Esse emblema pode ser concedido várias vezes.
+        nice_topic:
+          name: Tópico Interessante
+          description: Recebeu 10 curtidas em um tópico. Esse emblema pode ser concedido várias vezes.
+        good_topic:
+          name: Tópico Bom
+          description: Recebeu 25 curtidas em um tópico. Esse emblema pode ser concedido várias vezes.
+        great_topic:
+          name: Tópico Excelente
+          description: Recebeu 50 curtidas em um tópico. Esse emblema pode ser concedido várias vezes.
+        nice_share:
+          name: Compartilhamento Interessante
+          description: Compartilhou uma postagem com 25 visitas únicas
+        good_share:
+          name: Compartilhamento Bom
+          description: Compartilhou uma postagem com 300 visitas únicas
+        great_share:
+          name: Compartilhamento Excelente
+          description: Compartilhou uma postagem com 1000 visitas únicas
         first_like:
           name: Primeiro Like
           description: Curtiu uma resposta

config/locales/client.ru.yml

@@ -286,6 +286,7 @@ ru:
       other_accounts: Другие учетные записи с этим IP адресом
       no_other_accounts: (нет)
     user:
+      said: "{{username}}:"
       profile: "Профиль"
       mute: "Отключить"
       edit: "Настройки"
@@ -366,6 +367,7 @@ ru:
         title: "Фон профиля"
       email:
         title: "E-mail"
+        instructions: "Всегда скрыт от публики."
         ok: "Отлично, мы послали вам письмо с инструкциями."
         invalid: "Введите корректный адрес электронной почты."
         authenticated: "Ваш адрес электронной почты подтвержден через {{provider}}."
@@ -377,6 +379,7 @@ ru:
         ok: "Допустимое имя."
       username:
         title: "Псевдоним"
+        instructions: "Уникальный, без пробелов и покороче."
         short_instructions: "Пользователи могут упоминать вас по @{{username}}."
         available: "Псевдоним доступен."
         global_match: "Адрес электронной почты совпадает с зарегистрированным."
@@ -464,6 +467,7 @@ ru:
         too_short: "Пароль слишком короткий."
         common: "Пароль слишком короткий."
         ok: "Допустимый пароль."
+        instructions: "Не менее %{count} символов."
       ip_address:
         title: "Последний IP адрес"
       registration_ip_address:
@@ -537,7 +541,6 @@ ru:
     created: 'Тема создана'
     created_lowercase: 'создано'
     trust_level: 'Уровень доверия'
-    search_hint: 'псевдоним или адрес электронной почты'
     create_account:
       title: "Зарегистрироваться"
       failed: "Произошла ошибка. Возможно, этот Email уже используется. Попробуйте восстановить пароль"
@@ -718,6 +721,7 @@ ru:
         actions: "Массовое действие"
         change_category: "Изменить раздел"
         close_topics: "Закрыть темы"
+        archive_topics: "Архивировать темы"
         notification_level: "Изменить уровень оповещения"
         selected:
           one: "Вы выбрали <b>1</b> тему."
@@ -964,7 +968,6 @@ ru:
       post_number: "сообщение {{number}}"
       in_reply_to: "Ответить"
       last_edited_on: "последний раз сообщение редактировалось"
-      reply_as_new_topic: "Ответить в новой теме"
       continue_discussion: "Продолжить обсуждение из {{postLink}}:"
       follow_quote: "перейти к цитируемому сообщению"
       show_full: "Показать полный текст"
@@ -1029,6 +1032,7 @@ ru:
         convert_to_moderator: "Добавить цвет модератора"
         revert_to_regular: "Убрать цвет модератора"
         rebake: "Обработать сообщение заново - HTML"
+        unhide: "Показать"
       actions:
         flag: 'Жалоба'
         defer_flags:
@@ -1205,7 +1209,6 @@ ru:
       allow_badges_label: "Разрешить вручение наград в этом разделе"
       edit_permissions: "Изменить права доступа"
       add_permission: "Добавить права"
-      everyone_permission: "все"
       this_year: "за год"
       position: "местоположение"
       default_position: "Позиция по умолчанию"
@@ -1876,7 +1879,6 @@ ru:
           likes_given: "Выразил симпатий"
           likes_received: "Получил симпатий"
           qualifies: "Заслуживает уровень доверия 3."
-          will_be_promoted: "Будет повышен в течение 24 часов."
           does_not_qualify: "Не заслуживает уровень доверия 3."
         sso:
           title: "Технология единого входа SSO"
@@ -1885,10 +1887,6 @@ ru:
           external_name: "Имя"
           external_email: "E-mail"
           external_avatar_url: "URL-адрес аватарки"
-      site_text:
-        none: "Выберите тип контента, чтобы начать редактирование."
-        title: 'Контент сайта'
-        edit: "Изменить контент сайта"
       site_settings:
         show_overriden: 'Показывать только переопределенные'
         title: 'Настройки сайта'
@@ -2012,7 +2010,6 @@ ru:
         star: '<b>f</b> Отметить тему'
         share_topic: '<b>shift s</b> Поделиться темой'
         share_post: '<b>s</b> Поделиться сообщением'
-        reply_as_new_topic: '<b>t</b> Ответить в новой теме'
         reply_topic: '<b>shift r</b> Ответить на тему'
         reply_post: '<b>r</b> Ответить на сообщение'
         quote_post: '<b>q</b> Цитировать сообщение'

config/locales/client.sv.yml

@@ -482,7 +482,6 @@ sv:
     created: 'Skapad'
     created_lowercase: 'skapad'
     trust_level: 'Förtroendenivå'
-    search_hint: 'användarnamn eller e-post'
     create_account:
       title: "Registrera nytt konto"
       failed: "Något gick fel, kanske är denna e-post redan registrerad, försök glömt lösenordslänken"
@@ -879,7 +878,6 @@ sv:
       post_number: "inlägg {{number}}"
       in_reply_to: "svara till"
       last_edited_on: "inlägg senast ändrat den"
-      reply_as_new_topic: "Svara som ny Tråd"
       continue_discussion: "Fortsätter diskussionen från {{postLink}}:"
       follow_quote: "gå till det citerade inlägget"
       show_full: "Via hela inlägget"
@@ -1497,6 +1495,14 @@ sv:
         delete_forbidden:
           one: "Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dag kan ej raderas.)"
           other: "Användare kan inte tas bort om de har inlägg. Radera alla inlägg innan du försöker ta bort en användare. (Inlägg som är äldre än %{count} dagar kan ej raderas.)"
+        cant_delete_all_posts:
+          one: "Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dag gammal. (Inställningen delete_user_max_post_age)"
+          other: "Kan inte radera alla inlägg. Några inlägg är äldre än %{count} dagar gamla. (Inställningen delete_user_max_post_age)"
+        cant_delete_all_too_many_posts:
+          one: "Kan inte radera alla inlägg, då användaren har fler än 1 inlägg. (delete_all_posts_max)"
+          other: "Kan inte radera alla inlägg, då användaren har fler än %{count} inlägg. (delete_all_posts_max)"
+        delete_confirm: "Är du SÄKER på att du vill radera den användaren? Detta är permanent!"
+        delete_and_block: "Radera och <b>blockera</b> denna e-post och IP-adress"
         deleted: "Användaren har raderats."
         delete_failed: "Ett problem uppstod då användaren skulle raderas. Kontrollera att alla inlägg är borttagna innan du försöker radera användaren."
         send_activation_email: "Skicka aktiveringsmail"
@@ -1524,10 +1530,6 @@ sv:
           days: "dagar"
           topics_replied_to: "Trådar svarade på"
           flagged_posts: "flaggade inlägg"
-      site_text:
-        none: "Välj typ av innehåll för att börja ändra."
-        title: 'Sidinnehåll'
-        edit: "Ändra sidinnehåll"
       site_settings:
         show_overriden: 'Visa bara överskrivna'
         title: 'Webbplatsinställningar'
@@ -1599,6 +1601,57 @@ sv:
         mark_tracking: '<b>m</b>, <b>t</b> Följd diskussion'
     badges:
       badge:
+        welcome:
+          name: Välkommen
+          description: Fick en gilla
+        autobiographer:
+          name: Självbiograf
+          description: Fyllde ut sin <a href="/my/preferences">profilinformation</a>
+        nice_post:
+          name: Bra inlägg
+          description: Fick 10 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger.
+        good_post:
+          name: Jättebra inlägg
+          description: Fick 25 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger.
+        great_post:
+          name: Fantastiskt inlägg
+          description: Fick 50 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger.
+        nice_topic:
+          name: Bra tråd
+          description: Fick 10 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger.
+        good_topic:
+          name: Jättebra tråd
+          description: Fick 25 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger.
+        great_topic:
+          name: Fantastisk tråd
+          description: Fick 50 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger.
+        nice_share:
+          name: Bra delning
+          description: Delade ett inlägg med 25 unika besökare
+        good_share:
+          name: Jättebra delning
+          description: Delade ett inlägg med 300 unika besökare
+        great_share:
+          name: Fantastisk delning
+          description: Delade ett inlägg med 1000 unika besökare
+        first_like:
+          name: Första gillning
+          description: Gillade ett inlägg
+        first_flag:
+          name: Första flaggning
+          description: Flaggade ett inlägg
+        first_share:
+          name: Första delning
+          description: Delade ett inlägg
+        first_link:
+          name: Första länk
+          description: Länkade internt till en annan tråd
+        first_quote:
+          name: Första citation
+          description: Citerade en användare
+        read_guidelines:
+          name: Läst riktlinjer
+          description: Läste <a href="/guidelines">forumets riktlinjer</a>
         reader:
           name: Läsare
           description: Läs varje inlägg i en diskussion med över 100 inlägg

config/locales/client.uk.yml

@@ -378,7 +378,6 @@ uk:
     created: 'Створено'
     created_lowercase: 'створено'
     trust_level: 'Рівень довіри'
-    search_hint: 'ім''я користувача або email'
     create_account:
       title: "Створити Новий Обліковий Запис"
       failed: "Щось пішло не так; скоріше за все, цю електронну пошту вже зареєстровано, спробуйте посилання Забув пароль"
@@ -700,7 +699,6 @@ uk:
       post_number: "допис {{number}}"
       in_reply_to: "Відповісти"
       last_edited_on: "допис востаннє редаговано"
-      reply_as_new_topic: "Відповісти у новій Темі"
       continue_discussion: "В продовження дискусії {{postLink}}:"
       follow_quote: "перейти до цитованого допису"
       show_full: "Показати Увесь Допис"
@@ -1340,10 +1338,6 @@ uk:
           posts_read: "Прочитано Дописів"
           posts_read_all_time: "Прочитано дописів (весь час)"
           flagged_posts: "Оскаржені дописи"
-      site_text:
-        none: "Виберіть тип вмісту, щоб почати його редагувати."
-        title: 'Вміст'
-        edit: "Редагування вмісту сайта"
       site_settings:
         show_overriden: 'Показувати тільки перевизначені'
         title: 'Налаштування'

config/locales/client.zh_CN.yml

@@ -232,6 +232,7 @@ zh_CN:
       other_accounts: 其他使用该 IP 地址的账户
       no_other_accounts: (无)
     user:
+      said: "{{username}}："
       profile: "个人资料"
       mute: "防打扰"
       edit: "修改设置"
@@ -312,6 +313,7 @@ zh_CN:
         title: "个人资料背景"
       email:
         title: "电子邮箱"
+        instructions: "绝不会被公开显示。"
         ok: "看起来不错哦，我们会发送电子邮件让您确认。"
         invalid: "请填写正确的电子邮箱地址。"
         authenticated: "您的电子邮箱已经被 {{provider}} 确认有效。"
@@ -323,6 +325,7 @@ zh_CN:
         ok: "您的名字符合要求。"
       username:
         title: "用户名"
+        instructions: "唯一，没有空格，简短。"
         short_instructions: "其他人可以用 @{{username}} 来提及您。"
         available: "您的用户名可用。"
         global_match: "电子邮箱与注册用户名相匹配。"
@@ -402,6 +405,7 @@ zh_CN:
         too_short: "您设置的密码太短了。"
         common: "您设置的密码太常见了。"
         ok: "您设置的密码符合要求。"
+        instructions: "至少需要 %{count} 个字符。"
       ip_address:
         title: "最后使用的 IP 地址"
       registration_ip_address:
@@ -475,7 +479,6 @@ zh_CN:
     created: '创建时间'
     created_lowercase: '创建时间'
     trust_level: '用户级别'
-    search_hint: '用户名或用户电子邮件'
     create_account:
       title: "创建新帐号"
       failed: "出问题了，有可能这个电子邮箱已经被注册了。试试忘记密码链接？"
@@ -656,6 +659,7 @@ zh_CN:
         actions: "批量操作"
         change_category: "更改目录"
         close_topics: "关闭话题"
+        archive_topics: "存档主题"
         notification_level: "更改提示等级"
         selected:
           other: "您已经选择了 <b>{{count}}</b>个主题"
@@ -672,7 +676,7 @@ zh_CN:
         educate:
           new: '<p>这里是您的新主题。</p><p>默认情况下，最近两天创建的主题是新主题，并会显示一个 <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">新</span> 的标识。</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>'
-          starred: '<p>您收藏的主题会出现在这里。</p><p>要收藏主题或者取消，请使用 </p><ul><li>the <i class="fa fa-star"></i> 在主题标题的右边</li><li>主题底部的星标按钮</li></ul>'
+          starred: '<p>您收藏的主题会出现在这里。</p><p>要收藏主题或者取消，请使用 <i class="fa fa-star"></p><ul><li>在主题标题的右边</i> </li><li>主题底部的星标按钮</li></ul>'
       bottom:
         latest: "没有更多主题可看了。"
         hot: "没有更多热门主题可看了。"
@@ -878,7 +882,6 @@ zh_CN:
       post_number: "帖子 {{number}}"
       in_reply_to: "回复给"
       last_edited_on: "最后修改于"
-      reply_as_new_topic: "回复为新主题"
       continue_discussion: "从 {{postLink}} 继续讨论："
       follow_quote: "跳转至所引用的帖子"
       show_full: "显示所有帖子"
@@ -935,6 +938,7 @@ zh_CN:
         convert_to_moderator: "增加职员颜色"
         revert_to_regular: "移除职员颜色"
         rebake: "重建 HTML"
+        unhide: "显示"
       actions:
         flag: '报告'
         defer_flags:
@@ -1075,7 +1079,6 @@ zh_CN:
       allow_badges_label: "允许在这个分类中授予徽章"
       edit_permissions: "编辑权限"
       add_permission: "添加权限"
-      everyone_permission: "任何人"
       this_year: "今年"
       position: "位置"
       default_position: "默认位置"
@@ -1720,7 +1723,6 @@ zh_CN:
           likes_given: "给出的赞"
           likes_received: "收到的赞"
           qualifies: "符合等级3的信用度"
-          will_be_promoted: "在24小时后升级"
           does_not_qualify: "未符合等级3的信用度"
         sso:
           title: "单点登录"
@@ -1729,10 +1731,6 @@ zh_CN:
           external_name: "名字"
           external_email: "电子邮件"
           external_avatar_url: "头像 URL"
-      site_text:
-        none: "选择内容类型以开始编辑。"
-        title: '内容'
-        edit: "编辑站点内容"
       site_settings:
         show_overriden: '只显示被覆盖了缺省值的'
         title: '设置'
@@ -1856,7 +1854,6 @@ zh_CN:
         star: '<b>f</b> 收藏主题'
         share_topic: '<b>shift s</b> 分享主题'
         share_post: '<b>s</b> 分享帖子'
-        reply_as_new_topic: '<b>t</b> 回复为新主题Reply as new topic'
         reply_topic: '<b>shift r</b> 回复主题'
         reply_post: '<b>r</b> 回复帖子'
         quote_post: '<b>q</b> 引用帖子'

config/locales/client.zh_TW.yml

@@ -449,7 +449,6 @@ zh_TW:
     created: '已建立'
     created_lowercase: '已建立'
     trust_level: '信任等級'
-    search_hint: '用戶名稱或電子郵件'
     create_account:
       title: "建立新帳號"
       failed: "發生了某些錯誤，可能此電子郵件地址已經註冊過，請試試看忘記密碼連結"
@@ -831,7 +830,6 @@ zh_TW:
       post_number: "文章 {{number}}"
       in_reply_to: "回覆"
       last_edited_on: "文章最近編輯的時間"
-      reply_as_new_topic: "回覆為新討論話題"
       continue_discussion: "繼續 {{postLink}} 的討論:"
       follow_quote: "跳到引用的文章"
       show_full: "顯示所有文章"
@@ -1613,17 +1611,12 @@ zh_TW:
           likes_given: "給出的讚"
           likes_received: "收到的讚"
           qualifies: "符合信任等級 3 的條件。"
-          will_be_promoted: "將在 24 小時內升級。"
           does_not_qualify: "不符合信任等級 3 的條件。"
         sso:
           external_username: "用戶名稱"
           external_name: "名稱"
           external_email: "電子郵件"
           external_avatar_url: "頭像 URL"
-      site_text:
-        none: "選擇要編輯的內容類型。"
-        title: '內容'
-        edit: "編輯網站的內容"
       site_settings:
         show_overriden: '只顯示修改過的項目'
         title: '設定'

config/locales/server.cs.yml

@@ -135,6 +135,8 @@ cs:
         name: "Název kategorie"
       post:
         raw: "Tělo"
+      user_profile:
+        bio_raw: "O mně"
     errors:
       messages:
         is_invalid: "je neplatné; zkuste se vyjádřit více popisně"
@@ -166,7 +168,12 @@ cs:
       title: "nový uživatel"
     basic:
       title: "základní uživatel"
-    change_failed_explanation: "Pokusili jste se změnil důvěryhodnost uživatele %{user_name} na '%{new_trust_level}'. Jejich důvěryhodnost je ale již '%{current_trust_level}'. %{user_name} zůstané na důvěryhodnosti '%{current_trust_level}'"
+    regular:
+      title: "člen"
+    leader:
+      title: "normální"
+    elder:
+      title: "vůdce"
   rate_limiter:
     too_many_requests: "Děláte tuto akci příliš často. Prosím počkejte %{time_left} a zkuste to znovu."
     hours:
@@ -342,6 +349,7 @@ cs:
     title: 'Odhlášen'
     description: "Byli jste odhlášeni ze seznamu. Již vás nebudeme kontaktovat."
     oops: "Pokud jste tuto akci provedli omylem, klikněte na odkaz níže."
+    error: "Chyba při odhlašování"
     not_found_description: "Bohužel jsme vás nemohli odhlásit ze seznamu. Je možné, že váš odkaz z emailu již není platný."
   resubscribe:
     action: "Znovu přihlásit"
@@ -462,10 +470,6 @@ cs:
     login_required_welcome_message:
       title: "Vyžadováno přihlášení: Uvítací zpráva"
       description: "Uvítací zpráva, která je zobrazena nepřihlášeným uživatelům, je-li zapnuto nastavení 'vyžadovat přihlášení'."
-    tos_user_content_license:
-      title: "Podmínky používání: Licence obsahu"
-    tos_miscellaneous:
-      title: "Podmínky používání: Různé"
     login_required:
       title: "Vyžadováno přihlášení: Úvodní stránka"
       description: "Text, který se zobrazí nepřihlášených uživatelům na webu, je-li přihlášení vyžadováno."
@@ -603,7 +607,6 @@ cs:
     incorrect_username_email_or_password: "Neplatné uživatelské jméno, email nebo heslo"
     wait_approval: "Děkujeme, že jste se zaregistrovali. Dáme vám vědět, až bude váš nový účet schválen."
     active: "Váš účet je aktivní a připraven k používání."
-    activate_email: "Už to skoro bude! Zaslali jsme vám aktivační email na <b>%{email}</b>. Prosím následujte instrukce v tomto emailu a aktivujte si tak svůj účet."
     not_activated: "Ještě se nemůžete přihlásit. Zaslali jsme vám aktivační email na <b>%{email}</b>. Prosím následujte instrukce v tomto emailu a aktivujte si tak svůj účet."
     suspended: "Máte zakázáno přihlášení až do %{date}."
     suspended_with_reason: "You can't log in until %{date}. The reason you were suspended: %{reason}"
@@ -773,9 +776,6 @@ cs:
   page_not_found:
     title: "Stránka, kterou žádáte, na tomto diskuzním fóru neexistuje. Možná vám můžeme pomoci ji najít, nebo poradit jiné téma, které se vám může líbit:"
   terms_of_service:
-    user_content_license: |-
-      Uživatelské příspěvky jsou licencovány pod licencí [Creative Commons Uveďte autora-Nevyužívejte dílo komerčně-Zachovejte licenci 3.0 Unported](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.cs). Aniž by tím byly tyto vyjádření nebo záruky dotčeny, má %{company_short_name} právo z vlastního úsudku (i) odmítnout nebo odstranit libovolný obsah, který podle rozumného názoru porušuje zásady tohoto webu nebo je jinak škodlivý nebo závadný, nebo (ii) ukončit nebo odepřít přístup k používání webu jakémukoliv jednotlivci nebo subjektu z jakéhokoliv důvodu. %{company_short_name} nemá žádnou povinnost poskytnout náhradu nebo vrátit jakoukoliv již zaplacenou částku.
-    miscellaneous: "Toto ujednání tvoří celou dohodu mezi %{company_short_name} a vámi ohledně zmiňované věci a smí být změněno pouze písemným dodatkem podepsaným pověřeným jednatelem společnosti %{company_short_name}, nebo zveřejněním revidované verze tohoto dokumentu. Provoz tohoto webu, jeho používání a jakýkoliv přístup na něj se řídí platnými zákony České republiky. Jakékoliv spory v souvislosti v tímto webem budou řešeny u soudů v České republice a používáním této služby souhlasíte se soudní pravomocí těchto soudů."
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
   deleted: 'smazáno'
   upload:

config/locales/server.da.yml

@@ -219,7 +219,6 @@ da:
       title: "ny bruger"
     basic:
       title: "basis-bruger"
-    change_failed_explanation: "Du forsøgte at degradere  %{user_name} til '%{new_trust_level}'. Imidlertid er deres tillidsniveau allerede '%{current_trust_level}'. %{user_name} bliver på '%{current_trust_level}'"
   rate_limiter:
     too_many_requests: "Vi har en daglig grænse for hvor mange gange den pågældende handling kan udføres. Vent venligst %{time_left} før du prøver igen."
     hours:
@@ -375,10 +374,6 @@ da:
   archetypes:
     regular:
       title: "Almindeligt emne"
-    banner:
-      message:
-        make: "Dette emne er nu et banner-emne. Det optræder i toppen af alle sider indtil brugeren fjerner det."
-        remove: "Dette emne er ikke mere et banner-emne. Det optræder ikke længere i toppen af alle sider."
   unsubscribed:
     title: 'Frameldt'
     description: "Du er blevet frameldt. Vi skriver ikke til dig igen."
@@ -506,10 +501,6 @@ da:
     login_required_welcome_message:
       title: "Log ind påkrævet: Velkomstbesked"
       description: "Velkomstbesked som vises til anonyme brugere når indstillingen 'log ind påkrævet' er aktiveret."
-    tos_user_content_license:
-      title: "Servicevilkår: Indholdslicens"
-    tos_miscellaneous:
-      title: "Servicevilkår: Diverse"
     login_required:
       title: "Log ind påkrævet: Hjemmeside"
       description: "Teksten som vises til anonyme brugere når login er påkrævet på sitet."
@@ -640,7 +631,6 @@ da:
     incorrect_username_email_or_password: "Ugyldigt navn, e-mail eller adgangskode"
     wait_approval: "Tak for din tilmelding. Du får besked, når din konto er blevet godkendt."
     active: "Din konto er aktiv og klar."
-    activate_email: "Du er næsten færdig! Vi har sendt en aktiverings-e-mail til <b>%{email}</b>. Følg venligst instruktionerne i e-mail’en for at aktivere din konto."
     not_activated: "Du kan ikke logge ind endnu. Vi har sendt en aktiverings-e-mail til dig. Følg venligst instruktionerne i e-mail’en for at aktivere din konto."
     suspended: "Du kan ikke logge ind før %{date}."
     suspended_with_reason: "Du kan ikke logge ind før %{date}. Begrundelse for din suspendering: %{reason}"
@@ -818,10 +808,6 @@ da:
     recent_topics: "Nye"
     see_more: "Flere"
     search_title: "Søg på denne side"
-  terms_of_service:
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
   deleted: 'slettet'
   upload:
     unauthorized: "Beklager, filen, som du forsøger at uploade er ikke autoriseret (autoriserede filendelser: %{authorized_extensions})."

config/locales/server.de.yml

@@ -228,7 +228,6 @@ de:
       title: "Stammgast"
     elder:
       title: "Anführer"
-    change_failed_explanation: "Du wolltest %{user_name} auf '%{new_trust_level}' zurückstufen. Jedoch ist seine Vertrauensstufe bereits '%{current_trust_level}'. %{user_name} verbleibt auf '%{current_trust_level}'"
   rate_limiter:
     slow_down: "Du hast diese Aktion zu oft durchgeführt. Versuch es später wieder. "
     too_many_requests: "Diese Aktion kann nur ein begrenztes Mal pro Tag durchgeführt werden. Bitte warte %{time_left} bis zum nächsten Versuch."
@@ -390,10 +389,6 @@ de:
   archetypes:
     regular:
       title: "Normales Thema"
-    banner:
-      message:
-        make: "Dieses Thema ist jetzt ein Banner-Thema. Es wird oberhalb jeder Seite angezeigt, bis es vom Benutzer weggeklickt wird."
-        remove: "Dieses Thema ist jetzt kein Banner-Thema mehr. Es wird nicht länger oberhalb jeder Seite angezeigt."
   unsubscribed:
     title: 'Abo abbestellt'
     description: "Dein Abo wurde abbestellt. Wir werden Dich nicht wieder kontaktieren!"
@@ -528,12 +523,6 @@ de:
     login_required_welcome_message:
       title: "Anmeldung erforderlich: Willkommensnachricht"
       description: "Willkommensnachricht welche angezeigt wird wenn der Benutzer nicht angemeldet ist und die Einstellung 'login required' aktiviert ist."
-    tos_user_content_license:
-      title: "Nutzungsbedingungen: Lizenz"
-      description: "VERALTET. Ist nicht mehr benutzt und wird entfernt. Bearbeite in der Kategorie „Mitarbeiter“ das Thema „Nutzungsbedingungen“."
-    tos_miscellaneous:
-      title: "Nutzungsbedingungen: Verschiedenes"
-      description: "VERALTET. Ist nicht mehr benutzt und wird entfernt. Bearbeite in der Kategorie „Mitarbeiter“ das Thema „Nutzungsbedingungen“."
     login_required:
       title: "Anmeldung erforderlich: Hauptseite"
       description: "Der Text welcher nicht angemeldeten Benutzer angezeigt wird, wenn eine Anmeldung erforderlich ist."
@@ -595,7 +584,7 @@ de:
     logo_url: "Die Logo-Grafik oben links auf deiner Seite, zum Beispiel: http://example.com/logo.png"
     digest_logo_url: "Alternatives Logo, das oben in E-Mail-Zusammenfassungen verwendet wird. Wenn leer wird `logo_url` verwendet. Zum Beispiel: http://example.com/logo.png "
     logo_small_url: "Kleine Logo-Grafik oben links auf der Seite, die beim Herunterscrollen angezeigt wird. Zum Beispiel: http://example.com/logo-small.png"
-    favicon_url: "Das Favicon Deiner Seite, siehe http://de.wikipedia.org/wiki/Favicon"
+    favicon_url: "Das Favicon deiner Website, siehe http://de.wikipedia.org/wiki/Favicon"
     mobile_logo_url: "Die statische Logo-Grafik oben links auf deiner Seite für mobile Geräte. Wenn leer wird `logo_url` benutzt. Zum Beispiel: 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-Emails benutzt wird. Die benutzte Domain sollte über korrekte SPF, DKIM und PTR Einträge verfügen, damit Emails sicher zugestellt werden können."
@@ -707,7 +696,6 @@ de:
     clean_orphan_uploads_grace_period_hours: "Frist (in Stunden) bevor ein verwaister Upload entfernt wird."
     purge_deleted_uploads_grace_period_days: "Frist (in Tagen) bevor ein entfernter Upload endgültig gelöscht wird."
     purge_inactive_users_grace_period_days: "Schonfrist (in Tagen) bevor ein inaktiver Benutzer gelöscht wird."
-    enable_s3_uploads: "Speichere hochgeladene Dateien auf Amazon S3."
     s3_use_iam_profile: 'Benutze die AWS EC2 IAM Rolle zum Abrufen von Keys. ANMERKUNG: Das Aktivieren überschreibt die Einstellungen „s3 access key id“ und „s3 secret access key“.'
     s3_upload_bucket: "Der Amazon S3 Bucketname in den hochgeladene Dateien abgelegt werden. WARNUNG: Nur Kleinbuchstaben, keine Punkte."
     s3_access_key_id: "The Amazon S3 access key id that will be used to upload images"
@@ -876,7 +864,6 @@ de:
     incorrect_username_email_or_password: "Benutzername, Mailadresse oder Passwort falsch"
     wait_approval: "Danke fürs Registrieren. Wir werden dich benachrichtigen, sobald dein Benutzerkonto freigeschaltet wurde."
     active: "Dein Konto ist nun freigeschaltet und einsatzbereit."
-    activate_email: "Fast fertig! Wir haben eine E-Mail an <b>%{email}</b> verschickt. Bitte folge den Anweisungen in dieser E-Mail, um dein Konto zu aktivieren."
     not_activated: "Du kannst Dich noch nicht anmelden. Wir haben dir eine Aktivierungs-E-Mail geschickt. Bitte folge zunächst den Anweisungen in dieser E-Mail, um dein Konto zu aktivieren."
     not_allowed_from_ip_address: "Von dieser IP-Adresse können Sie sich nicht als %{username} anmelden."
     suspended: "Du kannst Dich bis zum %{date} nicht anmelden."
@@ -889,6 +876,7 @@ de:
     new_registrations_disabled: "Leider können derzeit keine neuen Konten registriert werden."
     password_too_long: "Passwörter sind beschränkt auf 200 Zeichen."
   user:
+    no_accounts_associated: "Keine Konten zugehörig"
     username:
       short: "muss mindestens %{min} Zeichen lang sein"
       long: "darf nicht länger als %{max} Zeichen sein"
@@ -968,15 +956,8 @@ de:
 
       %{notes}
   flags_reminder:
-    flags_were_submitted:
-      one: "Es gibt Markierungen, die vor 1 Stunde gesendet wurden."
-      other: "Es gibt Markierungen, die von %{count} Stunden gesendet wurden."
     please_review: "Bitte überprüfe sie."
     post_number: "Beitrag"
-    how_to_disable: "Deaktiviere diese E-Mail, indem Du die notify_about_flags_after Einstellung auf 0 setzt."
-    subject_template:
-      one: "1 Markierung ist noch unbehandelt"
-      other: "%{count} Markierungen sind noch unbehandelt"
   flag_reasons:
     off_topic: "Dein Beitrag wurde als **Thema verfehlt** gemeldet: Die Community glaubt, dass er nicht zum Thema passt, wie es durch den Titel und den ersten Beitrag definiert wurde."
     inappropriate: "Dein Betrag wurde als **unangemessen** geflaggt: Die Community denkt, dass er beleidigend oder eine Verletzung der [der Richtlinien](/guidelines) ist."
@@ -1313,9 +1294,6 @@ de:
       Ein Benutzerkonto ist notwendig. Bitte registriere dich oder melde dich an.
   terms_of_service:
     title: "Nutzungsbedingungen"
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'Ich habe die <a href="/tos" target="_blank">Nutzerbedingungen</a> gelesen und akzeptiert.'
   deleted: 'gelöscht'
   upload:

config/locales/server.es.yml

@@ -231,7 +231,6 @@ es:
       title: "regular"
     elder:
       title: "lider"
-    change_failed_explanation: "Intentaste degradar a un usuario %{user_name} a '%{new_trust_level}'. Sin embargo su nivel de confianza ya es '%{current_trust_level}'. %{user_name} seguirá en '%{current_trust_level}'"
   rate_limiter:
     slow_down: "Has realizado esta acción demasiadas veces, inténtalo de nuevo más tarde"
     too_many_requests: "Estas haciendo eso demasiado a menudo. Por favor espera %{time_left} antes de intentarlo de nuevo."
@@ -394,10 +393,6 @@ es:
   archetypes:
     regular:
       title: "Tema normal"
-    banner:
-      message:
-        make: "Este tema es ahora un tema de encabezado . Aparecera en la parte superior de cada página hasta que el usuario lo cierre. "
-        remove: "Este tema ya no es un tema de encabezado y dejara de aparecer en la parte superior de cada página."
   unsubscribed:
     title: 'Dado de bajada'
     description: "Has sido dado de baja. ¡No te contactaremos de nuevo!"
@@ -505,7 +500,7 @@ es:
     image_magick_warning: 'El servidor está configurado para permitir miniaturas de imágenes grandes, pero ImageMagick no está instalado. Instala ImageMagick usando tu administrador de paquetes favorito o <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">descárgate la última versión</a>.'
     failing_emails_warning: 'Hay %{num_failed_jobs} de tareas de email que fallaron. Revisa tu archivo config/discourse.conf y asegúrate que la configuración del servidor de email esté correcta. <a href="/sidekiq/retries" target="_blank">Revisa las tareas fallidas en Sidekiq</a>.'
     default_logo_warning: "No has personalizado los imágenes del logo para tu sitio. Actualiza logo_url, logo_small_url, y favicon_url en la <a href='/admin/site_settings'>Configuración del Sitio</a>."
-    contact_email_missing: "No has proveido un correo de contacto para tu sitio. Por favor actualiza contact_email en la <a href='/admin/site_settings'>Configuración del Sitio</a>."
+    contact_email_missing: "No has proporcionado un email de contacto para tu sitio. Por favor, actualiza contact_email en los <a href='/admin/site_settings'>Ajustes del sitio</a>."
     contact_email_invalid: "La dirección email de contacto es inválida. Por favor actualiza contact_email en la <a href='/admin/site_settings'>Configuración del Sitio</a>."
     title_nag: "El título Site Setting todavía está configurado al valor predeterminado. Por favor actualízalo con el título de tu sitio en la <a href='/admin/site_settings'>Configuración del Sitio</a>."
     site_description_missing: "La site_description configuración está vacía. Escribe una breve descripción de este foro en la <a href='/admin/site_settings'>Configuración del Sitio</a>."
@@ -532,12 +527,6 @@ es:
     login_required_welcome_message:
       title: "Registro requerido: mensaje de bienvenida"
       description: "El mensaje de bienvenida que se muestra a los usuarios que han salido cuando la configuración de 'login required' está activada."
-    tos_user_content_license:
-      title: "Términos del servicio: licencia de contenido"
-      description: "OBSOLETO PRÓXIMAMENTE. No se usará más, será eliminado. En vez de esto, edita el tema Condiciones de Servicio en la categoría Staff."
-    tos_miscellaneous:
-      title: "Términos del servicio: misceláneo"
-      description: "OBSOLETO PRÓXIMAMENTE. No se usará más, será eliminado. En vez de esto, edita el tema Condiciones de Servicio en la categoría Staff."
     login_required:
       title: "Registro Requerido: Homepage"
       description: "El texto mostrado para usuarios no autorizados cuando el registro es requerido en el sitio."
@@ -694,7 +683,6 @@ es:
     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"
     backup_daily: "Crear automáticamente una copia de seguridad del sitio una vez al día."
-    enable_s3_backups: "Subir respaldos a S3 cuando sea completado. IIMPORTANTE: Se requiere que en las opciones de Archivo existan credenciales de S3 válidas."
     s3_backup_bucket: "El bucket remoto para mantener copias de seguridad. AVISO: Asegúrate de que es un bucket privado."
     active_user_rate_limit_secs: "Como de frecuentemente actualizaremos el campo 'last_seen_at', en segundos"
     verbose_localization: "Mostrar sugerencias de localización extendida en la interface de usuario "
@@ -716,7 +704,6 @@ es:
     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."
     purge_inactive_users_grace_period_days: "Período de gracia (en días) antes de eliminar un usuario inactivo."
-    enable_s3_uploads: "Situar las subidas en un almacenamiento Amazon S3."
     s3_use_iam_profile: 'Usar el rol de AWS EC2 IAM para descargar las llaves. NOTA: habilitando esta opción ignorará la "llave de acceso s3" y "la llave de acceso secreta s3".'
     s3_upload_bucket: "El nombre del depósito de Amazon S3 donde se subirán los archivos. AVISO: debe estar escrito en minúsculas y sin puntos."
     s3_access_key_id: "La clave id de acceso de Amazon S3 que se utilizará para subir imágenes."
@@ -884,7 +871,6 @@ es:
     incorrect_username_email_or_password: "Nombre de usuario, email o password incorrectos"
     wait_approval: "Gracias por registrarte. Te notificaremos cuando tu cuenta haya sido aprovada."
     active: "Tu cuenta está activa y lista."
-    activate_email: "¡Casi estás listo! Te envíaremos un email de activación a <b>%{email}</b>. Por favor sigue las instrucciones del email para activar tu cuenta."
     not_activated: "Aún no puedes hacer log in. Te hemos enviado un email de activación. Por favor sigue las instrucciones en el email para activar tu cuenta."
     suspended: "No puedes iniciar sesión hasta %{date}."
     suspended_with_reason: "No puedes iniciar sesión hasta el %{date}. El motivo por el que tu cuenta fue suspendida: %{reason}"
@@ -936,15 +922,8 @@ es:
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] actualización disponible"
   flags_reminder:
-    flags_were_submitted:
-      one: "Hay reportes enviados de hace 1 hora."
-      other: "Hay reportes enviados de hace %{count} horas."
     please_review: "Por favor, revísalos."
     post_number: "post"
-    how_to_disable: "Deshabilita este correo electrónico cambiando la opción notify_about_flags_after a 0."
-    subject_template:
-      one: "1 reporte esperando ser atendido"
-      other: "%{count} reportes esperando ser atendidos"
   flag_reasons:
     off_topic: "Tu post fue reportado como **off-topic**: la comunidad piensa que no se ajusta al asunto del tema, definido actualmente por su título y primer post."
     inappropriate: "Tu post ha sido reportado como **inapropiado**: la comunidad piensa que puede ser ofensivo, abusivo, o que supone una violación de las [directrices de la comunidad](/guidelines)."
@@ -1218,9 +1197,6 @@ es:
     search_google: "Google"
   terms_of_service:
     title: "Condiciones Generales de Uso"
-    user_content_license: |
-      Las contribuciones de los usuarios tienen licencia [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sin limitar esas declaraciones o garantías, %{company_short_name} tiene el derecho (que no la obligación) de, según el criterio de %{company_short_name}, (i) rechazar o eliminar cualquier contenido que, en opinión de %{company_short_name}, violara alguna de las políticas de %{company_short_name} o fuera perjudicial o censurable, o (ii) bloquear o denegar el acceso al uso del sitio a cualquier individuo o entidad por razones a juicio de %{company_short_name}. %{company_short_name} no tiene la obligación de devolver ninguna cantidad previamente pagada.
-    miscellaneous: "Este Contrato constituye un convenio completo entre %{company_short_name} y el Usuario en relación con el objeto del mismo y que sólo puede ser modificado por una enmienda escrita y firmada por un ejecutivo autorizado de %{company_short_name}, o mediante la publicación por %{company_short_name} de una versión revisada. \n\nEstas Condiciones de uso se regirán e interpretarán conforme a la legislación española. %{company_short_name} y el Usuario acuerdan someter cualquier controversia que pudiera suscitarse entre ellos por el acceso y/o uso del Sitio Web a los Juzgados y Tribunales de Madrid capital, salvo que la ley establezca otra cosa.\n\nSi alguna parte de este Acuerdo es considerada inválida o inaplicable, dicha parte se interpretará en el sentido de reflejar la intención original de las partes, y las partes restantes permanecerán en pleno vigor y efecto. La renuncia por cualquiera de las partes de cualquier término o condición de este Contrato o cualquier incumplimiento del mismo, en cualquier instancia, no renunciará a dicho término o condición o cualquier incumplimiento posterior de la misma. \n\nEl Usuario puede asignar sus derechos bajo este Contrato a cualquier parte que consienta a, y se compromete a estar obligado por sus términos y condiciones; %{company_short_name} puede asignar sus derechos bajo este Contrato sin condiciones. Este Contrato será vinculante y redundará en beneficio de las partes, sus sucesores y cesionarios autorizados."
     signup_form_message: 'He leído y acepto las <a href="/tos" target="_blank">Condiciones de Servicio</a>.'
   deleted: 'borrado'
   upload:

config/locales/server.fi.yml

@@ -24,6 +24,7 @@ fi:
   via: "%{username} sivustolta %{site_name}"
   is_reserved: "on varattu"
   purge_reason: "Poistettiin automaattisesti, koska tiliä ei oltu aktivoitu riittävässä ajassa"
+  disable_remote_images_download_reason: "Linkattujen kuvien lataaminen poistettiin käytöstä vähäisen tallennustilan vuoksi."
   errors:
     messages:
       too_long_validation: "on rajoitettu %{max} merkkiin; sinä syötit %{length} merkkiä."
@@ -254,7 +255,6 @@ fi:
       title: "mestari"
     elder:
       title: "johtaja"
-    change_failed_explanation: "Yritit alentaa käyttäjän %{user_name} luottamustasolle '%{new_trust_level}'. Käyttäjän luottamustaso on jo valmiiksi '%{current_trust_level}'. %{user_name} jatkaa edelleen luottamustasolla '%{current_trust_level}'"
   rate_limiter:
     slow_down: "Olet tehnyt tämän toiminnon liian monta kertaa, yritä uudelleen myöhemmin."
     too_many_requests: "Sille, kuinka useasti tämä toiminto voidaan suorittaa on määritelty päivittäinen raja. Odota %{time_left} ennen uudelleen kokeilemista."
@@ -419,8 +419,8 @@ fi:
       title: "Tavallinen ketju"
     banner:
       message:
-        make: "Tämä ketju on nyt banneri-ketju. Se näytetään jokaisen sivun ylälaidassa, kunnes käyttäjä kuittaa sen nähdyksi."
-        remove: "Tämä ketju ei ole enää banneri-ketju. Sitä ei näytetä enää jokaisen sivun ylälaidassa."
+        make: "Tämä ketju on nyt banneri. Se näytetään jokaisen sivun ylälaidassa, kunnes käyttäjä kuittaa sen nähdyksi."
+        remove: "Tämä ketju ei ole enää banneri. Sitä ei näytetä enää jokaisen sivun ylälaidassa."
   unsubscribed:
     title: 'Peruutetut tilaukset'
     description: "Olet perunut tilauksesi. Emme ota enää yhteyttä!"
@@ -555,10 +555,6 @@ fi:
     login_required_welcome_message:
       title: "Kirjautuminen vaaditaan: Tervetuloviesti"
       description: "Tervetuloviesti uloskirjautuneille käyttäjille, kun 'pakollinen kirjautuminen' on otettu käyttöön."
-    tos_user_content_license:
-      title: "Käyttöehdot: Sisällön lisenssi"
-    tos_miscellaneous:
-      title: "Käyttehdot: Muut"
     login_required:
       title: "Kirjautuminen vaaditaan: Kotisivu"
       description: "Teksti, joka näytetään tunnistautumattomille käyttäjille, kun sivustolle kirjautuminen on pakollista."
@@ -578,6 +574,7 @@ fi:
       title: "Ilmoitussähköpostin yläosa"
       description: "Viesti, joka näytetään kaikkien ilmoitussähköpostien yläosassa."
   site_settings:
+    delete_old_hidden_posts: "Poista automaattisesti kaikki yli 30 päivää piilotettuna olleet viestit."
     default_locale: "Sivuston oletuskieli (ISO 639-1 koodi)"
     allow_user_locale: "Salli käyttäjien vaihtaa käyttöliittymän kieli omista asetuksista"
     min_post_length: "Viestin merkkien minimimäärä"
@@ -667,6 +664,7 @@ fi:
     topics_per_period_in_top_summary: "Kejujen lukumäärä, joka näytetään oletuksena Huiput-listauksissa."
     topics_per_period_in_top_page: "Kejujen lukumäärä, joka näytetään laajennetussa Huiput-listauksessa."
     redirect_users_to_top_page: "Ohjaa uudet ja kauan poissa olleet käyttäjät automaattisesti huiput-sivulle."
+    show_email_on_profile: "Näytä käyttäjän sähköpostiosoite profiilissa (näkyy vain käyttäjälle itselleen ja henkilökunnalle)"
     email_token_valid_hours: "Unohtuneen salasanan / tilin vahvistamisen tokenit ovat voimassa (n) tuntia."
     email_token_grace_period_hours: "Unohtuneen salasanan / tilin vahvistamisen tokenit ovat vielä voimassa (n) tuntia käyttämisen jälkeen."
     enable_badges: "Ota käyttöön arvomerkkijärjestelmä (kokeellinen)"
@@ -712,7 +710,7 @@ fi:
     allow_restore: "Salli palautus, joka korvaa KAIKEN sivuston datan! Jätä valitsematta, jos et aio palauttaa sivuston varmuuskopiota"
     maximum_backups: "Tallennettuna pidettävien varmuuskopioiden maksimimäärä. Vanhemmat varmuuskopiot poistetaan automaattisesti"
     backup_daily: "Luo uusi varmuuskopio automaattisesti kerran päivässä."
-    enable_s3_backups: "Lataa varmuuskopiot S3:een niiden valmistuttua. TÄRKEÄÄ: Edellyttää, että toimivat S3 kirjautumistiedot on syötetty asetuksiin."
+    enable_s3_backups: "Lataa varmuuskopiot S3:een niiden valmistuttua. TÄRKEÄÄ: edellyttää, että toimivat S3 kirjautumistiedot on syötetty asetuksiin."
     s3_backup_bucket: "Amazon S3 bucket johon varmuuskopiot ladataan. VAROITUS: Varmista, että se on yksityinen."
     active_user_rate_limit_secs: "Kuinka usein 'last_seen_at' kenttä päivitetään, sekunneissa"
     verbose_localization: "Näytä laajennetut lokalisointitiedot käyttöliittymässä"
@@ -734,7 +732,7 @@ fi:
     clean_orphan_uploads_grace_period_hours: "Varoaika (tunteina) kunnes orpoutuneet liitetiedostot poistetaan"
     purge_deleted_uploads_grace_period_days: "Varoaika (päivinä) kunnes poistettu liitetiedosto tuhotaan."
     purge_inactive_users_grace_period_days: "Varoaika (päivinä) kunnes aktivoimaton käyttäjätili tuhotaan."
-    enable_s3_uploads: "Sijoita latauksen Amazon S3:een."
+    enable_s3_uploads: "Lataa liitetiedostot Amazon S3:een. Tärkeää: edellyttää toimivat S3 kirjautumistiedot (access key id ja secret access key)."
     s3_use_iam_profile: 'Käytä AWS EC2 IAM roolia avainten hakuun. HUOM: käyttöönotto korvaa "s3 access key id" ja "s3 secret access key" asetukset.'
     s3_upload_bucket: "Amazon S3 bucket, jonne lataukset sijoitetaan. VAROITUS: täytyy olla pienillä kirjaimilla, ei pisteitä."
     s3_access_key_id: "Amazon S3 access key id, jota käytetään kuvien sijoittamisessa."
@@ -810,6 +808,8 @@ fi:
     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"
     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"
     pop3_polling_enabled: "Pollaa sähköpostivastaukset POP3:lla."
     pop3_polling_ssl: "Käytä SSL-salausta yhdistettäessä POP3-palvelimeen. (Suositellaan)"
     pop3_polling_period_mins: "Tiheys minuuteissa kuinka usein POP3 tililtä tarkastetaan uudet sähköpostit. HUOM: vaatii uudelleenkäynnistyksen."
@@ -944,7 +944,7 @@ fi:
     incorrect_username_email_or_password: "Väärä käyttäjänimi, sähköposti tai salasana"
     wait_approval: "Kiitos kirjautumisesta. Ilmoitamme, kun tilisi on hyväksytty."
     active: "Tilisi on aktivoitu ja valmiina käyttöön."
-    activate_email: "Olet melkein valmis! Lähetimme vahvistusviestin osoitteeseen <b>%{email}</b>. Seuraa viestin ohjeita ottaaksesi tilisi käyttöön."
+    activate_email: "Olet melkein valmis! Lähetimme vahvistusviestin antamaasi osoitteeseen. Seuraa viestin ohjeita ottaaksesi tilisi käyttöön."
     not_activated: "Et voi vielä kirjautua sisään. Lähetimme sinulle vahvistusviestin. Seuraa sähköpostiviestin ohjeita ottaaksesi tunnuksen käyttöön."
     not_allowed_from_ip_address: "Et voi kirjautua käyttäjätunnuksella %{username} tästä IP-osoitteesta."
     suspended: "Et voi kirjautu sisään ennen %{date}."
@@ -957,6 +957,7 @@ fi:
     new_registrations_disabled: "Uusien tilien luonti ei ole tällä hetkellä sallittu."
     password_too_long: "Salasanan enimmäispituus on 200 merkkiä."
   user:
+    no_accounts_associated: "Ei liittyviä käyttäjätilejä"
     username:
       short: "täytyy olla vähintään %{min} merkkiä"
       long: "ei saa olla yli %{max} merkkiä"
@@ -1003,6 +1004,50 @@ fi:
       Tämän kutsun lähetti luotettu käyttäjä, joten sinun ei tarvitse kirjautua sisään.
   test_mailer:
     subject_template: "[%{site_name}] Sähköpostin toimitettavuustesti"
+    text_body_template: |
+      Tämä on testisähköposti sivustolta
+
+      [**%{base_url}**][0]
+
+      Sähköpostin toimitus on monimutkaista. Tässä on muutama tärkeä asia, jotka kannattaa tarkistaa ensin:
+
+      - *Varmista,* että `ilmoitusten sähköpostiosoitteen` from: kenttä on asetettu oikein sivuston asetuksissa. **Sähköpostin varmennus tapahtuu "from"-kentän sähköpostiosoitteen verkkotunnusta vastaan**.
+
+      - Selvitä, miten sähköpostiohjelmassasi saa näkyville *sähköpostin raakadatan,* jotta voit tutkia viestin tunnistetiedot. Gmailissa tämä tapahtuu "näytä kokonaan" valinnalla viestin oikeassa yläkulmassa olevasta valikosta.
+
+      - **TÄRKEÄÄ:** Onko palveluntarjoajasi syöttänyt reverse DNS kentän verkkotunnuksille ja IP osoitteille, joists lähetät sähköpostia? [Kokeile Reverse PTR tietuetta][2] täällä. Jos palveluntarjoajasi ei tarjoa kunnollista reverse DNS pointer tietuetta, on hyvin epätodennäköistä, että mikään sähköposti menee perille.
+
+      - Onko verkkotunnuksesi [SPF record][8] oikein? [Kokeile SPF tietuetta][1] täällä. Huomaa, että TXT oikea tietuetyyppi SPF tietueelle.
+
+      - Onko verkkotunnuksesi [DKIM tietue][3] oikein? Tämä vaikuttaa merkittävästi sähköpostin toimitettavuuteen. [Kokeile DKIM tietuetta][7] täällä.
+
+      - Jos käytät omaa sähköpostipalvelinta, tarkista että palvelimen IP osoite [ei ole millään sähköpostin mustalla listalla][4].
+
+      - Tarkista myös, että se varmasti lähettää oikean muotoisen isäntänimen HELO viestissään, joka palauttaa oikean DNS tietueen. Jos näin ei ole, sähköposti hylätään monissa sähköpostipalveluissa.
+
+      (Helpoin tapa on luoda ilmainen tili [Mandrilliin][md], [Mailguniin][mg] tai [Mailjetiin][mj], joide ilmaiset palvelut riittävät hyvin piemen palstan käyttöön. Muista silti asettaa SPF ja DKIM tietueet DNS:ään!)
+
+      Toivottavasti tämä testisähköposti meni perille OK!
+
+      Onnea matkaan,
+
+      Ystäväsi [Discourselta](http://www.discourse.org)
+
+      [0]: %{base_url}
+      [1]: http://www.kitterman.com/spf/validate.html
+      [2]: http://mxtoolbox.com/ReverseLookup.aspx
+      [3]: http://www.dkim.org/
+      [4]: http://whatismyipaddress.com/blacklist-check
+      [5]: %{base_url}/unsubscribe
+      [7]: http://dkimcore.org/tools/dkimrecordcheck.html
+      [8]: http://www.openspf.org/SPF_Record_Syntax
+      [md]: http://mandrill.com
+      [mg]: http://www.mailgun.com/
+      [mj]: http://www.mailjet.com/pricing
+
+      ----
+
+      <small>Jokaisen lähettämäsi sähköpostin lopussa pitäisi olla listaltapoistumislinkki, joten luodaan sellainen tähänkin. Tämän sähköpostin lähetti Yritys, Tie 1, 12345 Kaupunki, Suomi. Jos et halua vastaanottaa näitä sähköposteja jatkossa, [klikkaa poistuaksesi listalta][5].</small>
   new_version_mailer:
     subject_template: "[%{site_name}] Uusi Discourse versio, päivitys saatavilla"
     text_body_template: |+
@@ -1040,13 +1085,13 @@ fi:
       %{notes}
   flags_reminder:
     flags_were_submitted:
-      one: "Sivustolla on liputuksia, jotka annettiin yli 1 tunti sitten."
-      other: "Sivustolla on liputuksia, jotka annettiin yli %{count} tuntia sitten."
+      one: "Nämä liput annettiin yli tunti sitten."
+      other: "Nämä liput annettiin yli %{count} tuntia sitten."
     please_review: "Ole hyvä ja tarkasta ne."
     post_number: "viesti"
-    how_to_disable: "Ota tämä sähköposti-ilmoitus pois käytöstä asettamalla notify_about_flags_after arvo 0."
+    how_to_disable: "Ota tämä sähköposti-ilmoitus pois käytöstä asettamalla <pre>notify_about_flags_after</pre> arvoon 0."
     subject_template:
-      one: "1 liputus odottaa käsittelyä"
+      one: "Yksi liputus odottaa käsittelyä"
       other: "%{count} liputusta odottaa käsittelyä"
   flag_reasons:
     off_topic: "Viestisi liputettiin **asiaan kuulumattomaksi**: se ei kuulu tähän ketjuun, jonka aiheen määrittelee aloitusviesti ja otsikko."
@@ -1078,6 +1123,73 @@ fi:
         Kuitenkin, jos viesti piilotettiin toista kertaa, se pysyy piilotettuna kunnes henkilökunta tutkii tilanteen – jonka jälkeen voi seurata muita seuraamuksia, mukaan lukien tilisi hyllyttäminen.
 
         Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines).
+    usage_tips:
+      text_body_template: |
+        Tässä yksityisviestissä on muutama pikaohje, joiden avulla pääset alkuun:
+
+        ## Jatka vierittämistä
+
+        Palstalla ei ole sivunumeroita tai 'Seuraava'-painikkeita – lukeaksesi lisää, **jatka vain sivun vierittämistä alaspäin!**
+
+        Kun uusia viestejä lähetetään, nekin ilmestyvät näkyviin automaattisesti.
+
+        ## Missä olen?
+
+        - Jos haluat käyttää hakua, päästä käyttäjäsivullesi tai avata päävalikon, klikkaa **oikeassa yläkulmassa olevia painikkeita**.
+
+        - Ketjun otsikkoa klikkaamalla pääset uusimpaan lukemattomaan viestiin. Klikkaa uusinta toimintaa tai viestien lukumäärrää hypätäksesi ketjun alkuun tai loppuun.
+
+        - Kun olet lukemassa viestiketjua, pääset takaisin ylös &uarr; klikkaamalla otsikkoa. Klikkaa vihreää edistymispalkkia oikealla alhaalla tuodaksesi esiin navigaatiopainikkeet, tai käytä <kbd>home</kbd> ja <kbd>end</kbd> näppäimiä.
+
+        <img src="/images/welcome/progress-bar.png" width="143" height="39">
+
+        ## Kuinka vastaan viesteihin?
+
+        - Vastataksesi ketjuun yleisesti, käytä Vastaa-painiketta <img src="/images/welcome/reply-topic.png" width="29" height="25"> sivun alalaidassa.
+
+        - Vastataksesi tiettyyn viestiin, käytä kyseisen viestin Vastaa-painiketta <img src="/images/welcome/reply-post.png" width="29" height="25">.
+
+        - Jos haluat viedä keskustelun uuteen suuntaan, mutta säilyttää yhteyden aiempaan keskusteluun, käytä Aloita uusi yhdistetty ketju -painiketta <img src="/images/welcome/reply-as-new-topic.png" width="15" height="25"> viestin oikealla puolella.
+
+        Lainataksesi toista käyttäjää viestissäsi, valitse teksti jota haluat lainata ja klikkaa mitä hyvänsä Vastaa-painiketta.
+
+        <img src="/images/welcome/quote-reply.png" width="350" height="129">
+
+        Tavoittaaksesi toisen käyttäjän viestissäsi, mainitse hänen nimensä. Kirjoita `@` ja automaattinen täydennys tulee esiin.
+
+        <img src="/images/welcome/username-completion.png" width="230" height="131">
+
+        ## Mitä muuta voin tehdä?
+
+        Jokaisen viestin alalaidassa on rivi painikkeita.
+
+        <img src="/images/welcome/like-link-flag-bookmark.png" width="169" height="46">
+
+        Käytä **tykkää** painiketta osoittaaksesi kirjoittajalle, että olet pitänyt hänen viestistään. Jos huomaat viestissä ongelman, saata asia kirjoittajan tai palstan henkilökunnan tietoon yksityisesti **liputa** painikkeella.
+
+        Voit myös **jakaa** linkin viestiin tai **lisätä sen kirjanmerkkeihin** käyttäjäsivullesi myöhempää tarkastelua varten.
+
+        ## Kuka minulle puhuu?
+
+        Kun toinen käyttäjä vastaa viestiisi, lainaa viestiäsi tai mainitsee `@käyttäjänimesi`, numero ilmestyy sivun oikeaan yläkulmaan. Sieltä pääset katselemaan **ilmoituksiasi**.
+
+        <img src="/images/welcome/notification-panel.png" width="178" height="59">
+
+        Älä murehdi siitä, että et huomaisi uusi vastauksia. Saat sähköposti-ilmoituksen uusista vastauksista viesteihisi (ja yksityisviesteistä) jos et ole paikalla, kun ne saapuvat.
+
+        ## Milloin keskustelut ovat uusia?
+
+        Oletuksena kaikki alle kaksi päivää vanhat keskustelut tulkitaan uusiksi ja kaikki keskustelut joihin olet ottanut osaa (vastannut, luonut tai lukenut pitkään) asetetaan automaattisesti seurantaan.
+
+        Näet siniset uusien ketjujen ja viestien ilmaisimet näiden ketjujen yhteydessä:
+
+        <img src="/images/welcome/topics-new-unread.png" width="368" height="89">
+
+        Voit vaihtaa yksittäisen viestiketjun ilmoitusasetuksia ketjun alalaidassa olevalla painikkeella (asetuksen voi muuttaa myös aluekohtaisesti). Vaihtaaksesi asetuksia siitä, kuinka seuraat ketjuja tai mitkä ketjut tulkitaan uusiksi, katso [käyttäjäasetukset](/my/preferences).
+
+        ## Miksi en voi tehdä jotain?
+
+        Uusien käyttäjien oikeuksia rajoitetaan turvallisussyistä. Osallistumalla ansaitset yhteisön luottamuksen ja rajoitukset poistuvat automaattisesti. Korkeammilla [luottamustasoilla](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) saat vielä enemmän valtuuksia joiden avulla voit auttaa yhteisön ylläpitämisessä.
     welcome_user:
       subject_template: "Tervetuloa sivustolle %{site_name}!"
       text_body_template: |
@@ -1090,6 +1202,24 @@ fi:
         Toivottavasti viihdyt!
     welcome_invite:
       subject_template: "Tervetuloa sivustolle %{site_name}!"
+      text_body_template: |
+        Kiitos kutsun hyväksymisestä sivustolle %{site_name} -- tervetuloa!
+
+        Olemme luoneet sinulle automaattisesti käyttäjänimen: **%{username}**, mutta voit vaihtaa sen koska hyvänsä [käyttäjäprofiilistasi][prefs].
+
+        Kirjautuaksesi sisään uudestaan, joko:
+
+        1. Kirjaudu sisään millä metodilla haluat -- kunhan se on yhdistetty **samaan sähköpostiosoitteeseen,** kuin jonne vastaanotit alkuperäisen kutsun. Muuten emme voi tietää, että se todella olet sinä!
+
+        2. Luo salasana [käyttäjäprofiilissasi][prefs], ja käytä sitä kirjautumiseen.
+
+        %{new_user_tips}
+
+        Me uskomme [sivistyneeseen kanssakäymiseen](%{base_url}/guidelines).
+
+        Toivottavasti viihdyt!
+
+        [prefs]: %{user_preferences_url}
     export_succeeded:
       subject_template: "Vieminen suoritettu onnistuneesti"
       text_body_template: "Vieminen onnistui."
@@ -1154,6 +1284,12 @@ fi:
         Tälle sähköpostiosoitteelle ei löydy käyttäjätiliä. Yritä lähettää sähköposti toisesta osoitteesta tai ota yhteyttä henkilökuntaan.
     email_reject_empty:
       subject_template: "Sähköpostiongelma -- Ei sisältöä"
+      text_body_template: |
+        Pahoittelemme, mutta sähköpostin lähettäminen tänne %{destination} (otsikolla %{former_title}) ei onnistunut.
+
+        Emme löytäneet sähköpostista viestin sisältöä. Varmista, että kirjoitit jotain viestin yläreunaan - emme pysty käsittelemään lainausten sekaan kirjoitettuja vastauksia.
+
+        Jos saat tämän viestin, vaikka sähköpostissa oli sisältöä, yritä uudestaan siten, että viesti sisältää HTML-sisältöä (ei pelkkää selkotekstiä).
     email_reject_parsing:
       subject_template: "Sähköpostionelma -- Tunnistamaton sisältö"
       text_body_template: |

config/locales/server.he.yml

@@ -223,7 +223,6 @@ he:
       title: "רגיל/ה"
     elder:
       title: "מוביל/ה"
-    change_failed_explanation: "ניסית להוריד את דרגת %{user_name} לדרגה '%{new_trust_level}'. אולם הדרגה שלהם היא כבר '%{current_trust_level}'. %{user_name} יישאר '%{current_trust_level}'"
   rate_limiter:
     slow_down: "ביצעתם פעולה זו מספר רב מידי של פעמים, נסו שוב מאוחר יותר"
     too_many_requests: "יש לנו מגבלה יומית על מספר הפעמים שניתן לבצע פעולה זו. אנא המתן %{time_left} לפני ניסיון חוזר."
@@ -386,10 +385,6 @@ he:
   archetypes:
     regular:
       title: "נושא רגיל"
-    banner:
-      message:
-        make: "הנושא הזה ננעץ. הוא יופיע בראש הקטגוריה שלו עד שיוסר מנעיצה על ידי מנהל או שכפתור נקה נעיצות נלחץ."
-        remove: "נושא זה הוסר מנעיצה. הוא לא יופיע יותר בראש כל עמוד."
   unsubscribed:
     title: 'מנוי בוטל'
     description: "המנוי שלך בוטל. לא ניצור איתך קשר יותר!"
@@ -524,12 +519,6 @@ he:
     login_required_welcome_message:
       title: "Login Required: Welcome Message"
       description: "Welcome message that is displayed to logged out users when the 'login required' setting is enabled."
-    tos_user_content_license:
-      title: "Terms of Service: Content License"
-      description: "מיושן. אינו בשימוש יותר ויוסר. ערכו את הנושא תנאי השימוש בקטגוריית הצוות במקום."
-    tos_miscellaneous:
-      title: "Terms of Service: Miscellaneous"
-      description: "מיושן. אינו בשימוש יותר ויוסר. ערכו את הנושא תנאי השימוש בקטגוריית הצוות במקום."
     login_required:
       title: "Login Required: Homepage"
       description: "The text displayed for unauthorized users when login is required on the site."
@@ -702,7 +691,6 @@ he:
     clean_up_uploads: "הסירו העלאות יתומות וללא הפניה כדי למנוע אירוח בלתי חוקי של חומר. אזהרה: אתם עלולי לרצות לגבות את תיקיית ה-/uploads שלכם לפנו שתאפשרו הגדרה זו."
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
-    enable_s3_uploads: "מקמו את העלאות באכסון S3 של Amazon."
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase (cf. http://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html)"
     s3_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות."
     s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות."
@@ -860,7 +848,6 @@ he:
     incorrect_username_email_or_password: "שם משתמש, דואר אלקטרוני או סיסמה לא נכונים"
     wait_approval: "תודה על שנרשמת. אנחנו ניידע אותך כשהחשבון שלך יאושר."
     active: "החשבון שלך הופעל ומוכן לשימוש."
-    activate_email: "כמעט סיימת! שלחנו הודעת דואר אלקטרוני לכתובת <b>%{email}</b> להפעלת החשבון. בבקשה עקוב אחר ההוראות בהודעה כדי להפעיל את חשבונך."
     not_activated: "אינך יכול להתחבר עדיין. שלחנו לך הודעת דואר אלקטרוני לאישור. בבקשה עקוב אחר ההוראות בהודעה כדי להפעיל את חשבונך."
     suspended: "אינך יכול להתחבר עד %{date}."
     suspended_with_reason: "אינך יכול להתחבר עד %{date}. הסיבה להשעייתך: %{reason}"
@@ -923,15 +910,8 @@ he:
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] update available"
   flags_reminder:
-    flags_were_submitted:
-      one: "There are flags that were submitted over 1 hour ago."
-      other: "There are flags that were submitted over %{count} hours ago."
     please_review: "Please review them."
     post_number: "post"
-    how_to_disable: "Disable this email by changing the notify_about_flags_after setting to 0."
-    subject_template:
-      one: "1 flag is waiting to be handled"
-      other: "%{count} flags are waiting to be handled"
   flag_reasons:
     off_topic: "הפרסום שלך סומן כ**מחוץ לנושא**: הקהילה מאמינה שהוא אינו תואם לנושא, כפי שהוא מוגדר כרגע בכותרת ובפרסום הראשון שבו."
     inappropriate: "הפרסום שלך סומן כ**בלתי ראוי**: הקהילה חושבת שהוא מעליב, פוגעני או מפר את [הכללים המנחים](/guidelines)."
@@ -1217,9 +1197,6 @@ he:
     search_google: "גוגל"
   terms_of_service:
     title: "תנאי השימוש"
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
   deleted: 'deleted'
   upload:
@@ -1259,18 +1236,21 @@ he:
     ערכו את הפרסום הראשון בנושא זהכדי לשנות את התוכנים של העמוד %{page_name}.
   guidelines_topic:
     title: "שאלות נפוצות / כללים מנחים"
-    body: "<a name=\"civilized\"></a>\n\n## [זהו מקום מתורבת לדיון ציבורי](#civilized)\n\nאנא התייחסו לפורום הדיון ביחס של כבוד, בדומה לאופן בו הייתם נוהגים בפארק ציבורי. גם אנחנו משאב קהילתי משותף  &mdash; מקום כדי לחלוק יכולות, ידע ותחומי עניין תוך כדי שיחה מתפתחת.\n\nאלו אינם חוקים קשים ומהירים, אלא כלי עזר שנועדו לסייע להכרעות אנושיות במסגרת הקהילות שלנו. השתמשו בכללים המנחים הללו כדי לשמוש על הזירה הזו כמקום נקי, מואר ומאפשר שיח ציבורי מתורבת.\n<a name=\"improve\"></a>\n\n## [שפרו את הדיון](#improve)\n\nסייעו לנו להפוך פורום זה למקום מעולה לדיון באמצעות עבודה מתמדת על שיפור הדיון בדרך כל שהיא, גם אם בעזרת תרומה קטנה או צנועה. אם אינם בטוחים אם הפרסום שלכם תורם לשיחה, חשבו שוב מה בעצם ברצונכם לומר ונסו שוב מאוחר יותר.\n\nהנושאים שנדונים כאן חשובים לנו, ואנו רוצים שתנהגו כלפיהם ככאלה שחשובים גם לכם. לכן, נהגו בכבוד לנושאים ולאנשים אשר דנים בהם, גם אם אינכם מסכימים אם חלק מהדברים שנאמרים.\n\nאחת הדרכים לשפר את הדיון היא באמצעות גילוי נושאים שלגביהם כבר מתנהל דיון. אנא השקיעו מזמנים כדי ללגלוש בין הנושאים כאן לפני שתשיבו או תפתחו נושאים חדשים משלכם, וכך גם תגדילו את הסיכויים לפגוש אחרים להכיר אחרים שחולקים אותם תחומי עניין.\n.\n\n<a name=\"agreeable\"></a>\n\n## [נטו להסכמה, גם אם אינם מסכימים](#agreeable)\n\nאתם עשויים לרצות להגיב באי הסכמה למשהו שתראו כאן. זה בסדר, א-ב-ל זכרו _לבקר את הרעיונות, לא את האנשים_. אנא המנעו מ:\n\n* הדבקת כינויים או שמות.\n* מתקפות לגופו של אדם.\n* תגובה לטון הכתיבה בפרסום כלשהוא, במקום לתוכן הממשי שלו.\n* סתירה אינסטנקטיבית.\n\nבמקום כל אלו הגיבו בטיעוני נגד אשר משפרים את השיחה.\n\n<a name=\"participate\"></a>\n\n## [ההשתתפות שלכם נחשבת](#participate)\n\nהשיחה שאנחנו מנהלים כאן משפיעה על כל חברי הקהילה. עזרו לנו להשפיע על עתיד הקהילה באמצעות הצטרפות לדיונים אשר יעשו את הפורום הזה מקום מעניין יותר לשהות בו  &mdash; והתעלמו מכאלו שלא עושים כך.\n\nמערכת Discourse כוללת כלים אשר מאפשרים לקהילה לזהות באופן קולקטיבי את התרומות הטובות ביותר (והגרועות ביותר): פרסומים מועדפים, סימניות, לייקים, סימונים, תגובות, עריכות וכן הלאה. השתמשו בכל הכלים הללו כדי לשפר את החוויה האישית שלכם, וגם את זו של כולם.\n\nבואו ננסה להשאיר את הפארק טוב יותר מכפי שמצאנו אותו.\n\n<a name=\"flag-problems\"\
-      ></a>\n\n## [אם נתקלתם בבעיה, סמנו אותה](#flag-problems)\n\nלמנחים יש סמכות מיוחדת; הם אחראים לפורום הזה. אבל גם את/ה. בעזרתך מנחים יכולים כמדריכים לדיון, ולא רק כשומרים או שוטרים.\n\nכאשר אתם נתקלים בהתנהגות פסולה, אל תגיבו אליה. זה יעודד את ההתנהגות הרעה על ידי מתן הכרה, יגזול מכם אנרגיה ויבזבז זןמ לכולם. _פשוט סמנו אותה_. אם מספיק יועברו מספיק סימונים, תינקט פעולה, באופן אוטומטי או על ידי התערבות של מנחה. \n\nבכדי לתחזק את הקהילה שלנו, שמורה למנחים הזכות להסיר תוכן או חשבונות משתמש מכל סיבה בכל זמן. מנחים לא מאשרים הודעות לפני פרסום בדרך כלשהיא; המנחים ומפעילי האתר אינו נושאים באחריות כלשהיא לתוכן שפורסם על ידי הקהילה.\n\n\n<a name=\"be-civil\"></a>\n\n## [נהגו כאזרחים]](#be-civil)\nאין משהו שפוגע ביכולת לנהל שיחה טובה כמו גסות רוח:\n\n* נהגו כאזרחים טובים. אל תפרסמו שום דבר שאדם סביר היה מחשיב פוגעני, מעליב או טקסט שנאה.\n* כתבו נקי. אל תפרסמו שום דבר מגונה או מיני מפורש.\n* כבדו זה את זו. המנעו מלהטריד או לגרום צער לאחרים, מלהתחזות לאחרים או לחשוף את פרטיהם האישיים.\n* כבדו את הפורום שלנו. אל תפרסמו ספאם או כל פעולה ונדליסטית אחרת לפורום.\n\nאלו אינן כללים ברורים עם הגדרות מדוייקות &mdash; המנו אפילו מ_חזות_ של משהו מהדברים הללו. אם אינכם בטוחים, שאלו את עצמכם איך הייתם מרגישים לו אחד מהפרסומים שלכם היה מופיע על העמוד הראשון של הניו-יורק טיימס (או עיתון מכובד אחר, לבחירתכם).\n\nזהו פורום פומבי ומנועי חיפוש מאנדקסים דיונים אלו. הקפידו על השפה, הקישורים והתמונות בטוחים ומותאמים למשפחה וחברים.\n\n<a name=\"keep-tidy\"></a>\n\n## [שמרו על סדר ונקיון](#keep-tidy)\n\nעשו מאמץ למקום דברים במקום הנכון, כך שנוכל להשקיע יותר זמן בדיון ופחות בסידור וניקיון. לכן\n\n* אל תתחילו נושא בקטגוריה שאינה מתאימה.\n* אל תפרסמו במקביל את אותו הדבר בכמה נושאים שונים.\n* אל תפרסמו תגובות ללא תוכן.\n* אל תפגעו בנושא באצמעות שינויו באמצע הדיון.\n* אל תוסיפו חתימה בהודעות שלכם &mdash; כל פרטי הפרופיל שלכם יוצמדו לכל פרסום שלכם.\n\nבמקום לפרסם \"1+\" או \"אני מסכים/מסכימה, השתמשו בכפתור הלייק. במקום לקחת נושא בדיון לכיוון שונה בצורה קיצונית, השתמש ב\"תגובה כנושא חדשה\".\n\n<a name=\"stealing\"></a>\n\n## [פרסמו רק חומר שלכם](#stealing)\n\nאינם יכולים לפרסם שום תוכן דיגיטלי ששייך למישהו אחר ללא רשותם. אינכם יכולים\
-      \ לפרסם תיאור, קישורים או דרכים לגנוב את הקניין הרוחני של מישהו אחר (ובכלל זה תוכנה, וידאו, שמע, תמונות) או כדי לעבור על כל חוק אחר.\n\n\n<a name=\"tos\"></a>\n\n## [תנאי השימוש](#tos)\n\nכן, חוק ומשפט יכולים להיות משעממים, אבל עלינו להגן על עצמנו &ndash; ובהמשך לכך גם עליך ועל המידע שלך &ndash; מחבר'ה לא נחמדים. יש לנו [תנאי שימוש] (/tos) אשר מתארים את ההתנהגות והזכויות שלך ושלנו ביחס לתוכן, פרטיות וחוקים. כדי להשתמש בשירות [אתם חייבים להסכים לציית לכללים אלו(/tos).\n"
+    body: "<a name=\"civilized\"></a>\n\n## [זהו מקום מתורבת לדיון ציבורי](#civilized)\n\nאנא התייחסו לפורום הדיון ביחס של כבוד, בדומה לאופן בו הייתם נוהגים בפארק ציבורי. גם אנחנו משאב קהילתי משותף  &mdash; מקום כדי לחלוק יכולות, ידע ותחומי עניין תוך כדי שיחה מתפתחת.\n\nאלו אינם חוקים קשים ומהירים, אלא כלי עזר שנועדו לסייע להכרעות אנושיות במסגרת הקהילות שלנו. השתמשו בכללים המנחים הללו כדי לשמוש על הזירה הזו כמקום נקי, מואר ומאפשר שיח ציבורי מתורבת.\n<a name=\"improve\"></a>\n\n## [שפרו את הדיון](#improve)\n\nסייעו לנו להפוך פורום זה למקום מעולה לדיון באמצעות עבודה מתמדת על שיפור הדיון בדרך כל שהיא, גם אם בעזרת תרומה קטנה או צנועה. אם אינם בטוחים אם הפרסום שלכם תורם לשיחה, חשבו שוב מה בעצם ברצונכם לומר ונסו שוב מאוחר יותר.\n\nהנושאים שנדונים כאן חשובים לנו, ואנו רוצים שתנהגו כלפיהם ככאלה שחשובים גם לכם. לכן, נהגו בכבוד לנושאים ולאנשים אשר דנים בהם, גם אם אינכם מסכימים אם חלק מהדברים שנאמרים.\n\nאחת הדרכים לשפר את הדיון היא באמצעות גילוי נושאים שלגביהם כבר מתנהל דיון. אנא השקיעו מזמנים כדי ללגלוש בין הנושאים כאן לפני שתשיבו או תפתחו נושאים חדשים משלכם, וכך גם תגדילו את הסיכויים לפגוש אחרים להכיר אחרים שחולקים אותם תחומי עניין.\n.\n\n<a name=\"agreeable\"></a>\n\n## [נטו להסכמה, גם אם אינם מסכימים](#agreeable)\n\nאתם עשויים לרצות להגיב באי הסכמה למשהו שתראו כאן. זה בסדר, א-ב-ל זכרו _לבקר את הרעיונות, לא את האנשים_. אנא המנעו מ:\n\n* הדבקת כינויים או שמות.\n* מתקפות לגופו של אדם.\n* תגובה לטון הכתיבה בפרסום כלשהוא, במקום לתוכן הממשי שלו.\n* סתירה אינסטנקטיבית.\n\nבמקום כל אלו הגיבו בטיעוני נגד אשר משפרים את השיחה.\n\
+      \n<a name=\"participate\"></a>\n\n## [ההשתתפות שלכם נחשבת](#participate)\n\nהשיחה שאנחנו מנהלים כאן משפיעה על כל חברי הקהילה. עזרו לנו להשפיע על עתיד הקהילה באמצעות הצטרפות לדיונים אשר יעשו את הפורום הזה מקום מעניין יותר לשהות בו  &mdash; והתעלמו מכאלו שלא עושים כך.\n\nמערכת Discourse כוללת כלים אשר מאפשרים לקהילה לזהות באופן קולקטיבי את התרומות הטובות ביותר (והגרועות ביותר): פרסומים מועדפים, סימניות, לייקים, סימונים, תגובות, עריכות וכן הלאה. השתמשו בכל הכלים הללו כדי לשפר את החוויה האישית שלכם, וגם את זו של כולם.\n\nבואו ננסה להשאיר את הפארק טוב יותר מכפי שמצאנו אותו.\n\n<a name=\"flag-problems\"></a>\n\n## [אם נתקלתם בבעיה, סמנו אותה](#flag-problems)\n\nלמנחים יש סמכות מיוחדת; הם אחראים לפורום הזה. אבל גם את/ה. בעזרתך מנחים יכולים כמדריכים לדיון, ולא רק כשומרים או שוטרים.\n\nכאשר אתם נתקלים בהתנהגות פסולה, אל תגיבו אליה. זה יעודד את ההתנהגות הרעה על ידי מתן הכרה, יגזול מכם אנרגיה ויבזבז זןמ לכולם. _פשוט סמנו אותה_. אם מספיק יועברו מספיק סימונים, תינקט פעולה, באופן אוטומטי או על ידי התערבות של מנחה. \n\nבכדי לתחזק את הקהילה שלנו, שמורה למנחים הזכות להסיר תוכן או חשבונות משתמש מכל סיבה בכל זמן. מנחים לא מאשרים הודעות לפני פרסום בדרך כלשהיא; המנחים ומפעילי האתר אינו נושאים באחריות כלשהיא לתוכן שפורסם על ידי הקהילה.\n\n\n<a name=\"be-civil\"></a>\n\n## [נהגו כאזרחים]](#be-civil)\nאין משהו שפוגע ביכולת לנהל שיחה טובה כמו גסות רוח:\n\n* נהגו כאזרחים טובים. אל תפרסמו שום דבר שאדם סביר היה מחשיב פוגעני, מעליב או טקסט שנאה.\n* כתבו נקי. אל תפרסמו שום דבר מגונה או מיני מפורש.\n* כבדו זה את זו. המנעו מלהטריד\
+      \ או לגרום צער לאחרים, מלהתחזות לאחרים או לחשוף את פרטיהם האישיים.\n* כבדו את הפורום שלנו. אל תפרסמו ספאם או כל פעולה ונדליסטית אחרת לפורום.\n\nאלו אינן כללים ברורים עם הגדרות מדוייקות &mdash; המנו אפילו מ_חזות_ של משהו מהדברים הללו. אם אינכם בטוחים, שאלו את עצמכם איך הייתם מרגישים לו אחד מהפרסומים שלכם היה מופיע על העמוד הראשון של הניו-יורק טיימס (או עיתון מכובד אחר, לבחירתכם).\n\nזהו פורום פומבי ומנועי חיפוש מאנדקסים דיונים אלו. הקפידו על השפה, הקישורים והתמונות בטוחים ומותאמים למשפחה וחברים.\n\n<a name=\"keep-tidy\"></a>\n\n## [שמרו על סדר ונקיון](#keep-tidy)\n\nעשו מאמץ למקום דברים במקום הנכון, כך שנוכל להשקיע יותר זמן בדיון ופחות בסידור וניקיון. לכן\n\n* אל תתחילו נושא בקטגוריה שאינה מתאימה.\n* אל תפרסמו במקביל את אותו הדבר בכמה נושאים שונים.\n* אל תפרסמו תגובות ללא תוכן.\n* אל תפגעו בנושא באצמעות שינויו באמצע הדיון.\n* אל תוסיפו חתימה בהודעות שלכם &mdash; כל פרטי הפרופיל שלכם יוצמדו לכל פרסום שלכם.\n\nבמקום לפרסם \"1+\" או \"אני מסכים/מסכימה, השתמשו בכפתור הלייק. במקום לקחת נושא בדיון לכיוון שונה בצורה קיצונית, השתמש ב\"תגובה כנושא חדשה\".\n\n<a name=\"stealing\"></a>\n\n## [פרסמו רק חומר שלכם](#stealing)\n\nאינם יכולים לפרסם שום תוכן דיגיטלי ששייך למישהו אחר ללא רשותם. אינכם יכולים לפרסם תיאור, קישורים או דרכים לגנוב את הקניין הרוחני של מישהו אחר (ובכלל זה תוכנה, וידאו, שמע, תמונות) או כדי לעבור על כל חוק אחר.\n\n\n<a name=\"tos\"></a>\n\n## [תנאי השימוש](#tos)\n\nכן, חוק ומשפט יכולים להיות משעממים, אבל עלינו להגן על עצמנו &ndash; ובהמשך לכך גם עליך ועל המידע שלך &ndash; מחבר'ה לא נחמדים. יש\
+      \ לנו [תנאי שימוש] (/tos) אשר מתארים את ההתנהגות והזכויות שלך ושלנו ביחס לתוכן, פרטיות וחוקים. כדי להשתמש בשירות [אתם חייבים להסכים לציית לכללים אלו(/tos).\n"
   tos_topic:
     title: "תנאי השימוש"
-    body: "הכללים והתנאים הבאים חלים על כל שימוש באתר %{company_domain} וכל התוכן, השירותים והמוצרים הזמנים בו או דרכו, כולל, ולא רק, תוכנת הפורום %{company_domain, פורום התמיכה של %{company_domain ושירותי האירוח של %{company_domain (\"אירוח\") (להלן, \"האתר\"). האתר הוא בבעלות ומופעל על ידי %{company_full_name} (\"%{company_name}\").. האתר נתון להסכמתך ללא שינוי של כל הכללים והתנאים הכלולים כאן וכל כלל ומדיניות (כולל, וללא מגבלה,  [מדיניות הפרטיות] (/privacy)של %{company_domain} ו[כללי ההתנהגות הקהילתיים] (/faq)ונהלים אשר אשויים להתפרסם מעת לעת באתר זה על ידי %{company_name} (להלן, \"ההסכם\").\n\nאנא קראו הסכם זה בזהירות לפני גישה או שימוש באתר. בגישה או שימוש בכל חלק של האתר, הנכם מסכימים להיות מחוייבים לכללים והתנאים שבהסכם זה. אם אינכם מסכימים לכל הכללים והתנאים של הסכם זה, אז אינכם רשאים לגשת לאתר או להשתמש באיזהשהו שירות. אם הכללים והתנאים האלה נחשבים הצעה מטעם %{company_name}, קבלתה מוגבלת לכללים אלה. האתר זמין רק ליחידים בני 13 ומעלה.\n\n<a name=\"1\"></a>\n\n## [1. חשבון %{company_domain} שלך](#1)\n \nאם את/ה יוצרים חשבון באתר, את/ה אחראים לתחזר את האבטחה של החשבון שלך ואתם נושאים באחריות המלאה לכל הפעילויות שיתבצעו תחת החשבון. אתם חייבים ליידע באופן מיידי את %{company_name} על כל שימוש לא מאושר שנעשה בחשבונך או כל פרצה אחרת. %{company_name} לא יהיו אחראיים לפעולה כל שהיא או למחדל שלך, כולל כל סוג של נזק שיגרם כתוצאה מפעיולות כאלה או מחדלים.\n\n<a name=\"2\"></a>\n\n## [2. אחריות התורמים](#2)\n\nאם אתם מפרסמים חומר לאתר, מפרסמים קישורים באתר, או הופכים (או מאפשר לכל צד שלישי אחר להפוך) חומר לזמין באמצעות האתר (כל סוג של חומר, \"תוכן\"), אתם אחראיים באופן מלא לתוכן ולכל סוג של פגיעה כתוצאה ממנו. זה יהיה המקרה בלי קשר להאם התוכן המדובר מכיל טקסט, גרפיקה, קובץ אודיו או תוכנת מחשב. על ידי הפיכת התוכן לזמין אתם מצהירים ומסכימים ש:\n\n* ההורדה, העתה והשימוש בתוכן לא פוגעים בזכויות קניין, כולל אבל לא רק זכויות היוצרים, פטנט, סימן רשום או זכויות סודיות מסחרית של צד שלישי כל שהוא;\n\n* אם למעסיק שלכם יש זכויות על קניין רוחני שיצרתם עליכם לפעול באחת הדרכים: (1) לקבל רשות מהמעסיק לפרסם או להפוך את התוכן לזמין, כולל אבל לא רק לכל תוכנה, או (2) להבטיח קבלה של כתב ויתור על כל הזכויות על או במסגרת התוכן;\n\
-      \n* אתם פועלים בהתאמה מלאה עם כל רשיונות צד שלישי בנוגע לתוכן ועומדים בהצלחה בכל הכללים והתנאים הנדרשים כדי להעבירו למשתמשי קצה;\n\n* התוכן אינו כולל או מתקין וירסום, תוכלעות, רוגלות, סוסים טרויאנים או תוכן פוגעני או הרסני אחר כלשהו;\n\nהתוכן אינו ספאם, אינו מופק על ידי מכונה או מופק בצורה רנדומאלית, ואינו כולל תוכן לא אתי או לרצוי שנועד למשוך תנועת גולשים לאתרי צד שלישי או להשפר את דירוגם של אתרים כאלה בתוצאות מנועי חיפוש, או כל פעולה בלתי חוקית אחרת (כגון phishing) או מטעה את המקבלים אותו בנוגע למקור החומר (למשל זיוף);\n\n* התוכן אינו פורונוגרפי, אינו כולל איומים או מעודד אלימות ואינו מפר את זכויות פרטיות וציבוריות של צד שלישי כלשהו;\n\n* התוכן שלכם אינו מפורסם באמצעות מסרים אלקטרוניים לא רצויים דוגמאת קישורי (links) ספאם בקבוצות דיון, קבוצות דיוור, בלוגים ואתרים ואמצעי קידום לא מוזמנים אחרים;\n\n* התוכן שלכם אינו נקרא או מתאר בצורה שמטעה אתת הקוראים למחשבה שאתם אדם אחר או חברה אחרת; ו\n\n* במקרה שהתוכן שלך כולל קוד מחשב, תיארתם בצורה מתאימה את הסוג ו/או הקטגוריה שלו, אופיו, שימושיו והשפעתו על החומרים – הן אם התבקשתם לעשות כן על ידי %{company_name} וגם אם לא.\n \n<a name=\"3\"></a>\n \n## [3. רישיון תוכן משתמש ](#3)\n\nתרומותיהם של משתמשים הנן תחת רישיון [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). ללא  מגבלה כלשהי על הצהרות או התחייבויות אלה, שמורה ל%{company_name} הזכות (אך לא החובה) על פי שיקול דעת בלבדי (1) לסרב או להסיר כל תוכן אשר על פי הדעה הסבירה של %{company_name} מפר את מדיניות %{company_name} או פוגע או מעורר התנגדות, או (2) להשמיד או למנוע גישה ושימוש באתר מכל פרט או יישות מכל סיבה שהיא על פי שקול הדעת הבלבדי של %{company_name}. ל %{company_name}לא תהיה שום התחייבות לספק החזר מכל סכום שהוא ששולם בעבר.\n\n<a name=\"4\"></a>\n\n## [4. תשלומים והחזרים](#4)\n\n### כללים כלליים. \n\nשירותים אופציונאליים בתשלום או שדרוגים עשוים להיות זמינים באתר. בשימוש בשירות אופציונאלי בתשלום או שדרוג אתם מסכימים לשלם ל%{company_name} את עלות המנוי החודשי או השנתי המצויינים. התשלומים יחוייבו על בסיס יומי על בסיס היום בו התחלתם לעשות שימוש בשירות או בשדרוג ויכסו את השימוש בשירות או בשדרוג כתקופת מנוי חודשי\
-      \ או שנתי כפי שיצויין. סכומים אלה אינם ניתנתים להחזרה.\n\n### חידוש אוטומטי\n\nאלא אם כן תודיעו ל%{company_name} לפני סוף תקופת המנוי המיושם שהנכם מעוניינים לבטל את השירות או השדרוג, המנוי שלכם יחודש באופן אוטומטי והנכם מסמיכים אותנו לגבות את סכום המנוי החודש או השנתי הרלוונטי אז (כמו גם את המסים הנלווים) באמצעות כל כרטיס אשראי או אמצעי תשלום אחר שמופיע ברשומותינו כקשור אליכם. מנויים ניתנים לביטול בכל עת.\n\n<a name=\"5\"></a\n\n### אירוח ושירותי תמיכה\n \nשירותי אירוח ותמיכה אופציונאליים עשויים להיות מסופקים על ידי %{company_name} תחת הכללים והתנאים של כל שירות שכזה. בהרשמה לחשבון שירות אירוח/תמיכה הנכם מסכימים לציית לכללים ותנאים שכאלה.\n\n<a name=\"6\"></a>\n\n## [6. אחריות המבקרים באתר]\n\nל%{company_name} לא בדק/ה, ולא מסוגל/ת לבדוק, את כל התוכן, כולל תוכנת המחשב, המפורסמם באתר ולא יכול/ה להיות אחראיים לתוכן, לשימוש או לתוצאות של שימוש בתכנים אלה. בהפעלת האתר %{company_name} אינה מצהירה או מרמזת שהיא מאשרת את התוכן המפורסם, או מאמינ/ה כי חומר זה נכון, שמוש או בלתי-מזיק. אתם אחראיים לנקיטת האמצעים הנדרשים להגן על עצמכם ומערכות המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים ותוכן פוגעני או הרסני אחר. אתר זה עלול להכיל תוכן פוגעני, לא ישר או מעורר התנגדות, כמו גם תוכן הכולל אי דיוקים טכניים, טעויות טיפוגרפיות ושגיאות אחרות. האתר עלול להכיל חומר שמפר זכויות פרטיות או פומביות או מפר קניין רוחני וזכויות יוצרים אחרות של צדדים שלישיים, שהאפשרות להורדה, העתקה או שימוש  בהם מותנה בכללים או תנאים נוספים, מוצהרים ובלתי מוצהרים. %{company_name} מתנער/ת מכל אחריות לכל פגיעה כתוצאה מהשימוש שעושים המבקרים באתר, או מהורדה של תוכן שפורסם על ידי מבקרים.\n\n<a name=\"7\"></a>\n\n## [7. תוכן שפורסם באתרים אחרים](#7)\nלא בדקנו, ואיננו מסוגלים לבדוק, את כל התוכן כולל תוכנות מחשב, שנהיה זמין דרך האתרים והדפים אליהם מקשרים הקישורים מ-%{company_name}. ל%{company_name} אין שום שליטה על האתרים ועמודים שאינם של %{company_name} ואינו/ה אחראי/ת לתכניהם או לשימוש בהם. בקישור לאתר או עמוד שאינו של %{company_name} אינה מצהירה או רמוזת לכך שהיא תומכת באתר או בעמוד. אתם אחראיים לנקטית האמצעים הנדרשים כדי להגן על עצמכם או מערכת המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים וכל תוכן פוגעני או הרסני אחר. %{company_name} מסיר/ה\
-      \ מעצמם כל אחריות לכל נזק שיגרם משימוש שתעשו באתרים ועמודים שאינם של %{company_name}.\n\n<a name=\"8\"></a>\n\n## [8. הפרת זכויות יוצרים ומדיניות ](#8)\n\nכפי ש%{company_name} מבקש/ת ומצפה מאחרים לכבד את כויות הקניינו/ה הרוחני, היא/הוא גם מכבד/ת את הקניין הרוחני של אחרים. אם אתם מאמינים שחומר הממוקם או מקושר אל %{company_name} מפר את זכויות היוצרים שלכם ואם אתר זה יושב בארה\"ב אנו מעודדים אתכם ליידע את %{company_name}, בהתאם למדיניות[Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") של %{company_name}. %{company_name} יגיבו לכל פניה שכזו, כולל הסרה של החומר המפר או ניטרול כל הקישורים לחומר המפר, כנדרש או כראוי. %{company_name} תמנע גישה ושימוש של מבקר/ת באתר אם, תחת נסיבות מתאימות, המבקר/ת נחושים להמשיך בהפרה של זכויות יוצרים או זכויות קניין אחרות של %{company_name} או של אחרים. במקרה של מחיקה שכזו, ל%{company_name} לא תהיה המחוייבות לספק החזר של סכום כלשהו ששולם ל%{company_name} בעבר.\n\n<a name=\"9\"></a>\n\n## [9. קניין רוחני](#9)\n\nהסכם זה אינו מעביר מ%{company_name} אליך או לצד שלישי זכות קניינית כלשהי וכל זכות, כותרת ועניין בנוגע לקניין כזה ישארו (בין הצדדים) רק עם %{company_name}.\n%{company_name}, %{company_domain} הלוגו של %{company_domain} וכל סימן רשום אחר, סימוני שירות, גרפיקה וסמלילים המשמשים בתקשורת עם %{company_domain} אם עם האתר הם סימנים מסחריים או סימנים רשומים של %{company_name} או מחזיקי רישיונות מטעם %{company_name}. סימנים מסחריים אחרים, סימני שירותים, גרפיקות וסממלילים המשתמשים בתקשורת עם האתר עשויים להיות סימנים מסחריים של צד ג'. השימוש שלך באתר אינו מבטיח לך שום זכות או רישיון להפיץ או לעשות כל שימוש אחר בסימנים מסחריים של %{company_name}או של צד שלישי.\n\n<a name=\"10\"></a>\n\n## [10. פרסומות](#10)\n\n%{company_name} שומר/ת לעצמם את הזכות להציג פרסומות על התוכן שלך אלא אם כן רכשת שדרוג או שירות להסרת פרסומות.  \n\n<a name=\"11\"></a>\n\n## [11. ייחוס](#11)\n\n%{company_name} שומר/ת לעצמו/ה את הזכות להציג קישורים עם ייחוס, כמו למשל 'מופעל באמצעות %{company_domain}', מחבר/ת נושא, וייחוס פונטים בכותרות העליונות והתחתונות של התוכן שלך. קרדיט בתחתית העמוס וסרגיל הכלים של %{company_domain} לא יוסר אלא אם כן נרכשו\
-      \ שדרוגים.\n\n<a name=\"12\"></a>\n\n## [12. שינויים](#12)\n\n%{company_domain} שומר/ת לעצמם את הזכות, על פי החלטה בלבדית, לשנות או להחליף כל חלק מהסכם זה. זוהי אחריותך לבדוק את ההסכם מידי תקופה ולבדוק אם נערכו בו שינויים. המשך השימוש והגישה באתר לאחר פרסום כל שינוי בסכם זה מהווה הסכמה לקבלת שינויים אלו. %{company_domain} עשוי/ה גם להציע בעתיד  שירותים ו/או תכונות דרך האתר (כולל שחרור כלים ומשאבים חדשים). מאפיינים חדשים כאלו יהיו נתונים לכללים ולהגדרות שבהסכם זה.\n\n<a name=\"13\"></a>\n\n## [13. הפסקת ההסכם](#13)\n\n%{company_domain} עשוי/ה להפסיק את הגישה שלך לכל או לחלק מהאתר בכל זמן, עם או ללא סיבה, עם או ללא ידוע, באופן אפקטיבי ומיידי. אם אתם מעוניינים להפסיק הסכם זה או את החשבון ב%{company_domain} (אם יש לכם אחד כזה), אתם יכולים פשוט להפסיק להשתמש באתר. כל ההוראות של הסכם זה שבאופיין תקפות ,לאחר ביטול ימשיכו להתקיים לאחר הביטול, כולל, וללא מגבלה, הוראות הבעלות, הצהרות הסרת האחריות, שיפוי ומגבלות האחריות.\n\n<a name=\"14\"></a>\n\n## [14. הסרת אחריות](#14)\n\nהאתר מוגש כפי שהוא. %{company_name} והספקים שלו/ה ומחזיקי הרישון מטעמם מסירים בזאת מעצמם אחריות מכל סוג, מפורש או משתמע, כולל וללא מגבלות, אחריות לגבי מסחר, התאמה למטרה מסוימת ואי הפרה. %{company_name} ו/או ספקיו/ה ו/או בעלי רשיונות מטעמה אינם מתחייבים שהאתר הינו נטול תקלות או שחלקים שהוכנסו בו יהיו המשכיים וללא הפרעות. אם אתם ממש קוראים את זה, היה [ממתק](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). אתם מבינים שאם אתם מורידים, צורכים תוכן או שירות בדרך אחרת מהאתר אתם עושים זאת על פי שיקול דעתכם ועל אחריותכם בלבד.\n\n<a name=\"15\"></a>\n\n## [15. הגבלת האחריות](#15)\nבשום מקרה לא יהיה/תהיה %{company_name} או ספקיו/ה או מחזיקים ברשיון מטעמם אחראיים בנוגע לכל נושא הקשור להסכם זה תחת שום חוזה, רשלנות, אחריות ישירה או כל תיאוריה משפטית אחרת עבור: (1) כל נזק מיוחד, מקרי או תוצאתי; (2) עלות הרכש עבור מוצרים שירותים חלופיים; (3) עבור הפרעה בשימוש או אובד או פגיעה בנתונים; או (4) כל סכום שעולה על התעריפים ששולמו על ידך ל%{company_name} במסגרת הסכם זה במהלך שנים-עשר (12) החודשים שקדמו לסיבת העניין. %{company_name} לא ישא/תישא באחריות בנוגע לשום כישלון או ההשהיה בשל עניינים שמעבר לשליטתם בהסתכלות\
-      \ הגיונית.  כל האמור לעיל לא יחול על איסורים על פי החוק התקף.\n\n<a name=\"16\"></a>\n\n## [16. הצהרה כללית ואחריות](#16)\n\nהנכם מצהירים ולוקחים אחריות על כך ש(1) השימוש שלכם באתר יהיה בהתאם ל[מדיניות הפרטיות](/privacy) של %{company_name}, [כללי ההתנהגות הקהילתיים](/guidelines), הסכם זה וכל החוקים והתקנות התקפים (כולל וללא מגבלה כל חוק מקומי או תקנה בארצך, במדינה, בעיר או באזור ממשלתי אחר, ביחס להתנהלות וקבלת תוכן מקוון, וכולל כל החוקים התקפים ביחס להעברת מידע טכני המיוצא מתוך המדינה בה שוכן אתר זה או המדינה בה אתם נמצאים), וש(2) השימוש שלך באתר לא יפגע או ימעל בזכויות הקניין הרוחני של כל צד שלישי.\n\n<a name=\"17\"></a>\n\n## [17. שיפוי](#17)\n\nאתם מסכימים לשפות ולמנוע פגיעה ב%{company_name}, קבלנים ומחזיקים ברשיונות מטעמו והדירקטורים, פקידים, מועסקים וסוכנים מטעמם כנגד כל טענה ונזק, כולל תביעות בנושאי תעריפים, העולות כתוצאה משימוש שלך באתר, כולל, אך ללא מגבלה, הפרה של הסכם זה מצדכם.\n\n<a name=\"18\"></a>\n\n## [18. שונות](#18)\n\nהסכם זה מהווה את ההסכם השלם בין %{company_name} וביניכם בנוגע לנושאים הנדונים, וניתן לשנותם רק  על ידי הסכם כתוב החתום על ידי מנהל/ת מוסמכים מטעם  %{company_name}, או על ידי פרסום מטעם %{company_name} של גרסא מתוקנת. פרט למידה בה הדין החל, אם ישנו כזה, פוסק אחרת, הסכם זה, כל גישה או שימוש באתר יהיה על פי החוקים של מדינת קליפורניה, ארה\"ב, למעט התנגשויות עם תיקונים בחוק, והמקום הראוי לכל מחלוקת הנובעת מעניינים אלו יבוררו בבתי המשפט המדינתי והפדראלי הממוקמים במחוז סן-פרנסיסקו, קליפורניה. מלבד טעות לסעד או שוויוניות או טענות ביחס לזכויות קניין רוחני (אשר עשויות לעלות בכל בית משפט מוסמך ללא הפקדת ערבות), כל מחלוקת שעולה תחת הסכם זה תבורר בסופו של דבר בהתאם לכללי בוררות מקיפים של הבוררות השיפוטית ושירות הגישור (Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”)), על ידי שלושה בוררים שימונו לכללים אלה. הבוררות תתקיים בסן-פרנסיסקו, קליפורניה, בשפה האנגלית והחלטת הבוררות תמומש בכל בית מספר. הצד המוביל בכל פעולה או הליך לאכיפת הסכם זה יהיה זכאי להוצאות ושכר טרחת עורכי הדין. אם חלק כלשהו של הסכם זה אינו תקף או אינו בר-אכיפה, חלק זה יפורש בדרך שתשקף את הכוונה המקונית של הצדדים והחלקים האחרים יישארו בתוקף מלא. כתב ויתור של מי\
-      \ מהצדדים על כלל או תנאי של חוזה זה או הפרה אחד מסעיפים, לא תבטל או תוותר  תנאי או כלל זה, או על כל הפרה בעקבותיו. אתם רשאים להעביר את זכויותיכם בהסכם זה לכל צד שמסכים ומקבל עליו את המגבלות, התנאים והכללים; %{company_name} רשאים להעביר את זכויותיהם תחת הסכם זה ללא תנאי. הסכם זה יהיה מחייב ופעיל כלפי הצדדים, יורשיהם ומורשי חתימה מטעמם. \n\nמסמך זה מופץ תחת רישוי CC-BY-SA. הוא עודכן לאחרונה ב-31.3.2013. הגרסא המקורית אומצה מ[תנאי השימוש והשירות של וורדפרס](http://en.wordpress.com/tos/).\n"
+    body: "הכללים והתנאים הבאים חלים על כל שימוש באתר %{company_domain} וכל התוכן, השירותים והמוצרים הזמנים בו או דרכו, כולל, ולא רק, תוכנת הפורום %{company_domain, פורום התמיכה של %{company_domain ושירותי האירוח של %{company_domain (\"אירוח\") (להלן, \"האתר\"). האתר הוא בבעלות ומופעל על ידי %{company_full_name} (\"%{company_name}\").. האתר נתון להסכמתך ללא שינוי של כל הכללים והתנאים הכלולים כאן וכל כלל ומדיניות (כולל, וללא מגבלה,  [מדיניות הפרטיות] (/privacy)של %{company_domain} ו[כללי ההתנהגות הקהילתיים] (/faq)ונהלים אשר אשויים להתפרסם מעת לעת באתר זה על ידי %{company_name} (להלן, \"ההסכם\").\n\nאנא קראו הסכם זה בזהירות לפני גישה או שימוש באתר. בגישה או שימוש בכל חלק של האתר, הנכם מסכימים להיות מחוייבים לכללים והתנאים שבהסכם זה. אם אינכם מסכימים לכל הכללים והתנאים של הסכם זה, אז אינכם רשאים לגשת לאתר או להשתמש באיזהשהו שירות. אם הכללים והתנאים האלה נחשבים הצעה מטעם %{company_name}, קבלתה מוגבלת לכללים אלה. האתר זמין רק ליחידים בני 13 ומעלה.\n\n<a name=\"1\"></a>\n\n## [1. חשבון %{company_domain} שלך](#1)\n \nאם את/ה יוצרים חשבון באתר, את/ה אחראים לתחזר את האבטחה של החשבון שלך ואתם נושאים באחריות המלאה לכל הפעילויות שיתבצעו תחת החשבון. אתם חייבים ליידע באופן מיידי את %{company_name} על כל שימוש לא מאושר שנעשה בחשבונך או כל פרצה אחרת. %{company_name} לא יהיו אחראיים לפעולה כל שהיא או למחדל שלך, כולל כל סוג של נזק שיגרם כתוצאה מפעיולות כאלה או מחדלים.\n\n<a name=\"2\"></a>\n\n## [2. אחריות התורמים](#2)\n\nאם אתם מפרסמים חומר לאתר, מפרסמים קישורים באתר, או הופכים (או מאפשר לכל צד שלישי אחר להפוך) חומר לזמין\
+      \ באמצעות האתר (כל סוג של חומר, \"תוכן\"), אתם אחראיים באופן מלא לתוכן ולכל סוג של פגיעה כתוצאה ממנו. זה יהיה המקרה בלי קשר להאם התוכן המדובר מכיל טקסט, גרפיקה, קובץ אודיו או תוכנת מחשב. על ידי הפיכת התוכן לזמין אתם מצהירים ומסכימים ש:\n\n* ההורדה, העתה והשימוש בתוכן לא פוגעים בזכויות קניין, כולל אבל לא רק זכויות היוצרים, פטנט, סימן רשום או זכויות סודיות מסחרית של צד שלישי כל שהוא;\n\n* אם למעסיק שלכם יש זכויות על קניין רוחני שיצרתם עליכם לפעול באחת הדרכים: (1) לקבל רשות מהמעסיק לפרסם או להפוך את התוכן לזמין, כולל אבל לא רק לכל תוכנה, או (2) להבטיח קבלה של כתב ויתור על כל הזכויות על או במסגרת התוכן;\n\n* אתם פועלים בהתאמה מלאה עם כל רשיונות צד שלישי בנוגע לתוכן ועומדים בהצלחה בכל הכללים והתנאים הנדרשים כדי להעבירו למשתמשי קצה;\n\n* התוכן אינו כולל או מתקין וירסום, תוכלעות, רוגלות, סוסים טרויאנים או תוכן פוגעני או הרסני אחר כלשהו;\n\nהתוכן אינו ספאם, אינו מופק על ידי מכונה או מופק בצורה רנדומאלית, ואינו כולל תוכן לא אתי או לרצוי שנועד למשוך תנועת גולשים לאתרי צד שלישי או להשפר את דירוגם של אתרים כאלה בתוצאות מנועי חיפוש, או כל פעולה בלתי חוקית אחרת (כגון phishing) או מטעה את המקבלים אותו בנוגע למקור החומר (למשל זיוף);\n\n* התוכן אינו פורונוגרפי, אינו כולל איומים או מעודד אלימות ואינו מפר את זכויות פרטיות וציבוריות של צד שלישי כלשהו;\n\n* התוכן שלכם אינו מפורסם באמצעות מסרים אלקטרוניים לא רצויים דוגמאת קישורי (links) ספאם בקבוצות דיון, קבוצות דיוור, בלוגים ואתרים ואמצעי קידום לא מוזמנים אחרים;\n\n* התוכן שלכם אינו נקרא או מתאר בצורה שמטעה אתת הקוראים למחשבה שאתם אדם אחר או חברה אחרת; ו\n\n* במקרה שהתוכן\
+      \ שלך כולל קוד מחשב, תיארתם בצורה מתאימה את הסוג ו/או הקטגוריה שלו, אופיו, שימושיו והשפעתו על החומרים – הן אם התבקשתם לעשות כן על ידי %{company_name} וגם אם לא.\n \n<a name=\"3\"></a>\n \n## [3. רישיון תוכן משתמש ](#3)\n\nתרומותיהם של משתמשים הנן תחת רישיון [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). ללא  מגבלה כלשהי על הצהרות או התחייבויות אלה, שמורה ל%{company_name} הזכות (אך לא החובה) על פי שיקול דעת בלבדי (1) לסרב או להסיר כל תוכן אשר על פי הדעה הסבירה של %{company_name} מפר את מדיניות %{company_name} או פוגע או מעורר התנגדות, או (2) להשמיד או למנוע גישה ושימוש באתר מכל פרט או יישות מכל סיבה שהיא על פי שקול הדעת הבלבדי של %{company_name}. ל %{company_name}לא תהיה שום התחייבות לספק החזר מכל סכום שהוא ששולם בעבר.\n\n<a name=\"4\"></a>\n\n## [4. תשלומים והחזרים](#4)\n\n### כללים כלליים. \n\nשירותים אופציונאליים בתשלום או שדרוגים עשוים להיות זמינים באתר. בשימוש בשירות אופציונאלי בתשלום או שדרוג אתם מסכימים לשלם ל%{company_name} את עלות המנוי החודשי או השנתי המצויינים. התשלומים יחוייבו על בסיס יומי על בסיס היום בו התחלתם לעשות שימוש בשירות או בשדרוג ויכסו את השימוש בשירות או בשדרוג כתקופת מנוי חודשי או שנתי כפי שיצויין. סכומים אלה אינם ניתנתים להחזרה.\n\n### חידוש אוטומטי\n\nאלא אם כן תודיעו ל%{company_name} לפני סוף תקופת המנוי המיושם שהנכם מעוניינים לבטל את השירות או השדרוג, המנוי שלכם יחודש באופן אוטומטי והנכם מסמיכים אותנו לגבות את סכום המנוי החודש או השנתי הרלוונטי אז (כמו גם את המסים הנלווים) באמצעות\
+      \ כל כרטיס אשראי או אמצעי תשלום אחר שמופיע ברשומותינו כקשור אליכם. מנויים ניתנים לביטול בכל עת.\n\n<a name=\"5\"></a\n\n### אירוח ושירותי תמיכה\n \nשירותי אירוח ותמיכה אופציונאליים עשויים להיות מסופקים על ידי %{company_name} תחת הכללים והתנאים של כל שירות שכזה. בהרשמה לחשבון שירות אירוח/תמיכה הנכם מסכימים לציית לכללים ותנאים שכאלה.\n\n<a name=\"6\"></a>\n\n## [6. אחריות המבקרים באתר]\n\nל%{company_name} לא בדק/ה, ולא מסוגל/ת לבדוק, את כל התוכן, כולל תוכנת המחשב, המפורסמם באתר ולא יכול/ה להיות אחראיים לתוכן, לשימוש או לתוצאות של שימוש בתכנים אלה. בהפעלת האתר %{company_name} אינה מצהירה או מרמזת שהיא מאשרת את התוכן המפורסם, או מאמינ/ה כי חומר זה נכון, שמוש או בלתי-מזיק. אתם אחראיים לנקיטת האמצעים הנדרשים להגן על עצמכם ומערכות המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים ותוכן פוגעני או הרסני אחר. אתר זה עלול להכיל תוכן פוגעני, לא ישר או מעורר התנגדות, כמו גם תוכן הכולל אי דיוקים טכניים, טעויות טיפוגרפיות ושגיאות אחרות. האתר עלול להכיל חומר שמפר זכויות פרטיות או פומביות או מפר קניין רוחני וזכויות יוצרים אחרות של צדדים שלישיים, שהאפשרות להורדה, העתקה או שימוש  בהם מותנה בכללים או תנאים נוספים, מוצהרים ובלתי מוצהרים. %{company_name} מתנער/ת מכל אחריות לכל פגיעה כתוצאה מהשימוש שעושים המבקרים באתר, או מהורדה של תוכן שפורסם על ידי מבקרים.\n\n<a name=\"7\"></a>\n\n## [7. תוכן שפורסם באתרים אחרים](#7)\nלא בדקנו, ואיננו מסוגלים לבדוק, את כל התוכן כולל תוכנות מחשב, שנהיה זמין דרך האתרים והדפים אליהם מקשרים הקישורים מ-%{company_name}. ל%{company_name} אין שום שליטה על האתרים ועמודים שאינם של %{company_name} ואינו/ה\
+      \ אחראי/ת לתכניהם או לשימוש בהם. בקישור לאתר או עמוד שאינו של %{company_name} אינה מצהירה או רמוזת לכך שהיא תומכת באתר או בעמוד. אתם אחראיים לנקטית האמצעים הנדרשים כדי להגן על עצמכם או מערכת המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים וכל תוכן פוגעני או הרסני אחר. %{company_name} מסיר/ה מעצמם כל אחריות לכל נזק שיגרם משימוש שתעשו באתרים ועמודים שאינם של %{company_name}.\n\n<a name=\"8\"></a>\n\n## [8. הפרת זכויות יוצרים ומדיניות ](#8)\n\nכפי ש%{company_name} מבקש/ת ומצפה מאחרים לכבד את כויות הקניינו/ה הרוחני, היא/הוא גם מכבד/ת את הקניין הרוחני של אחרים. אם אתם מאמינים שחומר הממוקם או מקושר אל %{company_name} מפר את זכויות היוצרים שלכם ואם אתר זה יושב בארה\"ב אנו מעודדים אתכם ליידע את %{company_name}, בהתאם למדיניות[Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") של %{company_name}. %{company_name} יגיבו לכל פניה שכזו, כולל הסרה של החומר המפר או ניטרול כל הקישורים לחומר המפר, כנדרש או כראוי. %{company_name} תמנע גישה ושימוש של מבקר/ת באתר אם, תחת נסיבות מתאימות, המבקר/ת נחושים להמשיך בהפרה של זכויות יוצרים או זכויות קניין אחרות של %{company_name} או של אחרים. במקרה של מחיקה שכזו, ל%{company_name} לא תהיה המחוייבות לספק החזר של סכום כלשהו ששולם ל%{company_name} בעבר.\n\n<a name=\"9\"></a>\n\n## [9. קניין רוחני](#9)\n\nהסכם זה אינו מעביר מ%{company_name} אליך או לצד שלישי זכות קניינית כלשהי וכל זכות, כותרת ועניין בנוגע לקניין כזה ישארו (בין הצדדים) רק עם %{company_name}.\n%{company_name}, %{company_domain} הלוגו של %{company_domain} וכל סימן רשום\
+      \ אחר, סימוני שירות, גרפיקה וסמלילים המשמשים בתקשורת עם %{company_domain} אם עם האתר הם סימנים מסחריים או סימנים רשומים של %{company_name} או מחזיקי רישיונות מטעם %{company_name}. סימנים מסחריים אחרים, סימני שירותים, גרפיקות וסממלילים המשתמשים בתקשורת עם האתר עשויים להיות סימנים מסחריים של צד ג'. השימוש שלך באתר אינו מבטיח לך שום זכות או רישיון להפיץ או לעשות כל שימוש אחר בסימנים מסחריים של %{company_name}או של צד שלישי.\n\n<a name=\"10\"></a>\n\n## [10. פרסומות](#10)\n\n%{company_name} שומר/ת לעצמם את הזכות להציג פרסומות על התוכן שלך אלא אם כן רכשת שדרוג או שירות להסרת פרסומות.  \n\n<a name=\"11\"></a>\n\n## [11. ייחוס](#11)\n\n%{company_name} שומר/ת לעצמו/ה את הזכות להציג קישורים עם ייחוס, כמו למשל 'מופעל באמצעות %{company_domain}', מחבר/ת נושא, וייחוס פונטים בכותרות העליונות והתחתונות של התוכן שלך. קרדיט בתחתית העמוס וסרגיל הכלים של %{company_domain} לא יוסר אלא אם כן נרכשו שדרוגים.\n\n<a name=\"12\"></a>\n\n## [12. שינויים](#12)\n\n%{company_domain} שומר/ת לעצמם את הזכות, על פי החלטה בלבדית, לשנות או להחליף כל חלק מהסכם זה. זוהי אחריותך לבדוק את ההסכם מידי תקופה ולבדוק אם נערכו בו שינויים. המשך השימוש והגישה באתר לאחר פרסום כל שינוי בסכם זה מהווה הסכמה לקבלת שינויים אלו. %{company_domain} עשוי/ה גם להציע בעתיד  שירותים ו/או תכונות דרך האתר (כולל שחרור כלים ומשאבים חדשים). מאפיינים חדשים כאלו יהיו נתונים לכללים ולהגדרות שבהסכם זה.\n\n<a name=\"13\"></a>\n\n## [13. הפסקת ההסכם](#13)\n\n%{company_domain} עשוי/ה להפסיק את הגישה שלך לכל או לחלק מהאתר בכל זמן, עם או ללא סיבה, עם או ללא ידוע, באופן אפקטיבי\
+      \ ומיידי. אם אתם מעוניינים להפסיק הסכם זה או את החשבון ב%{company_domain} (אם יש לכם אחד כזה), אתם יכולים פשוט להפסיק להשתמש באתר. כל ההוראות של הסכם זה שבאופיין תקפות ,לאחר ביטול ימשיכו להתקיים לאחר הביטול, כולל, וללא מגבלה, הוראות הבעלות, הצהרות הסרת האחריות, שיפוי ומגבלות האחריות.\n\n<a name=\"14\"></a>\n\n## [14. הסרת אחריות](#14)\n\nהאתר מוגש כפי שהוא. %{company_name} והספקים שלו/ה ומחזיקי הרישון מטעמם מסירים בזאת מעצמם אחריות מכל סוג, מפורש או משתמע, כולל וללא מגבלות, אחריות לגבי מסחר, התאמה למטרה מסוימת ואי הפרה. %{company_name} ו/או ספקיו/ה ו/או בעלי רשיונות מטעמה אינם מתחייבים שהאתר הינו נטול תקלות או שחלקים שהוכנסו בו יהיו המשכיים וללא הפרעות. אם אתם ממש קוראים את זה, היה [ממתק](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). אתם מבינים שאם אתם מורידים, צורכים תוכן או שירות בדרך אחרת מהאתר אתם עושים זאת על פי שיקול דעתכם ועל אחריותכם בלבד.\n\n<a name=\"15\"></a>\n\n## [15. הגבלת האחריות](#15)\nבשום מקרה לא יהיה/תהיה %{company_name} או ספקיו/ה או מחזיקים ברשיון מטעמם אחראיים בנוגע לכל נושא הקשור להסכם זה תחת שום חוזה, רשלנות, אחריות ישירה או כל תיאוריה משפטית אחרת עבור: (1) כל נזק מיוחד, מקרי או תוצאתי; (2) עלות הרכש עבור מוצרים שירותים חלופיים; (3) עבור הפרעה בשימוש או אובד או פגיעה בנתונים; או (4) כל סכום שעולה על התעריפים ששולמו על ידך ל%{company_name} במסגרת הסכם זה במהלך שנים-עשר (12) החודשים שקדמו לסיבת העניין. %{company_name} לא ישא/תישא באחריות בנוגע לשום כישלון או ההשהיה בשל עניינים שמעבר לשליטתם בהסתכלות הגיונית.  כל האמור לעיל לא יחול\
+      \ על איסורים על פי החוק התקף.\n\n<a name=\"16\"></a>\n\n## [16. הצהרה כללית ואחריות](#16)\n\nהנכם מצהירים ולוקחים אחריות על כך ש(1) השימוש שלכם באתר יהיה בהתאם ל[מדיניות הפרטיות](/privacy) של %{company_name}, [כללי ההתנהגות הקהילתיים](/guidelines), הסכם זה וכל החוקים והתקנות התקפים (כולל וללא מגבלה כל חוק מקומי או תקנה בארצך, במדינה, בעיר או באזור ממשלתי אחר, ביחס להתנהלות וקבלת תוכן מקוון, וכולל כל החוקים התקפים ביחס להעברת מידע טכני המיוצא מתוך המדינה בה שוכן אתר זה או המדינה בה אתם נמצאים), וש(2) השימוש שלך באתר לא יפגע או ימעל בזכויות הקניין הרוחני של כל צד שלישי.\n\n<a name=\"17\"></a>\n\n## [17. שיפוי](#17)\n\nאתם מסכימים לשפות ולמנוע פגיעה ב%{company_name}, קבלנים ומחזיקים ברשיונות מטעמו והדירקטורים, פקידים, מועסקים וסוכנים מטעמם כנגד כל טענה ונזק, כולל תביעות בנושאי תעריפים, העולות כתוצאה משימוש שלך באתר, כולל, אך ללא מגבלה, הפרה של הסכם זה מצדכם.\n\n<a name=\"18\"></a>\n\n## [18. שונות](#18)\n\nהסכם זה מהווה את ההסכם השלם בין %{company_name} וביניכם בנוגע לנושאים הנדונים, וניתן לשנותם רק  על ידי הסכם כתוב החתום על ידי מנהל/ת מוסמכים מטעם  %{company_name}, או על ידי פרסום מטעם %{company_name} של גרסא מתוקנת. פרט למידה בה הדין החל, אם ישנו כזה, פוסק אחרת, הסכם זה, כל גישה או שימוש באתר יהיה על פי החוקים של מדינת קליפורניה, ארה\"ב, למעט התנגשויות עם תיקונים בחוק, והמקום הראוי לכל מחלוקת הנובעת מעניינים אלו יבוררו בבתי המשפט המדינתי והפדראלי הממוקמים במחוז סן-פרנסיסקו, קליפורניה. מלבד טעות לסעד או שוויוניות או טענות ביחס לזכויות קניין רוחני (אשר עשויות לעלות בכל בית משפט מוסמך ללא הפקדת ערבות),\
+      \ כל מחלוקת שעולה תחת הסכם זה תבורר בסופו של דבר בהתאם לכללי בוררות מקיפים של הבוררות השיפוטית ושירות הגישור (Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”)), על ידי שלושה בוררים שימונו לכללים אלה. הבוררות תתקיים בסן-פרנסיסקו, קליפורניה, בשפה האנגלית והחלטת הבוררות תמומש בכל בית מספר. הצד המוביל בכל פעולה או הליך לאכיפת הסכם זה יהיה זכאי להוצאות ושכר טרחת עורכי הדין. אם חלק כלשהו של הסכם זה אינו תקף או אינו בר-אכיפה, חלק זה יפורש בדרך שתשקף את הכוונה המקונית של הצדדים והחלקים האחרים יישארו בתוקף מלא. כתב ויתור של מי מהצדדים על כלל או תנאי של חוזה זה או הפרה אחד מסעיפים, לא תבטל או תוותר  תנאי או כלל זה, או על כל הפרה בעקבותיו. אתם רשאים להעביר את זכויותיכם בהסכם זה לכל צד שמסכים ומקבל עליו את המגבלות, התנאים והכללים; %{company_name} רשאים להעביר את זכויותיהם תחת הסכם זה ללא תנאי. הסכם זה יהיה מחייב ופעיל כלפי הצדדים, יורשיהם ומורשי חתימה מטעמם. \n\nמסמך זה מופץ תחת רישוי CC-BY-SA. הוא עודכן לאחרונה ב-31.3.2013. הגרסא המקורית אומצה מ[תנאי השימוש והשירות של וורדפרס](http://en.wordpress.com/tos/).\n"
   privacy_topic:
     title: "מדיניות פרטיות"
     body: |

config/locales/server.it.yml

@@ -19,11 +19,12 @@ it:
   topics: "Argomenti"
   posts: "messaggi"
   loading: "Caricamento"
-  powered_by_html: 'Powered by <a href="http://www.discourse.org">Discourse</a>, è consigliato abilitare javascript'
+  powered_by_html: 'Powered by <a href="http://www.discourse.org">Discourse</a>, è consigliato abilitare JavaScript '
   log_in: "Accedi"
   via: "%{username} via %{site_name}"
   is_reserved: "è riservato"
   purge_reason: "Cancellato automaticamente poiché vecchio e non verificato"
+  disable_remote_images_download_reason: "Lo scaricamento delle immagini remote è stato disabilitato perché non c'è abbastanza spazio disco disponibile."
   errors:
     messages:
       too_long_validation: "è limitato a %{max} caratteri; tu ne hai inseriti %{length}."
@@ -46,7 +47,7 @@ it:
     more_replies:
       one: "1 ulteriore risposta"
       other: "%{count} ulteriori risposte"
-    loading: "Caricamento della discussione..."
+    loading: "Caricamento Discussione..."
     permalink: "Permalink"
     imported_from: "Questo è un argomento collegato all'originale su: %{link}"
     in_reply_to: "▶ %{username}"
@@ -146,11 +147,11 @@ it:
 
       Invece di aggiungere una nuova risposta, valuta l'ipotesi di modificare le tue precedenti o di partecipare a un altro argomento.
     reviving_old_topic: |
-      ### Resuscitare questo topic?
+      ### Resuscitare questo argomento?
 
       L'ultima risposta a questo argomento è vecchia di %{days} giorni. La tua risposta farà tornare l'argomento in cima alla lista e tutti gli utenti coinvolti verranno notificati.
 
-      Sei davvero sicuro di voler continuare questo vecchio topic?
+      Sei davvero sicuro di voler continuare questo vecchio argomento?
   activerecord:
     attributes:
       category:
@@ -167,6 +168,7 @@ it:
         topic:
           attributes:
             base:
+              warning_requires_pm: "Puoi allegare solo avvertimenti ai messaggi privati."
               too_many_users: "Puoi inviare avvertimenti ad un solo utente per volta."
             archetype:
               cant_send_pm: "Spriacenti, non puoi mandare un messaggio privato a quell'utente."
@@ -184,7 +186,7 @@ it:
     no_info_me: "<div class='missing-profile'>il campo \"Su di me\" del tuo profilo è vuoto, <a href='/users/%{username_lower}/preferences/about-me'>vuoi compilarlo?</a></div>"
     no_info_other: "<div class='missing-profile'>%{name} non ha ancora compilato il campo \"Su di me\" del suo profilo</div>"
   vip_category_name: "Lounge"
-  vip_category_description: "Una categoria esclusiva per i membri con Livello Affidabilità 3 o superiore."
+  vip_category_description: "Una categoria esclusiva per i membri con livello di esperienza 3 o superiore."
   meta_category_name: "Meta"
   meta_category_description: "Discussioni su questo sito, la sua organizzazione, come funziona e come come noi possiamo migliorarlo."
   staff_category_name: "Staff"
@@ -192,7 +194,7 @@ it:
   assets_topic_body: "Questo è un argomento permanente, visibile solo allo staff, per salvare immagini e file utilizzati nel design del sito. Non eliminarlo!\n\n\nEcco come fare:\n\n\n1. Rispondi a questo argomento.\n2. Carica qui tutte le immagini che desideri usare per loghi, favicon e così via (usa l'icona di caricamento nell'editor del messaggio o trascina direttamente le immagini).\n3. Invia la risposta per creare il messaggio.\n4. Fai click con il tasto destro sulle immagini nel tuo nuovo messaggio per prelevare il percorso delle immagini caricate, o clicca l'icona di modifica messaggio e ottieni il percorso alle immagini. Copia il percorso delle immagini.\n5. Incolla i percorsi nella sezione [impostazioni di base](/admin/site_settings/category/required).\n\nSe vuoi permettere di caricare file di diverso tipo, modifica `authorized_extensions` nelle [impostazioni file](/admin/site_settings/category/files)."
   lounge_welcome:
     title: "Benvenuto nel Lounge"
-    body: "\nCongratulazioni! :confetti_ball: \n\nSe vedi questo argomento, sei stato recentemente promosso a **abituale** (livello di attendibilità 3).\n\nAdesso puoi &hellip;\n\n\n* Modificare il titolo di qualunque argomento \n* Cambiare la categoria di qualunque argomento \n* Seguire tutti i tuoi collegamenti (è rimosso il [nofollow automatico](http://en.wikipedia.org/wiki/Nofollow) ) \n* Accedere alla categoria privata Lounge visibile solo agli utenti con livello di attendibilità 3 o superiore\n* Assegnare con più forza i \"Mi piace\" e le segnalazioni \n\nEcco l'elenco degli altri [utenti abituali](/badges/3/regular). Vai a salutarli.\n\nGrazie per essere una parte importante di questa comunità! \n\n(Per maggiori informazioni sui livelli di attendibilità, [leggi questa discussione][trust]. Nota che possono rimanere utenti abituali solo quegli utenti che continuano a soddisfare i criteri di selezione) \n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n"
+    body: "\nCongratulazioni! :confetti_ball: \n\nSe vedi questo argomento, sei stato recentemente promosso a **esperto** (livello di esperienza 3).\n\nAdesso puoi &hellip;\n\n\n* Modificare il titolo di qualunque argomento \n* Cambiare la categoria di qualunque argomento \n* Seguire tutti i tuoi collegamenti (è rimosso il [nofollow automatico](http://en.wikipedia.org/wiki/Nofollow) ) \n* Accedere alla categoria privata Lounge visibile solo agli utenti con livello di esperienza 3 o superiore\n* Assegnare con più forza i \"Mi piace\" e le segnalazioni \n\nEcco l'elenco degli altri [utenti esperti](/badges/3/regular). Vai a salutarli.\n\nGrazie per essere una parte importante di questa comunità! \n\n(Per maggiori informazioni sui livelli di esperienza, [leggi questa discussione][trust]. Nota che possono rimanere utenti esperti solo quegli utenti che continuano a soddisfare i criteri di selezione) \n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n"
   category:
     topic_prefix: "Definizione della categoria %{category}"
     replace_paragraph: "[Sostituisci questo primo paragrafo con una breve descrizione della nuova categoria. Questa guida apparirà nell'area di selezione della categoria, perciò cerca di stare sotto i 200 caratteri. Finché non modifichi questo testo o non crei argomenti, questa categoria non apparirà sulla pagina delle categorie.]"
@@ -219,7 +221,6 @@ it:
       title: "abituale"
     elder:
       title: "capo"
-    change_failed_explanation: "Hai cercato di degradare %{user_name} a '%{new_trust_level}'. Però il suo livello di attendibilità è già '%{current_trust_level}'. %{user_name} resterà a '%{current_trust_level}'"
   rate_limiter:
     slow_down: "Hai eseguito questa operazione troppe volte, riprova più tardi"
     too_many_requests: "C'è un limite giornaliero su quante volte si può fare questa azione. Per favore attendi %{time_left} prima di riprovare."
@@ -384,7 +385,7 @@ it:
       title: "Argomento Normale"
     banner:
       message:
-        make: "Questo argomento è ora diventato uno striscione. Apparirà in cima ad ogni pagina finché non viene chiuso dall'utente."
+        make: "Questo argomento è ora uno striscione. Apparirà in cima ad ogni pagina finché non viene chiuso dall'utente."
         remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina."
   unsubscribed:
     title: 'Iscrizione annullata'
@@ -410,11 +411,11 @@ it:
     topics:
       title: "Argomenti"
       xaxis: "Giorno"
-      yaxis: "Numero di nuovi topic"
+      yaxis: "Numero di nuovi argomenti"
     posts:
-      title: "Post"
+      title: "Messaggi"
       xaxis: "Giorno"
-      yaxis: "Numero di nuovi post"
+      yaxis: "Numero di nuovi messaggi"
     likes:
       title: "Mi piace"
       xaxis: "Giorno"
@@ -430,10 +431,10 @@ it:
     starred:
       title: "Preferiti"
       xaxis: "Giorno"
-      yaxis: "Numero di nuovi preferiti"
+      yaxis: "Numero di nuovi argomenti preferiti"
     users_by_trust_level:
-      title: "Utenti per livello"
-      xaxis: "Trust Level"
+      title: "Utenti per Livello Esperienza"
+      xaxis: "Livello Esperienza"
       yaxis: "Numero Utenti"
     emails:
       title: "Email Inviate"
@@ -452,7 +453,7 @@ it:
       xaxis: "Giorno"
       yaxis: "Numero di messaggi privati"
     notify_moderators_private_messages:
-      title: "Notifiche ai moderatori"
+      title: "Notifica i Moderatori"
       xaxis: "Giorno"
       yaxis: "Numero di messaggi privati"
     notify_user_private_messages:
@@ -463,27 +464,28 @@ it:
       title: "Referenti Migliori"
       xaxis: "Utente"
       num_clicks: "Click"
-      num_topics: "Topic"
+      num_topics: "Argomenti"
     top_traffic_sources:
       title: "Migliori Sorgenti di Traffico"
       xaxis: "Dominio"
       num_clicks: "Click"
-      num_topics: "Topic"
+      num_topics: "Argomenti"
       num_users: "Utenti"
     top_referred_topics:
-      title: "Migliori Topic Referenziati"
-      xaxis: "Topic"
+      title: "Migliori Argomenti Referenziati"
+      xaxis: "Argomento"
       num_clicks: "Click"
   dashboard:
     rails_env_warning: "Il tuo server è in modalità %{env}."
-    ruby_version_warning: "Stai eseguendo la versione 2.0.0 di Ruby che è nota per avere problemi. Effettua l'upgrade alla patch livello 247 o seguenti."
+    ruby_version_warning: "Stai eseguendo la versione 2.0.0 di Ruby che ha problemi noti. Effettua l'upgrade alla patch livello 247 o seguenti."
     host_names_warning: "Il tuo file config/database.yml sta usando l'hostname localhost di default. Aggiornalo con l'hostname del tuo sito."
-    gc_warning: 'Il tuo server sta usando i parametri di garbage collection di default di ruby, che potrebbero non garantirti le migliori performance. Leggi questo topic sul tuning delle performance: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>.'
+    gc_warning: 'Il tuo server usa i parametri di garbage collection di default di ruby, che potrebbero non garantirti le migliori prestazioni. Leggi questo argomento sulla taratura delle prestazioni: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126">Tuning Ruby and Rails for Discourse</a>.'
     sidekiq_warning: 'Sidekiq non è in esecuzione. Molti task, come l''invio di email, sono eseguiti in maniera asincrona da sidekiq. Perfavore assicurati che almeno un processo sidekiq sia in esecuzione. <a href="https://github.com/mperham/sidekiq">Leggi di più su sidekiq qui</a>.'
     queue_size_warning: 'Il numero di job in coda è %{queue_size}, che è alto. Questo indica un problema con i processi Sidekiq, oppure dovresti aggiungere altri Sidekiq worker.'
     memory_warning: 'Il tuo server ha meno di 1 GB di memoria. È raccomandato avere a disposizione almeno 1 GB di memoria.'
     enable_google_logins_warning: "Stai utilizzando una versione deprecata del sistema di autenticazione Google OpenID . Google terminerà il supporto di OpenID a partire dal 20 Aprile 2015. Inizia ad usare Google OAuth2 al più presto. <a href='https://meta.discourse.org/t/configuring-google-login-for-discourse/15858' target='_blank'>Guarda questa guida per saperne di più</a>"
-    both_googles_warning: "Hai sia enable_google_logins che enable_google_oauth2_login attivati nelle impostazioni del sito. Disabilita enable_google_logins."
+    both_googles_warning: "Hai entrambe le impostazioni enable_google_logins e enable_google_oauth2_logins attivate. Disabilita enable_google_logins."
+    google_oauth2_config_warning: 'Il server è configurato per permettere registrazioni e login con Google Oauth2 (enable_google_oauth2_logins), ma il client id e il client secret non sono impostati. Vai nelle <a href="/admin/site_settings">Impostazioni del sito</a> e aggiorna le impostazioni. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Leggi questa guida per saperne di più</a>.'
     facebook_config_warning: 'Il server è configurato per accettare registrazioni e login con Facebook (enable_facebook_logins), tuttavia i parametri segreti non sono impostati. Vai alle <a href="/admin/site_settings">Impostazioni</a> e aggiorna i campi interessati. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Leggi questa guida per saperne di più</a>.'
     twitter_config_warning: 'Il server è configurato per accettare registrazioni e login con Twitter (enable_twitter_logins), tuttavia la chiave e i parametri segreti non sono impostati. Vai alle <a href="/admin/site_settings">Impostazioni</a> e aggiorna i campi interessati. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Leggi questa guida per saperne di più</a>.'
     github_config_warning: 'Il server è configurato per accettare registrazioni e login con GitHub (enable_github_logins), tuttavia il client id e i valori segreti non sono impostati. Vai alle <a href="/admin/site_settings">Impostazioni</a> e aggiorna i campi interessati. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Leggi questa guida per saperne di più</a>.'
@@ -505,8 +507,8 @@ it:
       title: "Educazione Nuovi Utenti: Prime Risposte"
       description: "Per le prime due risposte dei nuovi utenti, durante la composizione del messaggio una pop-up verrà automaticamente visualizzata per mostrare dei consigli."
     education_new_topic:
-      title: "Educatione Nuovi Utenti: Primi Topic"
-      description: "Per i primi due topic dei nuovi utenti, durante la composizione del messaggio una pop-up verrà automaticamente visualizzata per mostrare dei consigli."
+      title: "Educatione Nuovi Utenti: Primi Argomenti"
+      description: "Per i primi due argomenti dei nuovi utenti, verrà automaticamente visualizzata una finestra pop-up  per mostrare dei consigli durante la composizione del messaggio."
     usage_tips:
       title: "Guida iniziale nuovi utenti"
       description: "Guida e informazioni essenziali per nuovi utenti."
@@ -518,11 +520,7 @@ it:
       description: "Un messaggio privato verrà automaticamente inviato a tutti gli utenti invitati dopo che loro accettano l'invito."
     login_required_welcome_message:
       title: "Accesso richiesto: messaggio di benvenuto"
-      description: "Messaggio che viene mostrato agli utenti non collegati quando è richiesto il login."
-    tos_user_content_license:
-      title: "Termini di Servizio: Licenza del Contenuto"
-    tos_miscellaneous:
-      title: "Termini di Servizio: Varie"
+      description: "Messaggio che viene mostrato agli utenti non collegati quando l'impostazione \"login obbligatorio\" è attiva."
     login_required:
       title: "Login richiesto: Homepage"
       description: "Testo mostrato agli utenti non autorizzati quando il login è necessario."
@@ -531,7 +529,7 @@ it:
       description: "HTML che verrà inserito dentro i tag <head></head>"
     top:
       title: "Intestazione delle pagine"
-      description: "HTML che verrà aggiunto in cima a ogni pagina (dopo l'header, prima della barra di navigazione o del titolo del topic)."
+      description: "HTML che verrà aggiunto in cima a ogni pagina (dopo l'header, prima della barra di navigazione o del titolo dell'argomento)."
     bottom:
       title: "Piè di pagina"
       description: "HTML che verrà aggiunto in fondo ad ogni pagina."
@@ -542,49 +540,59 @@ it:
       title: "Testata Notifiche Email"
       description: "Un messaggio che verrà mostrato in cima alle notifiche email."
   site_settings:
+    delete_old_hidden_posts: "Cancella automaticamente tutti i messaggi nascosti che restano nascosti per più di 30 giorni."
     default_locale: "Il linguaggio di default di questa installazione Discourse (ISO 639-1 Code)"
-    allow_user_locale: "Permetti agli utenti di scegliere la lingua"
-    min_post_length: "Lunghezza minima dei messaggi nei post, in caratteri"
-    min_private_message_post_length: "Numero minimo di caratteri per i messaggi privati"
-    max_post_length: "Numero massimo di caratteri nei post"
-    min_topic_title_length: "Numero minimo di caratteri per i titoli delle conversazioni"
-    max_topic_title_length: "Numero massimo di caratteri per i titoli delle conversazioni"
-    min_private_message_title_length: "Numero minimo di caratteri necessari per un messaggio privato."
+    allow_user_locale: "Permetti agli utenti di personalizzare la lingua dell'interfaccia"
+    min_post_length: "Lunghezza minima dei messaggi in caratteri"
+    min_private_message_post_length: "Lunghezza minima in caratteri per i messaggi privati"
+    max_post_length: "Lunghezza massima dei messaggi in caratteri"
+    min_topic_title_length: "Numero minimo di caratteri per i titoli degli argomenti"
+    max_topic_title_length: "Numero massimo di caratteri per i titoli degli argomenti"
+    min_private_message_title_length: "Numero minimo di caratteri necessari per un messaggio privato"
     min_search_term_length: "Numero minimo di caratteri per le parole cercate"
-    allow_uncategorized_topics: "Permetti la creazione di topic senza categoria."
+    allow_uncategorized_topics: "Permetti la creazione di argomenti senza categoria."
     uncategorized_description: "La descrizione della categoria \"Non classificato\". Lascia vuoto per nessuna descrizione."
-    allow_duplicate_topic_titles: "Permetti discussioni con lo stesso titolo, duplicato"
-    unique_posts_mins: "Quanti minuti prima che un utente possa postare un altro topic con lo stesso contenuto"
+    allow_duplicate_topic_titles: "Permetti più argomenti con lo stesso identico titolo"
+    unique_posts_mins: "Quanti minuti prima che un utente possa inviare un altro argomento con lo stesso contenuto"
+    educate_until_posts: "Per i primi (n) messaggi di un utente, mostra la finestra pop-up con il pannello di istruzioni per nuovi utenti."
     title: "Breve titolo di questo sito, usato nel tag title."
     site_description: "Descrivi questo sito in una sola frase. La descrizione verrà usata nel tag meta description."
+    contact_email: "Indirizzo email del contatto principale del sito. A questo indirizzo potrebbero essere inviate notifiche importanti da parte di discourse.org riguardo aggiornamenti critici."
     queue_jobs: "SOLO PER SVILUPPATORI! ATTENZIONE! Per default, accoda i job in sidekiq. Se disabilitato, il tuo sito non funzionerà."
     crawl_images: "Recupera le immagini dagli URL remoti per inserire le dimensioni corrette di ampiezza e altezza nel tag."
     download_remote_images_to_local: "Scarica localmente le immagini remote; ciò permettei di evitare immagini assenti."
     download_remote_images_threshold: "Minimo spazio disco necessario per scaricare le immagini remote in locale (in percentuale)"
     disabled_image_download_domains: "Le immagini non verranno mai scaricate dai seguenti domini. Elenco delimitato dal carattere pipe |"
-    ninja_edit_window: "Per (n) secondi dopo la creazione del post, le modifiche non saranno tracciate nella sua cronologia."
-    edit_history_visible_to_public: "Permetti a tutti di vedere le precedenti versioni di un post modificato. Se disabilitato solo i membri dello staff possono vederle."
-    category_featured_topics: "Numero di topic mostrati per categoira nella pagina /categories"
-    fixed_category_positions: "Se attivo, sarai in grado di assegnare un ordine personalizzato alle categoria. Se non attivo, le categorie saranno in ordine di attività."
-    exclude_rel_nofollow_domains: "Una lista di domini in cui nofollow non è aggiunto (tld.com autorizzerà automaticamente sub.tld.com)"
-    favicon_url: "La favicon del tuo sito, per informazioni http://en.wikipedia.org/wiki/Favicon"
-    apple_touch_icon_url: "Icona usata per dispositivi mobile Apple. La dimensione consigliata è 144 x 144 pixel."
-    email_custom_headers: "Una lista di intestazioni email custom delimitata da una barra verticale"
+    ninja_edit_window: "Per (n) secondi dopo la creazione del messaggio, le modifiche non saranno tracciate nella cronologia."
+    post_edit_time_limit: "L'autore può modificare o cancellare il proprio messaggio per (n) minuti dopo averlo inserito. Metti 0 per sempre."
+    edit_history_visible_to_public: "Permetti a tutti di vedere le precedenti versioni di un messaggio modificato. Se disabilitato solo i membri dello staff possono vederle."
+    delete_removed_posts_after: "I messaggi rimossi dall'autore saranno automaticamente cancellati dopo (n) ore."
+    max_image_width: "Larghezza massima delle miniature delle immagini in un messaggio"
+    max_image_height: "Altezza massima delle miniature delle immagini in un messaggio"
+    category_featured_topics: "Numero di argomenti mostrati per categoria nella pagina /categories. Dopo il cambiamento di questo valore, la pagina delle categorie impiega fino a 14 minuti per aggiornarsi."
+    show_subcategory_list: "Quando si accede ad una categoria, mostra l'elenco di sottocategorie anziché l'elenco di argomenti. "
+    fixed_category_positions: "Se attivo, sarai in grado di ordinare le categorie. Se non attivo, le categorie saranno in ordine di attività."
+    exclude_rel_nofollow_domains: "Una lista di domini separati da pipe | in cui il nofollow non viene aggiunto (tld.com autorizzerà automaticamente sub.tld.com)"
+    post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio."
+    logo_url: "Il logo mostrato in alto a sinistra del tuo sito, es: http://example.com/logo.png"
+    favicon_url: "La favicon del tuo sito, vedi http://it.wikipedia.org/wiki/Favicon"
+    apple_touch_icon_url: "Icona usata per dispositivi touch Apple. La dimensione consigliata è 144 x 144 pixel."
+    email_custom_headers: "Una lista di intestazioni email personalizzate delimitata da una barra verticale (pipe |)"
     use_https: "L'indirizzo completo del sito (Discourse.base_url) dovrebbe essere http o https? NON ATTIVARE QUESTA OPZIONE A MENO CHE HTTPS SIA GIA' CONFIGURATO E FUNZIONANTE!"
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
     summary_posts_required: "Minimo numero di messaggi in un argomento affinché venga abilitato 'Riassumi Questo Argomento' "
     summary_likes_required: "Minimo numero di \"Mi piace\" in un argomento affinché venga abilitato 'Riassumi Questo Argomento'"
     summary_percent_filter: "Quando un utente clicca su 'Riassumi Questo Argomento', mostra i primi % messaggi"
-    enable_private_messages: "Autorizza gli utenti con livello di attendibilità 1 a creare e rispondere a messaggi privati"
+    enable_private_messages: "Autorizza gli utenti con livello di esperienza 1 a creare e rispondere a messaggi privati"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_interval: "Interval before a new long poll is issued in milliseconds "
     polling_interval: "How often should logged in user clients poll in milliseconds"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
     auto_track_topics_after: "Valore globale in millisecondi prima che un argomento venga automaticamente seguito, modificabile dagli utenti (0 sempre, -1 mai)"
-    new_topic_duration_minutes: "Valore globale in minuti per i quali un topic è considerato come nuovo, modificabile dagli utenti (-1 sempre, -2 ultima visita)"
-    flags_required_to_hide_post: "Numero di segnalazioni che rendono un topic automaticamente nascosto. L'utente riceve un messaggio privato. (0 mai)"
+    new_topic_duration_minutes: "Valore globale in minuti per i quali un argomento è considerato come nuovo, modificabile dagli utenti (-1 sempre, -2 ultima visita)"
+    flags_required_to_hide_post: "Numero di segnalazioni che rendono un argomento automaticamente nascosto. L'utente riceve un messaggio privato. (0 mai)"
     cooldown_minutes_after_hiding_posts: "Numero di minuti che l'utente deve attendere prima di modificare un post nascosto per segnalazione"
-    max_topics_in_first_day: "Numero massimo di topic che l'utente può creare nel suo primo giorno di forum"
+    max_topics_in_first_day: "Numero massimo di argomenti che l'utente può creare nel suo primo giorno di forum"
     max_replies_in_first_day: "Numero massimo di risposte che un utente può pubblicare nel suo primo giorno di forum"
     notify_mods_when_user_blocked: "Se un utente è bloccato automaticamente, manda un messaggio ai moderatori."
     post_undo_action_window_mins: "Numero di minuti durante i quali gli utenti sono autorizzati ad annullare le loro azioni su un post (segnalazioni, like, etc)"
@@ -597,14 +605,24 @@ it:
     allow_moderators_to_create_categories: "Permetti ai moderatori di creare nuove categorie"
     top_menu: "Determina quali elementi vengono mostrati nella navigazione in homepage, ed in quale ordine. Esempio latest|new|unread|starred|categories|top|read|posted"
     post_menu: "Determina quali elementi vengono mostrati nel menù del post, ed in quale ordine. Esempio like|edit|flag|delete|share|bookmark|reply"
+    post_menu_hidden_items: "Le voci di menu da nascondere per difetto nel menu di composizione del messaggio, a meno che non vengano premuti i punti di sospensione per espanderle."
+    share_links: "Determina quali elementi appaiono nella finestra di condivisione e in quale ordine."
     track_external_right_clicks: "Segui i collegamenti esterni sui quali viene fatto click destro (es: apri in una nuova tab). Disabilitato di default perché riscrive le URL"
+    topics_per_page: "Quanti argomenti vengono caricati per difetto nella lista di argomenti, e quando si scorre in basso per caricare altri argomenti"
+    posts_per_page: "Quanti messaggi vengono caricati per difetto in un argomento, e quando si scorre in basso per caricare altri messaggi"
+    send_welcome_message: "Invia a tutti i nuovi utenti un messaggio di benvenuto con una guida di avvio rapido."
+    show_email_on_profile: "Mostra l'email di un utente nel suo profilo (visibile solo a se stesso e allo staff)"
     enable_badges: "Attiva il sistema targhette (sperimentale)"
     port: "Usa questa porta HTTP al posto della default 80. Lasciare vuoto solo durante lo sviluppo"
     force_hostname: "Specifica un hostname nella URL. Lasciare vuoto solo durante lo sviluppo"
-    invite_expiry_days: "Per quanti giorni le chiavi utente sono valide"
-    min_password_length: "Massima lunghezza della password."
-    sso_url: "Indirizzo SSO endpoint"
-    sso_secret: "Stringa segreta utilizzata per criptare/decriptare le informazioni SSO, assicurati che sia lungo almeno 10 caratteri"
+    invite_expiry_days: "Per quanti giorni le chiavi per inviti utente sono valide"
+    login_required: "E' richiesta l'autenticazione per leggere contenuti su questo sito, disabilita l'accesso anonimo."
+    min_username_length: "Lunghezza minima del nome utente in caratteri. ATTENZIONE: GLI UTENTI GIÀ ESISTENTI CON NOMI PIÙ CORTI DI QUESTO NON RIUSCIRANNO AD ACCEDERE AL SITO."
+    max_username_length: "Lunghezza massima del nome utente in caratteri. ATTENZIONE: GLI UTENTI GIÀ ESISTENTI CON NOMI PIÙ LUNGHI DI QUESTO NON RIUSCIRANNO AD ACCEDERE AL SITO."
+    min_password_length: "Minima lunghezza della password."
+    block_common_passwords: "Non permettere password che sono nelle 10.000 password più comuni."
+    sso_url: "URL per l'endpoint del single sign on "
+    sso_secret: "Stringa segreta utilizzata per criptare/decriptare le informazioni SSO, assicurati che sia lunga almeno 10 caratteri"
     sso_overrides_email: "Sostituisce le email locali con quelli del sito esterno con cui ci si è connessi tramite SSO (ATTENZIONE: potrebbero avvenire discrepanze a causa delle direttive per le email locali)"
     sso_overrides_username: "Sostituisce gli username locali con quelli del sito esterno con cui ci si è connessi tramite SSO (ATTENZIONE: potrebbero avvenire discrepanze a causa delle differenze dei requisiti di lunghezza)"
     sso_overrides_name: "Sostituisce i nomi locali con quelli del sito esterno con cui ci si è connessi tramite SSO (ATTENZIONE: potrebbero avvenire discrepanze a causa delle direttive per i nomi locali)"
@@ -635,18 +653,24 @@ it:
     tl1_requires_topics_entered: "Quanti argomenti deve inserire un utente per essere promosso a livello di esperienza 1."
     tl1_requires_read_posts: "Quanti messaggi deve leggere un utente per essere promosso al livello di esperienza 1."
     tl1_requires_time_spent_mins: "Per quanti minuti un utente deve leggere i messaggi per essere promosso al livello di esperienza 1."
-    min_trust_to_create_topic: "Livello minimo richiesto per creare un nuovo topic."
-    min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un topic segnato come wiki."
-    title_fancy_entities: "Converti caratteri ASCII comuni in HTML nei titoli del topic, tipo SmartyPants http://daringfireball.net/projects/smartypants/"
+    tl2_requires_topics_entered: "Quanti argomenti deve inserire un utente per essere promosso a livello di esperienza 2."
+    tl2_requires_read_posts: "Quanti messaggi deve leggere un utente per essere promosso a livello di esperienza 2."
+    tl2_requires_time_spent_mins: "Per quanti minuti un utente deve leggere i messaggi per essere promosso al livello di esperienza 2."
+    tl2_requires_days_visited: "Per quanti giorni un utente deve visitare il sito per essere promosso a livello di esperienza 2."
+    min_trust_to_create_topic: "Livello minimo richiesto per creare un nuovo argomento."
+    min_trust_to_edit_wiki_post: "Livello minimo richiesto per modificare un argomento segnato come wiki."
+    title_fancy_entities: "Converti caratteri ASCII comuni in HTML nei titoli dell'argomento, tipo SmartyPants http://daringfireball.net/projects/smartypants/"
     title_prettify: "Previeni refusi ed errori comuni nei titoli, inclusi Tutto maiuscolo, Primo carattere minuscolo, ! e ? ripetuti, . aggiuntivi alla fine, etc etc."
     faq_url: "Se hai un documento sulle FAQ ospitato da qualche altra parte che vuoi usare, fornisci l'URL qui."
     tos_url: "Se hai un documento dei Termini di Servizio ospitato da qualche altra parte che vuoi usare, fornisci l'URL qui."
     privacy_policy_url: "Se hai un documento sulle Politiche di Privacy ospitato da qualche altra parte che vuoi usare, fornisci l'URL qui."
     newuser_spam_host_threshold: "Il numero delle volte che un nuovo utente può postare un link verso lo stesso host compreso nel `newuser_spam_host_posts` post prima che venga considerato spam."
     reply_by_email_address: "Template di risposta via email, per esempio: %{reply_key}@risposta.esempio.com o risposte+%{reply_key}@esempio.com"
+    delete_user_max_post_age: "Non permettere di cancellare utenti il cui primo messaggio è più vecchio di (x) giorni."
     delete_all_posts_max: "Massimo numero di post che possono essere eliminati contemporaneamente con il pulsante Cancella tutti i post. Se un utente ha più post attivi, questi non possono essere eliminati contemporaneamente e l'utente non può essere cancellato."
     username_change_period: "Numero di giorni (dall'iscrizione) dopo i quali è possibile modificare lo username. Digita 0 per non permettere cambi di username"
     email_editable: "Permetti agli utenti di cambiare l'indirizzo email dopo la registrazione."
+    allow_uploaded_avatars: "Permetti agli utenti di caricare un avatar personale."
     default_digest_email_frequency: "Quanto spesso gli utenti ricevono mail di riepilogo. Possono modificare questa impostazione nel loro pannello utente."
     default_external_links_in_new_tab: "Apri link esterni in una nuova scheda. Gli utenti possono modificare questa impostazione nelle loro preferenze."
     public_user_custom_fields: "Una whitelist di campi personalizzati di un utente che possono essere mostrati pubblicamente."
@@ -656,9 +680,13 @@ it:
     global_notice: "Mostra a tutti i visitatori un avviso con striscione globale URGENTE, EMERGENZA, lascia vuoto per nasconderlo (HTML consentito)."
     short_progress_text_threshold: "Quando il numero di messaggi di un argomento supera questo valore, la barra di avanzamento mostrerà solo il numero attuale di messaggi. Se modifichi la lunghezza della barra di avanzamento, potresti dover cambiare questo valore."
     default_code_lang: "Ai blocchi di codice GitHub viene applicata l'evidenziazione della sintassi del linguaggio di programmazione di default (lang-auto, ruby, python ecc.)"
+    embed_truncate: "Tronca i messaggi incorporati."
+    embed_category: "Categoria degli argomenti incorporati."
+    embed_post_limit: "Numero massimo di messaggi da incorporare."
     tos_accept_required: "Se abilitato, gli utenti dovranno accettare i termini del servizio durante l'iscrizione. Modifica 'Signup Form: Terms of Service Message' nel tab dei contenuti per modificare il messaggio."
     notify_about_flags_after: "Se ci sono segnalazioni che non sono state revisionate dopo tutte queste ore, invia un'email al contact_email. Imposta a 0 per disattivare."
     show_create_topics_notice: "Se il sito ha meno di 5 argomenti pubblici, mostra un avviso chiedendo agli amministratori di creare qualche argomento."
+    prevent_anons_from_downloading_files: "Impedisci agli utenti anonimi di scaricare file. ATTENZIONE: ciò impedirà il funzionamento di tutti gli asset del sito inviati come allegati."
     errors:
       invalid_email: "Indirizzo email non valido."
       invalid_username: "Non c'è alcun utente con quel nome."
@@ -683,7 +711,9 @@ it:
     invited_to_private_message: "%{display_username} ti ha invitato in un messaggio privato: %{link}"
     invitee_accepted: "%{display_username} ha accettato il tuo invito"
     linked: "%{display_username} ti ha linkato in %{link}"
+    granted_badge: "Hai guadagnato %{link}"
   search:
+    within_post: "n°%{post_number} di %{username}"
     types:
       category: 'Categorie'
       topic: 'Risultati'
@@ -692,12 +722,15 @@ it:
   most_posts: "Molti Post"
   most_recent_poster: "Autore Più Recente"
   frequent_poster: "Autore Assiduo"
+  redirected_to_top_reasons:
+    new_user: "Benvenuto nella nostra comunità! Questi sono gli argomenti recenti più popolari."
+    not_seen_in_a_month: "Bentornato! Non ti si vede da un po'. Questi sono gli argomenti più popolari da quando sei stato via."
   move_posts:
     new_topic_moderator_post:
-      one: "Ho spostato 1 post in un nuovo topic: %{topic_link}"
+      one: "Ho spostato 1 messaggio in un nuovo argomento: %{topic_link}"
       other: "Ho spostato %{count} messaggi in un nuovo argomento: %{topic_link}"
     existing_topic_moderator_post:
-      one: "Ho spostato un post in un topic esistente: %{topic_link}"
+      one: "Ho spostato un messaggio in un argomento esistente: %{topic_link}"
       other: "Ho spostato %{count} messaggi in un argomento esistente: %{topic_link}"
   change_owner:
     post_revision_text: "Proprietà trasferita da %{old_user} a %{new_user}"
@@ -723,13 +756,15 @@ it:
     pinned_disabled: "Questo argomento è stato spuntato. Non sarà più mostrato in cima alla sua categoria."
     pinned_globally_enabled: "Questo argomento è ora puntato globalmente. Apparirà in cima sia alla sua categoria sia alle liste di tutti argomenti finché non sarà spuntato dallo staff - e allora varrà per tutti - oppure dai singoli utenti - e allora varrà solo per loro stessi."
     pinned_globally_disabled: "Questo argomento è ora spuntato. Non apparirà più in cima alla sua categoria."
+    visible_enabled: "Questo argomento è stato reso visibile. Sarà mostrato nelle liste degli argomenti."
+    visible_disabled: "Questo argomento è ora invisibile. Non verrà più mostrato in nessuna lista degli argomenti. Sarà possibile accedervi solo tramite collegamento diretto."
   login:
     not_approved: "Il tuo account non è ancora stato approvato. Verrai notificato via mail quando potrai effettuare il log in."
     incorrect_username_email_or_password: "Nome utente, email o password errati"
     wait_approval: "Grazie per esserti registrato. Ti notificheremo quando il tuo account verrà approvato."
     active: "Il tuo account è attivo e pronto all'uso."
-    activate_email: "Ci siamo quasi! Abbiamo mandato un'email di attivazione a <b>%{email}</b>. Per favore segui le istruzioni contenute nell'email per attivare il tuo account."
     not_activated: "Non puoi ancora fare il login. Ti abbiamo mandato un'email di attivazione. Per favore segui le istruzioni contenute nell'email per attivare il tuo account."
+    not_allowed_from_ip_address: "Non puoi collegarti come %{username} da quell'indirizzo IP."
     suspended: "Non puoi accedere fino a %{date}."
     suspended_with_reason: "Non puoi accedere fino a %{date}. Il motivo della sospensione è il seguente: %{reason}"
     errors: "%{errors}"
@@ -738,7 +773,9 @@ it:
     omniauth_error: "Spiacenti, si è verificato un errore nel verificare il tuo account %{strategy}. Forse non hai accettato l'autorizzazione?"
     omniauth_error_unknown: "Qualcosa è andato storto tentando di loggarti, per favore riprova."
     new_registrations_disabled: "Non sono permesse nuove registrazioni in questo momento."
+    password_too_long: "Le password sono limitate a 200 caratteri."
   user:
+    no_accounts_associated: "Nessun account associato"
     username:
       short: "deve essere almeno di %{min} caratteri"
       long: "non deve essere più lungo di %{max} caratteri"
@@ -753,6 +790,10 @@ it:
       blocked: "è bloccato."
   invite_mailer:
     subject_template: "%{invitee_name} ti ha invitato a '%{topic_title}' su %{site_domain_name}"
+    text_body_template: "%{invitee_name} ti invita ad una discussione\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\nsu\n\n> %{site_title} -- %{site_description}\n\nSe sei interessato, clicca il collegamento qui sotto:\n\n%{invite_link}\n\nL'invito è da parte di un utente affidabile, perciò puoi rispondere alla discussione immediatamente. \n"
+  invite_forum_mailer:
+    subject_template: "%{invitee_name} ti invita a partecipare su %{site_domain_name}"
+    text_body_template: "%{invitee_name} ti invita a partecipare a \n\n> **%{site_title}**\n>\n> %{site_description}\n\nSe sei interessato, clicca il collegamento in basso:\n\n%{invite_link}\n\nQuesto invito è da parte di un utente affidabile, perciò non dovrai effettuare un login.\n"
   test_mailer:
     subject_template: "[%{site_name}] Test Invio Email"
   new_version_mailer:
@@ -760,15 +801,8 @@ it:
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] aggiornamento disponibile"
   flags_reminder:
-    flags_were_submitted:
-      one: "Ci sono segnalazioni che sono state inviate oltre 1 ora fa"
-      other: "Ci sono segnalazioni che sono state inviate oltre %{count} ore fa."
     please_review: "Per favore, revisionale."
     post_number: "messaggio"
-    how_to_disable: "Disattiva questa email impostando notify_about_flags_after a 0."
-    subject_template:
-      one: "1 segnalazione è in attesa di essere revisionata"
-      other: "%{count} segnalazioni sono in attesa di essere revisionate"
   flag_reasons:
     off_topic: "Il tuo messaggio è stato segnalato come **fuori tema**: la comunità pensa non riguardi l'argomento, come attualmente definito dal titolo e dal contenuto del primo messaggio."
     inappropriate: "Il tuo messaggio è stato segnalato come **inappropriato**: la comunità lo ritiene offensivo, ingiurioso o una violazione delle [linee guida della comunità](/guidelines)."
@@ -799,10 +833,6 @@ it:
         Comunque, se il messaggio verrà nascosto dalla comunità un'altra volta, resterà nascosto finché non verrà gestito dallo staff – e ci potrebbero essere ulteriori provvedimenti, inclusa la possibile sospensione del tuo account.
 
         Per ulteriori informazioni, puoi far riferimento alle nostre [community guidelines](%{base_url}/guidelines).
-    usage_tips:
-      text_body_template: "Questo messaggio privato contiene qualche breve consiglio per permetterti di iniziare: \n\n## Continua a scorrere \n\nNon ci sono bottoni per cambiare pagina né numeri di pagina - per leggere più messaggi, semplicemente **continua a scorrere giù!** \n\nNon appena arrivano nuovi messaggi, questi appaiono automaticamente. \n\n## Dove mi trovo? \n\n- Per la ricerca, la tua pagina utente, o il menu, usa i **bottoni icona in alto a destra**. \n\n- In un elenco di argomenti, cliccando sul titolo arriverai sempre al prossimo messaggio che non hai ancora letto. Usa l'ora di ultima attività per saltare all'ultimo messaggio.\n\n- Mentre leggi un argomento, salta all'inizio &uarr; cliccando sul titolo dell'argomento stesso. Clicca la barra verde in basso a destra per vedere tutti i bottoni di navigazione, oppure usa i tasti <kbd>inizio</kbd> e <kbd>fine</kbd>. \n<img src=\"/images/welcome/progress-bar.png\" width=\"143\" height=\"39\"> \n\n## Come faccio a rispondere? \n\n- Per rispondere all'argomento base, usa il bottone Rispondi <img src=\"/images/welcome/reply-topic.png\" width=\"29\" height=\"25\"> che si trova nella parte più in basso della pagina. \n\n- Per rispondere ad un messaggio specifico, usa il bottone Rispondi <img src=\"/images/welcome/reply-post.png\" width=\"29\" height=\"25\"> che si trova su quel messaggio. \n\n- Per deviare la conversazione - anziché andare fuori tema - e lasciare le due conversazioni collegate tra loro, usa Rispondi come Nuovo Argomento <img src=\"/images/welcome/reply-as-new-topic.png\" width=\"33\" height=\"25\"> alla destra del messaggio. \n\nPer citare qualcuno nella risposta, seleziona il testo che vuoi citare, poi premi qualunque bottone Rispondi. \n\n<img src=\"/images/welcome/quote-reply.png\" width=\"350\" height=\"129\"> \n\nPer avvisare qualcuno nella tua risposta, menziona il suo nome. Inizia digitando `@` e si aprirà un completamento automatico. \n\n<img src=\"/images/welcome/username-completion.png\" width=\"230\" height=\"131\">\n\nPer [Emoji standard](http://www.emoji-cheat-sheet.com/), inizia a scrivere `:` oppure direttamente\
-        \ i normali smile `:)` :smile:\n\n## Che altro posso fare? \n\nCi sono bottoni-azione in fondo ad ogni messaggio.\n\n<img src=\"/images/welcome/like-link-flag-bookmark.png\" width=\"169\" height=\"46\">\n\nPer far sapere a qualcuno che ti è piaciuto il suo messaggio, usa il bottone **mi piace**. Se rilevi un problema con un messaggio, non esitare ad usare il bottone di segnalazione **bandiera** per inviare una notifica privata all'autore o ad un moderatore. \n\nPuoi anche **condividere** un collegamento ad un messaggio, o impostare un **segnalibro** ad un messaggio per riferimenti futuri. \n\n## Chi sta parlando con me? \n\nQuando qualcuno risponde ad un tuo messaggio o lo cita, oppure menziona il tuo `@utente`, appare un numero sul bottone della conversazione in alto a destra della pagina. Usalo per accedere alle tue **notifiche**.\n\n<img src=\"/images/welcome/notification-panel.png\" width=\"178\" height=\"59\"> \n\nSe non sei presente sul forum quando ci sono risposte ai tuoi messaggi (oppure quando ricevi messaggi privati), riceverai delle notifiche per email. \n\n## Quando le conversazioni sono considerate nuove? \n\nPer difetto, sono considerate nuove tutte le conversazioni che hanno meno di due giorni, e sarà seguita ogni conversazione alla quale hai partecipato (risposto, creato o letto per un periodo abbastanza lungo). \n\nVedrai accanto a tali argomenti un indicatore blu con dei numeri:\n\n<img src=\"/images/welcome/topics-new-unread.png\" width=\"368\" height=\"89\"> \n\nPuoi cambiare lo stato delle notifiche di ogni argomento con il pannello in fondo all'argomento stesso (lo puoi impostare anche per categoria). Per cambiare il modo in cui segui gli argomenti, o la definizione di Nuovo, vedi le [tue preferenze](/my/preferences).\n\n## Perché certe cose non le posso fare? \n\nPer ragioni di sicurezza i nuovi utenti hanno qualche limitazione. Mano a mano che partecipi, ottieni la fiducia della comunità e diventi un cittadino completo, e tali limitazioni vengono automaticamente rimosse. Quanto raggiungi un [livello di esperienza] (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)\
-        \ abbastanza alto, allora ottieni ulteriori capacità per aiutarci a gestire la nostra comunità.\n"
     welcome_user:
       subject_template: "Benvenuto su %{site_name}!"
       text_body_template: |
@@ -852,11 +882,11 @@ it:
       subject_template: "Esportazione fallita"
       text_body_template: "Esportazione fallita. Controlla i log."
     email_reject_trust_level:
-      subject_template: "Problema email -- Livello Attendibilità insufficente"
+      subject_template: "Problema email -- Livello Esperienza insufficente"
       text_body_template: |
         Ci dispiace, ma il tuo messaggio email per %{destination} (con il titolo %{former_title}) non è stato processato.
 
-        Il tuo utente non ha il livello di attendibilità richiesto per inviare nuovi argomenti a questo indirizzo email. Se credi che ciò sia un errore, contatta un membro dello staff.
+        Il tuo utente non ha il livello di esperienza richiesto per inviare nuovi argomenti a questo indirizzo email. Se credi che ciò sia un errore, contatta un membro dello staff.
     email_reject_no_account:
       subject_template: "Problema email -- Nessun Account"
       text_body_template: |
@@ -925,47 +955,43 @@ it:
       text_body_template: |
         %{username} ti ha invitato alla conversazione privata '%{topic_title}' su %{site_name}:
 
-        Segui questo link per visualizzare il topic: %{base_url}%{url}
+        Segui questo collegamento per visualizzare l'argomento: %{base_url}%{url}
     user_replied:
-      subject_template: "[%{site_name}] %{username} ha risposto ad un tuo post in '%{topic_title}'"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
-        %{username} ha risposto ad un tuo post in '%{topic_title}' su %{site_name}:
-
-        ---
         %{message}
 
+        %{context}
+
         ---
-        Per favore visita questo link per rispondere: %{base_url}%{url}
+        %{respond_instructions}
     user_quoted:
-      subject_template: "[%{site_name}] %{username} ti ha citato in '%{topic_title}'"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
-        %{username} ti ha citato in '%{topic_title}' su %{site_name}:
-
-        ---
         %{message}
 
+        %{context}
+
         ---
-        Per favore visita questo link per rispondere: %{base_url}%{url}
+        %{respond_instructions}
     user_mentioned:
-      subject_template: "[%{site_name}] %{username} ti ha menzionato in '%{topic_title}'"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
-        %{username} ti ha menzionato in '%{topic_title}' su %{site_name}:
-
-        ---
         %{message}
 
+        %{context}
+
         ---
-        Perfavore visita questo link per rispondere: %{base_url}%{url}
+        %{respond_instructions}
     user_posted:
-      subject_template: "[%{site_name}] %{subject_prefix}%{username} ha postato in '%{topic_title}'"
+      subject_template: "[%{site_name}] %{topic_title}"
       text_body_template: |
-        %{username} ha postato in '%{topic_title}' su %{site_name}:
-
-        ---
         %{message}
 
+        %{context}
+
         ---
-        Perfavore visita questo link per rispondere: %{base_url}%{url}
+        %{respond_instructions}
     user_posted_pm:
       subject_template: "[%{site_name}] [PM] %{topic_title}"
       text_body_template: |
@@ -978,14 +1004,14 @@ it:
     digest:
       why: "Un breve resoconto di %{site_link} dall'ultima tua visita il %{last_seen_at}."
       subject_template: "[%{site_name}] Riepilogo per %{date}"
-      new_activity: "Nuove attività nei tuoi topic e post:"
+      new_activity: "Nuove attività nei tuoi argomenti e messaggi:"
       top_topics: "Post Popolari"
-      other_new_topics: "Topic più attivi"
+      other_new_topics: "Argomenti più attivi"
       click_here: "clicca qui"
       from: "%{site_name} riepilogo"
       read_more: "Leggi altro"
-      more_topics: "Ci sono stati %{new_topics_since_seen} nuovi topic dall'ultima volta che ti sei connesso il %{last_seen_at}."
-      more_topics_category: "Ci sono stati %{new_topics_since_seen} nuovi topic in queste categorie dall'ultima volta che ti sei connesso il %{last_seen_at}."
+      more_topics: "Ci sono %{new_topics_since_seen} nuovi argomenti dall'ultima tua visita il %{last_seen_at}."
+      more_topics_category: "Ci sono %{new_topics_since_seen} nuovi argomenti inseriti in queste categorie dall'ultima tua visita il %{last_seen_at}."
       posts:
         one: "1 post"
         other: "%{count} post"
@@ -1000,7 +1026,9 @@ it:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
       subject_template: "[%{site_name}] Imposta una password"
-      text_body_template: "Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). \n\nIn alternativa, puoi effettuare il login usando uno dei servizi online supportati (Google, Facebook...) e associati con questo indirizzo email. \n\nSe non hai fatto tu questa richiesta, ignora tranquillamente questa email.\n\nClicca sul link che segue per scegliere una password:\n%{base_url}/users/password-reset/%{email_token}\n"
+      text_body_template: "Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook ecc.) associato con questo indirizzo email validato. \n\nSe non hai fatto tu questa richiesta, ignora tranquillamente questa email.\n\nClicca sul seguente collegamento per scegliere una password:\n%{base_url}/users/password-reset/%{email_token}\n"
+    account_created:
+      subject_template: "[%{site_name}] Il Tuo Nuovo Account "
     authorize_email:
       subject_template: "[%{site_name}] Conferma il tuo nuovo indirizzo email"
       text_body_template: |
@@ -1035,17 +1063,18 @@ it:
 
         Se il link non è cliccabile, copialo ed incollalo manualmente nella barra degli indirizzi del browser.
   page_not_found:
-    title: "La pagina richiesta non esiste in questo forum. Forse possiamo aiutarti a trovarla, o un topic simile:"
+    title: "La pagina richiesta non esiste oppure è privata."
     popular_topics: "Popolari"
     recent_topics: "Recenti"
     see_more: "Altro"
     search_title: "Cerca nel sito"
     search_google: "Google"
+  login_required:
+    welcome_message: |
+      #[Benvenuto su %{title}](#welcome)
+      E' richiesto un account. Per continuare, crea un nuovo account oppure collegati.
   terms_of_service:
     title: "Termini di Servizio"
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'Ho letto e accetto i <a href="/tos" target="_blank">Termini del Servizio</a>.'
   deleted: 'cancellato'
   upload:
@@ -1061,7 +1090,7 @@ it:
       unknown_image_type: "Spiacente, ma il file che hai provato a caricare non sembra un'immagine."
       size_not_found: "Spiacente, ma non riusciamo a determinare la dimensione dell'immagine. Probabilmente l'immagine è corrotta?"
   flag_reason:
-    sockpuppet: "Un nuovo utente ha creato un topic, e un altro nuovo utente ha risposto con lo stesso indirizzo IP. Controlla le impostazioni di flag_sockpuppets"
+    sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto con lo stesso indirizzo IP. Controlla le impostazioni di flag_sockpuppets."
     spam_hosts: "Questo nuovo utente ha tentato di creare post multipli con link allo stesso dominio. Guarda l'impostazione newuser_spam_host_threeshold."
   email_log:
     no_user: "Non trovo l'utente con l'id %{user_id}"
@@ -1069,9 +1098,9 @@ it:
     post_not_found: "Non trovo post con id %{post_id}"
     notification_already_read: "La notifica per cui è stata inviata questa mail è già stata letta"
     topic_nil: "post.topic è nil"
-    post_deleted: "il post è stato cancellato dall'autore"
+    post_deleted: "il messaggio è stato cancellato dal suo autore"
     user_suspended: "l'utente è stato sospeso"
-    already_read: "l'utente ha già letto questo post"
+    already_read: "l'utente ha già letto questo messaggio"
     message_blank: "il messaggio è vuoto"
     message_to_blank: "message.to è vuoto"
     text_part_body_blank: "text_part.body è vuoto"
@@ -1082,10 +1111,23 @@ it:
   privacy: "Privacy"
   edit_this_page: "Modifica questa pagina"
   static_topic_first_reply: |
-    Modifica il primo post in questo topic per cambiare il contenuto della pagina %{page_name}.
+    Modifica il primo messaggio in questo argomento per cambiare il contenuto della pagina %{page_name}.
   guidelines_topic:
     title: "FAQ/Linee Guida"
+    body: "<a name=\"civilized\"></a>\n\n## [Un luogo civile per discussioni pubbliche](#civilized)\n\nSu questo forum per favore comportati con lo stesso rispetto con cui ti comporteresti in un parco comunale. Come il parco, infatti, anche questa è una risorsa pubblica &mdash; un luogo dove condividere competenze, conoscenze ed interessi attraverso continue conversazioni.\n\nQuelle che seguono non sono regole ferree, ma solo dei consigli per aiutarti a giudicare il comportamento degli altri membri di questa comunità. Usiamo queste linee guida per far sì che questo luogo rimanga sempre un posto piacevole e limpido dove discutere civilmente.\n\n<a name=\"improve\"></a>\n\n## [Migliorare le discussioni](#improve)\n\nPuoi aiutarci a fare di questo forum un piacevole luogo di discussione, facendo in modo di migliorare una discussione, anche se in piccola misura. Se non sei convinto che il tuo messaggio aggiunga qualcosa alla conversazione, pensa meglio a ciò che intendi dire o magari riprova più tardi.\n \nGli argomenti di cui trattiamo qui, per noi sono importanti, e vorremmo che lo fossero anche per te. Porta rispetto sia per l'argomento di discussione sia per le persone che stanno partecipando, anche se sei in disaccordo con qualcosa.\n\nUno dei modi per migliorare le discussioni è scoprire quelle che sono già in corso. Fatti un giro, spendi un po' di tempo a leggere le discussioni già inserite, prima di rispondere o di iniziare una nuova discussione; in questo modo avrai più possibilità di parlare con persone con i tuoi stessi interessi.\n\n<a name=\"agreeable\"></a>\n\n## [Sii gentile, anche quando sei in disaccordo](#agreeable)\n\nTi capiterà a volte di aver voglia di rispondere ad un messaggio esprimendo il tuo dissenso. Va benissimo, però ricorda sempre di _criticare le idee, non le persone_. Perciò per favore evita:\n\n*   Di offendere.\n*   Portare attacchi _ad personam_.\n*   Rispondere al tono di un messaggio invece che al suo reale contenuto.\n*   Avviare un contraddittorio per partito preso – o sindrome del Bastian Contrario.\n\nPiuttosto fornisci contro-argomentazioni valide\
+      \ che migliorino la discussione.\n\n<a name=\"participate\"></a>\n\n## [La tua partecipazione è importante](#participate)\n\nLe discussioni qui presenti modellano il nostro futuro. Aiutaci a dirigere ed influenzare il futuro di questa comunità scegliendo di partecipare a quelle discussioni che rendono questo forum un posto interessante dove stare e, di contro, evitando quelle altre discussioni che invece non lo fanno.\n\nQuesta piattaforma fornisce degli strumenti che permettono alla comunità di identificare i contributi migliori (e i peggiori): i preferiti, i segnalibri, i \"mi piace\", le bandiere, le risposte, le modifiche, ecc. Usa tutti questi strumenti per migliorare la tua esperienza e quella degli altri.\n\nFacciamo in modo di rendere insieme questo parco pubblico un po' meglio di come l'abbiamo trovato.\n\n<a name=\"flag-problems\"></a>\n\n## [Se noti un problema, segnalalo](#flag-problems)\n\nI moderatori hanno speciali autorità; sono loro i responsabili di questo forum. Ma anche tu lo sei. Con il tuo aiuto, i moderatori possono rappresentare solo dei bravi animatori, non dei custodi o dei poliziotti.\n\nSe ti accorgi di comportamenti impropri, non rispondere. La tua risposta incoraggerebbe l'autore a continuare, inoltre consuma inutilmente le tue energie e fa perdere tempo a tutti. Semplicemente _segnalalo_. Se arrivano abbastanza segnalazioni, verranno presi provvedimenti, sia automatici che con l'intervento di un moderatore. \n\nAl fine di manutenere la nostra comunità, i moderatori si riservano il diritto di cancellare qualsiasi contenuto o qualsiasi utente in qualunque momento. I moderatori non leggono i nuovi messaggi prima che vengano pubblicati, perciò loro non sono responsabili per contenuti inseriti dai membri di questa comunità.\n\n<a name=\"be-civil\"></a>\n\n## [Sii sempre civile](#be-civil)\n\nNon c'è niente di meglio della maleducazione per sabotare una conversazione salutare:\n\n*   Sii civile. Non inviare niente che una persona ragionevole possa considerare offensivo, ingiurioso o che inciti all'odio.\n*   Non sporcare. Non inviare niente di osceno o\
+      \ di sessualmente esplicito.\n*   Rispetta tutti. Non offendere né attaccare nessuno, non spacciarti per qualcun altro, non pubblicare informazioni private altrui.\n*   Rispetta il nostro forum. Non pubblicare spam o contenuti vandalici.\n\nAnche se le precedenti non sono regole formali con definizioni esatte &mdash; evita di pubblicare materiale anche se hai il semplice _sospetto_ che rientri in una di queste categorie. Se non sei sicuro se pubblicare o no, chiediti che cosa succederebbe se il tuo messaggio fosse pubblicato sulla prima pagina de \"Il corriere della sera\".\n\nEssendo questo un forum pubblico, i motori di ricerca indicizzano tutte le nostre discussioni. Mantieni il linguaggio, i tuoi collegamenti e le tue immagini consoni anche per essere visualizzati dai nostri amici e dalle nostre famiglie. \n\n<a name=\"keep-tidy\"></a>\n\n## [Tieni in ordine](#keep-tidy)\n\nFai il piccolo lo sforzo di mettere tutte le cose al loro posto, in modo tale che possiamo tutti spendere più tempo a discutere e meno tempo a ripulire. Quindi:\n\n*   Non iniziare una discussione nella categoria sbagliata.\n*   Non inviare lo stesso messaggio in discussioni diverse.\n*   Non inviare risposte prive di contenuto.\n*   Non andare fuori tema cambiando discorso.\n*   Non firmare i tuoi messaggi &mdash; ogni messaggio ha già allegate le informazioni del tuo profilo.\n\nPiuttosto che inviare un messaggio \"+1\" oppure \"Sono d'accordo\", usa il bottone \"Mi piace\". Piuttosto che andare fuori tema, usa il bottone \"Rispondi con nuovo argomento\".\n\n<a name=\"stealing\"></a>\n\n## [Farina del tuo sacco](#stealing)\n\nPer favore non inviare materiale che appartiene a qualcun altro senza il suo permesso. Non inviare descrizioni, collegamenti o metodi per rubare la proprietà intellettuale altrui (software, video, musica, immagini) o che violi qualche altra legge.\n\n<a name=\"tos\"></a>\n\n## [Termini del Servizio](#tos)\n\nSì, l'avvocatese è noioso, ma ci dobbiamo proteggere &ndash; e, per estensione, proteggere anche te ed i tuoi dati &ndash; contro persone non amichevoli. Abbiamo dei [Termini\
+      \ di Servizio](/tos) che descrivono il tuo (e il nostro) comportamento ed i diritti che riguardano i contenuti, la privacy e le leggi. Per poter usare questo servizio, devi accettare i nostri [TDS](/tos).\n"
   tos_topic:
     title: "Termini del Servizio"
+    body: "I seguenti termini e condizioni regolano l’uso del sito web %{company_domain} e di tutti i contenuti, i servizi e i prodotti disponibili direttamente sul sito web e mediante di esso, compresi, ma non limitatamente a, il Software Forum di %{company_domain}, il Forum di Supporto di %{company_domain} e il Servizio Hosting (\"Hosting\") di %{company_domain} (collettivamente chiamati nel seguito il Sito). Il Sito è di proprietà ed è gestito da %{company_full_name} (\"%{company_name}\"). L’uso del Sito è soggetto all’accettazione incondizionata di tutti i termini e le condizioni previsti nel presente documento e di tutte le altre regole operative, le politiche (incluse, senza limitazione, la [Politica sulla Privacy](/privacy) di %{company_domain} e le [Linee guida della comunità](/faq)) e le procedure che possono essere pubblicate di volta in volta su questo Sito da %{company_name} (nel seguito, il “Contratto”).\n\nLeggi il presente Contratto prima di accedere o utilizzare il Sito. L’accesso o l’utilizzo di qualsiasi parte del Sito implica l’accettazione dei termini e delle condizioni del presente contratto. In caso di mancata accettazione di tutti i termini e le condizioni del presente contratto, l’accesso al Sito o l’uso di qualsiasi servizio potrebbe non essere consentito. Se questi termini e condizioni sono considerati un’offerta di %{company_name}, l’accettazione è espressamente limitata ai presenti termini. Il Sito è disponibile solo per gli utenti con almeno 13 anni di età.\n\n<a name=\"1\"></a>\n\n## [1. Il tuo Account su %{company_domain}](#1)\n\nSe crei un account sul Sito, è tua responsabilità mantenere la sicurezza dell’account e sei interamente responsabile di tutte le attività eseguite con l’account. L’utente è tenuto a notificare immediatamente a %{company_name} usi non autorizzati dell’account o altre violazioni della sicurezza. %{company_name} non sarà responsabile per qualsiasi atto od omissione da parte tua, inclusi eventuali danni di qualsiasi tipo derivanti da tali atti o omissioni.\n\n<a name=\"2\"></a> \n\n## [2. Responsabilità dei Collaboratori](#2)\n\nSe\
+      \ pubblichi materiale o inserisci collegamenti sul Sito o rendi disponibile in altro modo (o consenti a terzi di rendere disponibile) materiale mediante il Sito (qualsiasi materiale di questo tipo, nel seguito chiamato il “Contenuto”), sei interamente responsabile del Contenuto e di qualsiasi danno risultante da tale Contenuto. Ciò è valido indipendentemente dalla circostanza in cui il Contenuto in questione sia costituito da testo, grafica, file audio o software informatico. Rendendo disponibile il Contenuto, l’utente dichiara e garantisce che:\n\n* il download, la copia e l’uso del Contenuto non viola i diritti di proprietà, inclusi ma non limitatamente a, il copyright, i brevetti, i diritti di marchi di fabbrica o di segreti commerciali di terze parti;\n* se il tuo datore di lavoro è titolare dei diritti sulla proprietà intellettuale creata da te, allora delle due l’una, o (i) hai ottenuto il permesso dal datore di lavoro di pubblicare o rendere disponibile il Contenuto, incluso ma non limitatamente a, qualsiasi software oppure (ii) che hai ottenuto dal datore di lavoro una rinuncia relativamente a tutti i diritti sul Contenuto o in riferimento ad esso;\n* sei pienamente in regola con le licenze di terze parti in relazione al Contenuto e che sono state adottate tutte le azioni necessarie per trasferire con esito positivo qualsiasi condizione richiesta agli utenti finali;\n* il Contenuto non contiene né installa alcun virus, worm, malware, cavalli di Troia o altri contenuti dannosi o distruttivi;\n* il Contenuto non costituisce spam, non è generato da macchina o in modo casuale e non contiene contenuto commerciale indesiderato o immorale finalizzato a indirizzare il traffico verso siti di terze parti o a migliorare il posizionamento nei motori di ricerca di siti di terze parti o per altri atti illeciti (ad esempio, il phishing) o per indurre in errore i destinatari in relazione all’origine del materiale (ad esempio, lo spoofing);\n* il Contenuto non ha carattere pornografico, non contiene minacce e non incita alla violenza e non viola i diritti di privacy o pubblicitari di terze\
+      \ parti;\n* il Contenuto non viene pubblicizzato tramite messaggi elettronici indesiderati, come collegamenti spam verso a newsgroup, elenchi email, altri blog e siti web e analoghi metodi promozionali non richiesti;\n* il Contenuto non è presentato in modo da indurre gli utenti a errori di identità con altri utenti o aziende; e\n* nel caso di Contenuto contenente codice informatico, hai classificato e/o descritto in modo accurato il tipo, la natura, gli usi e gli effetti dei materiali, se richiesto da %{company_name} o in altro modo.\n\n<a name=\"3\"></a>\n\n## [3. Licenza sui contenuti utente](#3)\n\nI contributi degli utenti sono resi disponibili ai sensi di una [Licenza Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Senza alcuna limitazione di tali dichiarazioni o garanzie, %{company_name} ha il diritto (sebbene non l’obbligo), a discrezione di %{company_name}  (i), di rifiutare o rimuovere qualsiasi contenuto che, nella ragionevole opinione di %{company_name}, viola qualsiasi politica di %{company_name} o è in altro modo dannoso o sgradevole, o (ii) di cessare o negare l’accesso e l’utilizzo del Sito a qualsiasi singolo utente o entità per qualsiasi motivo, a sola discrezione di %{company_name}. %{company_name} non ha alcun obbligo di rimborsare eventuali somme pagate in precedenza.\n\n<a name=\"4\"></a>\n\n## [4. Pagamento e rinnovo](#4)\n\n### Termini Generali\n\nPotrebbero essere disponibili sul Sito servizi opzionali o aggiornamenti a pagamento. Quando si utilizza un servizio opzionale o aggiornamento a pagamento, acconsenti a pagare a %{company_name} le commissioni per l’abbonamento mensile o annuale indicate per tale servizio. Le somme verranno addebitate con pagamento anticipato il giorno dell’abbonamento al servizio o aggiornamento e riguarderanno l’uso di tale servizio o aggiornamento per un periodo di abbonamento mensile o annuale, come indicato. Le commissioni non sono rimborsabili.\n\n### Rinnovo Automatico\n\nA meno che non invii una notifica a %{company_name} prima della\
+      \ scadenza del periodo di abbonamento applicabile da annullare, l’abbonamento si rinnoverà automaticamente e tu ci autorizzi a riscuotere le commissioni dell’abbonamento annuale o mensile applicabili in quel momento per tale abbonamento (così come eventuali tasse) utilizzando qualsiasi carta di credito o altro meccanismo di pagamento registrato. Gli abbonamenti possono essere annullati in qualsiasi momento.\n\n<a name=\"5\"></a>\n\n## [5. Servizi](#5)\n\n### Servizi di Hosting e di supporto \n\nPossono essere forniti da %{company_name} servizi opzionali di Hosting e di supporto, ai sensi dei termini e delle condizioni specifici per ogni servizio. Con la sottoscrizione a un account di servizi di hosting o supporto, accetti di rispettare i termini e le condizioni previsti.\n\n<a name=\"6\"></a>\n## [6. Responsabilità dei visitatori del Sito](#6)\n\n%{company_name} non ha rivisto e non può rivedere tutto il materiale, compreso il software informatico, pubblicato sul Sito e pertanto non può essere considerata responsabile per il contenuto, l’uso o gli effetti di tale materiale. Gestendo il Sito, %{company_name} non dichiara né implica che approva il materiale pubblicato o che ritiene che tale materiale sia accurato, utile o non nocivo. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. Il Sito potrebbe includere contenuto offensivo, indecente, o altrimenti discutibile, così come contenuto contenente imprecisioni tecniche, errori tipografici e altri errori. Il Sito potrebbe inoltre contenere materiale che viola i diritti pubblicitari o di privacy, o violare la proprietà intellettuale e altri diritti proprietari di terzi, o il cui download, la copia o l’utilizzo siano soggetti a ulteriori termini e condizioni, dichiarati o non dichiarati. %{company_name} declina ogni responsabilità per qualsiasi danno derivante dall’uso da parte di visitatori del Sito, o da qualsiasi download eseguito da tali visitatori del contenuto pubblicato.\n\n<a name=\"7\"></a>\n\n## [7. Contenuto\
+      \ pubblicato su altri siti Web](#7)\n\nNon abbiamo rivisto e non possiamo rivedere tutto il materiale, compreso il software informatico, reso disponibile mediante i siti e le pagine Web che contengono link a e dal sito %{company_domain}. %{company_name} non esercita alcun controllo su tali siti e pagine Web non %{company_domain} e non è responsabile del loro contenuto o utilizzo. Con il collegamento a un sito o a una pagina Web non %{company_domain}, %{company_name} non dichiara né ammette implicitamente che approva tale sito o pagina Web. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. %{company_name} declina ogni responsabilità per eventuali danni risultanti dall’uso di siti e pagine Web non %{company_domain}.\n\n<a name=\"8\"></a>\n\n## [8. Violazione del copyright e della politica DMCA](#8)\n\n%{company_name} chiede agli altri di rispettare i propri diritti di proprietà intellettuale e a sua volta rispetta i diritti di proprietà intellettuale di terzi. Se l’utente ritiene che il materiale presente o a cui accede mediante link dal sito %{company_domain} violi il proprio copyright, è invitato a inviare una notifica a %{company_name} in conformità alla politica [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (“DMCA”) di %{company_name}. %{company_name} risponderà a tutte le notifiche includendo, in base alle misure necessarie o appropriate, la rimozione del materiale che genera la violazione o la disabilitazione di tutti i link al materiale in presunta violazione. %{company_name} non consentirà più l’accesso e l’utilizzo del Sito al visitatore se, in circostanze appropriate, il visitatore si comporta come trasgressore recidivo del copyright o di altri diritti di proprietà intellettuale di %{company_name} o di terzi. In caso di rescissione, %{company_name} non avrà alcun obbligo di rimborsare eventuali somme pagate in precedenza ad %{company_name}.\n\n<a name=\"9\"></a>\n\n## [9. Proprietà intellettuale](#9)\n\
+      \nIl presente Contratto non trasferisce da %{company_name} all’utente qualsiasi proprietà intellettuale di %{company_name} o di terzi e tutti i diritti, la titolarità e l’interesse nel e su tale proprietà rimarranno (fra le parti) esclusivamente di %{company_name}. %{company_name}, %{company_domain}, il logo %{company_domain} e tutti gli altri marchi commerciali, marchi di servizio, grafica e logo utilizzati in connessione a %{company_domain} o il Sito sono marchi commerciali o marchi commerciali registrati di %{company_name} o dei licenziatari di %{company_name}. Altri marchi, marchi di servizio, grafica e logo utilizzati in connessione con il Sito possono essere marchi di terzi. L’utilizzo del Sito non implica per l’utente alcun diritto o licenza di riprodurre o utilizzare in altro modo qualsiasi marchio commerciale di %{company_name} o di terzi.\n\n<a name=\"10\"></a>\n\n## [10. Annunci pubblicitari](#10)\n\n%{company_name} si riserva il diritto di visualizzare annunci pubblicitari sul tuo contenuto, a meno che tu non abbia acquistato un Upgrade o un account di servizi senza pubblicità.\n\n<a name=\"11\"></a>\n\n## [11. Attribuzione](#11)\n\n%{company_name} si riserva il diritto di visualizzare link di attribuzione come “Powered by %{company_domain}”, autore del tema e attribuzione dei caratteri nel piè di pagina o la barra degli strumenti del tuo contenuto. I crediti a piè di pagina e la barra degli strumenti %{company_domain} non possono essere alterati o rimossi indipendentemente dagli upgrade acquistati.\n\n<a name=\"12\"></a>\n\n## [12. Modifiche](#12)\n\n%{company_name} si riserva il diritto, a sua unica discrezione, di modificare o rimpiazzare qualunque parte di questo Contratto. E’ tua responsabilità controllare questo Contratto periodicamente per prendere atto dei cambiamenti. L’uso continuato di %{company_domain} implica l’accettazione di tali cambiamenti. %{company_name} può, in futuro, offrire nuovi servizi e/o funzionalità attraverso il Sito (incluso il rilascio di nuovi strumenti e risorse). Tali nuovi servizi e/o funzionalità saranno soggetti ai termini e condizioni\
+      \ di questo Contratto.\n\n<a name=\"13\"></a>\n\n## [13. Rescissione del contratto](#13)\n\n%{company_name} può interrompere l’accesso a tutto o a parte del Sito in qualsiasi momento, con o senza causa, con o senza preavviso, con efficacia immediata. Se desideri rescindere dal presente Contratto o dall’account %{company_domain} (se disponibile), puoi semplicemente interrompere l’utilizzo del Sito. Tutte le disposizioni del presente Contratto che, per loro natura, devono permanere dopo la rescissione permarranno, incluse, senza limitazione, le disposizioni di proprietà, le esclusioni di garanzia, le indennità e le limitazioni di responsabilità.\n\n<a name=\"14\"></a>\n\n## [14. Esclusione di garanzie](#14)\n\nIl Sito è fornito “così com’è”. Con la presente, %{company_name}, i suoi fornitori e licenziatari declinano tutte le garanzie di qualsiasi tipo, espresse o implicite, incluse, senza limitazione, le garanzie di commerciabilità, idoneità per un particolare scopo e non violazione. Né %{company_name} né i suoi fornitori e licenziatari concedono alcuna garanzia che il Sito sia privo di errori o che l’accesso ad essi sarà continuo o ininterrotto. Se stai leggendo queste informazioni, ecco un [chiarimento] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Tu comprendi che scaricare o ottenere in altro modo i contenuti o i servizi mediante il Sito, a tua discrezione e a tuo rischio.\n\n<a name=\"15\"></a>\n\n## [15. Limitazione di responsabilità](#15)\n\nIn nessun caso %{company_name}, o suoi fornitori o licenziatari, saranno responsabili per qualsiasi aspetto oggetto del presente contratto ai sensi di qualsiasi accordo, negligenza, responsabilità oggettiva o altra dottrina legale o equitativa: (i) per qualsiasi danno speciale, incidentale o consequenziale; (ii) per il costo di approvvigionamento dei prodotti o dei servizi sostitutivi; (iii) per l’interruzione dell’utilizzo oppure la perdita o il danneggiamento di dati; o (iv) per gli importi che superano le commissioni versate ad %{company_name} ai sensi del presente contratto nel corso\
+      \ del periodo di dodici (12) mesi precedenti alla causa dell’azione. %{company_name} non sarà responsabile per qualsiasi errore o ritardo dovuto a cause al di fuori del proprio ragionevole controllo. Quanto precede non si applica nella misura vietata dalla legge applicabile.\n\n<a name=\"16\"></a>\n\n## [16. Garanzia e dichiarazione generale](#16)\n\nTu dichiari e garantisci che (i) l’utilizzo del Sito avverrà in stretta conformità alla [Politica sulla Privacy] (/privacy) di %{company_name}, alle [Linee Guida](/guidelines), al presente Contratto e a tutti i regolamenti e le leggi (inclusi senza limitazioni le leggi o i regolamenti locali in vigore nel paese, nello stato, nella città o in altra area governativa di appartenenza, per quanto riguarda la condotta online e il contenuto accettabile, e comprese tutte le leggi applicabili in materia di trasmissione di dati tecnici esportati dal paese di residenza del Sito o del tuo) e (ii) l’uso del Sito non viola o non si appropria indebitamente dei diritti di proprietà intellettuale di terze parti.\n\n<a name=\"17\"></a>\n\n## [17. Indennizzo](#17)\n\nTu accetti di indennizzare e manlevare %{company_name}, i suoi contraenti e i suoi licenziatari, e i rispettivi direttori, funzionari, dipendenti e agenti da e contro tutte le richieste di risarcimento e le spese, inclusi gli onorari, derivanti dall’uso del Sito, inclusa ma non limitatamente alla violazione dell’utente del presente Contratto.\n\n<a name=\"18\"></a>\n\n## [18. Varie](#18)\n\nIl presente Contratto costituisce l’intero contratto tra te e %{company_name} riguardo l’argomento oggetto del contratto, e può essere modificato solo da un emendamento scritto e firmato da un dirigente autorizzato di %{company_name}, o mediante l’invio da parte di %{company_name} di una versione riveduta. Salvo diversa disposizione nel presente Contratto nei limiti consentiti dalla legge applicabile, se disponibile, qualsiasi accesso a o utilizzo del sito sarà disciplinato dalle leggi dello stato italiano, con esclusione delle disposizioni in materia di conflitto di leggi, il foro competente per qualsiasi\
+      \ controversia derivante dal presente contratto o collegata allo stesso è il tribunale di Roma. Fatta eccezione per le richieste di risarcimento ingiuntivo o per via equitativa o richieste di risarcimento relative ai diritti di proprietà intellettuale (che possono essere avanzate in qualsiasi tribunale competente senza prestare garanzie), qualsiasi controversia derivante dal presente contratto sarà risolta in conformità alle leggi italiane (Italia). La parte vincente in qualsiasi azione o procedimento per l’applicazione del presente Contratto avrà diritto di ottenere il rimborso delle spese e degli onorari legali. Nel caso in cui una parte del presente Contratto venga ritenuta non valida o non applicabile, tale parte verrà interpretata in modo da riflettere le intenzioni originali delle parti e le altre disposizioni rimarranno attive ed efficaci. Il mancato esercizio da parte di qualsiasi parte di qualsiasi termine o condizione del presente Contratto o qualsiasi violazione dello stesso, in qualsiasi unica istanza, non implicherà la rinuncia a tale termine o condizione oppure a successive violazioni. Tu puoi assegnare diritti ai sensi del presente Contratto a qualsiasi parte che acconsenta e accetti di essere vincolata dai suoi termini e condizioni; %{company_name} può assegnare i suoi diritti ai sensi del presente Contratto senza condizioni. Il presente Contratto sarà vincolante e avrà effetto a beneficio delle parti, dei subentranti e degli assegnatari autorizzati.\n\nQuesto documento è CC-BY-SA. Ultimo aggiornamento 31 maggio 2013.\n\nAdattamento dal contratto originale [Termini di Servizio WordPress](http://en.wordpress.com/tos/). \n"
   privacy_topic:
-    title: "Policy sulla Privacy"
+    title: "Politica della Privacy"

config/locales/server.ja.yml

@@ -151,7 +151,6 @@ ja:
       title: "メンバー"
     leader:
       title: "レギュラー"
-    change_failed_explanation: "%{user_name} を '%{new_trust_level}' に格下げしようとしましたが、既にトラストレベルが '%{current_trust_level}' です。%{user_name} は '%{current_trust_level}' のままになります。"
   rate_limiter:
     too_many_requests: "このアクションを一日の間に実施可能な回数が決まっています。%{time_left}待ってから再度試してください。"
     hours:
@@ -288,10 +287,6 @@ ja:
   archetypes:
     regular:
       title: "通常のトピック"
-    banner:
-      message:
-        make: "このトピックはバナートピックに設定されています。ページ毎の一番上に表示されます。"
-        remove: "このトピックはバナートピックから外されていました。"
   unsubscribed:
     title: '購読解除'
     description: "購読解除されました。メールの送信をストップしました。"
@@ -413,10 +408,6 @@ ja:
     login_required_welcome_message:
       title: "ウェルカムメッセージ: 要ログイン"
       description: "'login required' 設定有効時に、ユーザに対してログインを促すメッセージの内容。"
-    tos_user_content_license:
-      title: "利用規約: コンテンツ使用許諾"
-    tos_miscellaneous:
-      title: "利用規約: その他"
     login_required:
       title: "ホームページ: 要ログイン"
       description: "要ログイン設定の際に、未ログインユーザに対して表示されるメッセージの内容。"
@@ -527,7 +518,6 @@ ja:
     incorrect_username_email_or_password: "ユーザネーム、メールアドレス、またはパスワードが違います"
     wait_approval: "サインアップありがとうござました。アカウントが承認され次第メールにて通知いたします。"
     active: "アカウントが利用可能になりました。"
-    activate_email: "<b>%{email}</b> にメールを送りました。メールの指示に従ってあなたのアカウントを有効にしてください。"
     not_activated: "まだログインできません。メールを送信済ですので、メールの指示に従ってあなたのアカウントを有効にしてください。"
     suspended: "%{date} までログインできません。"
     suspended_with_reason: "%{date} までログインできません。アカウントがサスペンドされた理由は次の通りです: %{reason}"
@@ -547,6 +537,8 @@ ja:
       blocked: "は許可されていません。"
     ip_address:
       blocked: "はブロックされてます。"
+  invite_forum_mailer:
+    subject_template: "%{invitee_name} あなたを %{site_domain_name}に招待しました。"
   test_mailer:
     subject_template: "[%{site_name}] メール送信テスト"
   flag_reasons:
@@ -665,10 +657,6 @@ ja:
         もし上記リンクがクリックできない場合は、ブラウザのアドレスバーにリンクアドレスをコピー&ペーストしてください。
   page_not_found:
     title: "リクエストしたページは存在しないかモデレータによって削除されました。"
-  terms_of_service:
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
   deleted: 'deleted'
   upload:
     unauthorized: "申し訳ありません、ファイルのアップロードが拒否されました (サポートするファイルの拡張子: %{authorized_extensions})."

config/locales/server.ko.yml

@@ -20,6 +20,7 @@ ko:
   posts: "게시물들"
   loading: "로딩중"
   powered_by_html: 'Powered by <a href="http://www.discourse.org">Discourse</a>, best viewed with JavaScript enabled'
+  log_in: "로그인"
   via: "%{site_name}의 %{username}"
   is_reserved: "예약됨"
   errors:
@@ -92,9 +93,11 @@ ko:
     errors:
       can_not_modify_automatic: "자동 그룹은 수정 하실 수 없습니다."
     default_names:
+      everyone: "모든 사람"
       admins: "운영자들"
       moderators: "운영자"
       staff: "스태프"
+      trust_level_0: "신뢰도_0"
       trust_level_1: "신뢰도 1"
       trust_level_2: "신뢰도 2"
       trust_level_3: "신뢰도 3"
@@ -194,6 +197,27 @@ ko:
   staff_category_description: "스태프들의 논의를 위한 비공개 카테고리입니다. 관리자 및 운영자에게만 보입니다."
   lounge_welcome:
     title: "라운지에 오신 것을 환영합니다."
+    body: |2
+
+      축하합니다! :confetti_ball:
+
+      당신의 신뢰도가 **지도자** (신뢰도 3등급)로 올라갔기 때문에 이 토픽을 볼 수 있게 되었습니다.
+
+      이제부터 아래의 행동들을 할 수 있습니다 &hellip;
+
+      * 토픽을 제목을 수정할 수 있습니다
+      * 토픽의 카테고리를 수정할 수 있습니다
+      * 링크가 follow로 처리됩니다 ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) 가 제거됩니다)
+      * 신뢰도 3 이상인 사용자가 접근할 수 있는 비공개 카테고리인 라운지에 접근할 수 있습니다
+      * 좋아요와 신고의 가중치가 높아집니다
+
+      [정규 멤버 목록](/badges/3/regular)을 확인할 수 있습니다. 인사하는 것을 잊지마세요.
+
+      이 커뮤니티의 중요한 역할을 해주신 것에 감사드립니다!
+
+      (신뢰도에 관한 더 자세한 정보를 보시려면, [이 토픽을 확인하세요][trust]. 기준에 맞는 사람만 정규 회원으로 자격이 유지됩니다.)
+
+      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
   category:
     topic_prefix: "'%{category}' 카테고리의 설명"
     replace_paragraph: "[이 첫번째 문단을 당신의 새로운 카테고리의 짧은 설명으로 바꿔주세요. 이 지침은 카테고리 선택 화면에 나타날 것입니다. 200자 이하로 적어주세요.]"
@@ -213,7 +237,12 @@ ko:
       title: "새로운 사용자"
     basic:
       title: "기본 사용자"
-    change_failed_explanation: "당신은 %{user_name} 사용자를 %{new_trust_level} 으로 강등시키려 하였습니다만, 신뢰도는 이미 %{current_trust_level} 입니다. %{user_name} 사용자의 레벨은 %{current_trust_level} 로 유지됩니다."
+    regular:
+      title: "회원"
+    leader:
+      title: "정규 회원"
+    elder:
+      title: "지도자"
   rate_limiter:
     too_many_requests: "지금 하시려는 행동에는 하루 제한이 있습니다. %{time_left} 동안 기다리시고 다시 시도해 주세요."
     hours:
@@ -308,6 +337,7 @@ ko:
     notify_user:
       title: '{{username}}에게 알리기'
       long_form: '신고한 사용자'
+      email_title: '"%{title}" 내의 당신의 게시글'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: '운영자에게 알리기'
@@ -342,15 +372,18 @@ ko:
       title: '운영자에게 알림'
       description: '이 게시물은 <a href="/faq">FAQ</a>, <a href="%{tos_url}">TOS</a>, 또는 기타 다른 이유에서 운영자의 주의가 필요합니다.'
       long_form: '운영자에게 알림'
+      email_title: '토픽 "%{title}" 은 운영자의 확인이 필요합니다'
+      email_body: "%{link}\n\n%{message}"
   flagging:
     you_must_edit: '<p>회원님의 포스트가 신고접수 되었습니다. <a href="/my/private-messages">개인 메시지</a>를 확인해주세요.</p>'
+    user_must_edit: '<p>게시물이 신고되었기 때문에 일시적으로 보이지 않습니다.</p>'
   archetypes:
     regular:
       title: "자주보는 토픽"
     banner:
       message:
-        make: "해당 토픽이 배너에 걸렸습니다. 해당 사용자가 내리기 전까지 모든 페이지 상단에 보여집니다."
-        remove: "해당 토픽이 배너에서 내려왔습니다. 더 이상 모든 페이지 상단에 보여지지 않습니다."
+        make: "이 토픽은 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다."
+        remove: "이 토픽은 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다."
   unsubscribed:
     title: '구독 해지"'
     description: "구독이 해지되었습니다."
@@ -472,6 +505,8 @@ ko:
     education_new_topic:
       title: "새로운 사용자 교육: 첫번째 토픽들"
       description: "새로운 사용자가 첫 두개의 토픽을 작성하면 자동 팝업됩니다."
+    usage_tips:
+      title: "새로운 사용자 가이드"
     welcome_user:
       title: "환영: 새로운 사용자"
       description: "새로운 사용자가 가입하면 자동으로 개인 메시지를 보냅니다."
@@ -481,12 +516,6 @@ ko:
     login_required_welcome_message:
       title: "로그인 필요: Welcome Message"
       description: "'login required' 설정이 활성화 되어있으면 웰컴 메시지가 로그인 되지 않은 사용자들에게 보여집니다."
-    tos_user_content_license:
-      title: "서비스 약관: 컨텐츠 라이센스"
-      description: "DEPRECATED. 사용되지 않음"
-    tos_miscellaneous:
-      title: "서비스 약관: 기타"
-      description: "DEPRECATED. 사용되지 않음"
     login_required:
       title: "로그인 필요: 홈페이지"
       description: "이 텍스트는 로그인이 필요하지만 인증되지 않은 사용자들에게 보여집니다."
@@ -596,7 +625,7 @@ ko:
     redirect_users_to_top_page: "자동으로 신규 사용자와 오래간만에 들어온 사용자를 탑 페이지로 리다이렉트 시킴"
     email_token_valid_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰의 유효 기간(시간)"
     email_token_grace_period_hours: "비밀번호 찾기, 계정 활성화에 사용되는 토큰은 사용되어진 이후 유효한 기간(시간)"
-    enable_badges: "훈장 시스템 활성화 (시험적 기능)"
+    enable_badges: "뱃지 시스템 활성화 (시험 기능)"
     allow_index_in_robots_txt: "이 사이트가 검색엔진에 의해 인덱스되는 것을 허용합니다.(robots.txt 수정)"
     email_domains_blacklist: "허용하지 않는 Email 도메인을 파이프(|)기호로 구분하여 입력. 예: mailinator.com|trashmail.net"
     email_domains_whitelist: "허용하는 Email 도메인을 파이프(|)기호로 구분하여 입력. 경고: 여기에 주어진 email domain이 아닌 경우 모두 거부됩니다."
@@ -653,7 +682,6 @@ ko:
     clean_up_uploads: "불법 호스팅을 막기 위해서 참조되지 않은 업로드 파일은 제거한다. 주의 : 이 설정을 활성화 하기 전에 `/uploads` 디렉토리를 백업하는 것이 좋다."
     clean_orphan_uploads_grace_period_hours: "참조되지 않은 업로드 파일을 제거하기 전 기간(시간)"
     purge_deleted_uploads_grace_period_days: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)"
-    enable_s3_uploads: "업로한 파일을 Amazon S3에 저장한다."
     s3_upload_bucket: "업로드된 파일이 위치할 Amazon S3 버켓 이름. 주의 : 소문자로 period(.)업는 문자열"
     s3_access_key_id: "이미지를 업로드 할 때 사용할 Amazon S3의 access key id"
     s3_secret_access_key: "이미지를 업로드 할 때 사용할 Amazon S3의 secret access key"
@@ -784,7 +812,6 @@ ko:
     incorrect_username_email_or_password: "계정 아이디, 이메일 또는 패스워드가 다릅니다."
     wait_approval: "가입해 주셔서 감사합니다. 곧 활성화 메일이 도착할 것 입니다."
     active: "당신의 계정이 활성화되었습니다."
-    activate_email: "계정 생성을 위해 <b>%{email}</b>로 이메일을 보냈습니다. 계정을 활성화하기 위해 지침을 따라주세요."
     not_activated: "당신은 아직 로그인 할 수 없습니다. 계정 활성화 이메일을 보냈습니다. 계정을 활성화하기 위해 지침을 따라주세요."
     suspended: "당신은 %{date} 까지 로그인할 수 없습니다. "
     suspended_with_reason: "당신은 %{date} 까지 로그인할 수 없습니다. 이유: %{reason}"
@@ -925,9 +952,6 @@ ko:
   page_not_found:
     title: "당신이 요청한 페이지를 찾을 수 없습니다. 혹시 아래와 같은 토픽을 찾으신 것은 아닌가요?"
   terms_of_service:
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
   deleted: '삭제되었습니다'
   upload:

config/locales/server.nl.yml

@@ -23,6 +23,7 @@ nl:
   log_in: "Inloggen"
   via: "%{username} via %{site_name}"
   is_reserved: "is gereserveerd"
+  purge_reason: "Automatisch verwijderd omdat het oud en niet geverifieerd is"
   errors:
     messages:
       too_long_validation: "is beperkt tot %{max} tekens; je gebruikt %{length}."
@@ -73,6 +74,7 @@ nl:
     one: "Sorry, nieuwe leden kunnen één link in een bericht opnemen."
     other: "Sorry, nieuwe leden kunnen %{count} links in een bericht opnemen."
   spamming_host: "Sorry, je kan niet linken naar die host."
+  user_is_suspended: "Geschorste gebruikers mogen geen berichten meer plaatsen."
   just_posted_that: "lijkt teveel op het bericht dat je net geschreven hebt"
   has_already_been_used: "is al eens gebruikt"
   invalid_characters: "bevat ongeldige tekens"
@@ -96,6 +98,7 @@ nl:
     errors:
       can_not_modify_automatic: "Je kunt automatische groepen niet wijzigen"
     default_names:
+      everyone: "iedereen"
       admins: "admins"
       moderators: "moderators"
       staff: "staf"
@@ -107,6 +110,26 @@ nl:
     until_posts:
       one: "één bericht"
       other: "%{count} berichten"
+    new-topic: |
+      Welkom op %{site_name} — **bedankt voor het starten van een nieuwe conversatie!**
+
+      - Geeft de titel een duidelijke beschrijving van het onderwerp, klinkt het interessant?
+
+      - Waar gaat het over? Wie zou er in geïnteresseerd zijn? Waarom is je topic van belang? Wat voor reacties verwacht je te krijgen?
+
+      - Probeer de juiste steekwoorden te gebruiken zodat anderen je topic kunnen **vinden*. Als het in een categorie moet zijn, kies dan een toepasselijke categorie.
+
+      Voor meer informatie, [bekijk onze regels](/guidelines). Deze tekst zal alleen verschijnen bij je eerste %{education_posts_text}.
+    new-reply: |
+      Welkom op %{site_name} — **bedankt voor het deelnemen aan de conversatie!**
+
+      - Geeft je reactie een nuttige bijdrage aan de conversatie, hoe klein dan ook?
+
+      - Wees aardig voor de andere leden.
+
+      - Je mag best kritisch zijn, maar onthoud dat je kritiek moet geven op *ideeën*, niet op mensen.
+
+      Voor meer informatie, [bekijk onze regels](/guidelines). Deze tekst zal alleen verschijnen bij je eerste %{education_posts_text}.
     avatar: |
       ### Wat dacht je van een nieuwe afbeelding voor je account?
 
@@ -147,6 +170,8 @@ nl:
         name: "Naam categorie"
       post:
         raw: "Inhoud"
+      user_profile:
+        bio_raw: "Over Mij"
     errors:
       messages:
         is_invalid: "is ongeldig; probeer wat uitgebreider te zijn"
@@ -154,6 +179,9 @@ nl:
       models:
         topic:
           attributes:
+            base:
+              warning_requires_pm: "Je kunt alleen waarschuwingen aan privéberichten toevoegen."
+              too_many_users: "Je kunt een waarschuwing per keer slechts naar één ander lid sturen."
             archetype:
               cant_send_pm: "Sorry, je kan geen privébericht sturen naar deze persoon."
         user:
@@ -172,6 +200,7 @@ nl:
   vip_category_name: "Lounge"
   vip_category_description: "Een categorie exclusief voor leden met trust level 3 en hoger."
   meta_category_name: "Meta"
+  meta_category_description: "Discussies over deze site, de organisatie, hoe het werkt en hoe het verbeterd kan worden."
   staff_category_name: "Staf"
   staff_category_description: "Privécategorie voor stafgesprekken. Topics zijn alleen zichtbaar voor admins en moderatoren."
   lounge_welcome:
@@ -187,13 +216,21 @@ nl:
     cannot_delete:
       uncategorized: "De categorie Ongecategoriseerd kan niet verwijderd worden"
       has_subcategories: "Deze categorie kan niet verwijderd worden, omdat deze subcategorieën heeft"
+      topic_exists:
+        one: "Categorie kan niet verwijderd worden omdat het 1 topic heeft. Het oudste topic is %{topic_link}."
+        other: "Categorie kan niet verwijderd worden omdat het %{count} topics heeft. Het oudste topic is %{topic_link}."
       topic_exists_no_oldest: "Categorie kan niet verwijderd worden omdat het aantal topics %{count} is."
   trust_levels:
     newuser:
       title: "nieuw lid"
     basic:
       title: "lid"
-    change_failed_explanation: "Je probeerde %{user_name} te degraderen naar '%{new_trust_level}'. Echter, het trust level is al '%{current_trust_level}'. %{user_name} blijft op trust level '%{current_trust_level}'"
+    regular:
+      title: "lid"
+    leader:
+      title: "vaste bezoeker"
+    elder:
+      title: "leider"
   rate_limiter:
     slow_down: "Je hebt deze actie te vaak uitgevoerd. Probeer het later nog een keer."
     too_many_requests: "Er is een dagelijks limiet voor hoe vaak je dat kan doen. Wacht %{time_left} voordat je dit opnieuw probeert."
@@ -309,13 +346,17 @@ nl:
       long_form: 'heeft dit als spam gemeld'
     inappropriate:
       title: 'Ongepast'
+      description: 'Dit bericht bevat inhoud dat iemand als beledigend, discriminerend of kwetsend kan ervaren. Ook kan het een overtreding van <a href="/guidelines">de regels</a> zijn.'
       long_form: 'heeft dit als ongepast gemeld'
     notify_user:
       title: 'Stuur {{username}} een privébericht'
+      description: 'Dit bericht bevat iets waarover ik je graag persoonlijk en privé wil spreken. Dit zet geen vlag.'
       long_form: 'bericht aan schrijver verstuurd'
+      email_title: 'Uw bericht in ''%{title}'''
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
       title: 'Licht moderators in'
+      description: 'Dit bericht moet door een moderator bekeken worden. Dit vanwege de <a href="/guidelines">regels</a>, <a href="%{tos_url}">voorwaarden</a> of vanwege een andere reden.'
       long_form: 'moderators ingelicht'
       email_title: 'Graag aandacht van een moderator voor een bericht in ''%{title}'''
       email_body: "%{link}\n\n%{message}"
@@ -338,14 +379,17 @@ nl:
       long_form: 'markeerde dit als spam'
     inappropriate:
       title: 'Ongepast'
+      description: 'Dit topic bevat inhoud dat iemand als beledigend, discriminerend of kwetsend kan ervaren. Ook kan het een overtreding van <a href="/guidelines">de regels</a> zijn.'
       long_form: 'markeerde dit als ongepast'
     notify_moderators:
       title: 'Licht moderators in'
+      description: 'Dit topic moet door een moderator bekeken worden. Dit vanwege de <a href="/guidelines">regels</a>, <a href="%{tos_url}">voorwaarden</a> of vanwege een andere reden.'
       long_form: 'lichtte moderators in'
       email_title: 'De topic "%{title}" moet door een moderator worden bekeken'
       email_body: "%{link}\n\n%{message}"
   flagging:
     you_must_edit: '<p>Je bericht is gemarkeerd door andere gebruikers van dit forum. Kijk bij je <a href="/my/private-messages">privéberichten</a> om te zien waarom.</p>'
+    user_must_edit: '<p>Je bericht heeft het maximaal aantal moderatie-meldingen gekregen en is daarom tijdelijk onzichtbaar.</p>'
   archetypes:
     regular:
       title: "Standaard topic"
@@ -354,6 +398,7 @@ nl:
     description: "Je hebt je uitgeschreven. Je krijgt geen mails meer van ons!"
     oops: "Als dat niet de bedoeling was, klik dan hieronder."
     error: "Fout bij afmelden"
+    preferences_link: "U kunt zich ook uitschrijven voor de verzamel emails op uw <a href='/my/preferences'>voorkeuren pagina</a>"
     not_found_description: "Sorry, we hebben je niet uit kunnen schrijven. Het is mogelijk dat de link in je e-mail is verlopen."
   resubscribe:
     action: "Opnieuw inschrijven"
@@ -465,6 +510,9 @@ nl:
     education_new_topic:
       title: "Uitleg voor nieuwe leden: Eerste topics"
       description: "Popup verschijnt automatisch als een nieuw lid zijn eerste twee topics schrijft."
+    usage_tips:
+      title: "Hulp voor nieuwe leden"
+      description: "Hulp en essentiële informatie voor nieuwe leden."
     welcome_user:
       title: "Welkom: Nieuw lid"
       description: "Een privébericht dat automatisch naar alle nieuwe leden wordt gestuurd als ze zich inschrijven."
@@ -474,10 +522,6 @@ nl:
     login_required_welcome_message:
       title: "Inloggen vereist: Welkomstbericht"
       description: "Welcomstbericht dat getoond wordt aan uitgelogde gebruikers als 'login required' is ingesteld."
-    tos_user_content_license:
-      title: "Algemene voorwaarden: Inhoudslicensie"
-    tos_miscellaneous:
-      title: "Terms of Service: Overig"
     login_required:
       title: "Inloggen nodig: Homepage"
       description: "De tekst die getoond wordt als men moet inloggen om naar het forum te kunnen gaan."
@@ -593,6 +637,7 @@ nl:
     display_name_on_posts: "Laat de volledige naam van een gebruiker bij zijn berichten zien, na de @gebruikersnaam"
     short_progress_text_threshold: "Als het aantal berichten in een topic meer is dan dit aantal zal de voortgangsbalk alleen het nummer van het huidige bericht tonen. Als je de breedte van de voortgangsbalk verandert, moet je dit getal misschien ook aanpassen."
     default_code_lang: "Standaard programmeertaal die gebruikt wordt voor syntax highlighting van GitHub codeblokken (lang-auto, ruby, python etc.)"
+    embed_truncate: "Kort de geembedde berichten in"
     tos_accept_required: "Gebruikers moeten een vinkje zetten bij het inschrijven om aan te geven dat ze akkoord gaan met de algemene voorwaarden als deze optie actief is. Ga naar 'Inschijfformulier: Algemene Voorwaarden' in de Inhoud tab om het bericht te wijzigen."
     errors:
       invalid_email: "Ongeldig e-mailadres."
@@ -601,6 +646,9 @@ nl:
       invalid_integer_max: "Waarde kan maximaal %{max} zijn."
       invalid_integer: "Waarde moet een integer zijn."
       invalid_string: "Ongeldige waarde."
+      invalid_string_min_max: "Moet tussen %{min} en %{max} tekens zijn."
+      invalid_string_min: "Moet te minste uit %{min} tekens bestaan."
+      invalid_string_max: "Mag uit niet meer dan %{max} tekens bestaan."
   notification_types:
     mentioned: "%{display_username} heeft je genoemd in %{link}"
     liked: "%{display_username} vond je bericht in %{link} leuk"
@@ -613,7 +661,9 @@ nl:
     invited_to_private_message: "%{display_username} heeft je uitgenodigd voor een privé-bericht: %{link}"
     invitee_accepted: "%{display_username} heeft je uitnodiging geaccepteerd"
     linked: "%{display_username} heeft je gelinkt in %{link}"
+    granted_badge: "%{link} is aan jou toegekend"
   search:
+    within_post: "#%{post_number} door %{username}"
     types:
       category: 'Categorieën'
       topic: 'Resultaten'
@@ -622,6 +672,9 @@ nl:
   most_posts: "Meer berichten"
   most_recent_poster: "Meest recente schrijver"
   frequent_poster: "Frequente schrijver"
+  redirected_to_top_reasons:
+    new_user: "Welkom bij deze community! Dit zijn een aantal van de meest populaire topics."
+    not_seen_in_a_month: "Welkom terug! We hebben je een tijdje niet gezien. Dit is een overzicht van de meest populaire topics die zijn gemaakt tijdens je afwezigheid."
   move_posts:
     new_topic_moderator_post:
       one: "Ik heb een bericht naar een nieuwe topic verplaatst: %{topic_link}"
@@ -653,13 +706,15 @@ nl:
     pinned_disabled: "Deze topic is niet langer gepind en zal niet meer bovenaan de lijst van topics in zijn categorie staan."
     pinned_globally_enabled: "Deze topic is nu globaal vastgepind en zal bovenaan de lijst van topics in zijn categorie en alle andere topiclijsten staan. Wanneer iemand op 'Verwijder pin' drukt, zal de topic voor diegene niet meer bovenaan staan."
     pinned_globally_disabled: "Deze topic is niet langer gepind en zal niet meer bovenaan de lijst van topics in zijn categorie staan."
+    visible_enabled: "Deze topic is nu zichtbaar en zal weer worden weergegeven in topiclijsten."
+    visible_disabled: "Deze topic is nu onzichtbaar en zal niet worden weergegeven in topiclijsten, en kan alleen via een directe link worden bezocht."
   login:
     not_approved: "Je account is nog niet goedgekeurd. Je zal via de mail een bericht van ons ontvangen wanneer je in kan loggen."
     incorrect_username_email_or_password: "Incorrecte gebruikersnaam, e-mailadres of wachtwoord"
     wait_approval: "Bedankt voor je inschrijving. We zullen je laten weten als je account is goedgekeurd."
     active: "Je account is actief en klaar voor gebruik!"
-    activate_email: "Je bent er bijna! We hebben een activatiemail verstuurd naar <b>%{email}</b>. Volg de instructies in de mail om je account te activeren."
     not_activated: "Je kan nog niet inloggen. We hebben je een activatiemail gestuurd. Volg de instructies in de mail om je account te activeren."
+    not_allowed_from_ip_address: "Je kunt niet inloggen als %{username} vanaf dat IP adres."
     suspended: "Je kan tot %{date} niet inloggen."
     suspended_with_reason: "Je kan tot %{date} niet inloggen. Je hebt bent om de volgende reden geschorst: %{reden}"
     errors: "%{errors}"
@@ -667,8 +722,12 @@ nl:
     something_already_taken: "Er ging iets mis, misschien zijn de gebruikersnaam en/of e-mailadres al in gebruik? Gebruik dan de 'wachtwoord vergeten' link"
     omniauth_error: "Sorry, er was een fout met je %{strategy} account. Wellicht heb je de autorisatie niet goedgekeurd?"
     omniauth_error_unknown: "Er is iets misgegaan bij het inloggen. Probeer het opnieuw."
+    new_registrations_disabled: "Het registeren van nieuwe accounts is niet toegestaan op dit moment."
+    password_too_long: "Wachtwoorden mogen maximaal 200 tekens lang zijn."
   user:
     username:
+      short: "moet ten minste %{min} tekens zijn"
+      long: "moet niet meer dan %{max} tekens zijn"
       characters: "mag alleen nummers, letters en underscores bevatten"
       unique: "moet uniek zijn"
       blank: "mag niet leeg zijn"
@@ -678,27 +737,51 @@ nl:
       blocked: "is niet toegestaan."
     ip_address:
       blocked: "is geblokkeerd."
+  invite_forum_mailer:
+    subject_template: "%{invitee_name} heeft je uitgenodigd voor %{site_domain_name}"
   test_mailer:
     subject_template: "[%{site_name}] E-mail Bezorgtest"
   new_version_mailer:
     subject_template: "[%{site_name}] Nieuwe Discourse-versie, update beschikbaar"
+    text_body_template: |
+      Er is een nieuwe versie van [Discourse](http://www.discourse.org) beschikbaar:
+
+      Jouw versie: %{installed_version}
+      Nieuwe versie: **%{new_version}**
+
+      Je wil misschien wel:
+
+      - Kijken wat er nieuw is in de [GitHub changelog](https://github.com/discourse/discourse/commits/master).
+
+      - Upgraden door naar [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) te gaan en op de "Upgrade" knop te klikken.
+
+      - Bezoek [meta.discourse.org](http://meta.discourse.org) voor nieuws, discussies over en ondersteuning voor Discourse.
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] Update beschikbaar"
   flags_reminder:
-    flags_were_submitted:
-      one: "Er zijn meldingen die langer dan 1 uur gelden gemaakt werden."
-      other: "Er zijn meldingen die langer dan %{count} uur gelden gemaakt werden."
     please_review: "Kijk hier even naar."
     post_number: "bericht"
-    how_to_disable: "Schakel deze mail uit door notify_about_flags_after op 0 te zetten."
-    subject_template:
-      one: "1 melding moet nog behandeld worden"
-      other: "%{count} meldingen moeten nog behandeld worden"
+  flag_reasons:
+    inappropriate: "Uw bericht bevat inhoud dat iemand als beledigend, discriminerend of kwetsend kan ervaren. Ook kan het een overtreding van [de regels](/guidelines)."
+  flags_dispositions:
+    agreed: "Bedankt dat je het ons hebt laten weten. We zijn het er mee eens dat er een probleem is en we gaan er naar kijken."
+    agreed_and_deleted: "Bedankt dat je het ons hebt laten weten. We zijn het er mee eens dat er een probleem is en we hebben het bericht verwijderd."
+    disagreed: "Bedankt dat je het ons hebt laten weten. We gaan er naar kijken."
+    deferred: "Bedankt dat je het ons hebt laten weten. We gaan er naar kijken."
+    deferred_and_deleted: "Bedankt dat je het ons hebt laten weten. We hebben het bericht verwijderd."
   system_messages:
     post_hidden:
       subject_template: "Bericht van %{site_name}: je bericht is verborgen wegens meldingen uit de community"
     welcome_user:
       subject_template: "Welkom bij %{site_name}!"
+      text_body_template: |
+        Fijn dat je lid bent geworden van %{site_name} en welkom!
+
+        %{new_user_tips}
+
+        We geloven altijd in [beschaafd gemeenschappelijk gedrag](%{base_url}/guidelines).
+
+        Geniet van je verblijf!
     welcome_invite:
       subject_template: "Welkom bij %{site_name}!"
     export_succeeded:
@@ -727,12 +810,49 @@ nl:
         ```
         %{logs}
         ```
+    csv_export_succeeded:
+      subject_template: "Data Export succesvol afgerond."
+    csv_export_failed:
+      subject_template: "Export mislukt"
+      text_body_template: "De export is mislukt. Bekijk de logbestanden."
     too_many_spam_flags:
       subject_template: "Account geblokkeerd"
+      text_body_template: |
+        Hallo,
+
+        Dit is een automatisch bericht van %{site_name} om je te informeren dat je berichten verborgen zijn omdat ze gemarkeerd zijn door de community.
+
+        Uit voorzorg is je nieuwe account geblokkeerd waardoor je geen berichten meer kan plaatsen tot iemand van de staf je account opnieuw beoordeeld.
+
+        Kijk voor verdere uitleg in de [community richtlijnen](%{base_url}/guidelines).
     blocked_by_staff:
       subject_template: "Account geblokkeerd"
+      text_body_template: |
+        Hallo,
+
+        Dit is een automatisch bericht van %{site_name} om je te informeren dat je account geblokkeerd is door de staf.
+
+        Kijk voor verdere uitleg in de [regels](%{base_url}/guidelines).
     user_automatically_blocked:
       subject_template: "Nieuwe gebruiker %{username} geblokkeerd wegens meldingen van andere gebruikers"
+      text_body_template: |
+        Dit is een automatisch gegenereerd bericht.
+
+        De nieuwe gebruiker [%{username}](%{base_url}%{user_url}) is automatisch geblokkeerd, omdat meerdere gebruikers de bericht(en) van %{username} gemarkeerd hebben.
+
+        Kijk hier voor [de markeringen](%{base_url}/admin/flags). Als %{username} ten onrechte geblokkeerd is, klik dan op de deblokkeerdknop op [de beheerpagina van deze gebruiker](%{base_url}%{user_url}).
+
+        De gevoeligheid kan worden gewijzigd via de `block_new_user` site instellingen.
+    spam_post_blocked:
+      subject_template: "Berichten van nieuwe gebruiker %{username} geblokkeerd vanwege herhaalde links"
+      text_body_template: |
+        Dit is een automatisch gegenereerd bericht.
+
+        Nieuwe gebruiker [%{username}](%{base_url}%{user_url}) probeerde meerdere berichten te plaatsen met links naar %{domains}, maar deze berichten zijn geblokkeerd om spam tegen te gaan. De gebruiker kan nog steeds nieuwe berichten plaatsen die niet linken naar %{domains}.
+
+        Bekijk de gebruiker [hier](%{base_url}%{user_url}).
+
+        De drempel hiervoor kan ingesteld worden met de `newuser_spam_host_threshold` en de `white_listed_spam_host_domains` site instellingen.
     unblocked:
       subject_template: "Account gedeblokkeerd"
       text_body_template: |
@@ -812,6 +932,7 @@ nl:
         ---
         %{respond_instructions}
     digest:
+      why: "Een korte samenvatting van %{site_link} sinds we je voor het laatst zagen op %{last_seen_at}."
       subject_template: "[%{site_name}] Samenvatting voor %{date}"
       new_activity: "Nieuwe reacties op je topics en berichten:"
       top_topics: "Populaire berichten"
@@ -819,6 +940,8 @@ nl:
       click_here: "klik hier"
       from: "%{site_name} Digest"
       read_more: "Lees verder"
+      more_topics: "Er werden nog %{new_topics_since_seen} andere nieuwe topics gepost sinds uw laatste bezoek op %{last_seen_at}."
+      more_topics_category: "Er werden nog %{new_topics_since_seen} andere nieuwe topics gepost in deze categorieën sinds uw laatste bezoek op %{last_seen_at}:"
       posts:
         one: "één bericht"
         other: "%{count} berichten"
@@ -840,6 +963,13 @@ nl:
 
         Klik op de volgende link om een wachtwoord in te stellen:
         %{base_url}/users/password-reset/%{email_token}
+    account_created:
+      subject_template: "[%{site_name}] Uw Nieuwe Account"
+      text_body_template: |
+        Er is een nieuw account voor je aangemaakt op  %{site_name}
+
+        Klik op deze link om een wachtwoord in te stellen voor je nieuwe account:
+        %{base_url}/users/password-reset/%{email_token}
     authorize_email:
       subject_template: "[%{site_name}] Bevestig je nieuwe e-mailadres"
       text_body_template: |
@@ -870,9 +1000,6 @@ nl:
       Voor dit forum is een account nodig. Maak een account aan of log in om verder te gaan.
   terms_of_service:
     title: "Algemene Voorwaarden"
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'Ik heb de <a href="/tos" target="_blank">Algemene Voorwaarden</a> gelezen en ga hiermee akkoord.'
   deleted: 'verwijderd'
   upload:
@@ -889,6 +1016,7 @@ nl:
       size_not_found: "Het is niet gelukt de afmetingen van de afbeelding te bepalen. Misschien is het bestand corrupt?"
   flag_reason:
     sockpuppet: "Een nieuwe gebruiker maakte een nieuwe topic en een andere gebruiker reageerde - vanaf hetzelfde IP-adres. Zie de flag_sockpuppets instelling."
+    spam_hosts: "Deze nieuwe gebruiker probeerde om meerdere berichten met links naar hetzelfde domein te plaatsen. Zie de newuser_spam_host_threshold instelling."
   email_log:
     no_user: "Kan geen gebruiker met id %{user_id} vinden"
     suspended_not_pm: "De gebruiker is geschorst, geen privébericht"

config/locales/server.pl_PL.yml

@@ -241,7 +241,6 @@ pl_PL:
       title: "regularny"
     elder:
       title: "starszyzna"
-    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}'"
   rate_limiter:
     slow_down: "Ta akcja została wykonana zbyt wiele razy, próbuj ponownie za jakiś czas"
     too_many_requests: "Liczba wykonań tej czynności w ciągu dnia jest ograniczona. Odczekaj %{time_left} przed ponowną próbą."
@@ -429,10 +428,6 @@ pl_PL:
   archetypes:
     regular:
       title: "Zwykły temat"
-    banner:
-      message:
-        make: "Ten temat został ustawiony jako baner.  Będzie pojawiać się na górze każdej strony do czasu zamknięcia przez użytkownika."
-        remove: "Ten temat nie jest już banerem. Nie będzie pojawiać się na górze  każdej strony."
   unsubscribed:
     title: 'Wypisano'
     description: "Zostałeś wypisany. Nie skontaktujemy się z Tobą więcej!"
@@ -562,10 +557,6 @@ pl_PL:
     login_required_welcome_message:
       title: "Wymagane logowanie: wiadomość powitalna"
       description: "Wiadomość powitalna wyświetlana niezalogowanym użytkownikom, gdy ustawienie 'login required' jest włączone."
-    tos_user_content_license:
-      title: "Warunki serwisu: Licencja treści"
-    tos_miscellaneous:
-      title: "Warunki serwisu: Rozmaite"
     login_required:
       title: "Login Required: Homepage"
       description: "The text displayed for unauthorized users when login is required on the site."
@@ -726,7 +717,6 @@ pl_PL:
     incorrect_username_email_or_password: "Niepoprawna nazwa użytkownika, email lub hasło"
     wait_approval: "Dziękujemy za rejestrację. Powiadomimy Cię gdy Twoje konto zostanie aktywowane."
     active: "Twoje konto zostało aktywowane i jest gotowe do użycia."
-    activate_email: "Prawie skończone! Wysłaliśmy email aktywacyjny na adres <b>%{email}</b>. Wykonaj instrukcje w nim zawarte by aktywować Twoje konto."
     not_activated: "Nie możesz się jeszcze zalogować. Wysłaliśmy do Ciebie email aktywacyjny. Wykonaj instrukcje w nim zawarte by aktywować Twoje konto."
     errors: "%{errors}"
     not_available: "Niedostępny. Może spróbuj %{suggestion}?"
@@ -760,15 +750,7 @@ pl_PL:
   test_mailer:
     subject_template: "[%{site_name}] Test dostarczania poczty"
   flags_reminder:
-    flags_were_submitted:
-      one: "Istnieją flagi dodane ponad 1 godzinę temu."
-      few: "Istnieją flagi dodane %{count} godziny temu."
-      other: "Istnieją flagi dodane %{count} godzin temu."
     post_number: "wpis"
-    subject_template:
-      one: "1 flaga oczekuje na reakcję"
-      few: "%{count} flagi oczekują na reakcję"
-      other: "%{count} flag oczekuje na reakcję"
   flag_reasons:
     off_topic: "Twój wpis został oznaczony jako **nie-na-temat**: społeczność uważa, że nie pasuje on do tematu zdefiniowanego przez tytuł i treść pierwszego wpisu w wątku."
     spam: "Twój wpis został oznaczony jako **spam**: społeczność uważa, że jest to nieprzydatna reklama bez związku z tematem."
@@ -788,12 +770,21 @@ pl_PL:
         Miłego korzystania!
     welcome_invite:
       subject_template: "Witaj na %{site_name}!"
+      text_body_template: "Dziękujemy za przyjęcie zaproszenia do %{site_name} – witamy!\n\nTwoja automatycznie wygenerowana nazwa użytkownika: **%{username}**. Możesz ją zmienić w każdej chwili w [swoich ustawieniach][prefs].\n\nAby zalogować się:\n\nA) Zaloguj się przyciskiem logowania przez zewnętrzny serwis. Pamiętaj, aby podpięty pod wybrany serwis adres e-mail **był taki sam** jak ten na który dostałeś swoje zaproszenie. W przeciwnym wypadku nie będziemy mogli stwierdzić, że ty to Ty! \n\nB) Stwórz unikalne hasło w [swoich ustawieniach][prefs] i zaloguj się przy jego pomocy.\n\n%{new_user_tips}\n\nWierzymy w [cywilizowane zachowanie](%{base_url}/guidelines) jako podstawę naszej społeczności.\n\n\
+        Miłego uczestnictwa! \n\n[prefs]: %{user_preferences_url}\n"
     export_succeeded:
       subject_template: "Eksportowanie zostało zakończone."
       text_body_template: "Eksport się powiódł."
     import_succeeded:
       subject_template: "Importowanie zostało zakończone."
       text_body_template: "Import się powiódł."
+    email_reject_empty:
+      text_body_template: |
+        Przepraszamy, ale wysyłanie twojej wiadomości do %{destination} (o tytule %{former_title}) zakończyło się niepowodzeniem.
+
+        Nie udało się wykryć treści. Upewnij się, że odpowiedź znajduje się na początku e-maila: nie rozpoznajemy odpowiedzi wymieszanych z cytowanym tekstem,
+
+        Dodatkowo upewnij się, że odpowiadasz e-mailem w formacie HTML (a nie czystym ASCII).
     too_many_spam_flags:
       subject_template: "Nowe konto zablokowane"
     blocked_by_staff:
@@ -925,9 +916,6 @@ pl_PL:
   page_not_found:
     title: "Strona, którą chciałeś odwiedzić, nie istnieje lub jest prywatna."
   terms_of_service:
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'Przeczytałem i zgadzam się z <a href="/tos" target="_blank">Regulaminem Serwisu</a>.'
   deleted: 'usunięte'
   upload:

config/locales/server.pt.yml

@@ -192,7 +192,6 @@ pt:
       title: "regular"
     elder:
       title: "líder"
-    change_failed_explanation: "Você tentou rebaixar %{user_name} para '%{new_trust_level}'. No entanto o nível de confiança dele já é '%{current_trust_level}'. %{user_name} permanecerá em '%{current_trust_level}'"
   rate_limiter:
     slow_down: "Realizou esta acção demasiadas vezes, tente novamente mais tarde"
     too_many_requests: "Nós possuímos um limite diário do número de vezes que uma ação pode ser tomada. Por favor aguarde %{time_left} antes de tentar novamente."
@@ -472,10 +471,6 @@ pt:
     login_required_welcome_message:
       title: "Boas-vindas: Login Solicitado"
       description: "Mensagem de boas-vindas que é exibida para usuários que não estão logados quando a configuração de 'login requerido' está ativada."
-    tos_user_content_license:
-      title: "Termos do Serviço: Licença do Conteúdo"
-    tos_miscellaneous:
-      title: "Termos do Serviço: Diversos"
     login_required:
       title: "É requerido que você entre em sua conta: Página Inicial"
       description: "Texto exibido para usuários não autorizados quando é se exige entrar na conta para acessar o site."
@@ -571,7 +566,6 @@ pt:
     incorrect_username_email_or_password: "Usuário, email ou senha incorretos"
     wait_approval: "Obrigado por se registar. Você será notificado por email quando a sua conta for aprovada."
     active: "A sua conta está ativa e pronta."
-    activate_email: "Estamos quase prontos! Enviamos um email de ativação para <b>%{email}</b>. Por favor siga as instruções no email para ativar a sua conta."
     not_activated: "Ainda não podes fazer log in. Enviamos um email de ativação para você. Por favor siga as instruções no email para ativar a sua conta."
     suspended: "Não pode iniciar sessão até %{date}"
     suspended_with_reason: "Não pode iniciar sessão até %{date}, pois encontra-se ativa uma suspensão com o seguinte motivo: %{reason}"
@@ -697,10 +691,6 @@ pt:
         %{base_url}/users/activate-account/%{email_token}
 
         Se não conseguires clicar no link em cima, tenta copia-lo e cola-lo na barra de endereções do seu browser de internet.
-  terms_of_service:
-    user_content_license: |
-      As contribuições do usuário são licenciadas sob [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem limitação de nenhuma destas representações ou garantias, %{company_short_name} tem o direito (mas não a obrigação) de, segundo o próprio critério de %{company_short_name} (i) recusar ou remover qualquer conteúdo que, na avaliação de %{company_short_name} viole qualquer regra de %{company_short_name} ou seja de alguma forma prejudicial ou censurável, ou (ii) cancelar ou negar o acesso e a utilização do site para qualquer pessoa ou entidade, por qualquer motivo, segundo próprio e único critério de %{company_short_name}. %{company_short_name} não terá obrigação de fornecer qualquer reembolso de quaisquer valores já pagos. ⏎
-    miscellaneous: "Este Acordo constitui a totalidade do acordo entre %{company_short_name} e você sobre o assunto em questão, e só pode ser modificado por uma emenda por escrito assinado por um executivo autorizado %{company_short_name}, ou pela publicação por %{company_short_name} de uma versão revisada. Exceto o definido em lei aplicável, se houver, em contrário, o presente Contrato, qualquer acesso ou uso do Site serão regidos pelas leis do República Federativa do Brasil, Brasil, excluindo seu conflito às disposições da lei, e o local adequado para quaisquer disputas decorrentes ou relacionadas com qualquer do mesmo serão os tribunais estaduais e federais localizados em Florianópolis, Santa Catarina. Com exceção de pedidos de medida cautelar ou de equidade ou reclamações relativas aos direitos de propriedade intelectual (que podem ser levados a qualquer tribunal competente, sem a constituição de uma garantia), qualquer litígio decorrente do presente Acordo será resolvido de acordo com as Regras de Arbitragem globais de Arbitragem e Mediação Judicial, Inc. (\"JAMS\") por três árbitros nomeados em conformidade com tais regras. A arbitragem terá lugar em Florianópolis, Santa Catarina, no idioma português brasileiro e a decisão arbitral pode ser executada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Contrato terá o direito de custos e honorários advocatícios. Se qualquer parte deste Contrato for considerada inválida ou inexequível, essa parte será interpretada de modo a refletir a intenção original das partes, e as parcelas restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Contrato ou qualquer violação da mesma, em qualquer instância, não vai renunciar a tal termo ou condição ou qualquer violação subseqüente. Você pode transferir seus direitos sob este Contrato a qualquer partido que consente e concorda em ficar vinculado por seus termos e condições; %{company_short_name} pode ceder seus direitos sob este Contrato sem qualquer condição. Este Acordo será vinculativo e reverterá em benefício das partes, seus sucessores e cessionários autorizados."
   deleted: 'removido'
   upload:
     unauthorized: "Desculpe-nos, o arquivo que você está tentando enviar não é autorizado (extensões autorizadas: %{authorized_extensions})."

config/locales/server.pt_BR.yml

@@ -161,7 +161,6 @@ pt_BR:
       title: "usuário novo"
     basic:
       title: "utilizador básico"
-    change_failed_explanation: "Você tentou rebaixar %{user_name} para '%{new_trust_level}'. No entanto o nível de confiança dele já é '%{current_trust_level}'. %{user_name} permanecerá em '%{current_trust_level}'"
   rate_limiter:
     too_many_requests: "Nós possuímos um limite diário do número de vezes que uma ação pode ser tomada. Por favor aguarde %{time_left} antes de tentar novamente."
     hours:
@@ -445,10 +444,6 @@ pt_BR:
     login_required_welcome_message:
       title: "Boas-vindas: Login Solicitado"
       description: "Mensagem de boas-vindas que é exibida para usuários que não estão logados quando a configuração de 'login requerido' está ativada."
-    tos_user_content_license:
-      title: "Termos do Serviço: Licença do Conteúdo"
-    tos_miscellaneous:
-      title: "Termos do Serviço: Diversos"
     login_required:
       title: "É requerido que você entre em sua conta: Página Inicial"
       description: "Texto exibido para usuários não autorizados quando é se exige entrar na conta para acessar o site."
@@ -527,7 +522,6 @@ pt_BR:
     github_client_secret: "Client secret para autenticação via Github, registrado em https://github.com/settings/applications"
     allow_restore: "Permitir restauração, que pode substituir todos os dados do site! Deixe falsa, a menos que você pretenda restaurar um backup"
     maximum_backups: "A quantidade máxima de backups para manter no disco. Backups mais antigos são excluídos automaticamente"
-    enable_s3_backups: "Enviar backups para o Amazon S3 quando completos. Certifique-se de ter preenchido as suas credenciais S3."
     s3_backup_bucket: "O repositório remoto para realizar backups. AVISO: Certifique-se de que é um repositório privado."
     active_user_rate_limit_secs: "Qual a frequencia de atualização do campo 'última vez visto em', em segundos."
     previous_visit_timeout_hours: "Quanto tempo uma visita dura antes de considerarmos como 'última visita', em horas."
@@ -618,7 +612,6 @@ pt_BR:
     incorrect_username_email_or_password: "Usuário, email ou senha incorretos"
     wait_approval: "Obrigado por se registar. Você será notificado por email quando a sua conta for aprovada."
     active: "A sua conta está ativa e pronta."
-    activate_email: "Estamos quase prontos! Enviamos um email de ativação para <b>%{email}</b>. Por favor siga as instruções no email para ativar a sua conta."
     not_activated: "Ainda não podes fazer log in. Enviamos um email de ativação para você. Por favor siga as instruções no email para ativar a sua conta."
     suspended: "Você não pode entrar até %{date}."
     suspended_with_reason: "Você não pode entrar até %{date}. Razão da sua suspensão: %{reason}"
@@ -646,15 +639,8 @@ pt_BR:
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] atualização disponível"
   flags_reminder:
-    flags_were_submitted:
-      one: "Há sinalizações que foram enviadas a mais de 1 hora."
-      other: "Há sinalizações que foram enviadas a mais de %{count} horas atrás."
     please_review: "Por favor, revise eles."
     post_number: "mensagem"
-    how_to_disable: "Desativar esse email mudando o notify_about_flags_after para 0."
-    subject_template:
-      one: "1 sinalização está esperando para ser verificada"
-      other: "%{count} sinalizações estão esperando para serem verificadas"
   flag_reasons:
     off_topic: "Sua postagem foi sinalizada como ***off-topic**: a comunidade pensa que ela não se encaixa nesse tópico, atualmente definido pelo título e sua primeira postagem."
     spam: "Sua postagem foi sinalizada como **spam*: a comunidade pensa que isso é uma propaganda não necessária ou relevante ao tópico, promocional por natureza."
@@ -843,9 +829,6 @@ pt_BR:
       #[Welcome to %{title}](#welcome)
       Este fórum de discussão requer uma conta para visualizar %{title}.  Para continuar a ler, por favor, crie uma nova conta ou entre na sua conta.
   terms_of_service:
-    user_content_license: |
-      As contribuições do usuário são licenciadas sob [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem limitação de nenhuma destas representações ou garantias, %{company_short_name} tem o direito (mas não a obrigação) de, segundo o próprio critério de %{company_short_name} (i) recusar ou remover qualquer conteúdo que, na avaliação de %{company_short_name} viole qualquer regra de %{company_short_name} ou seja de alguma forma prejudicial ou censurável, ou (ii) cancelar ou negar o acesso e a utilização do site para qualquer pessoa ou entidade, por qualquer motivo, segundo próprio e único critério de %{company_short_name}. %{company_short_name} não terá obrigação de fornecer qualquer reembolso de quaisquer valores já pagos. ⏎
-    miscellaneous: "Este Acordo constitui a totalidade do acordo entre %{company_short_name} e você sobre o assunto em questão, e só pode ser modificado por uma emenda por escrito assinado por um executivo autorizado %{company_short_name}, ou pela publicação por %{company_short_name} de uma versão revisada. Exceto o definido em lei aplicável, se houver, em contrário, o presente Contrato, qualquer acesso ou uso do Site serão regidos pelas leis do República Federativa do Brasil, Brasil, excluindo seu conflito às disposições da lei, e o local adequado para quaisquer disputas decorrentes ou relacionadas com qualquer do mesmo serão os tribunais estaduais e federais localizados em Florianópolis, Santa Catarina. Com exceção de pedidos de medida cautelar ou de equidade ou reclamações relativas aos direitos de propriedade intelectual (que podem ser levados a qualquer tribunal competente, sem a constituição de uma garantia), qualquer litígio decorrente do presente Acordo será resolvido de acordo com as Regras de Arbitragem globais de Arbitragem e Mediação Judicial, Inc. (\"JAMS\") por três árbitros nomeados em conformidade com tais regras. A arbitragem terá lugar em Florianópolis, Santa Catarina, no idioma português brasileiro e a decisão arbitral pode ser executada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Contrato terá o direito de custos e honorários advocatícios. Se qualquer parte deste Contrato for considerada inválida ou inexequível, essa parte será interpretada de modo a refletir a intenção original das partes, e as parcelas restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Contrato ou qualquer violação da mesma, em qualquer instância, não vai renunciar a tal termo ou condição ou qualquer violação subseqüente. Você pode transferir seus direitos sob este Contrato a qualquer partido que consente e concorda em ficar vinculado por seus termos e condições; %{company_short_name} pode ceder seus direitos sob este Contrato sem qualquer condição. Este Acordo será vinculativo e reverterá em benefício das partes, seus sucessores e cessionários autorizados."
     signup_form_message: 'Eu li e aceito os <a href="/tos" target="_blank">Termos de Serviço</ a>.'
   deleted: 'removido'
   upload:

config/locales/server.ru.yml

@@ -233,7 +233,6 @@ ru:
       title: "базовый пользователь"
     regular:
       title: "участник"
-    change_failed_explanation: "Вы попытались понизить пользователя %{user_name} до уровня '%{new_trust_level}'. Однако, его уровень доверия уже '%{current_trust_level}'. Пользователь %{user_name} останется в группе '%{current_trust_level}'"
   rate_limiter:
     slow_down: "Вы выполняете это действие слишком часто; пожалуйста, попробуйте еще раз позже"
     too_many_requests: "Вы повторяете действие слишком часто. Пожалуйста, подождите %{time_left} до следующей попытки."
@@ -421,10 +420,6 @@ ru:
   archetypes:
     regular:
       title: "Обычная тема"
-    banner:
-      message:
-        make: "Эта тема теперь является объявлением и будет отображаться сверху на всех страницах. Пользователи могут спрятать объявление, чтобы оно больше не показывалось для них - каждый сам для себя."
-        remove: "Эта тема больше не является объявлением и больше не будет отображаться вверху всех страниц."
   unsubscribed:
     title: 'Отписаться'
     description: "Вы отписались от рассылки. Мы более не будем посылать вам информацию."
@@ -555,12 +550,6 @@ ru:
     login_required_welcome_message:
       title: "Требуется вход: приветствие"
       description: "Приветствие, отображаемое пользователям, не вошедшим на сайт, если опция 'требуется вход' включена."
-    tos_user_content_license:
-      title: "Условия предоставления услуг: Content License"
-      description: "DEPRECATED. Not used anymore and will be removed. Edit the Terms of Service topic in the Staff category instead."
-    tos_miscellaneous:
-      title: "Условия предоставления услуг: Miscellaneous"
-      description: "DEPRECATED. Not used anymore and will be removed. Edit the Terms of Service topic in the Staff category instead."
     login_required:
       title: "Требуется вход: Начальная страница"
       description: "Текст, показываемый неавторизованным пользователям, когда требуется вход на сайт."
@@ -833,7 +822,6 @@ ru:
     incorrect_username_email_or_password: "Неверное имя пользователя, адрес электронной почты или пароль"
     wait_approval: "Спасибо за регистрацию. Мы оповестим вас, когда ваша учетная запись будет одобрена."
     active: "Ваша учетная запись активирована и готова к использованию."
-    activate_email: "Почти готово! Мы послали письмо с инструкциями по активации учетной записи на  <b>%{email}</b>."
     not_activated: "Вы пока что не можете войти на сайт. Пожалуйста, следуйте инструкциям по активации учетной записи, которые мы отправили вам  по электронной почтой."
     not_allowed_from_ip_address: "Вам нельзя входить как %{username} с этого IP адреса."
     suspended: "Вы не можете войти до %{date}."
@@ -927,15 +915,7 @@ ru:
 
       %{notes}
   flags_reminder:
-    flags_were_submitted:
-      one: "Есть жалобы, поданные более часа назад."
-      few: "Есть жалобы, поданные более %{count}ч назад."
-      other: "Есть жалобы, поданные более %{count}ч назад."
     please_review: "Пожалуйста, рассмотрите их"
-    subject_template:
-      one: "1 жалоба ожидает рассмотрения"
-      few: "%{count} жалоб(ы) ожидают рассмотрения"
-      other: "%{count} жалоб(ы) ожидают рассмотрения"
   flag_reasons:
     off_topic: "Сообщество считает, что ваше сообщение **не относится к теме**, учитывая ее заголовок и первое сообщение."
     inappropriate: "Сообщество считает ваше сообщение **неприемлемым**, т.е. оскорбительным, непристойным или нурашающим [кодекс чести](/guidelines)."
@@ -1229,9 +1209,6 @@ ru:
       Для доступа требуется учетная запись пользователя. Чтобы продолжить, пожалуйста, зарегистрируйтесь или войдите.
   terms_of_service:
     title: "Условия предоставления услуг"
-    user_content_license: |-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'Я прочитал(а) и согласен(а) с <a href="/tos" target="_blank">пользовательским соглашением</a>.'
   deleted: 'удалено'
   upload:

config/locales/server.sv.yml

@@ -342,10 +342,6 @@ sv:
     login_required_welcome_message:
       title: "Inloggning krävs: Välkomstmeddelande"
       description: "Välkomstmeddelande som visas för utloggade användare när inställningen för 'inloggning krävs' är aktiv. "
-    tos_user_content_license:
-      title: "Användarvillkor: Innehållslicens"
-    tos_miscellaneous:
-      title: "Användarvillkor: Diverse"
     login_required:
       title: "Inloggning krävs: Huvudsida"
     top:
@@ -425,7 +421,6 @@ sv:
     incorrect_username_email_or_password: "Incorrect username, email or password"
     wait_approval: "Thanks for signing up. We will notify you when your account has been approved."
     active: "Your account is active and ready."
-    activate_email: "You're almost done! We sent an activation email to <b>%{email}</b>. Please follow the instructions in the email to activate your account."
     not_activated: "You can't log in yet. We sent an activation email to you. Please follow the instructions in the email to activate your account."
     suspended: "Du kan inte logga in förrän %{date}."
     suspended_with_reason: "Du kan inte logga in förrän %{date}. Anledningen att du blev avstängd: %{reason}"

config/locales/server.uk.yml

@@ -150,7 +150,6 @@ uk:
       title: "новий користувач"
     basic:
       title: "базовий користувач"
-    change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}'"
   rate_limiter:
     too_many_requests: "У нас є обмеження щодо того, скільки разів за добу можна виконати цю дію. Будь ласка, зачекайте %{time_left} перед тим, як спробувати ще раз."
   datetime:
@@ -348,10 +347,6 @@ uk:
     login_required_welcome_message:
       title: "Потрібно увійти: Вітальне повідомлення"
       description: "Вітальне повідомлення, що відображається для користувачів, що вийшли, коли налаштування 'потрібен вхід' увімкнено."
-    tos_user_content_license:
-      title: "Умови використання: Ліцензія користувацького Контенту"
-    tos_miscellaneous:
-      title: "Умови використання: Різне"
     login_required:
       title: "Потрібно увійти: Головна сторінка"
       description: "Текст, що відображається для неавторизованих користувачів, коли потрібен вхід на сайт."
@@ -506,7 +501,6 @@ uk:
     incorrect_username_email_or_password: "Неправильне ім'я користувача, електронна скринька або пароль"
     wait_approval: "Дякуємо за реєстрацію. Ми сповістимо Вас, коли Ваш обліковий запис буде схвалено."
     active: "Тепер Ваш обліковий запис активовано і він готовий до використання."
-    activate_email: "Вже майже готово! Ми надіслали активаційного листа на скриньку <b>%{email}</b>. Будь ласка, дотимуйтеся інструкцій у листі, щоб активувати свій обліковий запис."
     not_activated: "Ви ще не можете увійти. Ми надіслали Вам активаційного листа. Будь ласка, дотримуйтеся інструкцій у листі, щоб активувати свій обліковий запис."
     suspended: "Ви не можете входити до %{date}."
     suspended_with_reason: "Ви не можете входити до %{date}. Причина призупинення Вашого облікового запису: %{reason}"
@@ -685,9 +679,6 @@ uk:
     search_google: "Google"
   terms_of_service:
     title: "Умови Використання"
-    user_content_license: |
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: 'I have read and accept the <a href="/tos" target="_blank">Terms of Service</a>.'
   deleted: 'deleted'
   upload:

config/locales/server.zh_CN.yml

@@ -248,7 +248,6 @@ zh_CN:
       title: "常规"
     elder:
       title: "领导"
-    change_failed_explanation: "您尝试将 %{user_name} 降至 '%{new_trust_level}'。然而他们的信任等级已经是 '%{current_trust_level}'。%{user_name} 将仍是 '%{current_trust_level}'"
   rate_limiter:
     slow_down: "您已经重复这一操作太多次了，请一会再重试"
     too_many_requests: "您的请求过于频繁，请等待 %{time_left} 之后再试。"
@@ -386,10 +385,6 @@ zh_CN:
   archetypes:
     regular:
       title: "常规主题"
-    banner:
-      message:
-        make: "本主题已经是一个横幅主题。它将出现在每一页的顶部，除非用户将其隐藏。"
-        remove: "本主题已经不再是横幅主题。它将不再显示在每一个页面的顶部。"
   unsubscribed:
     title: '取消订阅'
     description: "您已经取消订阅，我们不会再发送邮件给您！"
@@ -524,12 +519,6 @@ zh_CN:
     login_required_welcome_message:
       title: "登录要求：欢迎信息"
       description: "欢迎信息只有 'login required' 设置项被启用后才会向登出的用户显示。"
-    tos_user_content_license:
-      title: "服务条款：内容授权"
-      description: "废弃。不再使用并且将被移除。在职员分类中编辑服务条款。"
-    tos_miscellaneous:
-      title: "服务条款：其它"
-      description: "废弃。不再使用并且将被移除。在职员分类中编辑服务条款。"
     login_required:
       title: "登录要求：首页"
       description: "当要求登录时向未授权用户显示的文字。"
@@ -686,7 +675,6 @@ zh_CN:
     allow_restore: "允许导入数据，这将能替换所有全站数据！除非您计划导入数据，否则请保持设置为 false"
     maximum_backups: "磁盘保存的最大备份数量。老的备份将自动删除"
     backup_daily: "每天自动创建站点备份。"
-    enable_s3_backups: "当完成备份后上传备份到 S3。重要：确定在文件设置中的 S3 验证信息有效。"
     s3_backup_bucket: "远端备份 bucket。警告：确认它使私有的 bucket。"
     active_user_rate_limit_secs: "更新'最后一次见到'数据的间隔，单位为秒"
     verbose_localization: "在界面上显示详细的本地化提示"
@@ -708,7 +696,6 @@ zh_CN:
     clean_orphan_uploads_grace_period_hours: "删除孤立上传资料的宽限期（单位：小时）"
     purge_deleted_uploads_grace_period_days: "移除已删除的孤立上传资料的宽限期（单位：小时）"
     purge_inactive_users_grace_period_days: "移除不活跃用户的宽限期（单位：天）。"
-    enable_s3_uploads: "上传文件到 Amazon S3。"
     s3_use_iam_profile: '使用 AWS EC2 IAM 角色来获得 key。注意：启用这个会覆盖“S3 access key id”和“S3 secret access key” 设置。'
     s3_upload_bucket: "上传文件保存于 Amazon S3 的 bucket 名字。警告：必须为小写，无句点（.）。"
     s3_access_key_id: "将用于上传图片的 Amazon S3 access key。"
@@ -916,7 +903,6 @@ zh_CN:
     incorrect_username_email_or_password: "用户名、电子邮箱或密码不正确"
     wait_approval: "谢谢注册帐号。我们会在您的帐号获得批准之后通知您。"
     active: "您的帐号已经被激活，可以使用了。"
-    activate_email: "快完成了！我们发送了一封激活邮件<b>%{email}</b>给您，请按照邮件中的指示激活您的帐号。"
     not_activated: "您还不能登录。我们发送了一封激活邮件给您，请按照邮件中的步骤来激活您的帐号。"
     not_allowed_from_ip_address: "您不能以 %{username} 身份从该 IP 地址登陆。"
     suspended: "您要等到 %{date} 之后才能登录。"
@@ -1053,13 +1039,8 @@ zh_CN:
 
       %{notes}
   flags_reminder:
-    flags_were_submitted:
-      other: "在过去的 %{count} 小时内有新的标记。"
     please_review: "请核查他们。"
     post_number: "帖子"
-    how_to_disable: "将 notify_about_flags_after 设为 0 禁用这个通知邮件。"
-    subject_template:
-      other: "%{count} 个标记需要处理"
   flag_reasons:
     off_topic: "您的帖子被标记为**偏离主题**：社群认为它不适合处于这个主题中，主题应与标题和第一个帖子有关。"
     inappropriate: "您的帖子被标记为**不恰当**：社群认为它有冒犯、侮辱或者违反了[社群准则](/guidelines)。"
@@ -1090,80 +1071,6 @@ zh_CN:
         但是，如果帖子再次被社群标记并隐藏，它将被隐藏直至版主处理——并且可能导致进一步的措施，包括可能禁止您的用户帐号。
 
         需要了解更多，请查看我们的[社群指引](%{base_url}/guidelines)。
-    usage_tips:
-      text_body_template: |
-        这条私信包含了一些可以让您快速开始的技巧提示：
-
-        ## 保持滚动
-
-        没有下一页按钮或者页码——要阅读更多，**只需要继续向下滚动页面！**
-
-        当新的帖子加载后，它们会自动显示。
-
-        ## 我在哪儿？
-
-        - 要搜索，访问您的用户页面或者菜单，使用**右上角的图标按钮**。
-
-        - 在主题列表时，点击标题将会引导您至您下一个未读的帖子。使用最后一次活动时间调至最后一帖。
-
-        - 当在阅读主题时，通过点击帖子标题回到顶部 &uarr;。点击右下角的绿色进度条使用完整导航控制，或使用键盘上的 <kbd>home</kbd> 和 <kbd>end</kbd>键。
-
-            <img src="/images/welcome/progress-bar.png" width="143" height="39">
-
-
-
-        ## 我怎么回复？
-
-        - 要回复整个主题，使用页面最底下的回复按钮 <img src="/images/welcome/reply-topic.png" width="29" height="25">。
-
-        - 要回复特定的帖子，使用那个帖子的回复按钮 <img src="/images/welcome/reply-post.png" width="29" height="25">。
-
-        - 如果您想把讨论导向另一个方向，但是保持讨论之间的联系，请使用帖子右侧的“回复为新主题”<img src="/images/welcome/reply-as-new-topic.png" width="33" height="25">。
-
-        若想在您的回复中引用什么，选择想要引用的文字，然后点击任何回复按钮。
-
-        每一个帖子最下方有功能按钮。
-
-        <img src="/images/welcome/quote-reply.png" width="350" height="129">
-
-        （要引用整个帖子，使用编辑器工具栏的导入引用按钮。）
-
-        要在您的回复中提到某人，键入 `@`，自动完成将会弹出。
-
-        <img src="/images/welcome/username-completion.png" width="230" height="131">
-
-        要使用[标准绘文字（Emoji）](http://www.emoji-cheat-sheet.com/)，先键入`:`或传统表情符`:)` :smile
-
-        ## 我还能做什么？
-
-        <img src="/images/welcome/like-link-flag-bookmark.png" width="169" height="46">
-
-        要让别人知道您喜欢他们的帖子，使用**赞**按钮。如果您觉得一个帖子有问题，请使用**标记**按钮以私下地让它们或者我们的职员了解情况。
-
-        您可以分享一个帖子的链接，或者是收藏一个帖子以在用户也中引用他们。
-
-
-        ## 谁在跟我交谈？
-
-        当有人回复您的帖子，引用您的帖子或者使用`@用户名`提及到您的时候，一个数字将会立即出现在页面右上角。使用它查看**通知**。
-
-        <img src="/images/welcome/notification-panel.png" width="178" height="59">
-
-        不用担心错过他人的回复 —— 当别人回复您的帖子（和私信）时您不在站点上，您将会收到邮件提醒。
-
-        ## 哪一个是新讨论？
-
-        默认情况，所有小于两天的对话被认为是心的，并且所有您参与的讨论（回复过的、创建的或阅读了很长一段时间的）将自动被追踪。
-
-        您将会在主题名字附近见到蓝色的新合数字指示：
-
-        <img src="/images/welcome/topics-new-unread.png" width="368" height="89">
-
-        您可以通过帖子下方的控制选项改变每一个主题的通知状态（也可以设置每一个分类的状态）。要改变您跟踪帖子的方式，或新的定义，详见[您的用户设置](/my/preferences)。
-
-        ## 为什么我不能做某些事？
-
-        新用户因为某些安全原因被限制。只要您参与了讨论，您将会得到社群的信任，成为一个真正的成员，并且这些限制将自动被移除。当达到了一个足够的[信任等级](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)，您将会得到足够的能力来一起帮助社群管理。
     welcome_user:
       subject_template: "欢迎来到 %{site_name}！"
       text_body_template: |
@@ -1176,6 +1083,7 @@ zh_CN:
         好好享受你在论坛的时光吧！
     welcome_invite:
       subject_template: "欢迎来到 %{site_name}！"
+      text_body_template: "感谢您接受邀请加入 %{site_name} —— 欢迎！\n\n我们为您自动生成了一个用户名：**%{username}**，但是您在任何时候都可以访问[您的用户设置][prefs]来修改它。\n\n要再次登入，或者：\n\n1. 使用您喜欢的方式登入——但是必须以**同样的邮件地址**，即您收到邀请的邮箱地址登入。否则我们就无法分辨是不是您本人！\n\n2. 在 %{site_name} 的[用户设置][prefs]页面创建一个密码，然后使用该密码来登入。 \n\n%{new_user_tips}\n\n我们始终相信[讨论应该文明](%{base_url}/guidelines)。\n\n好好享受您在论坛的时光吧！\n\n[prefs]: %{user_preferences_url}\n"
     export_succeeded:
       subject_template: "导出成功"
       text_body_template: "导出操作成功。"
@@ -1240,6 +1148,11 @@ zh_CN:
         该邮件没有与已知的账户关联。试试从不同的邮件地址发送或联系一个职员。
     email_reject_empty:
       subject_template: "电子邮件错误 -- 空内容"
+      text_body_template: |
+        我们很抱歉，但是您发送至 %{destination}（名为 %{former_title}）的邮件无法发送。
+
+        我们没有在邮件中找到任何内容。请确定您在邮件的最上方写了一些内容 —— 我们不能解析行内回复。
+        如果您确实包含了内容但还收到了这个通知，试试包含 HTML 内容（而非纯文本）。
     email_reject_parsing:
       subject_template: "电子邮件错误 -- 内容无法识别"
       text_body_template: |
@@ -1480,9 +1393,6 @@ zh_CN:
       您需要一个账号。请创建一个账号或者登录以继续。
   terms_of_service:
     title: "服务条款"
-    user_content_license: |
-      用户发表内容以[知识共享 署名-非商业性使用-相同方式共享 3.0 未本地化版本](https://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh)发布。不限制任何说明或者保证，%{company_short_name} 有任何权利（而非义务）以 %{company_short_name} 的名义全权(i)拒绝或者删除任何内容。为保护 %{company_short_name} 的利益，任何违反 %{company_short_name} 政策或任何有害的、有异议的或任何(ii)对个体或者实体以任何理由中断或阻止访问该网站的权利由 %{company_short_name} 所有。%{company_short_name} 没有为已向其支付的款项提供退款的义务。
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: '我已经阅读并接受 <a href="/tos" target="_blank">服务条款</a>。'
   deleted: '已删除'
   upload:
@@ -1617,13 +1527,13 @@ zh_CN:
       是的，法律很无聊，但是我们必须保护我们自己 &ndash; 引申开来，您和您的数据 &ndash; 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述您的（或者我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，您必须同意遵守[使用条款](/tos)。
   tos_topic:
     title: "服务条款"
-    body: "下面的条款及条件适用于 %{company_domain} 网站的所有内容、服务和产品，其方式通过网站，其中包括，但不限于 %{company_domain} 论坛软件、%{company_domain} 支持论坛和在 %{company_domain} 托管服务（“托管”）（一起称为，网站）。该网站属于 %{company_full_name}（“%{COMPANY_NAME}”）并由其运营。该网站要求您必须接受所有本文中所包含的条款和条件以及其他所有的规则、政策（包括修改，但不限于 %{company_domain} 的[隐私政策](/privacy)、[社群准则](/FAQ)和程序（统称“协议”），并可能不时由 %{COMPANY_NAME} 发布。\n\n访问或使用本网站之前，请仔细阅读本协议。访问或使用网站的任何部分，即代表您同意成为受本协议的条款和条件。如果您不同意所有的条款和本协议的条件，那么您可能无法访问网站或使用任何服务。若这些条款和条件被认为是与 %{COMPANY_NAME} 的合同，则您必须接受这些条款。本网站只提供给 13 岁以上个人。\n\n<a name=\"1\"></A> \n\n## [1. 您的 %{company_domain} 帐号]（#1） \n\n如果您在网站上创建一个帐户，您有责任维护您的帐号安全，您对帐户下发生的所有活动完全负责。您必须立即通知 %{COMPANY_NAME} 关于您的帐户的任何未经授权或任何其他违反安全的使用。%{COMPANY_NAME} 不会对您的任何行或不作为，包括因该等作为或不作为而导致的任何种类的任何损失承担任何责任。 \n\n<a name=\"2\"></A> \n\n## [2. 提供者的责任]（#2） \n\n如果您张贴的材料有关于别的网站的链接，或以其他方式（或允许任何第三方进行）张贴别的网站的材料（不论何等材料，“内容”），您需对此完全负责，包括使用因该内容所造成的任何损害。不管所讨论的内容是文字、图形、音频文件或计算机软件。您声明和保证： \n\n* 下载、复制和使用内容不会侵犯专有权利，包括但不限于著作权，专利，商标或商业秘密权利的任何第三方；\n* 如果您的雇主对您的创造拥有知识产权，您必须以(i)获准从您的雇主发布或提供的内容，包括但不限于任何软件，或(ii)由您的雇主放弃拥有内容的所有权利；\n* 您已完全遵守有关该内容的第三方条约，并同意了所有面向最终用户所需的任何条款；\n* 内容不包含或安装任何病毒、蠕虫、恶意软件、特洛伊木马或其他有害或破坏性的内容；\n* 内容不是垃圾，不是机器的或随机生成的，并且不包含设计来吸引流量到第三方网站或助推第三方网站的搜索引擎排名，或者进一步非法行为不道德或不想要的广告内容（诸如网络钓鱼）或误导接受者为对材料的来源（如欺骗）；\n* 内容不色情，不包含威胁或煽动暴力，并没有侵犯任何第三方的隐私或公开权；\n* 您的内容不是不受欢迎的电子讯息，如新闻组垃圾链接、邮件列表、博客和网站，以及类似的不请自来的宣传方式宣传；\n* 您的内容不是在误导读者，以您是另外一个人或公司的方式；和 \n* 你应在内容中包含计算机代码，准确地分类和/或所描述的类型、性质、用途和材料的影响，是否请求 %{COMPANY_NAME} 或以其他方式这样做的情况下。 \n\n<a name=\"3\"></A> \n\n## [3.用户内容授权]（#3） \n\n用户贡献使用 [知识共享 署名-非商业性使用-相同方式共享3.0 Unported之许可](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh_CN)授权。在不限制任何该等陈述或保证的情况下，%{COMPANY_NAME} 有权利（但没有义务）在 %{COMPANY_NAME} 的全权酌情决定下(i)根据 %{COMPANY_NAME} 的合理意见，任何违反 %{COMPANY_NAME} 政策或以任何方式伤害或使他人反感的情况能拒绝或删除任何内容；或(ii)以任何理由终止或拒绝任何个人和组织访问和使用本网站。%{COMPANY_NAME} 有唯一裁量权。%{COMPANY_NAME} 没有义务退还先前支付的任何款项。 \n\n\n<a name=\"4\"></a> \n\n## [4. Payment and Renewal](#4)\n\n### General Terms\n\nOptional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on\
-      \ a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.\n\n### Automatic Renewal\n\nUnless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.\n\n<a name=\"5\"></a>\n\n## [5. Services](#5)\n\n### Hosting, Support Services\n\nOptional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.\n\n<a name=\"6\"></a>\n\n## [6. Responsibility of Website Visitors](#6)\n\n%{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility\
-      \ for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.\n\n<a name=\"7\"></a>\n\n## [7. Content Posted on Other Websites](#7)\n\nWe have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.\n\n<a name=\"8\"></a>\n\n## [8. Copyright Infringement and DMCA Policy](#8)\n\nAs %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.\n\
-      \n<a name=\"9\"></a>\n\n## [9. Intellectual Property](#9)\n\nThis Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.\n\n<a name=\"10\"></a>\n\n## [10. Advertisements](#10)\n\n%{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.\n\n<a name=\"11\"></a>\n\n## [11. Attribution](#11)\n\n%{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.\n\n<a name=\"12\"></a>\n\n## [12. Changes](#12)\n\n%{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.\n\n<a name=\"13\"></a>\n\n## [13. Termination](#13)\n\n%{company_name} may terminate your access to all or any part of the Website\
-      \ at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.\n\n<a name=\"14\"></a>\n\n## [14. Disclaimer of Warranties](#14)\n\nThe Website is provided \"as is\". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.\n\n<a name=\"15\"></a>\n\n## [15. Limitation of Liability](#15)\n\nIn no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.\n\n<a name=\"16\"></a>\n\n## [16. General Representation and Warranty](#16)\n\n\
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.\n\n<a name=\"17\"></a>\n\n## [17. Indemnification](#17)\n\nYou agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.\n\n<a name=\"18\"></a>\n\n## [18. Miscellaneous](#18)\n\nThis Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules\
-      \ of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.\n\n这份文件以 CC-BY-SA 授权下发布。最后更新时间为2013年5月31日。 \n\n本来改编自[WordPress的服务条款](http://en.wordpress.com/tos/)。\n"
+    body: "下面的条款及条件适用于 %{company_domain} 网站的所有内容、服务和产品，其方式通过网站，其中包括，但不限于 %{company_domain} 论坛软件、%{company_domain} 支持论坛和在 %{company_domain} 托管服务（“托管”）（一起称为，网站）。该网站属于 %{company_full_name}（“%{COMPANY_NAME}”）并由其运营。该网站要求您必须接受所有本文中所包含的条款和条件以及其他所有的规则、政策（包括修改，但不限于 %{company_domain} 的[隐私政策](/privacy)、[社群准则](/FAQ)和程序（统称“协议”），并可能不时由 %{COMPANY_NAME} 发布。\n\n访问或使用本网站之前，请仔细阅读本协议。访问或使用网站的任何部分，即代表您同意成为受本协议的条款和条件。如果您不同意所有的条款和本协议的条件，那么您可能无法访问网站或使用任何服务。若这些条款和条件被认为是与 %{COMPANY_NAME} 的合同，则您必须接受这些条款。本网站只提供给 13 岁以上个人。\n\n<a name=\"1\"></A> \n\n## [1. 您的 %{company_domain} 帐号]（#1） \n\n如果您在网站上创建一个帐户，您有责任维护您的帐号安全，您对帐户下发生的所有活动完全负责。您必须立即通知 %{COMPANY_NAME} 关于您的帐户的任何未经授权或任何其他违反安全的使用。%{COMPANY_NAME} 不会对您的任何行或不作为，包括因该等作为或不作为而导致的任何种类的任何损失承担任何责任。 \n\n<a name=\"2\"></A> \n\n## [2. 提供者的责任]（#2） \n\n如果您张贴的材料有关于别的网站的链接，或以其他方式（或允许任何第三方进行）张贴别的网站的材料（不论何等材料，“内容”），您需对此完全负责，包括使用因该内容所造成的任何损害。不管所讨论的内容是文字、图形、音频文件或计算机软件。您声明和保证： \n\n* 下载、复制和使用内容不会侵犯专有权利，包括但不限于著作权，专利，商标或商业秘密权利的任何第三方；\n* 如果您的雇主对您的创造拥有知识产权，您必须以(i)获准从您的雇主发布或提供的内容，包括但不限于任何软件，或(ii)由您的雇主放弃拥有内容的所有权利；\n* 您已完全遵守有关该内容的第三方条约，并同意了所有面向最终用户所需的任何条款；\n* 内容不包含或安装任何病毒、蠕虫、恶意软件、特洛伊木马或其他有害或破坏性的内容；\n* 内容不是垃圾，不是机器的或随机生成的，并且不包含设计来吸引流量到第三方网站或助推第三方网站的搜索引擎排名，或者进一步非法行为不道德或不想要的广告内容（诸如网络钓鱼）或误导接受者为对材料的来源（如欺骗）；\n* 内容不色情，不包含威胁或煽动暴力，并没有侵犯任何第三方的隐私或公开权；\n* 您的内容不是不受欢迎的电子讯息，如新闻组垃圾链接、邮件列表、博客和网站，以及类似的不请自来的宣传方式宣传；\n* 您的内容不是在误导读者，以您是另外一个人或公司的方式；和 \n* 你应在内容中包含计算机代码，准确地分类和/或所描述的类型、性质、用途和材料的影响，是否请求 %{COMPANY_NAME} 或以其他方式这样做的情况下。 \n\n<a name=\"3\"></A> \n\n## [3.用户内容授权]（#3） \n\n用户贡献使用 [知识共享 署名-非商业性使用-相同方式共享3.0 Unported之许可](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh_CN)授权。在不限制任何该等陈述或保证的情况下，%{COMPANY_NAME} 有权利（但没有义务）在 %{COMPANY_NAME} 的全权酌情决定下(i)根据 %{COMPANY_NAME} 的合理意见，任何违反 %{COMPANY_NAME} 政策或以任何方式伤害或使他人反感的情况能拒绝或删除任何内容；或(ii)以任何理由终止或拒绝任何个人和组织访问和使用本网站。%{COMPANY_NAME} 有唯一裁量权。%{COMPANY_NAME} 没有义务退还先前支付的任何款项。 \n\n\n<a name=\"4\"></a> \n\n## [4. Payment and Renewal](#4)\n\n### General Terms\n\nOptional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated.\
+      \ Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.\n\n### Automatic Renewal\n\nUnless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.\n\n<a name=\"5\"></a>\n\n## [5. Services](#5)\n\n### Hosting, Support Services\n\nOptional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.\n\n<a name=\"6\"></a>\n\n## [6. Responsibility of Website Visitors](#6)\n\n%{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions,\
+      \ stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.\n\n<a name=\"7\"></a>\n\n## [7. Content Posted on Other Websites](#7)\n\nWe have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.\n\n<a name=\"8\"></a>\n\n## [8. Copyright Infringement and DMCA Policy](#8)\n\nAs %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination,\
+      \ %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.\n\n<a name=\"9\"></a>\n\n## [9. Intellectual Property](#9)\n\nThis Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.\n\n<a name=\"10\"></a>\n\n## [10. Advertisements](#10)\n\n%{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.\n\n<a name=\"11\"></a>\n\n## [11. Attribution](#11)\n\n%{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.\n\n<a name=\"12\"></a>\n\n## [12. Changes](#12)\n\n%{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions\
+      \ of this Agreement.\n\n<a name=\"13\"></a>\n\n## [13. Termination](#13)\n\n%{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.\n\n<a name=\"14\"></a>\n\n## [14. Disclaimer of Warranties](#14)\n\nThe Website is provided \"as is\". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.\n\n<a name=\"15\"></a>\n\n## [15. Limitation of Liability](#15)\n\nIn no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond\
+      \ their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.\n\n<a name=\"16\"></a>\n\n## [16. General Representation and Warranty](#16)\n\nYou represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.\n\n<a name=\"17\"></a>\n\n## [17. Indemnification](#17)\n\nYou agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.\n\n<a name=\"18\"></a>\n\n## [18. Miscellaneous](#18)\n\nThis Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual\
+      \ property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.\n\n这份文件以 CC-BY-SA 授权下发布。最后更新时间为2013年5月31日。 \n\n本来改编自[WordPress的服务条款](http://en.wordpress.com/tos/)。\n"
   privacy_topic:
     title: "隐私政策"
     body: |

config/locales/server.zh_TW.yml

@@ -296,10 +296,6 @@ zh_TW:
   archetypes:
     regular:
       title: "一般討論話題"
-    banner:
-      message:
-        make: "此討論話題已成為橫幅討論話題，它將顯示於每頁的正上方，直到用戶將其關閉。"
-        remove: "此討論話題不再是橫幅討論話題，它將不再顯示於每頁的正上方。"
   unsubscribed:
     title: '取消訂閱'
     description: "你已經取消訂閱，我們不會再聯絡你。"
@@ -424,10 +420,6 @@ zh_TW:
     login_required_welcome_message:
       title: "請登入：歡迎訊息"
       description: "歡迎資訊只會在已啟用'login required'時向未登入的用戶顯示"
-    tos_user_content_license:
-      title: "服務條款：內容授權"
-    tos_miscellaneous:
-      title: "服務條款：其它"
     login_required:
       title: "請登入：首頁"
     head:
@@ -559,7 +551,6 @@ zh_TW:
     max_private_messages_per_day: "每個用戶每天最多能發\"私訊\"的數量"
     suggested_topics: "討論話題下的推薦話題數量"
     limit_suggested_to_category: "目前的話題下只顯示同分類的推薦話題"
-    enable_s3_uploads: "上傳檔案到 Amazon S3"
     s3_upload_bucket: "上傳檔案到 Amazon S3 的 bucket 名，警告：必須為英文小寫，且無句點（.）"
     s3_access_key_id: "上傳至 Amazon S3 的 access key id，將用於上傳圖片"
     s3_secret_access_key: "上傳至 Amazon S3 的 secret access key，將用於上傳圖片"
@@ -662,7 +653,6 @@ zh_TW:
     incorrect_username_email_or_password: "用戶名、電子郵箱或密碼不正確"
     wait_approval: "謝謝註冊帳號。我們會在你的帳號獲得批准之後通知你。"
     active: "你的帳號已經被啟用，可以使用了。"
-    activate_email: "快完成了！我們發送了一封啟用郵件<b>%{email}</b>給你，請按照郵件中的步驟來啟用你的帳號。"
     not_activated: "你還不能登入。我們發送了一封啟用郵件給你，請按照郵件中的步驟來啟用你的帳號。"
     suspended: "你在 %{date} 之前無法登入。"
     suspended_with_reason: "你在 %{date} 之前無法登入。你被停權的理由：%{reason}"
@@ -705,13 +695,8 @@ zh_TW:
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] 可以升級"
   flags_reminder:
-    flags_were_submitted:
-      other: "在過去的 %{count} 小時內有新的標記"
     please_review: "請再次確認。"
     post_number: "文章"
-    how_to_disable: "將 notify_about_flags_after 設為 0 來禁用此來通知 EMail"
-    subject_template:
-      other: "%{count} 個標記需要處理"
   flag_reasons:
     off_topic: "你的文章被標記為 **離題**：社群認為它不切合主題，也就是該討論話題的標題和首篇文章所述之內容。"
     spam: "你的文章被標記為 **垃圾內容**：我們認為這是一則廣告，和討論話題無關只是促銷資訊。"
@@ -881,9 +866,6 @@ zh_TW:
     search_title: "搜尋該網頁"
     search_google: "Google"
   terms_of_service:
-    user_content_license: |
-      使用者的內容基於 [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US) 授權。. Without limiting any of those representations or warranties, %{company_short_name} has the right (though not the obligation) to, in %{company_short_name}’s sole discretion (i) refuse or remove any content that, in %{company_short_name}’s reasonable opinion, violates any %{company_short_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_short_name}’s sole discretion. %{company_short_name} will have no obligation to provide a refund of any amounts previously paid.
-    miscellaneous: "This Agreement constitutes the entire agreement between %{company_short_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_short_name}, or by the posting by %{company_short_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_short_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns."
     signup_form_message: '我已閱讀並接受 <a href="/tos" target="_blank">服務條款</a>'
   deleted: '已刪除'
   upload:

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

@@ -3,7 +3,7 @@
 # Never edit this file. It will be overwritten when translations are pulled from Transifex.
 #
 # To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-pt-br/
+# https://www.transifex.com/projects/p/discourse-org/
 
 fr:
   js:

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

@@ -3,7 +3,7 @@
 # Never edit this file. It will be overwritten when translations are pulled from Transifex.
 #
 # To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-pt-br/
+# https://www.transifex.com/projects/p/discourse-org/
 
 zh_CN:
   js:

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

@@ -3,7 +3,7 @@
 # Never edit this file. It will be overwritten when translations are pulled from Transifex.
 #
 # To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-pt-br/
+# https://www.transifex.com/projects/p/discourse-org/
 
 zh_CN:
   activerecord:

public/403.ru.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Вы не можете этого сделать (403)</title>
-<meta http-equiv="Content-Type" content="text/html;" charset="utf-8">
+<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; }
     div.dialog {

public/422.ru.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Ваш запрос отклонен (HTTP-422)</title>
-<meta http-equiv="Content-Type" content="text/html;" charset="utf-8">
+<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; }
     div.dialog {

public/500.ru.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>HTTP-500</title>
-<meta http-equiv="Content-Type" content="text/html;" charset="utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>Упс...</h1>

public/503.fr.html

@@ -1,11 +1,11 @@
 <html>
 <head>
-<title>Le site est actuellement en cours de maintenance - Discourse.org</title>
+<title>Site est en cours de maintenance.</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-    <h1>Nous sommes actuellement indisponibles pour cause de maintenance.</h1>
-    <p>Merci de réessayer <span id="when-to-check-back">dans quelques minutes.</span></p>
-    <p id="apology">Merci pour votre compréhension !</p>
+    <h1>Nous sommes actuellement indisponible pour une maintenance planifiée.</h1>
+    <p>Merci de revenir <span id="when-to-check-back"> dans quelques minutes&lt;/ span&gt;.</span></p>
+    <p id="apology">Désolé pour le dérangement !</p>
 </body>
 </html>

public/503.pl_PL.html

@@ -1,11 +1,11 @@
 <html>
 <head>
 <title>Przerwa techniczna - Discourse.org</title>
-<meta http-equiv="tx_dqsymbolContent-Typetx_dqsymbol" content="tx_dqsymboltext/html;" charset="utf-8tx_dqsymbol">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>Strona jest aktualnie nieczynna z powodu planowanych działań technicznych</h1>
     <p>Zajrzyj tutaj <span id="when-to-check-back">za parę minut</span>.</p>
-    <p id="tx_dqsymbolapologytx_dqsymbol">Przepraszamy za niedogodności!</p>
+    <p id="apology">Przepraszamy za niedogodności!</p>
 </body>
 </html>

public/503.ru.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Технические работы на сайте</title>
-<meta http-equiv="Content-Type" content="text/html;" charset="utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
     <h1>На сайте проводятся плановые технические работы</h1>

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

@@ -3,7 +3,7 @@
 # Never edit this file. It will be overwritten when translations are pulled from Transifex.
 #
 # To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-pt-br/
+# https://www.transifex.com/projects/p/discourse-org/
 
 cs:
   site_settings:

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

@@ -3,7 +3,7 @@
 # Never edit this file. It will be overwritten when translations are pulled from Transifex.
 #
 # To work with us on translations, join this project:
-# https://www.transifex.com/projects/p/discourse-pt-br/
+# https://www.transifex.com/projects/p/discourse-org/
 
 nl:
   site_settings: