updated 38 locale files [ci skip]

config/locales/devise/devise.nl.yml

@@ -31,15 +31,27 @@ nl:
       hello: "Hallo %{email}!"
       invitation_instructions:
         accept: "Accepteer uitnodiging"
+        arrived: "Het sociale netwerk waar je op hebt gewacht is hier. Vernieuwd, veiliger, leuker, %{strong_diaspora} is laat je het web op een hele nieuwe manier delen en verkennen."
         be_yourself: "Wees jezelf"
         be_yourself_paragraph: "Het Internet heeft unieke nieuwe manieren mogelijk gemaakt om onszelf te uiten. %{strong_diaspora} laat jou jezelf zijn en laat jou delen hoe je dat wilt, met of zonder je echte naam."
         displaying_correctly: "Ziet deze e-mail er niet goed uit? %{link} in jouw browser"
         email_us: "Voor algemene vragen of hulp met je Diaspora account kun je een e-mail sturen naar %{email}."
         finally: "Eindelijk - het is er"
         friends_saying: "Wat je vrienden zeggen..."
+        get_connected_paragraph: "Als internationale beweging met een gedeelde visie voor een beter web, is de community het belangrijkste kenmerk van %{strong_diaspora}. Ontmoet nieuwe mensen, connect met vrienden, en join the fun."
+        have_fun: "Veel plezier"
+        have_fun_paragraph: "%{strong_diaspora} draait helemaal om het online ontdekken van geweldige content en mensen. %{link}, 's werelds eerste %{strong_diaspora} toepassing is nog maar het begin. Verzamel en deel het web in al zijn glorie."
+        here: hier
         ignore: "Als je de uitnodiging niet wilt accepteren, negeer dan deze E-mail."
+        join_team: "Sluit je aan bij ons Team"
+        love: "Liefs,"
+        made_by_people: "%{strong_diaspora} is gemaakt door mensen die net zoveel van het Internet houden als jij. %{jointeam}, of %{helpfund}!"
+        more_people: "Nog meer mensen zijn enthousiast je te zien!"
         no_account_till: "Je account wordt niet aangemaakt totdat je de bovenstaande link bezoekt en je aanmeldt."
+        or: of
+        sign_up_now: "Meld je nu aan →"
         subject: "Je bent uitgenodigd om lid te worden van Diaspora!"
+        unsubscribe: "Om je af te melden, klik %{link}."
         view_in: "View in"
       inviter:
         accept_at: "op %{url}, je kunt deze accepteren via onderstaande link."

config/locales/devise/devise.zh-CN.yml

@@ -31,6 +31,7 @@ zh-CN:
       hello: "您好, %{email}!"
       invitation_instructions:
         accept: 接收请求
+        be_yourself: 就做你自己
         displaying_correctly: "Email not displaying correctly? %{link} in your browser"
         ignore: 如果您不想接收这个邀请，请忽略这封邮件。
         no_account_till: 只有在您点击上面的链接并注册后，您的帐号才会被创建。

config/locales/diaspora/bg.yml

@@ -196,7 +196,6 @@ bg:
       add_a_new_aspect: "Създаване на аспект"
       add_to_aspect: "добавете някой от контактите си към \"%{name}\""
       all_contacts: "Всички контакти"
-      check_out: Прегледайте
       many_people_are_you_sure: "Наистина ли желаете да започнете частен разговор с повече от %{suggested_limit} контакта? Публикация в аспекта е по-подходящ начин за свързване с толкова хора."
       my_contacts: "Моите контакти"
       no_contacts: "Изглежда трябва да добавите контакти!"

config/locales/diaspora/da.yml

@@ -196,8 +196,8 @@ da:
     index:
       add_a_new_aspect: "Tilføj nyt aspekt"
       add_to_aspect: "Tilføj kontaktpersoner til %{name}"
+      add_to_aspect_link: "tilføj kontakter til %{name}"
       all_contacts: "Alle kontakter"
-      check_out: Tjek
       many_people_are_you_sure: "Er du sikker på du vil starte en privat samtale med mere end %{suggested_limit} kontakter? Et indlæg til dette aspekt kan være en bedre måde at kontakte dem."
       my_contacts: "Mine kontakter"
       no_contacts: "Det ser ud til at du bliver nødt til at tilføje nogle kontakter!"
@@ -302,6 +302,7 @@ da:
       to: Til
   layouts:
     application:
+      back_to_top: "Tilbage til toppen"
       public_feed: "Offentligt Diaspora nyheds feed for  %{name}"
       toggle: "skift mobil side"
       whats_new: "Hvad er nyt?"
@@ -571,6 +572,7 @@ da:
         other: "%{count} billeder af %{author}"
         two: "To billeder af %{author}"
         zero: "Ingen billeder af %{author}"
+      reshare_by: "Videredelt af %{author}"
   previous: Forrige
   privacy: Privatindstillinger
   privacy_policy: "Behandling af personlige oplysninger"

config/locales/diaspora/de.yml

@@ -200,11 +200,14 @@ de:
     index:
       add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
       add_to_aspect: "Füge Kontakte zu %{name} hinzu"
+      add_to_aspect_link: "füge Kontakte zu »%{name}« hinzu"
       all_contacts: "Alle Kontakte"
-      check_out: Abmelden
+      community_spotlight: Gemeinschafts-Schaukasten
       many_people_are_you_sure: "Bist du dir sicher, dass du eine private Unterhaltung mit mehr als %{suggested_limit} Kontakten beginnen möchtest? Einen Beitrag in diesen Aspekt zu schreiben könnte ein besserer Weg sein, um sie zu kontaktieren."
       my_contacts: "Meine Kontakte"
       no_contacts: "Sieht so aus, als müsstest du einige Kontakte hinzufügen!"
+      no_contacts_message: "Guck’ in den %{community_spotlight}"
+      no_contacts_message_with_aspect: "Guck’ in den %{community_spotlight} oder %{add_to_aspect_link}"
       only_sharing_with_me: "Nur mit dir Teilende"
       remove_person_from_aspect: "Entferne %{person_name} aus \"%{aspect_name}\""
       start_a_conversation: "Beginne eine Unterhaltung"
@@ -308,6 +311,7 @@ de:
       to: An
   layouts:
     application:
+      back_to_top: "Zurück zum Anfang"
       powered_by: "BETRIEBEN MIT DIASPORA*"
       public_feed: "Öffentlicher Diaspora Feed von %{name}"
       toggle: "Mobile Ansicht umschalten"
@@ -589,7 +593,7 @@ de:
   profile: Profil
   profiles:
     edit:
-      allow_search: "Erlaube anderen auf Diaspora nach dir zu suchen"
+      allow_search: "Anderen erlauben, auf Diaspora nach dir zu suchen"
       edit_profile: "Profil bearbeiten"
       first_name: Vorname
       last_name: Nachname
@@ -741,6 +745,7 @@ de:
     notification:
       new: "Neue %{type} von %{from}"
     public_explain:
+      atom_feed: Atom-Feed
       control_your_audience: "Kontrolliere deine Zielgruppe"
       logged_in: "Eingeloggt in %{service}"
       manage: "Verbundene Dienste verwalten"

config/locales/diaspora/de_formal.yml

@@ -199,7 +199,6 @@ de_formal:
       add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
       add_to_aspect: "Füge Kontakte zu %{name} hinzu"
       all_contacts: "Alle Kontakte"
-      check_out: Abmelden
       many_people_are_you_sure: "Sind Sie sich sicher, dass Sie eine private Unterhaltung mit mehr als %{suggested_limit} Kontakten beginnen möchten? Einen Beitrag in diesen Aspekt zu schreiben könnte ein besserer Weg sein, um sie zu kontaktieren."
       my_contacts: "Meine Kontakte"
       no_contacts: "Sieht so aus als müssten Sie einige Kontakte hinzufügen!"

config/locales/diaspora/el.yml

@@ -198,7 +198,6 @@ el:
       add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
       add_to_aspect: "Προσθέστε επαφές στο %{name}"
       all_contacts: "Όλες οι Επαφές"
-      check_out: "Ρίξε μια ματιά"
       many_people_are_you_sure: "Είστε σίγουρος/η ότι θέλετε να ξεκινήσετε μια ιδιωτική συνομιλία με περισσότερες από %{suggested_limit} επαφές? Η δημοσίευση σε αυτή την πτυχή ίσως είναι ένας καλύτερος τρόπος για να επικοινωνήσετε μαζί τους."
       my_contacts: "Οι Επαφές μου"
       no_contacts: "Φαίνεται πως χρειάζεται να προσθέσετε μερικές επαφές! "

config/locales/diaspora/en_1337.yml

@@ -175,7 +175,6 @@ en_1337:
       add_a_new_aspect: "4DD 4 N3W 45P3C7!"
       add_to_aspect: "4DD N00B5 2: %{name}"
       all_contacts: "4LL N00B5"
-      check_out: "CH3CK 0U7"
       many_people_are_you_sure: "R34LLY W4NN4 5P4M %{suggested_limit} N00B5? 5P4MM1NG 7H31R 45P3C7 M4Y B3 M0R3 1N73LL1G3N7!"
       my_contacts: "Y0UR N00B5"
       no_contacts: "L00K5 L1K3 U N33D 70 PWN M0R3 N00B5!"

config/locales/diaspora/eo.yml

@@ -202,7 +202,6 @@ eo:
       add_a_new_aspect: "Aldoni novan aspekton"
       add_to_aspect: "aldoni kontaktojn al %{name}"
       all_contacts: "Ĉiuj kontaktoj"
-      check_out: Vidu
       many_people_are_you_sure: "Ĉu vi certas, ke vi volas mesaĝi pli ol {suggested_limit} homojn? Afiŝi al tiu ĉi aspekto eble estas pli bona metodo kontakti ilin."
       my_contacts: "Miaj kontaktoj"
       no_contacts: "Vi bezonos aldoni iujn kontaktojn!"

config/locales/diaspora/es-AR.yml

@@ -202,7 +202,6 @@ es-AR:
       add_a_new_aspect: "Añadir un nuevo aspecto"
       add_to_aspect: "añade contactos a %{name}"
       all_contacts: "Todos los Contactos"
-      check_out: "Echa un vistazo a la "
       many_people_are_you_sure: "Estás seguro que querés comenzar una conversación privada con más de  %{suggested_limit} contactos? Publicando a este aspecto puede ser una mejor manera de contactarlos."
       my_contacts: "Mis Contactos"
       no_contacts: "Parece que necesitás agregar algunos contactos!"

config/locales/diaspora/es-CL.yml

@@ -200,7 +200,6 @@ es-CL:
       add_a_new_aspect: "Agregar un nuevo aspecto"
       add_to_aspect: "Añadir contactos a %{name}"
       all_contacts: "Todos los Contactos"
-      check_out: Desmarcar
       many_people_are_you_sure: "Estas seguro que quieres iniciar una conversación privada con más de %{suggested_limit} contactos? Postear algo en este aspecto quizás sea una mejor manera de contactarte con ellos."
       my_contacts: "Mis Contactos"
       no_contacts: "Parece que necesitas agregar algunos contactos!"

config/locales/diaspora/es.yml

@@ -202,10 +202,12 @@ es:
       add_a_new_aspect: "Añade un nuevo aspecto"
       add_to_aspect: "añade contactos a %{name}"
       all_contacts: "Todos los contactos"
-      check_out: "Echa un vistazo a la"
+      community_spotlight: "Comunidad Creativa"
       many_people_are_you_sure: "¿Estás seguro que quieres comenzar una conversación privada con más de %{suggested_limit} contactos? Publicar en sus aspectos podría ser mejor para contactar con ellos."
       my_contacts: "Mis Contactos"
       no_contacts: "¡Parece que necesitas añadir algunos contactos!"
+      no_contacts_message: "Echa un vistazo a %{community_spotlight}"
+      no_contacts_message_with_aspect: "Echa un vistazo a %{community_spotlight} o %{add_to_aspect_link}"
       only_sharing_with_me: "Solo compartiendo conmigo"
       remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
       start_a_conversation: "Inicia una conversación"
@@ -740,6 +742,7 @@ es:
     notification:
       new: "Nuevo %{type} de %{from}"
     public_explain:
+      atom_feed: "fuentes Atom"
       control_your_audience: "Controla tu Audiencia"
       logged_in: "conectado a %{service}"
       manage: "gestión de servicios conectados"

config/locales/diaspora/eu.yml

@@ -199,7 +199,6 @@ eu:
       add_a_new_aspect: "Alderdi berria gehitu"
       add_to_aspect: "Adiskideak gehitu %{name}(e)n"
       all_contacts: "Adiskide Guztiak"
-      check_out: Probatu
       many_people_are_you_sure: "Ziur al zaude elkarrizketa pribatu bat hasi nahi duzula %{suggested_limit} baino lagun gehiagorekin? Alderdi horretan mezu bat bidaltzea beharbada haiekin harremanetan egoteko modu hobea izan daiteke."
       my_contacts: "Nire Adiskideak"
       no_contacts: "Badirudi lagun batzuk gehitu behar dituzula!"

config/locales/diaspora/fi.yml

@@ -199,7 +199,6 @@ fi:
       add_a_new_aspect: "Lisää näkymä"
       add_to_aspect: "lisää kontakteja näkymään %{name}"
       all_contacts: "Kaikki kontaktit"
-      check_out: Katso
       many_people_are_you_sure: "Oletko varma, että haluat aloittaa yksityiskeskustelun useamman kuin %{suggested_limit} kontaktin kanssa? Viestin lähettäminen tähän näkymään voisi olla parempi tapa olla yhteydessä heihin."
       my_contacts: Kontaktini
       no_contacts: "Sinun pitäisi näköjään lisätä kontakteja!"

config/locales/diaspora/fr.yml

@@ -196,7 +196,6 @@ fr:
       add_a_new_aspect: "Ajouter un nouvel aspect"
       add_to_aspect: "ajouter les contacts à %{name}"
       all_contacts: "Tous les contacts"
-      check_out: Vérifiez
       many_people_are_you_sure: "Êtes-vous sûr de vouloir commencer une conversation privée avec plus de %{suggested_limit} contacts? Envoyer des messages à cet aspect peut être un meilleur moyen de les contacter."
       my_contacts: "Mes Contacts"
       no_contacts: "On dirait que vous avez besoin d'ajouter quelques contacts !"
@@ -301,6 +300,7 @@ fr:
       to: À
   layouts:
     application:
+      back_to_top: "Retour en haut"
       powered_by: "MIS EN SERVICE PAR DIASPORA*"
       public_feed: "Flux Diaspora public pour %{name}"
       toggle: "activer/désactiver la version mobile"

config/locales/diaspora/he.yml

@@ -207,7 +207,6 @@ he:
       add_a_new_aspect: "הוספת היבט חדש"
       add_to_aspect: " %{name}הוסף אנשי קשר ל"
       all_contacts: "כל אנשי הקשר"
-      check_out: יציאה
       many_people_are_you_sure: "האם אכן ברצונך לפתוח בשיחה פרטית עם למעלה מ־%{suggested_limit} אנשי קשר? פרסום להיבט זה הוא רעיון מוצלח יותר ליצירת קשר אתם."
       my_contacts: "אנשי הקשר שלי"
       no_contacts: "נראה כאילו עליך להוסיף עוד קצת אנשי קשר!"

config/locales/diaspora/hu.yml

@@ -200,7 +200,6 @@ hu:
       add_a_new_aspect: "Új csoport"
       add_to_aspect: "Kapcsolatok hozzáadása %{name}"
       all_contacts: "Összes ismerős"
-      check_out: "Nézd meg"
       many_people_are_you_sure: "Biztos, hogy privát beszélgetést akarsz kezdeményezni több mint %{suggested_limit} személlyel? Talán jobb lenne, ha bejegyzést írnál ennek a csoportnak."
       my_contacts: Kapcsolataim
       no_contacts: "Nincs ismerősöd."

config/locales/diaspora/ko.yml

@@ -201,11 +201,14 @@ ko:
     index:
       add_a_new_aspect: "새 애스펙 추가"
       add_to_aspect: "%{name} 애스펙에 컨택 추가"
+      add_to_aspect_link: "%{name} 애스펙으로 추가하세요"
       all_contacts: "모든 컨택"
-      check_out: 체크아웃
+      community_spotlight: "커뮤니티 스포트라이트"
       many_people_are_you_sure: "컨택 %{suggested_limit}명보다 많은 사람들에게 쪽지를 보내려 하십니까? 해당 애스펙에 게시물을 공유하길 권합니다."
       my_contacts: "내 컨택"
       no_contacts: "컨택을 좀 추가하는게 어때요?"
+      no_contacts_message: "%{community_spotlight}를 확인하세요"
+      no_contacts_message_with_aspect: "%{community_spotlight}를 확인하거나 %{add_to_aspect_link}"
       only_sharing_with_me: "나와만 공유하고 있는 사람들"
       remove_person_from_aspect: "\"%{aspect_name} 애스펙에서 %{person_name}님 지우기"
       start_a_conversation: "대화를 시작하세요"
@@ -309,6 +312,7 @@ ko:
       to: 받는이
   layouts:
     application:
+      back_to_top: "맨 위로 돌아가기"
       powered_by: "디아스포라* 제공"
       public_feed: "%{name}님의 공개 디아스포라 피드"
       toggle: 모바일
@@ -741,6 +745,7 @@ ko:
     notification:
       new: "%{from}님의 새 %{type}"
     public_explain:
+      atom_feed: "Atom 구독"
       control_your_audience: "보일 사람 제어하기"
       logged_in: "%{service}에 로그인 되었습니다"
       manage: "연결된 서비스 관리"

config/locales/diaspora/ml.yml

@@ -201,11 +201,14 @@ ml:
     index:
       add_a_new_aspect: "Add a new aspect"
       add_to_aspect: "add contacts to %{name}"
+      add_to_aspect_link: "add contacts to %{name}"
       all_contacts: "All Contacts"
-      check_out: "Check out"
+      community_spotlight: "Community Spotlight"
       many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
+      no_contacts_message: "Check out %{community_spotlight}"
+      no_contacts_message_with_aspect: "Check out %{community_spotlight} or %{add_to_aspect_link}"
       only_sharing_with_me: "Only sharing with me"
       remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
       start_a_conversation: "Start a conversation"
@@ -744,6 +747,7 @@ ml:
     notification:
       new: "പുതിയ %{type} %{from} ല്‍ നിന്ന്"
     public_explain:
+      atom_feed: "Atom feed"
       control_your_audience: "Control your Audience"
       logged_in: "%{service} ലേയ്ക്ക് പ്രവേശിച്ചിരിക്കുന്നു."
       manage: "ബന്ധിപ്പിച്ചിരിക്കുന്ന സേവനങ്ങളെ കൈകാര്യം ചെയ്യുക"

config/locales/diaspora/ms.yml

@@ -132,7 +132,6 @@ ms:
       add_a_new_aspect: "Tambah aspek baru"
       add_to_aspect: "menambah kenalan ke %{name}"
       all_contacts: "Semua Kenalan"
-      check_out: "Daftar keluar"
       many_people_are_you_sure: "Adakah anda pasti anda mahu untuk memulakan perbualan peribadi dengan lebih daripada% {suggested_limit} kenalan? Posting ke aspek ini mungkin cara yang lebih baik untuk menghubungi mereka."
       my_contacts: "Kenalan Saya"
       only_sharing_with_me: "Hanya berkongsi dengan saya"

config/locales/diaspora/nb.yml

@@ -59,6 +59,9 @@ nb:
       success: "Kontakt lagt til aspekt."
     aspect_contacts:
       done_editing: fullfør
+    aspect_listings:
+      add_an_aspect: "+ Lag et nytt aspekt"
+      edit_aspect: "Rediger %{name}"
     aspect_stream:
       stay_updated: "Hold deg oppdatert"
       stay_updated_explanation: "Din hovedstrøm viser alle kontaktene dine, tags du følger, og innlegg fra noen kreative medlemmer i felleskapet. "
@@ -66,7 +69,7 @@ nb:
     contacts_visible: "Kontakter i dette aspektet vil kunne se hverandre."
     create:
       failure: "Greide ikke å opprette aspektet."
-      success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
+      success: "Aspektet %{name} har blitt laget"
     destroy:
       failure: "%{Name} er ikke tom, og kunne ikke fjernes."
       success: "%{name} har blitt fjerna."
@@ -91,6 +94,9 @@ nb:
         explanation: "Cubbi.es er den første Diaspora-applikasjonen som er i utviklingsfasen."
         heading: "Koble til Cubbi.es"
         learn_more: "Lær mer"
+      diaspora_id:
+        content_1: "Diaspora-ID-en din er:"
+        heading: Diaspora-ID
       donate: Doner
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       help:
@@ -101,13 +107,17 @@ nb:
         tag_question: "#question"
       introduce_yourself: "Dette er strømmen din. Hopp inn og presenter deg selv."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      new_here:
+        learn_more: "Lær mer"
       no_contacts: "Ingen kontakter"
       no_tags: "No tags"
       people_sharing_with_you: "Folk som deler med deg"
       post_a_message: "legg ut en melding >>"
       services:
         content: "Du kan koble følgende tjenester til Diaspora:"
+        heading: "Koble til tjenester"
       welcome_to_diaspora: "Velkommen til Diaspora, %{name}!"
+      your_aspects: "Dine aspekter"
     many: "%{count} aspekter"
     move_contact:
       error: "Feil ved flytting av kontakt: %{inspect}"
@@ -119,7 +129,7 @@ nb:
     no_contacts_message:
       try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
     no_posts_message:
-      start_talking: "Ingen har sagt noe enda. Få samtalen i gang!"
+      start_talking: "Ingen har sagt noe enda!"
     one: "1 aspekt"
     other: "%{count} aspekter"
     seed:
@@ -127,6 +137,7 @@ nb:
       friends: Venner
       work: Jobb
     selected_contacts:
+      manage_your_aspects: "Håndter aspektene dine."
       no_contacts: "Du har ingen kontakter her enda."
       view_all_community_spotlight: "Se alle community spotlight"
       view_all_contacts: "Vis alle kontakter"
@@ -137,6 +148,9 @@ nb:
       failure: "Aspektet ditt, %{name}, har for langt navn."
       success: "Aspektet ditt, %{name}, har blitt endra."
     zero: "ingen aspekter"
+  authorizations:
+    index:
+      revoke_access: "Trekk tilbake tilgangen"
   back: Tilbake
   bookmarklet:
     explanation: "%{link} fra hvor som helst ved å bokmerke denne linken."
@@ -149,7 +163,7 @@ nb:
     few: "%{count} kommentarer"
     many: "%{count} kommentarer"
     new_comment:
-      comment: Kommentér
+      comment: Kommenter
       commenting: Kommenterer...
     one: "1 kommentar"
     other: "%{count} kommentarer"
@@ -163,7 +177,6 @@ nb:
       add_a_new_aspect: "Legg til nytt aspekt"
       add_to_aspect: "Add contacts to %{name}"
       all_contacts: "Alle kontakter"
-      check_out: "Sjekk ut"
       many_people_are_you_sure: "Er du sikker på at du vil starte en privat samtale med flere enn %{suggested_limit} kontakter? Det kan være bedre å poste dette som et innlegg til dette aspektet. "
       my_contacts: "Mine kontakter"
       no_contacts: "Ingen kontakter."
@@ -181,6 +194,7 @@ nb:
     zero: "ingen kontakter"
   conversations:
     create:
+      fail: "Ugyldig melding"
       sent: "Melding sendt"
     destroy:
       success: "Samtale fjernet"
@@ -202,6 +216,8 @@ nb:
     new:
       subject: emne
       to: til
+    new_message:
+      fail: "Ugyldig melding"
     show:
       delete: "slett og blokkér samtalen"
       reply: svar
@@ -245,6 +261,7 @@ nb:
       comma_seperated_plz: "Du kan skrive inn flere epostadresser delt med komma."
       if_they_accept_info: "Hvis de aksepterer, vil de bli lagt til i aspektet du valgte."
       invite_someone_to_join: "Inviter noen til Diaspora!"
+      language: Språk
       personal_message: "Personlig melding"
       resend: "Send på nytt"
       send_an_invitation: "Send en invitasjon"
@@ -266,6 +283,7 @@ nb:
       profile: profil
       recent_notifications: "Nye notifications"
       settings: innstillinger
+      view_all: "Vis alle"
   likes:
     likes:
       people_dislike_this:
@@ -273,22 +291,23 @@ nb:
         many: "%{count} personer misliker dette"
         one: "1 person misliker dette"
         other: "%{count} personer misliker dette"
-        two: "%{count} dislikes"
+        two: "%{count} misliker dette"
         zero: "ingen misliker dette"
       people_like_this:
         few: "%{count} personer liker dette"
         many: "%{count} personer liker dette"
         one: "1 person liker dette"
         other: "%{count} personer liker dette"
-        two: "%{count} likes"
+        two: "%{count} liker dette"
         zero: "ingen liker dette"
       people_like_this_comment:
         few: "%{count} liker"
         many: "%{count} liker"
         one: "%{count} liker"
-        other: "%{count} likes"
+        other: "%{count} liker"
-        two: "%{count} likes"
+        two: "%{count} liker dette"
-        zero: "no likes"
+        zero: "ingen liker"
+  limited: Begrenset
   more: Mer
   next: neste
   no_results: "Ingen resultater ble funnet"
@@ -298,21 +317,21 @@ nb:
       many: "%{actors} kommenterte også på %{post_author}s %{post_link}."
       one: "%{actors} kommenterte også på %{post_author}s %{post_link}."
       other: "%{actors} har også kommentert på %{post_author}'s %{post_link}."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
+      two: "%{actors} kommenterte også %{post_author}s %{post_link}."
       zero: "%{actors} har også kommentert på %{post_author}'s %{post_link}."
     also_commented_deleted:
       few: "%{actors} kommenterte på en slettet post."
       many: "%{actors} kommenterte på en slettet post."
       one: "%{actors} kommenterte på en slettet post."
       other: "%{actors} kommenterte på en slettet post."
-      two: "%{actors} commented on a deleted post."
+      two: "%{actors} kommenterte en slettet post."
       zero: "%{actors} kommenterte på en slettet post."
     comment_on_post:
       few: "%{actors} kommenterte på din %{post_link}."
       many: "%{actors} kommenterte på din %{post_link}."
       one: "%{actors} kommenterte på din %{post_link}."
       other: "%{actors} kommenterte på din %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
+      two: "%{actors} kommenterte din %{post_link}."
       zero: "%{actors} kommenterte på din %{post_link}."
     helper:
       new_notifications:
@@ -320,7 +339,7 @@ nb:
         many: "%{count} nye varsler"
         one: "1 nytt varsel"
         other: "%{count} nye varsler"
-        two: "%{count} new notifications"
+        two: "%{count} nye varsler"
         zero: "ingen nye varsler"
     index:
       and: og
@@ -345,7 +364,7 @@ nb:
       many: "%{actors} likte ditt innlegg du har slettet."
       one: "%{actors} likte ditt innlegg du har slettet."
       other: "%{actors} likte ditt innlegg du har slettet."
-      two: "%{actors} liked your deleted post."
+      two: "%{actors} likte din slettede post."
       zero: "%{actors} likte ditt innlegg du har slettet."
     mentioned:
       few: "%{actors} har nevnt deg i en %{post_link}."
@@ -359,7 +378,7 @@ nb:
       many: "%{actors} nevnte deg i en slettet post."
       one: "%{actors} nevnte deg i en slettet post."
       other: "%{actors} nevnte deg i en slettet post."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} nevnte deg i en slettet post."
       zero: "%{actors} nevnte deg i en slettet post."
     post: innlegg
     private_message:
@@ -381,14 +400,14 @@ nb:
       many: "%{actors} har delt innlegget du slettet."
       one: "%{actors} har delt innlegget du slettet."
       other: "%{actors} har delt innlegget du slettet."
-      two: "%{actors} reshared your deleted post."
+      two: "%{actors} delte din slettede post."
       zero: "%{actors} har delt innlegget du slettet."
     started_sharing:
       few: "%{actors} har begynt å dele med deg."
       many: "%{actors} har begynt å dele med deg."
       one: "%{actors} har begynt å dele med deg."
       other: "%{actors} started sharing with you."
-      two: "%{actors} started sharing with you."
+      two: "%{actors} begynte å dele med deg."
       zero: "%{actors} har begynt å dele med deg."
   notifier:
     click_here: "klikk her"
@@ -443,8 +462,8 @@ nb:
     person:
       add_contact: "legg til kontakt"
       already_connected: "Allerede tilkoblet"
-      pending_request: "venter på svar"
+      pending_request: "Venter på svar"
-      thats_you: "det er deg!"
+      thats_you: "Det er deg!"
     profile_sidebar:
       born: født
       edit_my_profile: "Endre profilen min"
@@ -470,7 +489,7 @@ nb:
       add_some: "legg til noen"
       edit: endre
       you_have_no_tags: "du har ingen tags!"
-    two: "%{count} people"
+    two: "%{count} personer"
     webfinger:
       fail: "Beklager, vi kunne ikke finne %{handle}."
     zero: "ingen personer"
@@ -540,6 +559,7 @@ nb:
     update:
       failed: "Kunne ikke oppdatere profil"
       updated: "Profil oppdatert"
+  public: Offentlig
   reactions:
     few: "%{count} reaksjoner"
     many: "%{count} reaksjoner"
@@ -572,7 +592,7 @@ nb:
     destroy:
       error: "Velg et aspekt først!"
       ignore: "Ignorerte venneforespørsel"
-      success: "Dere er nå venner."
+      success: "Dere deler nå oppdateringer."
     helper:
       new_requests:
         few: "%{count} nye forespørsler!"
@@ -596,7 +616,7 @@ nb:
         many: "%{count} Reshares"
         one: "1 Reshare"
         other: "%{count} Reshares"
-        two: "%{count} reshares"
+        two: "%{count} delinger"
         zero: "Del igjen"
       reshare_confirmation: "Reshare %{author} - %{text}?"
       reshare_original: "Reshare orignial"
@@ -608,8 +628,6 @@ nb:
       already_authorized: "En bruker med diaspora id %{diaspora_id} har alllerede autorisert denne %{service_name} kontoen."
       failure: "Autentisering gikk galt."
       success: "Autentisering vellykket."
-    destroy:
-      success: "Successfully destroyed authentication."
     failure:
       error: "feil under tilkobling av tjenesten"
     finder:
@@ -660,7 +678,7 @@ nb:
       by_email: "via Epost"
       dont_have_now: "Du har ingen akkurat nå, men flere invitasjoner kommer snart!"
       from_facebook: "Fra Facebook"
-      invitations_left: "(%{count} igjen)"
+      invitations_left: "%{count} igjen"
       invite_someone: "Inviter noen"
       invite_your_friends: "Innviter vennene dine"
       invites: "Invitasjoner "
@@ -693,12 +711,16 @@ nb:
     reshare:
       reshare: "Del på nytt"
     stream_element:
+      connect_to_comment: "Koble til denne brukeren for å kommentere posten"
+      currently_unavailable: "kommentering er ikke tilgjengelig"
       dislike: "Liker ikke"
       hide_and_mute: "Hide and Mute"
       ignore_user: "Ignorér %{name}"
       ignore_user_description: "Ignorér og fjern bruker fra alle aspekter?"
       like: Liker
+      shared_with: "Delt med: %{aspect_names}"
       unlike: "Liker ikke"
+      viewable_to_anyone: "Denne posten er synlig for alle på Internett"
   status_messages:
     create:
       success: "Nevnte :%{navn}"
@@ -725,6 +747,12 @@ nb:
       two: "Show two more comments"
       zero: "No more comments"
   streams:
+    comment_stream:
+      contacts_title: "Personer hvis poster du har kommentert"
+    followed_tag:
+      follow: Følg
+    like_stream:
+      contacts_title: "Personer hvis poster du liker"
     mentions:
       contacts_title: "Folk som har nevnt deg"
       title: "Your Mentions"
@@ -743,10 +771,13 @@ nb:
       success: "Successfully stopped following: #%{name}"
   tags:
     show:
+      follow: "Følg #%{tag}"
       followed_by: "fulgt av"
+      following: "Følger #%{tag}"
       nobody_talking: "Ingen snakker om %{tag} ennå."
       people_tagged_with: "Personer tagget med %{tag}"
       posts_tagged_with: "Innlegg tagget med #%{tag}"
+      stop_following: "Slutt å følge #%{tag}"
   tokens:
     show:
       connect_to_cubbies: "Koble til Cubbi.es"
@@ -787,11 +818,13 @@ nb:
       liked: "... noen liker innlegget ditt?"
       mentioned: " du nevnes i et innlegg?"
       new_password: "Nytt Passord"
+      photo_export_unavailable: "Eksportering av bilder er for øyeblikket utilgjengelig"
       private_message: " du mottar en privat melding?"
       receive_email_notifications: "Motta varsler på epost når:"
       reshared: "...noen deler igjen ditt innlegg?"
       show_getting_started: "Skru på Start igjen."
       started_sharing: "... noen begynner å dele med deg?"
+      stream_preferences: "Innstillinger for strøm"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora brukernavn"
     getting_started:
@@ -827,3 +860,4 @@ nb:
     no_person_constructed: "Ingen personer kunne konstrueres fra dette hCard."
     not_enabled: "det virker ikke som webfinger er aktivert for % {account}'s vert"
     xrd_fetch_failed: "kunne ikke få xrd fra kontoen %{account}"
+  welcome: Velkommen!

config/locales/diaspora/nl.yml

@@ -79,7 +79,7 @@ nl:
       aspect_list_is_visible: "contactlijst van aspect is zichtbaar voor anderen in aspect"
       confirm_remove_aspect: "Weet je zeker dat je dit aspect wilt verwijderen?"
       done: Klaar
-      make_aspect_list_visible: "maak contactlijst van aspect zichtbaar?"
+      make_aspect_list_visible: "maak contacten in dit aspect zichtbaar voor elkaar?"
       remove_aspect: "Verwijder dit aspect"
       rename: hernoem
     few: "%{count} aspecten"
@@ -96,7 +96,7 @@ nl:
         content_1: "Jou Diaspora ID is:"
         content_2: "Geef deze aan mensen zodat ze je op Diaspora kunnen vinden."
       donate: Doneer
-      handle_explanation: "Dit is jouw Diaspora id. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
+      handle_explanation: "Dit is jouw Diaspora ID. Net als een e-mailadres kun je deze aan mensen geven zodat ze je kunnen bereiken."
       help:
         do_you: "Wil jij: "
         email_feedback: "%{link} jouw feedback, als je voorkeur hebt"
@@ -105,16 +105,14 @@ nl:
         have_a_question: "... een %{link} vraag?"
         here_to_help: "De Diaspora community staat voor je klaar!"
         need_help: "Hulp nodig?"
-        tag_bug: "#bug"
+        tag_question: vraag
-        tag_feature: "#feature"
-        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-gedreven tutorials, instructies, en nieuws."
       introduce_yourself: "Dit is jouw stream.  Spring erin en introduceer jezelf."
       keep_us_running: "Houd %{pod} snel door bij te dragen aan de maandelijkse koffie kosten!"
       new_here:
         follow: "Volg %{link} en verwelkom nieuwe Diaspora* gebruikers!"
         learn_more: "Leer meer"
-        title: "Verwelkom Nieuwe Gebruikers"
+        title: "Nieuwe Gebruikers"
       no_contacts: "Geen contacten"
       no_tags: "+ Vind een tag"
       people_sharing_with_you: "Mensen die met jou delen"
@@ -132,10 +130,10 @@ nl:
       success: "Persoon naar nieuw aspect verplaatst"
     new:
       create: Aanmaken
-      name: Naam
+      name: "Naam (alleen zichtbaar voor jou)"
     no_contacts_message:
       or_spotlight: "Of je kan delen met %{link}\n"
-      try_adding_some_more_contacts: "Je kunt meer contacten zoeken (top) of uitnodigen (rechts)."
+      try_adding_some_more_contacts: "Je kunt meer contacten zoeken of uitnodigen."
       you_should_add_some_more_contacts: "Voeg wat meer contacten toe!"
     no_posts_message:
       start_talking: "Nog niemand heeft iets gezegd!"
@@ -192,12 +190,11 @@ nl:
     few: "%{count} contacten"
     index:
       add_a_new_aspect: "Voeg een aspect toe"
-      add_to_aspect: "Add contacts to %{name}"
+      add_to_aspect: "voeg contacten toe aan %{name}"
       all_contacts: "Alle Contacten"
-      check_out: Bekijk
       many_people_are_you_sure: "Weet je zeker dat je een privégesprek wil starten met meer dan %{suggested_limit} contacten? Een bericht plaatsen in dit aspect is waarschijnlijk een betere manier om met hen te communiceren."
       my_contacts: "Mijn Contacten"
-      no_contacts: "Geen contacten."
+      no_contacts: "Voeg wat contacten toe!"
       only_sharing_with_me: "Delen alleen met mij"
       remove_person_from_aspect: "Verwijder %{person_name} uit \"%{aspect_name}\""
       start_a_conversation: "Start een conversatie"
@@ -209,7 +206,7 @@ nl:
     sharing:
       people_sharing: "Mensen die met jou delen:"
     two: "%{count} contacten"
-    zero: "geen contacten"
+    zero: contacten
   conversations:
     create:
       fail: "Ongeldig bericht"
@@ -293,16 +290,17 @@ nl:
       to: Aan
   layouts:
     application:
+      back_to_top: "Terug naar top"
       public_feed: "Publieke Diaspora Feed van %{name}"
       toggle: "switch mobiele versie"
       whats_new: "wat is nieuw op Diaspora?"
       your_aspects: "jouw aspecten"
     header:
       login: inloggen
-      logout: "log uit"
+      logout: "Log uit"
-      profile: profiel
+      profile: Profiel
       recent_notifications: "Recente notificaties"
-      settings: instellingen
+      settings: Instellingen
       view_all: "Bekijk alles"
   likes:
     likes:
@@ -377,8 +375,8 @@ nl:
       many: "%{actors} vinden jouw %{post_link} leuk."
       one: "%{actors} vindt jouw %{post_link} leuk."
       other: "%{actors} vinden jouw %{post_link} leuk."
-      two: "%{actors} vinden je %{post_link} leuk."
+      two: "%{actors} vinden jouw %{post_link} leuk."
-      zero: "%{actors} vindt jouw %{post_link} leuk."
+      zero: "%{actors} vinden jouw %{post_link} leuk."
     liked_post_deleted:
       few: "%{actors} vonden jouw verwijderde post leuk."
       many: "%{actors} vonden jouw verwijderde post leuk."
@@ -391,8 +389,8 @@ nl:
       many: "%{actors} hebben je genoemd in een %{post_link}."
       one: "%{actors} heeft je genoemd in een %{post_link}."
       other: "%{actors} hebben je genoemd in een %{post_link}."
-      two: "%{actors} heeft je genoemd in een %{post_link}."
+      two: "%{actors} hebben je genoemd in een %{post_link}."
-      zero: "%{actors} heeft je genoemd in een %{post_link}."
+      zero: "%{actors} hebben je genoemd in een %{post_link}."
     mentioned_deleted:
       few: "%{actors} hebben jouw genoemd in een verwijderde post."
       many: "%{actors} hebben jou genoemd in een verwijderde post."
@@ -408,12 +406,12 @@ nl:
       two: "%{actors} hebben je een bericht gestuurd."
       zero: "%{actors} heeft jou een bericht gestuurd."
     reshared:
-      few: "%{actors} heeft jou %{post_link} doorgegeven."
+      few: "%{actors} hebben jouw %{post_link} doorgegeven."
-      many: "%{actors} hebben jou %{post_link} doorgegeven."
+      many: "%{actors} hebben jouw %{post_link} doorgegeven."
       one: "%{actors} heeft jouw %{post_link} doorgegeven."
       other: "%{actors} hebben jouw %{post_link} doorgegeven."
-      two: "%{actors} heeft jou %{post_link} doorgegeven."
+      two: "%{actors} hebben jouw %{post_link} doorgegeven."
-      zero: "%{actors} heeft jouw %{post_link} doorgegeven."
+      zero: "%{actors} hebben jouw %{post_link} doorgegeven."
     reshared_post_deleted:
       few: "%{actors} hebben jouw verwijderde post doorgegeven."
       many: "%{actors} hebben jouw verwijderde post doorgegeven."
@@ -601,13 +599,13 @@ nl:
       password_to_confirm: "(we hebben je huidige wachtwoord nodig om de wijzigingen te bevestigen)"
       unhappy: Ontevreden?
     new:
-      create_my_account: "Maak mijn account aan"
+      create_my_account: "Maak mijn account aan!"
       enter_email: "Vul een e-mailadres in"
       enter_password: "Vul een wachtwoord in"
       enter_password_again: "Vul hetzelfde wachtwoord nogmaals in"
       enter_username: "Kies een gebruikersnaam (alleen letters, nummers, en underscores)"
       join_the_movement: "Sluit je aan!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Social Networking met een ♥"
   requests:
     create:
       sending: Versturen...
@@ -689,14 +687,14 @@ nl:
       know_email: "Weet je hun e-mailadres? Je zou ze uit moeten nodigen"
       your_diaspora_username_is: "Jouw Diaspora gebruikersnaam is: %{diaspora_handle}"
     aspect_dropdown:
-      add_to_aspect: "Voeg toe aan aspect"
+      add_to_aspect: "Voeg contact toe"
       toggle:
         few: "In %{count} aspecten"
         many: "In %{count} aspecten"
         one: "In %{count} aspect"
         other: "In %{count} aspecten"
         two: "In %{count} aspecten"
-        zero: "Voeg toe aan aspect"
+        zero: "Voeg contact toe"
     contact_list:
       all_contacts: "Alle contacten"
     footer:
@@ -745,7 +743,7 @@ nl:
       connect_to_comment: "Verbind met deze gebruiker om op zijn of haar berichten te reageren"
       currently_unavailable: "reageren nog niet beschikbaar"
       dislike: "Vind ik niet meer leuk"
-      hide_and_mute: "Verberg en blokkeer"
+      hide_and_mute: "Verberg en blokkeer bericht"
       ignore_user: "Negeer %{name}"
       ignore_user_description: "Gebruiker negeren en hem uit alle aspecten verwijderen?"
       like: "Vind ik leuk"
@@ -795,23 +793,23 @@ nl:
     mentioned_stream: "@Vermeldingen"
     mentions:
       contacts_title: "Mensen die jou hebben genoemd"
-      title: "Your Mentions"
+      title: "@Mij"
     multi:
       contacts_title: "Gebuikers in je Stream"
     public:
       contacts_title: "Recente Posters"
       title: "Publieke activiteit"
     tags:
-      contacts_title: "People who dig these tags"
+      contacts_title: "Mensen die deze tag cool vinden"
       title: "Posts getagged: %{tags}"
   tag_followings:
     create:
-      failure: "Volgen mislukt: #%{name}"
+      failure: "Volgen van #%{name} mislukt. Misschien volg je het al?"
       none: "Je kan geen blanco tag volgen!"
-      success: "Volgen succesvol: #%{name}"
+      success: "Hoera! Vanaf nu volg je #%{name}."
     destroy:
-      failure: "Stoppen met volgen mislukt: #%{name}"
+      failure: "Het is niet gelukt om te stoppen met het volgen van #%{name}. Misschien ben je al succesvol gestopt met volgen?"
-      success: "Succesvol gestopt met volgen: #%{name}"
+      success: "Jammer! Je bent gestopt met het volgen van #%{name}."
   tags:
     show:
       follow: "Volg #%{tag}"
@@ -846,7 +844,7 @@ nl:
     edit:
       also_commented: "...iemand na jou op de post van jouw contact reageert?"
       auto_follow_aspect: "Aspect voor automatische gevolgde gebruikers:"
-      auto_follow_back: "Automatically follow back if a someone follows you"
+      auto_follow_back: "Automatisch terug volgen wanneer iemand jou volgt"
       change: Verander
       change_email: "Verander e-mailadres"
       change_language: "Taal wijzigen"
@@ -859,7 +857,7 @@ nl:
         make_diaspora_better: "We willen graag dat je ons helpt om Diaspora te verbeteren, dus blijf in plaats van weg te gaan. Als je wel weg wilt gaan, willen we dat je weet wat er dan gebeurt."
         mr_wiggles: "Mr Wiggles zal het niet leuk vinden je te zien gaan"
         no_turning_back: "Op het moment is er geen weg terug."
-        what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+        what_we_delete: "We verwijderen al je foto's en profiel gegevens zo snel mogelijk. Reacties blijven ten behoeve van de context bewaard en zijn geassocieerd met jouw Diaspora ID."
       close_account_text: "Sluit Account"
       comment_on_post: "...iemand op jouw post reageert?"
       current_password: "Huidig wachtwoord"

config/locales/diaspora/pl.yml

@@ -202,7 +202,6 @@ pl:
       add_a_new_aspect: "Dodaj aspekt"
       add_to_aspect: "dodaj kontakty do %{name}"
       all_contacts: "Wszystkie kontakty"
-      check_out: Zobacz
       many_people_are_you_sure: "Czy na pewno chcesz rozpocząć prywatną rozmowę z więcej niż %{suggested_limit} osobami? Możesz po prostu opublikować swoją wiadomość w tej grupie. "
       my_contacts: "Moje kontakty"
       no_contacts: "Wygląda na to, że musisz dodać kilka kontaktów!"
@@ -309,6 +308,7 @@ pl:
       to: Do
   layouts:
     application:
+      back_to_top: "Powrót na górę"
       powered_by: "NAPĘDZANE PRZEZ DIASPORĘ*"
       public_feed: "Publiczny kanał Diaspory użytkownika %{name}"
       toggle: "przełącz widok mobilny"

config/locales/diaspora/pt-BR.yml

@@ -201,7 +201,6 @@ pt-BR:
       add_a_new_aspect: "Adicione um novo aspecto"
       add_to_aspect: "Adicionar contatos para %{name}"
       all_contacts: "Todos Contatos"
-      check_out: Confira
       many_people_are_you_sure: "Tem certeza de que deseja iniciar uma conversa privada com mais de %{suggested_limit} contatos? Uma postagem para o aspecto que eles estão pode ser uma melhor maneira de contactá-los."
       my_contacts: "Meus Contatos"
       no_contacts: "Parece que você precisa adicionar mais contatos!"

config/locales/diaspora/pt-PT.yml

@@ -199,7 +199,6 @@ pt-PT:
       add_a_new_aspect: "Adicionar um novo aspecto"
       add_to_aspect: "Adicionar contactos a %{name}"
       all_contacts: "Todos os Contactos"
-      check_out: Veja
       many_people_are_you_sure: "Tem a certeza de que deseja começar um conversa privada com mais de %{suggested_limit} contactos? Publicar para este aspecto pode ser uma forma melhor de os contactar."
       my_contacts: "Os Meus Contactos"
       no_contacts: "Parece que precisa de adicionar alguns contactos."

config/locales/diaspora/ru.yml

@@ -199,7 +199,6 @@ ru:
       add_a_new_aspect: "Новый аспект"
       add_to_aspect: "добавить контакты в %{name}"
       all_contacts: "Все контакты"
-      check_out: Оцените
       many_people_are_you_sure: "Вы уверены, что хотите начать приватную беседу с числом контактов более %{suggested_limit}? Возможно, лучше просто написать сообщение в этот аспект."
       my_contacts: "Мои контакты"
       no_contacts: "Похоже, вам надо добавить несколько контактов!"
@@ -304,6 +303,7 @@ ru:
       to: Для
   layouts:
     application:
+      back_to_top: "Вернуться наверх"
       powered_by: "ПОДДЕРЖИВАЕТСЯ ДИАСПОРОЙ*"
       public_feed: "Общественный канал Диаспоры для %{name}"
       toggle: обычный/мобильный
@@ -573,12 +573,13 @@ ru:
       not_found: "Извините, мы не смогли найти эту запись."
       permalink: "постоянная ссылка"
       photos_by:
-        few: "%{count} photos by %{author}"
+        few: "%{count} фото пользователя %{author}"
-        many: "%{count} photos by %{author}"
+        many: "%{count} фото пользователя %{author}"
-        one: "One photo by %{author}"
+        one: "Одно фото пользователя %{author}"
-        other: "%{count} photos by %{author}"
+        other: "%{count} фото пользователя %{author}"
-        two: "Two photos by %{author}"
+        two: "Два фото пользователя %{author}"
-        zero: "No photos by %{author}"
+        zero: "Нет фото пользователя %{author}"
+      reshare_by: "Поделился(лась) %{author}"
   previous: ранее
   privacy: Приватность
   privacy_policy: "Политика конфиденциальности"
@@ -875,6 +876,7 @@ ru:
       wrong_password: "Введенный вами пароль не совпадает с вашим текущим паролем."
     edit:
       also_commented: "... кто-то комментировал сообщения ваших контактов?"
+      auto_follow_aspect: "Помещать этих пользователей в аспект:"
       auto_follow_back: "Автоматически подписываться в ответ, если кто-то начинает следить за вашими записями"
       change: Изменить
       change_email: "Изменить адрес"
@@ -897,6 +899,7 @@ ru:
       edit_account: "Редактировать аккаунт"
       email_awaiting_confirmation: "Мы послали ссылку для активации на %{unconfirmed_email}. Пока вы не пройдете по ней и не активируете новый адрес, мы будем использовать ваш прежний ящик %{email}."
       export_data: "Экспорт информации"
+      following: "Настройки подписок"
       getting_started: "Новые пользовательские настройки"
       liked: "...кому-нибудь нравится ваше сообщение?"
       mentioned: "... вы упомянуты в сообщении?"
@@ -937,6 +940,8 @@ ru:
       does_not_exist: "Пользователя %{username} не существует!"
     update:
       email_notifications_changed: "Настройки уведомлений сохранены"
+      follow_settings_changed: "Настройки подписок изменены"
+      follow_settings_not_changed: "Не удалось изменить настройки подписок."
       language_changed: "Язык изменён"
       language_not_changed: "Не удалось изменить язык"
       password_changed: "Пароль изменён. Теперь вы можете войти в систему с новым паролем."

config/locales/diaspora/sk.yml

@@ -201,7 +201,6 @@ sk:
       add_a_new_aspect: "Pridať novú kategóriu"
       add_to_aspect: "Pridať kontakty do kategórie %{name}"
       all_contacts: "Všetky kontakty"
-      check_out: Vyskúšať
       many_people_are_you_sure: "Určite chcete začať súkromný rozhovor s viac ako %{suggested_limit} ľuďmi? Poslanie príspevku do tejto kategórie môže byť lepší spôsob, ako sa s nimi spojiť."
       my_contacts: "Moje kontakty"
       no_contacts: "Zdá sa, že treba pridať pár kontaktov!"
@@ -308,6 +307,7 @@ sk:
       to: Príjemca
   layouts:
     application:
+      back_to_top: "Späť nahor"
       powered_by: "PREVÁDZKUJE DIASPORA*"
       public_feed: "Verejný kanál Diaspory pre %{name}"
       toggle: "prepnúť na stránku pre mobil"

config/locales/diaspora/sl.yml

@@ -198,7 +198,6 @@ sl:
       add_a_new_aspect: "Dodaj nov pogled"
       add_to_aspect: "Dodaj stik k %{name}"
       all_contacts: "Vsi stiki"
-      check_out: Razišči
       many_people_are_you_sure: "Ste prepričani, da želite začeti zasebni  pogovor z več kot %{suggested_limit} stiki? Morda bi bilo bolje, da bi  sporočilo objavili v pogledu."
       my_contacts: "Moji stiki"
       no_contacts: "Ni stikov."

config/locales/diaspora/sq.yml

@@ -191,7 +191,6 @@ sq:
       add_a_new_aspect: "Shtoni një aspekt të ri"
       add_to_aspect: "shtoni kontakte te %{name}"
       all_contacts: "Krejt Kontaktet"
-      check_out: "Kontrolloni te"
       many_people_are_you_sure: "Jeni i sigurt se doni të nisni një bashkëbisedim privatme më tepër se %{suggested_limit} kontakte? Postimi te ky aspekt mund të jetë një mënyrë më e mirë për t'u lidhur me ta."
       my_contacts: "Kontaktet e Mia"
       no_contacts: "Duket se keni nevojë të shtoni ndonjë kontakt!"

config/locales/diaspora/sv.yml

@@ -198,7 +198,6 @@ sv:
       add_a_new_aspect: "Lägg till en ny aspekt"
       add_to_aspect: "lägg till kontakter i %{name}"
       all_contacts: "Alla kontakter"
-      check_out: "Checka ut"
       many_people_are_you_sure: "Är du säker på att du vill starta en privat konversation mer mer än %{suggested_limit} kontakter? Ett bättre sätt kan vara att posta inlägget i denna aspekt."
       my_contacts: "Mina kontakter"
       no_contacts: "Det verkar som om att du skulle behöva några fler kontakter!"
@@ -300,6 +299,7 @@ sv:
       to: Till
   layouts:
     application:
+      back_to_top: "Åter till början"
       public_feed: "Offentligt Diasporaflöde för %{name}"
       toggle: "byt till mobilanpassad "
       whats_new: "några nyheter?"

config/locales/diaspora/tr.yml

@@ -203,7 +203,6 @@ tr:
       add_a_new_aspect: "Yeni yön ekle"
       add_to_aspect: "%{name} unsuruna kişi ekle"
       all_contacts: "Tüm Kişiler"
-      check_out: "Kontrol et"
       many_people_are_you_sure: "%{suggested_limit} sayısından yüksek kişiyle özel görüşme başlatmak istediğinden emin misin? Bu yöne gönderi yapmak onlarla iletişime geçmek için daha iyi bir yol olabilir."
       my_contacts: Kişilerim
       no_contacts: "Birkaç kişi eklemen gerekir gibi görünüyor!"

config/locales/diaspora/uk.yml

@@ -199,7 +199,6 @@ uk:
       add_a_new_aspect: "Новий аспект"
       add_to_aspect: "додати контакти до %{name}"
       all_contacts: "Усі контакти"
-      check_out: Перевірити
       many_people_are_you_sure: "Ви упевнені, що хочете почати приватну бесіду з числом контактів більше %{suggested_limit}? Можливо, краще просто написати повідомлення в цей аспект."
       my_contacts: "Мої контакти"
       no_contacts: "Схоже, вам потрібно додати декілька контактів!"

config/locales/diaspora/vi.yml

@@ -196,7 +196,6 @@ vi:
       add_a_new_aspect: "Thêm mối quan hệ mới"
       add_to_aspect: "thêm liên lạc vào %{name}"
       all_contacts: "Tất cả liên lạc"
-      check_out: "Kiểm tra"
       many_people_are_you_sure: "Bạn có chắc là muốn trò chuyện với hơn %{suggested_limit} người khác? Posting to this aspect may be a better way to contact them."
       my_contacts: "Liên lạc của tôi"
       no_contacts: "Có vẻ như bạn cần thêm vài liên lạc!"

config/locales/diaspora/zh-CN.yml

@@ -46,6 +46,7 @@ zh-CN:
       video_title:
         unknown: 未知影片标题
   are_you_sure: 你确定吗？
+  are_you_sure_delete_account: "你真的确定要关闭您的户口吗? 关了就不能再开了哦!"
   aspect_memberships:
     destroy:
       failure: 从视图中移除好友失败
@@ -85,6 +86,7 @@ zh-CN:
       handle_explanation: "这是您的 diaspora 帐号， 就像是邮箱一样，你可以把它提供给想好友您的人。"
       help:
         here_to_help: "Diaspora community is here to help!"
+        need_help: 需要帮助吗？
         tag_bug: "#bug"
         tag_feature: "#feature"
         tag_question: "#question"
@@ -93,6 +95,7 @@ zh-CN:
       no_tags: "No tags"
       people_sharing_with_you: 与您分享的人
       post_a_message: 发布站内信>>
+      welcome_to_diaspora: "%{name}，欢迎加入Diaspora!"
     many: "%{count}个视图"
     move_contact:
       error: "好友移动错误：%{inspect}"
@@ -109,6 +112,7 @@ zh-CN:
     other: "%{count}个视图"
     seed:
       family: 家人
+      friends: 好友
       work: 同事
     show:
       edit_aspect: 编辑视图
@@ -220,6 +224,7 @@ zh-CN:
       comma_seperated_plz: 你可以输入多个邮箱，输入多个时以逗号分隔。
       if_they_accept_info: 如果他们接受，就会自动被加入到您所邀请的视图中。
       invite_someone_to_join: 邀请好友来加入到Diaspora！
+      language: 语言
       personal_message: 个人信息
       resend: 重寄
       send_an_invitation: 发送邀请函
@@ -227,6 +232,7 @@ zh-CN:
       to: 收件人
   layouts:
     application:
+      back_to_top: 回到上面
       powered_by: "Powered by DIASPORA*"
       public_feed: "%{name} 的 Diaspora RSS Feed"
       toggle: 切换为手机网页
@@ -467,6 +473,7 @@ zh-CN:
       notice: 照片更新成功。
   posts:
     show:
+      destroy: 删除
       photos_by:
         few: "%{count} photos by %{author}"
         many: "%{count} photos by %{author}"
@@ -612,6 +619,7 @@ zh-CN:
       logged_in: "成功登录到 %{service}"
       manage: 管理已连线的服务
       outside: "不使用 Diaspora 的人也能看到公开讯息。"
+      share: 分享
       title: 设定连线服务
     publisher:
       all: 全部
@@ -624,6 +632,7 @@ zh-CN:
       publishing_to: 发布至：
       share: 分享
       share_with: 与他分享：
+      upload_photos: 上载照片
       whats_on_your_mind: 你想到了什么？
     reshare:
       reshare: 重新分享
@@ -710,6 +719,8 @@ zh-CN:
       your_handle: "您的 diaspora 帐号"
     getting_started:
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+    logged_out:
+      signed_out: "您已经退出 Diaspora* 了，欢迎再度光临！"
     public:
       does_not_exist: "不存在 %{username} 这个用户！"
     update:
@@ -726,3 +737,4 @@ zh-CN:
     no_person_constructed: "从这份 hcard 资料无法组建出联络人。"
     not_enabled: "%{account} 的主机似乎没有启用 webfinger"
     xrd_fetch_failed: "从 %{account} 这个帐号取得 xrd 时发生错误"
+  welcome: 欢迎！

config/locales/diaspora/zh-TW.yml

@@ -203,7 +203,6 @@ zh-TW:
       add_a_new_aspect: 加入新面向
       add_to_aspect: "加聯絡人到%{name}"
       all_contacts: 所有聯絡人
-      check_out: 看看
       many_people_are_you_sure: "你確定要進行跟%{suggested_limit}個聯絡人的私人對話? 貼文到該面向可能是跟他們聯絡比較好的方式."
       my_contacts: 我的聯絡人
       no_contacts: 你好像應該要多加點聯絡人!

config/locales/javascript/javascript.da.yml

@@ -35,6 +35,19 @@ da:
       hey: "Hej {{name}}!"
       no_tags: "Du har ikke fulgt nogen tags! Vil du fortsætte alligevel?"
       preparing_your_stream: "Forbereder din personlige strøm..."
+    header:
+      contacts: Kontakter
+      home: Hjem
+      log_out: "Log ud"
+      mark_all_as_read: "Marker alle som læst"
+      messages: Beskeder
+      notifications: Meddelelser
+      profile: Profil
+      recent_notifications: "Seneste Meddelelser"
+      search: "Find personnel eller #tags"
+      settings: Indstillinger
+      view_all: "Se alle"
+    ignore: Ignorer
     infinite_scroll:
       no_more: "Ikke flere indlæg."
     photo_uploader:
@@ -48,6 +61,7 @@ da:
     search_for: "Søg efter {{name}}"
     show_more: "Vis mere"
     stream:
+      hide: Skjul
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
@@ -55,13 +69,15 @@ da:
         other: "<%= count %> Likes"
         two: "<%= count %> Likes"
         zero: "<%= count %> Likes"
+      limited: Begrænset
       more_comments:
-        few: "Show <%= count %> more comments"
+        few: "Show <%= count %> flere kommentarer"
-        many: "Show <%= count %> more comments"
+        many: "Show <%= count %> flere kommentarer"
         one: "Show <%= count %> more comment"
         other: "Show <%= count %> more comments"
         two: "Show <%= count %> more comments"
         zero: "Show <%= count %> more comments"
+      public: Offentlig
       reshares:
         few: "<%= count %> Reshares"
         many: "<%= count %> Reshares"
@@ -69,6 +85,7 @@ da:
         other: "<%= count %> Reshares"
         two: "<%= count %> Reshares"
         zero: "<%= count %> Reshares"
+      show: Vis
     tags:
       wasnt_that_interesting: "OK, jeg formoder #{{tagName}} ikke var så spændende igen..."
     timeago:

config/locales/javascript/javascript.nl.yml

@@ -7,7 +7,7 @@
 nl:
   javascripts:
     aspect_dropdown:
-      add_to_aspect: "Voeg toe aan aspect"
+      add_to_aspect: "Voeg contact toe"
       all_aspects: "Alle aspecten"
       error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
       select_aspects: "Selecteer aspecten"
@@ -28,14 +28,30 @@ nl:
       hide: "verberg reacties"
       show: "laat reacties zien"
     confirm_dialog: "Weet je het zeker?"
+    delete: Verwijder
     failed_to_like: "Leuk vinden mislukt!"
     failed_to_post_message: "Bericht plaatsen mislukt!"
     getting_started:
       alright_ill_wait: "Prima, ik wacht wel."
       hey: "Hey, {{name}}!"
+      no_tags: "Hey, je volgt geen tags! Toch doorgaan?"
       preparing_your_stream: "Preparing your personialized stream..."
+    header:
+      contacts: Contacten
+      log_out: "Log uit"
+      mark_all_as_read: "Markeer alles gelezen"
+      messages: Berichten
+      notifications: Notificaties
+      profile: Profiel
+      recent_notifications: "Recente Notificaties"
+      search: "Vind mensen of #tags"
+      settings: Instellingen
+      view_all: "Bekijk alle"
+    ignore: Negeer
     infinite_scroll:
       no_more: "Geen posts meer."
+    photo_uploader:
+      looking_good: "Wow, wat ben je knap!"
     publisher:
       at_least_one_aspect: "Je moet op zijn minst één aspect publiceren"
       limited: "Gelimiteerd - je post is alleen zichtbaar voor de mensen waarmee je hem deelt"
@@ -45,27 +61,37 @@ nl:
     search_for: "Zoek naar {{name}}"
     show_more: "laat meer zien"
     stream:
+      comment: Reageer
+      hide: Verberg
+      like: "Vind ik leuk"
       likes:
-        few: "<%= count %> Likes"
+        few: "<%= count %> mensen vinden dit leuk"
-        many: "<%= count %> Likes"
+        many: "<%= count %> mensen vinden dit leuk"
-        one: "<%= count %> Like"
+        one: "<%= count %> mensen vinden dit leuk"
-        other: "<%= count %> Likes"
+        other: "<%= count %> mensen vinden dit leuk"
-        two: "<%= count %> Likes"
+        two: "<%= count %> mensen vinden dit leuk"
-        zero: "<%= count %> Likes"
+        zero: "<%= count %> mensen vinden dit leuk"
+      limited: "Beperkt zichtbaar"
       more_comments:
-        few: "Show <%= count %> more comments"
+        few: "Toon nog <%= count %> reacties"
-        many: "Show <%= count %> more comments"
+        many: "Toon nog <%= count %> reacties"
-        one: "Show <%= count %> more comment"
+        one: "Toon nog <%= count %> reacties"
-        other: "Show <%= count %> more comments"
+        other: "Toon nog <%= count %> reacties"
-        two: "Show <%= count %> more comments"
+        two: "Toon nog <%= count %> reacties"
-        zero: "Show <%= count %> more comments"
+        zero: "Toon nog <%= count %> reacties"
+      nsfw: "Deze post is aangemerkt als NSFW door de auteur."
+      original_post_deleted: "Originele post verwijderd door de auteur."
+      public: Openbaar
+      reshare: Doorgeven
       reshares:
-        few: "<%= count %> Reshares"
+        few: "<%= count %> Doorgaven"
-        many: "<%= count %> Reshares"
+        many: "<%= count %> Doorgaven"
-        one: "<%= count %> Reshare"
+        one: "<%= count %> Doorgaven"
-        other: "<%= count %> Reshares"
+        other: "<%= count %> Doorgaven"
-        two: "<%= count %> Reshares"
+        two: "<%= count %> Doorgaven"
-        zero: "<%= count %> Reshares"
+        zero: "<%= count %> doorgaven"
+      show: Toon
+      unlike: "Vind ik niet meer leuk"
     tags:
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago:

config/locales/javascript/javascript.ru.yml

@@ -9,16 +9,16 @@ ru:
     aspect_dropdown:
       add_to_aspect: "Добавить контакт"
       all_aspects: "Все аспекты"
-      error: "Невозможно начать делиться с пользователем {{name}}.  Возможно, вы его заблокировали?"
+      error: "Невозможно начать делиться с пользователем <%= name %>.  Возможно, вы его заблокировали?"
       select_aspects: "Выбрать аспекты"
-      started_sharing_with: "Вы начали делиться с {{name}}!"
+      started_sharing_with: "Вы начали делиться с <%= name %>!"
-      stopped_sharing_with: "Вы перестали делиться с {{name}}."
+      stopped_sharing_with: "Вы перестали делиться с <%= name %>."
       toggle:
-        few: "В {{count}} аспектах"
+        few: "В <%= count %> аспектах"
-        many: "В {{count}} аспектах"
+        many: "В <%= count %> аспектах"
-        one: "В {{count}} аспекте"
+        one: "В <%= count %> аспекте"
-        other: "В {{count}} аспектах"
+        other: "В <%= count %> аспектах"
-        two: "В {{count}} аспектах"
+        two: "В <%= count %> аспектах"
         zero: "Выбрать аспекты"
     aspect_navigation:
       deselect_all: "Выключить все"
@@ -28,13 +28,28 @@ ru:
       hide: "скрыть комментарии"
       show: "Показать все комментарии"
     confirm_dialog: "Вы уверены? "
+    delete: Удалить
     failed_to_like: "Не удалось!"
     failed_to_post_message: "Не удалось отправить сообщение!"
     getting_started:
       alright_ill_wait: "Хорошо, я подожду."
-      hey: "Привет, {{name}}!"
+      hey: "Привет, <%= name %>!"
       no_tags: "Вы не следите ни за одной меткой! Все равно продолжить?"
       preparing_your_stream: "Подготовка вашего личного потока..."
+    header:
+      admin: Администратор
+      contacts: Контакты
+      home: Главная
+      log_out: Выйти
+      mark_all_as_read: "Пометить как прочитанные"
+      messages: Сообщения
+      notifications: Уведомления
+      profile: Профиль
+      recent_notifications: "Последние уведомления"
+      search: "Поиск людей или #меток"
+      settings: Настройки
+      view_all: "Посмотреть все"
+    ignore: Блокировать
     infinite_scroll:
       no_more: "Сообщений больше нет."
     photo_uploader:
@@ -45,32 +60,42 @@ ru:
       public: "Публичная - ваша запись будет видна всем, включая поисковые системы"
     reshares:
       duplicate: "Настолько круто, да? Вы уже поделились этой записью!"
-    search_for: "Искать {{name}}"
+    search_for: "Искать <%= name %>"
     show_more: "показать больше"
     stream:
+      comment: Комментировать
+      hide: Скрыть
+      like: Нравится
       likes:
-        few: "<%= count %> Likes"
+        few: "Понравилось: <%= count %>"
-        many: "<%= count %> Likes"
+        many: "Понравилось: <%= count %>"
-        one: "<%= count %> Like"
+        one: "Понравилось: <%= count %>"
-        other: "<%= count %> Likes"
+        other: "Понравилось: <%= count %>"
-        two: "<%= count %> Likes"
+        two: "Понравилось: <%= count %>"
-        zero: "<%= count %> Likes"
+        zero: "Понравилось: <%= count %>"
+      limited: Ограниченная
       more_comments:
-        few: "Show <%= count %> more comments"
+        few: "Показать остальные комментарии (<%= count %>)"
-        many: "Show <%= count %> more comments"
+        many: "Показать остальные комментарии (<%= count %>)"
-        one: "Show <%= count %> more comment"
+        one: "Показать остальные комментарии (<%= count %>)"
-        other: "Show <%= count %> more comments"
+        other: "Показать остальные комментарии (<%= count %>)"
-        two: "Show <%= count %> more comments"
+        two: "Показать остальные комментарии (<%= count %>)"
-        zero: "Show <%= count %> more comments"
+        zero: "Показать остальные комментарии (<%= count %>)"
+      nsfw: "Эта запись была помечена автором как \"18+\"."
+      original_post_deleted: "Исходная запись удалена автором."
+      public: Публичная
+      reshare: Поделиться
       reshares:
-        few: "<%= count %> Reshares"
+        few: "Поделились: <%= count %>"
-        many: "<%= count %> Reshares"
+        many: "Поделились: <%= count %>"
-        one: "<%= count %> Reshare"
+        one: "Поделились: <%= count %>"
-        other: "<%= count %> Reshares"
+        other: "Поделились: <%= count %>"
-        two: "<%= count %> Reshares"
+        two: "Поделились: <%= count %>"
-        zero: "<%= count %> Reshares"
+        zero: "Поделились: <%= count %>"
+      show: Показать
+      unlike: "Не нравится"
     tags:
-      wasnt_that_interesting: "Что ж, видимо, метка #{{tagName}} была не такой уж интересной..."
+      wasnt_that_interesting: "Что ж, видимо, метка #<%= tagName %> была не такой уж интересной..."
     timeago:
       day: день
       days: "%d дней[-я]"
@@ -88,4 +113,4 @@ ru:
       years: "%d лет"
     videos:
       unknown: "Неизвестный видеоформат"
-      watch: "Смотреть это видео на {{provider}}"
+      watch: "Смотреть это видео на <%= provider %>"