updated 55 locale files [ci skip]

55 files changed, 904 insertions, 1080 deletions

diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index 8c6d7dfb4..14bf41448 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -51,7 +51,7 @@ fi:
         made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
         more_people: "Even more people are excited to see you!"
         no_account_till: "Käyttäjätilisi luodaan vasta, kun rekisteröidyt yllä olevan linkin kautta. "
-        or: "or"
+        or: "tai"
         sign_up_now: "Sign up now →"
         subject: "Sinut on kutsuttu käyttämään Diasporaa!"
         team_diaspora: "Team Diaspora"
diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml
index 75b9dd15b..078bf27ae 100644
--- a/config/locales/devise/devise.sl.yml
+++ b/config/locales/devise/devise.sl.yml
@@ -6,204 +6,116 @@
 sl: 
   devise: 
     confirmations: 
-      confirmed: !binary |
-          VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIHVzcGWabm8gcG90cmplbi4gWmRh
-          aiBzdGUgcHJpamF2bGplbmku
+      confirmed: "Vaš uporabniški račun je uspešno potrjen. Zdaj ste prijavljeni."
       new: 
-        resend_confirmation: !binary |
-            UG9ub3ZubyBwb5psamkgbmF2b2RpbGEgemEgcG90cmRpdGV2IHVwb3JhYm5p
-            mmtlZ2EgcmHodW5h
-      send_instructions: !binary |
-          ViBuYXNsZWRuamloIG5la2FqIG1pbnV0YWggYm9zdGUgcHJlamVsaSBlLXBv
-          mnRvIHogIG5hdm9kaWxpLCBrYWtvIHBvdHJkaXRpIHZhmiB1cG9yYWJuaZpr
-          aSByYeh1bi4=
+        resend_confirmation: "Ponovno pošlji navodila za potrditev uporabniškega računa"
+      send_instructions: "V naslednjih nekaj minutah boste prejeli e-pošto z  navodili, kako potrditi vaš uporabniški račun."
     failure: 
-      inactive: !binary |
-          VmGaIHJh6HVuIJplIG5pIGFrdGl2aXJhbi4=
-      invalid: !binary |
-          TmFwYehubyB1cG9yYWJuaZprbyBpbWUgYWxpIGdlc2xvLg==
-      invalid_token: !binary |
-          UHJldmVyamFuamUgcHJpc3Rub3N0aSBuaSBtb2dv6GUu
-      locked: !binary |
-          VmGaIHJh6HVuIGplIHpha2xlbmplbi4=
-      timeout: !binary |
-          VmGaYSBzZWphIGplIHBvdGVrbGEuIFphIG5hZGFsamV2YW5qZSBzZSBwb25v
-          dm5vIHByaWphdml0ZS4=
+      inactive: "Vaš račun še ni aktiviran."
+      invalid: "Napačno uporabniško ime ali geslo."
+      invalid_token: "Preverjanje pristnosti ni mogoče."
+      locked: "Vaš račun je zaklenjen."
+      timeout: "Vaša seja je potekla. Za nadaljevanje se ponovno prijavite."
       unauthenticated: "Za nadaljevanje se prijavite ali registrirajte."
-      unconfirmed: !binary |
-          WmEgbmFkYWxqZXZhbmplIHBvdHJkaXRlIHZhmiByYeh1bi4=
+      unconfirmed: "Za nadaljevanje potrdite vaš račun."
     invitations: 
       invitation_token_invalid: "Povabilo ni veljavno!"
-      send_instructions: !binary |
-          VmGaZSBwb3ZhYmlsbyBqZSBwb3NsYW5vLg==
-      updated: !binary |
-          VmGaZSBnZXNsbyBqZSB1c3Blmm5vIHNwcmVtZW5qZW5vLiBaZGFqIHN0ZSBw
-          cmlqYXZsamVuaS4=
+      send_instructions: "Vaše povabilo je poslano."
+      updated: "Vaše geslo je uspešno spremenjeno. Zdaj ste prijavljeni."
     mailer: 
       confirmation_instructions: 
-        confirm: !binary |
-            UG90cmRpIHVwb3JhYm5pmmtpIHJh6HVu
-        subject: !binary |
-            TmF2b2RpbGEgemEgcG90cmRpdGV2IHVwb3JhYm5pmmtlZ2EgcmHodW5h
-        you_can_confirm: !binary |
-            VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGxhaGtvIHBvdHJkaXRlIHMgcG9tb+hq
-            byBzcG9kbmplIHBvdmV6YXZlOg==
+        confirm: "Potrdi uporabniški račun"
+        subject: "Navodila za potrditev uporabniškega računa"
+        you_can_confirm: "Vaš uporabniški račun lahko potrdite s pomočjo spodnje povezave:"
       hello: "Pozdravljeni %{email}!"
       invitation_instructions: 
         accept: "Sprejmi povabilo"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "Socialno omrežje, ki ste ga že čakali je prispelo. Prenovljeno, varnejše in bolj zabavo, %{strong_diaspora} je pripravljena, da vam pomaga deliti in raziskati splet na povsem nov način."
+        be_yourself: "Bodi to kar si"
+        be_yourself_paragraph: "Internet je ustvaril edinstvene nove načine za nas, da se izražamo. %{strong_diaspora} vam omogoča, da ste to kar ste in da delite kakor sami želite z ali brez vašega pravega imena."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "E-pošta se ne prikazuje pravilno? %{link} v vašem brskalniku"
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
+        email_us: "Za splošna vprašanja ali pomoč z računom Diaspore, nam pišite na %{email}."
+        finally: "Končno je tukaj"
+        friends_saying: "Kar vaši prijatelji pravijo ..."
+        get_connected: "Povežite se"
         get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
-        ignore: !binary |
-            yGUgcG92YWJpbGEgbmUgnmVsaXRlIHNwcmVqZXRpLCBwcm9zaW1vIGplbWxq
-            aXRlIHRvIGUtcG+adG8ga290IGJyZXpwcmVkbWV0bm8u
-        join_team: "Join our Team"
+        have_fun: "Uživajte"
+        have_fun_paragraph: "%{strong_diaspora} je vse o odkrivanju nove vsebine in ljudi na spletu.%{link}, prva aplikacija %{strong_diaspora} je šele začetek. Zberite in delite splet v vsej njeni slavi."
+        help_fund: "pomagaj pri financiranju Diaspore"
+        here: "tukaj"
+        ignore: "Če povabila ne želite sprejeti, prosimo jemljite to e-pošto kot brezpredmetno."
+        join_team: "Pridruži se našemu timu"
         love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
-        no_account_till: !binary |
-            VmGaIHJh6HVuIG5lIGJvIHVzdHZhcmplbiwgZG9rbGVyIG5lIGJvc3RlIG9i
-            aXNrYWxpICBwb3ZlemF2ZSB6Z29yYWogaW4gc2UgdnBpc2FsaS4=
-        or: "or"
-        sign_up_now: "Sign up now →"
-        subject: !binary |
-            UG92YWJsamVuaSBzdGUsIGRhIHNlIHByaWRydZ5pdGUgb21yZZ5qdSBEaWFz
-            cG9yYSE=
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        made_by_people: "%{strong_diaspora} je narejena s pomočjo ljudi, ki ljubijo internet toliko kot ti. %{jointeam}, ali %{helpfund}!"
+        more_people: "Celo več ljudi je navdušenih, da te vidijo!"
+        no_account_till: "Vaš račun ne bo ustvarjen, dokler ne boste obiskali  povezave zgoraj in se vpisali."
+        or: "ali"
+        sign_up_now: "Registriraj se zdaj →"
+        subject: "Povabljeni ste, da se pridružite omrežju Diaspora!"
+        team_diaspora: "Tim Diaspore"
+        unsubscribe: "Za odjavo kliknite %{link}."
+        view_in: "Poglej v"
       inviter: 
         accept_at: "na %{url}, sprejmete lahko preko spodnje povezave."
         has_invited_you: "%{name}"
-        have_invited_you: !binary |
-            JXtuYW1lc30gc28gdmFzIHBvdmFiaWxpIHYgb21yZZ5qZSBEaWFzcG9yYQ==
+        have_invited_you: "%{names} so vas povabili v omrežje Diaspora"
       reset_password_instructions: 
         change: "Spremeni geslo"
-        ignore: !binary |
-            ViBrb2xpa29yIHRlZ2EgbmlzdGUgemFodGV2YWxpLCBqZW1saml0ZSB0byBl
-            LXBvmnRvIGtvdCBicmV6cHJlZG1ldG5vLg==
-        someone_requested: !binary |
-            TmVrZG8gamUgemFodGV2YWwgcG92ZXphdm8gemEgc3ByZW1lbWJvIHZhmmVn
-            YSBnZXNsYSwga2FyIGxhaGtvIHN0b3JpdGUgcyBwb21v6GpvIHNwb2RuamUg
-            cG92ZXphdmUu
+        ignore: "V kolikor tega niste zahtevali, jemljite to e-pošto kot brezpredmetno."
+        someone_requested: "Nekdo je zahteval povezavo za spremembo vašega gesla, kar lahko storite s pomočjo spodnje povezave."
         subject: "Navodila za ponastavitev gesla"
-        wont_change: !binary |
-            VmGaZSBnZXNsbyBsYWhrbyBzcHJlbWVuaXRlIHMgcG9tb+hqbyB6Z29ybmpl
-            IHBvdmV6YXZlIHRlciB6IHZwaXNvbSBub3ZlZ2EgZ2VzbGEu
+        wont_change: "Vaše geslo lahko spremenite s pomočjo zgornje povezave ter z vpisom novega gesla."
       unlock_instructions: 
-        account_locked: !binary |
-            WmFyYWRpIHZl6GtyYXRuZSBuZXVzcGWabmUgcHJpamF2ZSBzZSBqZSB2YZog
-            dXBvcmFibmmaa2kgcmHodW4gemFrbGVuaWwu
-        click_to_unlock: !binary |
-            T2RrbGVuaXRlIHZhmiB1cG9yYWJuaZpraSByYeh1biBzIGtsaWtvbSBuYSBz
-            cG9kbmpvIHBvdmV6YXZvOg==
-        subject: !binary |
-            TmF2b2RpbGEgemEgb2RrbGVwYW5qZSB1cG9yYWJuaZprZWdhIHJh6HVuYQ==
-        unlock: !binary |
-            T2RrbGVuaSB1cG9yYWJuaZpraSByYeh1bg==
-      welcome: !binary |
-          RG9icm9kb5psaSAle2VtYWlsfSE=
+        account_locked: "Zaradi večkratne neuspešne prijave se je vaš uporabniški račun zaklenil."
+        click_to_unlock: "Odklenite vaš uporabniški račun s klikom na spodnjo povezavo:"
+        subject: "Navodila za odklepanje uporabniškega računa"
+        unlock: "Odkleni uporabniški račun"
+      welcome: "Dobrodošli %{email}!"
     passwords: 
       edit: 
         change_password: "Spremeni geslo"
       new: 
         forgot_password: "Ste pozabili geslo?"
-        no_account: !binary |
-            VXBvcmFibmmaa2kgcmHodW4gcyB0ZW0gZS1uYXNsb3ZvbSBuZSBvYnN0YWph
-            LiBWIGtvbGlrb3IgmmUg6GFrYXRlIG5hIHBvdmFiaWxvLCB2YXMgcHJvc2lt
-            byB6YSBwb3RycGxqZW5qZS4=
-        send_password_instructions: !binary |
-            UG+abGppIG5hdm9kaWxhIHphIHBvbmFzdGF2aXRldiBnZXNsYQ==
-      send_instructions: !binary |
-          ViBuZWthaiBtaW51dGFoIGJvc3RlIHByZWplbGkgZS1wb5p0byB6IG5hdm9k
-          aWxpIHphIHBvbmFzdGF2aXRldiB2YZplZ2EgZ2VzbGEu
-      updated: !binary |
-          VmGaZSBnZXNsbyBqZSBiaWxvIHVzcGWabm8gc3ByZW1lbmplbm8uIFpkYWog
-          c3RlIHByaWphdmxqZW5pLg==
+        no_account: "Uporabniški račun s tem e-naslovom ne obstaja. V kolikor še čakate na povabilo, vas prosimo za potrpljenje."
+        send_password_instructions: "Pošlji navodila za ponastavitev gesla"
+      send_instructions: "V nekaj minutah boste prejeli e-pošto z navodili za ponastavitev vašega gesla."
+      updated: "Vaše geslo je bilo uspešno spremenjeno. Zdaj ste prijavljeni."
     registrations: 
-      destroyed: !binary |
-          TmFzdmlkZW5qZSEgVmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIHVzcGWabm8g
-          cHJla2xpY2FuLiBWbGp1ZG5vIHZhcyB2YWJpbW8sIGRhIG5hcyBwb25vdm5v
-          IG9iaZroZXRlLg==
-      signed_up: !binary |
-          VmGaYSByZWdpc3RyYWNpamEgamUgdXNwZZpuYS4gViBrb2xpa29yIGplIG9t
-          b2dv6GVubywgc3RlIHYgdmGabyBlLXBvmnRvIHByZWplbGkgc3Bvcm/oaWxv
-          IHphIHBvdHJkaXRldiByYeh1bmEu
-      updated: !binary |
-          VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIHVzcGWabm8gcG9zb2RvYmxqZW4u
+      destroyed: "Nasvidenje! Vaš uporabniški račun je uspešno preklican. Vljudno vas vabimo, da nas ponovno obiščete."
+      signed_up: "Vaša registracija je uspešna. V kolikor je omogočeno, ste v vašo e-pošto prejeli sporočilo za potrditev računa."
+      updated: "Vaš uporabniški račun je uspešno posodobljen."
     sessions: 
       new: 
-        alpha_software: !binary |
-            VXBvcmFiaWxpIGJvc3RlIGFscGhhIHJhemxp6GljbyBwcm9ncmFtYS4=
-        bugs_and_feedback: !binary |
-            T3BvemFyamFtbyB2YXMsIGRhIGxhaGtvIG5hbGV0aXRlIG5hIGhyb5roZS4g
-            VmVzZWxpIGJvbW8gdnNha2UgcHJpamF2bGplbmUgbmFwYWtlLCBraSBqbyBs
-            YWhrbyBvZGRhdGUgcyBwb21v6GpvICdGZWVkYmFjaycgZ3VtYmEgbmEgZGVz
-            bmkgc3RyYW5pIHNwbGV0bmVnYSBicnNrYWxuaWthLiBQbyBuYWpib2xqmmlo
-            IG1v6GVoIHNlIGJvbW8gcG90cnVkaWxpLCBkYSBwcmlqYXZsamVubyBuYXBh
-            a28gb2JyYXZuYXZhbW8gaW4gb2RwcmF2aW1vIHYgbmFqa3JhapplbSBtb55u
-            ZW0g6GFzdS4=
-        bugs_and_feedback_mobile: !binary |
-            T3BvemFyamFtbyB2YXMsIGRhIGxhaGtvIG5hbGV0aXRlIG5hIG5hcGFrZS4g
-            IFZlc2VsaSBib21vIHZzYWtlIHZhmmUgcHJpamF2bGplbmUgbmFwYWtlLCBr
-            aSBqbyBib21vIHBvc2t1c2lsaSBvYnJhdm5hdmF0aSBpbiByZZppdGkgdiBu
-            YWprcmFqmmVtIG1vnm5lbSDoYXN1Lg==
+        alpha_software: "Uporabili boste alpha različico programa."
+        bugs_and_feedback: "Opozarjamo vas, da lahko naletite na hrošče. Veseli bomo vsake prijavljene napake, ki jo lahko oddate s pomočjo 'Feedback' gumba na desni strani spletnega brskalnika. Po najboljših močeh se bomo potrudili, da prijavljeno napako obravnavamo in odpravimo v najkrajšem možnem času."
+        bugs_and_feedback_mobile: "Opozarjamo vas, da lahko naletite na napake.  Veseli bomo vsake vaše prijavljene napake, ki jo bomo poskusili obravnavati in rešiti v najkrajšem možnem času."
         login: "Prijava"
-        modern_browsers: !binary |
-            cG9kcGlyYSBsZSBub3ZlapplIHNwbGV0bmUgYnJza2FsbmlrZS4=
+        modern_browsers: "podpira le novejše spletne brskalnike."
         password: "Geslo"
         remember_me: "Zapomni si me"
         sign_in: "Prijavi se"
-        username: !binary |
-            VXBvcmFibmmaa28gaW1l
-      signed_in: !binary |
-          VmGaYSBwcmlqYXZhIGplIHVzcGWabmEu
-      signed_out: !binary |
-          VmGaYSBvZGphdmEgamUgdXNwZZpuYS4=
+        username: "Uporabniško ime"
+      signed_in: "Vaša prijava je uspešna."
+      signed_out: "Vaša odjava je uspešna."
     shared: 
       links: 
         forgot_your_password: "Ste pozabili geslo?"
-        receive_confirmation: !binary |
-            U3RlIHByZWplbGkgbmF2b2RpbGEgemEgcG90cmRpdGV2IHVwb3JhYm5pmmtl
-            Z2EgcmHodW5hPw==
-        receive_unlock: !binary |
-            U3RlIHByZWplbGkgbmF2b2RpbGEgemEgb2RrbGVwYW5qZSB1cG9yYWJuaZpr
-            ZWdhIHJh6HVuYT8=
+        receive_confirmation: "Ste prejeli navodila za potrditev uporabniškega računa?"
+        receive_unlock: "Ste prejeli navodila za odklepanje uporabniškega računa?"
         sign_in: "Prijava"
         sign_up: "Vpis"
-        sign_up_closed: !binary |
-            VnBpcyB0cmVudXRubyBuaSBvbW9nb+hlbi4=
+        sign_up_closed: "Vpis trenutno ni omogočen."
       mail_signup_form: 
-        sign_up_for_an_invite: !binary |
-            UHJpamF2YSBuYSDoYWthbG5vIGxpc3RvIHphIHBvdmFiaWxhIQ==
+        sign_up_for_an_invite: "Prijava na čakalno listo za povabila!"
     unlocks: 
       new: 
-        resend_unlock: !binary |
-            UG9ub3ZubyBwb5psamkgbmF2b2RpbGEgemEgb2RrbGVwYW5qZSB1cG9yYWJu
-            aZprZWdhIHJh6HVuYQ==
-      send_instructions: !binary |
-          ViBuZWthaiBtaW51dGFoIGJvc3RlIHByZWplbGkgZS1wb5p0byB6IG5hdm9k
-          aWxpIHphIG9ka2xlcGFuamUgdmGaZWdhIHVwb3JhYm5pmmtlZ2EgcmHodW5h
-          Lg==
-      unlocked: !binary |
-          VmGaIHVwb3JhYm5pmmtpIHJh6HVuIGplIGJpbCB1c3Blmm5vIG9ka2xlbmpl
-          bi4gWmRhaiBzdGUgcHJpamF2bGplbmku
+        resend_unlock: "Ponovno pošlji navodila za odklepanje uporabniškega računa"
+      send_instructions: "V nekaj minutah boste prejeli e-pošto z navodili za odklepanje vašega uporabniškega računa."
+      unlocked: "Vaš uporabniški račun je bil uspešno odklenjen. Zdaj ste prijavljeni."
   errors: 
     messages: 
-      already_confirmed: !binary |
-          amUgnmUgYmlsbyBwb3RyamVubw==
-      not_found: !binary |
-          bmkgYmlsbyBtb2dv6GUgbmFqdGk=
+      already_confirmed: "je že bilo potrjeno"
+      not_found: "ni bilo mogoče najti"
       not_locked: "ni bilo zaklenjeno"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 7ac42ed1a..d1d54591d 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -111,6 +111,9 @@ ar:
         here_to_help: "مجتمع دياسبرا متأهب للمساعدة"
         need_help: "تحتاج للمساعدة؟"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "حافظ على %{pod} سريعا عبر تبرع شهري لصيانة السيرفرات "
@@ -552,7 +555,7 @@ ar:
       invalid_ext: "{file} له صيغة غير صالحة. {extensions} هي الصيغ الوحيدة المسموح بها."
       size_error: "{file} ذو حجم كبير جدا, {sizeLimit} هو الحجم الأقصى المسموح به."
     new_profile_photo: 
-      or_select_one: "أو اختر واحدة من الموجودات مسبقا"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "ارْفَع صورةً شخصيةً جديدة"
     photo: 
       view_all: "شاهد كل صور %{name}"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index e9a8c6d4a..9d6ab34f3 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -111,6 +111,9 @@ bg:
         here_to_help: "Общността е готова да помогне!"
         need_help: "Нуждаете се от помощ?"
         satisfaction: "%{link}: Поддръжка осигурена от общността"
+        tag_bug: "бъг"
+        tag_feature: "функция"
+        tag_question: "въпрос"
         tutorials_wiki_and_forum: "%{tutorial}, %{wiki} и %{forum}: Ръководства, съвети и новини от общността"
       introduce_yourself: "Това е вашият поток.  Включете се и се представете."
       keep_us_running: "Осигурете бързата работа на %{pod} като дарите пари за месечната издръжка на сървърите!"
@@ -552,7 +555,7 @@ bg:
       invalid_ext: "{file} е с невалидно разширение. Позволени са само: {extensions}."
       size_error: "{file} е твърде голям. Максималният разрешен размер е {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "или изберете от вече качените"
+      or_select_one_existing: "или изберете от вече качените %{photos}"
       upload: "Качете нова снимка за профила!"
     photo: 
       view_all: "всички снимки на %{name}"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 4c1ae8576..0d26bea06 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -111,6 +111,9 @@ br:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ br:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} is too large, maximum file size is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Kas ur poltred nevez!"
     photo: 
       view_all: "sellet ouzh an holl fotoioù gant %{name}"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index fe718fa2d..91aa769ea 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -111,6 +111,9 @@ cs:
         here_to_help: "Komunita Diaspory je tu!"
         need_help: "Potřebujete pomoct?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Pomozte %{pod} udržet rychlý, kupte našim serverům dávku kávy."
@@ -552,7 +555,7 @@ cs:
       invalid_ext: "{file} má chybnou příponu. Jsou povoleny pouze {extensions}."
       size_error: "{file} je přiliš veliký, maximální velikost je {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "nebo vyberte nějaký z již existujících ve složce"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Nahrajte novou profilovou fotku!"
     photo: 
       view_all: "zobrazit všechny fotky uživatele %{name}"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 7e018a2e6..4b3cd1b71 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -111,6 +111,9 @@ cy:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Oes rhaid help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ cy:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} is too large, maximum file size is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "gweld lluniau %{name} i gŷd"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 238a4102e..fe70d529d 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -111,6 +111,9 @@ da:
         here_to_help: "Diaspora samfundet er her!"
         need_help: "Brug for hjælp?"
         satisfaction: "%{link}: Samfunds-drevet support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Dette er din strøm. Hop ud i det og introducér dig selv."
       keep_us_running: "Hold %{pod} kørende hurtigt og køb serverne deres kaffe fix med en månedlig donation!"
@@ -552,7 +555,7 @@ da:
       invalid_ext: "{file} har en ugyldig filtype. Kun {udvidelser} er tilladt."
       size_error: "{File} er for stor. Maksimal filstørrelse er {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "eller vælge en fra dit allerede eksisterende"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload et nyt profilbillede!"
     photo: 
       view_all: "se alle %{name}s billeder"
@@ -657,9 +660,9 @@ da:
         two: "%{count} delinger"
         zero: "Del"
       reshare_confirmation: "Del %{author} - %{text}?"
-      reshare_original: "Del orginal"
+      reshare_original: "Del original"
       reshared_via: "delt via"
-      show_original: "Vis orginal"
+      show_original: "Vis original"
   search: "Søg"
   services: 
     create: 
@@ -760,7 +763,7 @@ da:
       currently_unavailable: "Det er i øjeblikket ikke muligt at kommentere"
       dislike: "Synes ikke om"
       hide_and_mute: "Skjul indlæg og kommentarer"
-      ignore_user: "Ignore %{name}"
+      ignore_user: "Ignorer %{name}"
       ignore_user_description: "Ignore and remove user from all aspects?"
       like: "Synes om"
       shared_with: "Delt med: %{aspect_names}"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index aeab2bef6..b1e6256cc 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -106,11 +106,14 @@ de:
         do_you: "Hast du:"
         email_feedback: "Dein Feedback für Diaspora per %{link}"
         feature_suggestion: "… einen %{link}-Vorschlag?"
-        find_a_bug: "… einen %{link} gefunden?"
+        find_a_bug: "… ein %{link}?"
         have_a_question: "… eine %{link}?"
-        here_to_help: "Die Diaspora-Gemeinschaft ist hier!"
+        here_to_help: "Die Diaspora-Gemeinschaft ist für dich da!"
         need_help: "Benötigst du Hilfe?"
         satisfaction: "%{link}: Unterstützung durch die Gemeinschaft"
+        tag_bug: "problem"
+        tag_feature: "feature"
+        tag_question: "frage"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Von der Gemeinschaft erstellte Tutorials, Anleitungen und Nachrichten"
       introduce_yourself: "Das ist dein Stream. Leg' los und stell dich vor."
       keep_us_running: "Hilf %{pod}, schnell zu arbeiten und spendiere unseren Servern ihre Tasse Kaffee mit einer monatlichen Spende!"
@@ -552,7 +555,7 @@ de:
       invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
       size_error: "{file} ist zu groß. Die maximale Dateigröße beträgt {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "oder eins deiner bereits verfügbaren Fotos auswählen"
+      or_select_one_existing: "oder eins deiner bereits hochgeladenen %{photos} auswählen"
       upload: "Ein neues Profilfoto hochladen"
     photo: 
       view_all: "zeige alle Fotos von %{name}"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index bcfd0576e..8c1af0d51 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -111,6 +111,9 @@ de_formal:
         here_to_help: "Die Diaspora-Community ist hier!"
         need_help: "Benötigen Sie Hilfe?"
         satisfaction: "%{link}: Unterstützung durch die Gemeinschaft"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Das ist ihr Stream. Legen Sie los und stellen Sie sich vor."
       keep_us_running: "Helfen Sie, %{pod} schnell zu arbeiten und kaufen Sie unseren Servern ihren monatlichen Schuss Kaffee!"
@@ -552,7 +555,7 @@ de_formal:
       invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt."
       size_error: "{file} ist zu groß. Die maximale Dateigröße beträgt {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "oder wählen Sie eins aus Ihren bereits bestehenden"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Laden Sie ein neues Profilfoto hoch!"
     photo: 
       view_all: "zeige alle Fotos von %{name}"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index b6dc76491..07acd9923 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -111,6 +111,9 @@ el:
         here_to_help: "Η κοινότητα του Diaspora είναι εδώ για να σε βοηθήσει!"
         need_help: "Χρειάζεστε βοήθεια;"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Αυτή είναι η Ροή σας. Μπείτε και συστηθείτε."
       keep_us_running: "Διατηρείστε τη καλή λειτουργία του %{pod}, παρέχοντας στους servers μας τη καφείνη τους!"
@@ -552,7 +555,7 @@ el:
       invalid_ext: "{file} δεν έχει έγκυρη τύπο αρχείου. Μόνο τύποι αρχείου {extensions} επιτρέπονται."
       size_error: "{file} είναι πολύ μεγάλο, το μέγιστο μέγεθος αρχείου είναι {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "ή επιλέξτε κάποια από τις υπάρχουσες"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Μεταφορτώστε μια νέα φωτογραφία προφίλ!"
     photo: 
       view_all: "δες όλες τις φωτογραφίες του χρήστη %{name}"
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index a9428fa5a..5cc9af30d 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -111,6 +111,9 @@ en_1337:
         here_to_help: "45K PR0G4M3R5!"
         need_help: "N33D H3LP?"
         satisfaction: "%{link}: C0MMUN17Y-P0W3R3D 5UPP0R7!"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "K33P %{pod} UP BY D0N471NG 3V3RY M0N7H!"
@@ -552,7 +555,7 @@ en_1337:
       invalid_ext: "{file} H45 1NV4L1D 3X73N510N! 0NLY {extensions} 4R3 4LL0W3D!"
       size_error: "{file} 15 2 L4RG3, M4X1MUM F1L3 51Z3 15 {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "0R 53L3C7 0N3 FR0M Y0UR 4LR34DY 3X1571NG!"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "UPL04D 4 N3W PR0F1L3 P1C!"
     photo: 
       view_all: "V13W 4LL 0F %{name}'s PR0N"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index 1cb07dd48..94ec55998 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -111,6 +111,9 @@ en_pirate:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ en_pirate:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} is too large, maximum file size is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "view all of %{name}'s photos"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 15548bbfa..270b10f52 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -111,6 +111,9 @@ en_shaw:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "𐑒𐑰𐑐 %{pod} 𐑮𐑳𐑯𐑦𐑙 𐑓𐑨𐑕𐑑, 𐑚𐑲 𐑬𐑮 𐑕𐑻𐑝𐑼𐑟 𐑞𐑺 𐑥𐑳𐑯𐑔𐑤𐑦 𐑒𐑪𐑓𐑦 𐑓𐑦𐑒𐑕!"
@@ -552,7 +555,7 @@ en_shaw:
       invalid_ext: "{file} 𐑣𐑨𐑟 𐑦𐑯𐑝𐑨𐑤𐑦𐑛 𐑧𐑒𐑕𐑑𐑧𐑯𐑖𐑩𐑯. 𐑴𐑯𐑤𐑦 {extensions} 𐑸 𐑩𐑤𐑬𐑛."
       size_error: "{file} 𐑦𐑟 𐑑𐑵 𐑤𐑸𐑡, 𐑥𐑨𐑒𐑕𐑦𐑥𐑩𐑥 𐑓𐑲𐑤 𐑕𐑲𐑟 𐑦𐑟 {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "𐑹 𐑕𐑩𐑤𐑧𐑒𐑑 𐑢𐑳𐑯 𐑓𐑮𐑳𐑥 𐑘𐑹 𐑷𐑤𐑮𐑧𐑛𐑦 𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "𐑩𐑐𐑤𐑴𐑛 𐑩 𐑯𐑿 𐑐𐑮𐑴𐑓𐑲𐑤 𐑓𐑴𐑑𐑴!"
     photo: 
       view_all: "𐑝𐑿 𐑷𐑤 𐑝 %{name}𐑟 𐑓𐑴𐑑𐑴𐑟"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 29cd0df29..5a42fef2d 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -111,6 +111,9 @@ eo:
         here_to_help: "Jen la DIASPORA* komunumo!"
         need_help: "Ĉu Vi Bezonas Helpon?"
         satisfaction: "%{link}: Komunuma helpo"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Instruiloj, lerniloj kaj novaĵoj funkciigitaj de la komunumo"
       introduce_yourself: "Tio estas via torento. Ensaltu kaj prezentu vin mem."
       keep_us_running: "Helpu %{pod} rapide funkcii kaj aĉetu por niaj servkomputiloj ilian kaforiparon per ĉiumonata donatado!"
@@ -552,7 +555,7 @@ eo:
       invalid_ext: "{file} havas malvalidan sufikson. Nur {extensions} estas validaj."
       size_error: "{file} estas tro granda; la maksimuma dosiergrandeco estas {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "aŭ elektu unu el via jam ekzistanta"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Alŝutu novan profilbildon!"
     photo: 
       view_all: "Vidi ĉiujn bildojn de %{name}"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 7628e9d40..d39481c6d 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -111,6 +111,9 @@ es-AR:
         here_to_help: "La comunidad de Diáspora está acá!"
         need_help: "Necesitás ayuda?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ es-AR:
       invalid_ext: "{file} tiene una extensión incorrecta. Sólo se permiten {extensions}."
       size_error: "{file} es demasiado grande, el tamaño máximo de archivo es {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "O seleccioná una ya existente."
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "¡Subir una nueva foto de perfil!"
     photo: 
       view_all: "ver todas las fotos de %{name}"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 821fd56c1..3821d69ca 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -111,6 +111,9 @@ es-CL:
         here_to_help: "La comunidad de Diaspora esta aquí!"
         need_help: "Necesitas ayuda?"
         satisfaction: "%{link}: Soporte impulsado por la comunidad"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Mantén %{pod} rápido, !compra a nuestros servidores su dosis mensual de café!"
@@ -552,7 +555,7 @@ es-CL:
       invalid_ext: "{file} tiene una extensión no válida. Solo están permitidas {extensions}."
       size_error: "{file} es demasiado grande, el tamaño máximo por archivo es {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "o selecciona uno de los que ya existen"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "¡Sube una nueva foto de perfil!"
     photo: 
       view_all: "ver todas las fotos de %{name}"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 37c983a48..749ef564d 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -105,12 +105,15 @@ es:
       help: 
         do_you: "Tal vez:"
         email_feedback: "Si lo prefieres, envía tus comentarios a este %{link}."
-        feature_suggestion: "...plantees sugerencias? %{link}"
-        find_a_bug: "...encontraste errores? %{link}"
-        have_a_question: "...tengas preguntas? %{link}"
+        feature_suggestion: "- Plantees sugerencias. %{link}"
+        find_a_bug: "- Encuentres errores. %{link}"
+        have_a_question: "- Tengas preguntas. %{link}"
         here_to_help: "¡La comunidad Diaspora está aquí!"
-        need_help: "¿Necesitas ayuda?"
+        need_help: "Ayuda"
         satisfaction: "%{link}: Soporte de la Comunidad"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutoriales, wiki y noticias"
       introduce_yourself: "Esta es tu entrada de novedades. Adelante, preséntate..."
       keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores sus dosis de café mensual!"
@@ -124,7 +127,7 @@ es:
       post_a_message: "publica un mensaje >>"
       services: 
         content: "Puedes conectar los siguientes servicios a Diaspora*:"
-        heading: "Servicios conectados"
+        heading: "Servicios"
       unfollow_tag: "Dejar de seguir a #%{tag}"
       welcome_to_diaspora: "¡Bienvenid@ a Diaspora, %{name}!"
       your_aspects: "Tus Aspectos"
@@ -532,7 +535,7 @@ es:
     two: "%{count} personas"
     webfinger: 
       fail: "Perdona, no pudimos encontrar %{handle}"
-    zero: "ninguna persona"
+    zero: "0 personas"
   photos: 
     comment_email_subject: "fotografía de %{name}"
     create: 
@@ -552,7 +555,7 @@ es:
       invalid_ext: "{file} tiene una extensión inválida. Sólo {extensions} están permitidas."
       size_error: "{file} es demasiado largo, el tamaño máximo por archivo es de {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "o selecciona alguna de las ya subidas"
+      or_select_one_existing: "o selecciona alguna de las %{photos} ya existentes"
       upload: "¡Sube una foto nueva de perfil!"
     photo: 
       view_all: "ver todas las fotos de %{name}"
@@ -759,7 +762,7 @@ es:
       connect_to_comment: "Conecta con esta persona para comentar en su publicación"
       currently_unavailable: "comentarios actualmente no disponibles"
       dislike: "No me gusta"
-      hide_and_mute: "Ocultar publicación y desactivar notificaciones"
+      hide_and_mute: "Ignorar la publicación"
       ignore_user: "Ignorar a %{name}"
       ignore_user_description: "¿Ignorar y quitar a esa persona de todos los aspectos?"
       like: "Me gusta"
@@ -788,7 +791,7 @@ es:
     show_more_comments: "Mostrar %{number} comentarios más"
   streams: 
     aspects: 
-      title: "Tus Aspectos"
+      title: "Aspectos"
     aspects_stream: "Aspectos"
     commented_on: "comentado"
     community_spotlight_stream: "Comunidad Creativa"
@@ -796,7 +799,7 @@ es:
       add_a_tag: "Añade una etiqueta"
       contacts_title: "Gente que sigue esas etiquetas"
       follow: "Seguir"
-      title: "#Etiquetas seguidas"
+      title: "#Etiquetas"
     followed_tags_stream: "#Etiquetas seguidas"
     mentioned_stream: "@Menciones"
     mentions: 
@@ -899,7 +902,7 @@ es:
       simply_visit: "Simplemente visita"
       works_on_modern: "Funciona en todos los smartphones modernos"
     privacy_settings: 
-      ignored_users: "Usuarios Ignorados"
+      ignored_users: "Personas Ignoradas"
       stop_ignoring: "Dejar de ignorar"
       title: "Configuración de Privacidad"
     public: 
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 749c0cd00..52326cf28 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -111,6 +111,9 @@ eu:
         here_to_help: "Diaspora komunitatea hemen dago!"
         need_help: "Laguntza Behar Duzu?"
         satisfaction: "%{link}: Komunitateak mantendutako laguntza"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Hau zure kronologia da.  Animatu eta zure burua aurkeztu."
       keep_us_running: "Mantendu %{pod} azkar izaten, erosiezu gure ostalariei hilabeteroko kafe-konponketa!"
@@ -552,7 +555,7 @@ eu:
       invalid_ext: "{file}(r)en luzapena ez da onartu. {extensions} dira onartuak soilik."
       size_error: "{file} pisutsuegia da, fitxategi baten gehiengo pisua {sizeLimit} da."
     new_profile_photo: 
-      or_select_one: "edo aukeratu dagoeneko badagoen bat"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Igo ezazu profil argazki berri bat!"
     photo: 
       view_all: "%{aspect}(r)en argazki guztiak ikusi"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 427d2daad..a0a1dd344 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -61,7 +61,7 @@ fi:
       done_editing: "muokkaus valmis"
     aspect_listings: 
       add_an_aspect: "+ Lisää näkymä"
-      deselect_all: "Poista valinta kaikista"
+      deselect_all: "Poista valinnat"
       edit_aspect: "Muokkaa näkymää %{name}"
       select_all: "Valitse kaikki"
     aspect_stream: 
@@ -109,17 +109,20 @@ fi:
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
-        need_help: "Need Help?"
+        need_help: "Tarvitsetko apua?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Tämä on virtasi. Hyppää sekaan ja esittele itsesi."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Seuraa tagia %{link} ja toivota uudet käyttäjät tervetulleiksi Diasporaan!"
+        learn_more: "Lue lisää"
+        title: "Tervehdi uusia käyttäjiä"
       no_contacts: "Ei kontakteja"
-      no_tags: "No tags"
+      no_tags: "+ Etsi tageja seurattaviksi"
       people_sharing_with_you: "Ihmiset jotka jakavat kanssasi"
       post_a_message: "lähetä viesti >>"
       services: 
@@ -199,7 +202,7 @@ fi:
       add_a_new_aspect: "Lisää näkymä"
       add_to_aspect: "lisää kontakteja näkymään %{name}"
       all_contacts: "Kaikki kontaktit"
-      check_out: "Check out"
+      check_out: "Katso"
       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: "Kontaktini"
       no_contacts: "Ei kontakteja."
@@ -532,7 +535,7 @@ fi:
     two: "%{count} people"
     webfinger: 
       fail: "Valitettavasti tunnusta %{handle} ei löytynyt."
-    zero: "Ei ihmisiä"
+    zero: "0 ihmistä"
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
@@ -552,7 +555,7 @@ fi:
       invalid_ext: "{file} sisältää viallisen tiedostopäätteen. Tuetut muodot ovat {extensions}."
       size_error: "{file} on liian suuri, suurin tiedostokoko on {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "tai valitse joku olemassa olevista"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Lisää uusi profiilikuva!"
     photo: 
       view_all: "näytä kaikki käyttäjän %{name} kuvat"
@@ -582,15 +585,15 @@ fi:
       first_name: "Etunimi"
       last_name: "Sukunimi"
       update_profile: "Päivitä profiili"
-      your_bio: "Biografia"
-      your_birthday: "Syntymäpäivä"
+      your_bio: "Biografiasi"
+      your_birthday: "Syntymäpäiväsi"
       your_gender: "Sukupuolesi"
       your_location: "Sijaintisi"
       your_name: "Nimesi"
       your_photo: "Profiilikuva"
       your_private_profile: "Yksityinen profiilisi"
       your_public_profile: "Julkinen profiilisi"
-      your_tags: "Sinä 5:llä #tagilla"
+      your_tags: "Kuvaile itseäsi viidellä sanalla"
       your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
       failed: "Profiilin päivitys epäonnistui"
@@ -660,7 +663,7 @@ fi:
       reshare_original: "Reshare orignial"
       reshared_via: "reshared via"
       show_original: "Show Original"
-  search: "Etsi"
+  search: "Haku"
   services: 
     create: 
       already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
@@ -732,17 +735,11 @@ fi:
       control_your_audience: "Hallitse yleisöäsi"
       logged_in: "sisäänkirjautunut palveluun %{service}"
       manage: "hallitse yhdistettyjä palveluita"
-      new_user_welcome_message: |-
-          Käytä #hashtageja luokitellaksesi viestisi ja löytääksesi ihmisiä, jotka jakavat kiinnostuksen kohteesi. Kutsu upeita ihmisiä paikalle @Maininnoilla.
-          
-          Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions
+      new_user_welcome_message: "Käytä #hashtageja luokitellaksesi viestisi ja löytääksesi ihmisiä, jotka jakavat kiinnostuksen kohteesi. Kutsu upeita ihmisiä paikalle @Maininnoilla."
       outside: "Julkiset viestit näkyvät Diasporan ulkopuolelle."
       share: "Jaa"
       title: "Olet lähettämässä julkista viestiä!"
-      visibility_dropdown: |-
-          Muuta tästä pudotusvalikosta viestisi näkyvyyttä. (Suosittelemme, että teet tästä ensimmäisestä viestistäsi julkisen.)
-          
-          Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)
+      visibility_dropdown: "Muuta tästä pudotusvalikosta viestisi näkyvyyttä. (Suosittelemme, että teet tästä ensimmäisestä viestistäsi julkisen.)"
     publisher: 
       all: "kaikki"
       all_contacts: "kaikki kontaktit"
@@ -800,7 +797,7 @@ fi:
     community_spotlight_stream: "Yhteisön valokeila"
     followed_tag: 
       add_a_tag: "Lisää tagi"
-      contacts_title: "People who dig these tags"
+      contacts_title: "Näistä tageista pitävät ihmiset"
       follow: "Seuraa"
       title: "#Seuratut tagit"
     followed_tags_stream: "#Seuratut tagit"
@@ -817,7 +814,7 @@ fi:
       title: "Public Activity"
     recently: "äskettäin:"
     tags: 
-      contacts_title: "People who dig these tags"
+      contacts_title: "Näistä tageista pitävät ihmiset"
       title: "Posts tagged: %{tags}"
   tag_followings: 
     create: 
@@ -832,8 +829,8 @@ fi:
       followed_by: "tagia seuraa"
       following: "Seurataan tagia #%{tag}"
       nobody_talking: "Kukaan ei vielä keskustele tagista %{tag}."
-      people_tagged_with: "Ihmiset merkitty %{tag} tagilla"
-      posts_tagged_with: "Viestit merkitty #%{tag} tagilla"
+      people_tagged_with: "Tagilla %{tag} merkityt ihmiset"
+      posts_tagged_with: "Tagilla #%{tag} merkityt viestit"
       stop_following: "Lopeta tagin #%{tag} seuraaminen"
   tokens: 
     show: 
@@ -852,8 +849,8 @@ fi:
   username: "Käyttäjätunnus"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "Sähköpostiosoite %{email} aktivoitu"
+      email_not_confirmed: "Sähköpostiosoitetta ei voitu aktivoida. Oliko linkki väärä?"
     destroy: 
       no_password: "Syötä nykyinen salasanasi sulkeaksesi tilisi."
       success: "Tilisi on lukittu. Meiltä voi mennä 20 minuuttia tilisi sulkemiseen. Kiitos, kun kokeilit Diasporaa."
@@ -870,7 +867,7 @@ fi:
       download_photos: "Lataa kaikki kuvat"
       download_xml: "Lataa tiedot XML-muodossa"
       edit_account: "Muokkaa käyttäjätiliä"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      email_awaiting_confirmation: "Olemme lähettäneet sinulle aktivointilinkin osoitteeseen %{unconfirmed_email}. Jatkamme alkuperäisen osoitteesi %{email} käyttämistä siihen saakka, kunnes aktivoit uuden osoitteesi kyseisen linkin kautta."
       export_data: "Vie tietoja"
       getting_started: "New User Prefrences"
       liked: "...tykkää kirjoituksistasi?"
@@ -918,8 +915,8 @@ fi:
       password_not_changed: "Salasanan vaihto epäonnistui"
       settings_not_updated: "Asetusten päivittäminen epäonnistui"
       settings_updated: "Asetukset päivitetty"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      unconfirmed_email_changed: "Sähköpostiosoite muutettu. Se täytyy aktivoida."
+      unconfirmed_email_not_changed: "Sähköpostiosoitteen vaihto epäonnistui"
   webfinger: 
     fetch_failed: "webfinger-profiilin %{profile_url} haku epäonnistui"
     hcard_fetch_failed: "tapahtui virhe haettaessa hcard:ia tilille %{account}"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 8da73f69b..f114414f9 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -111,6 +111,9 @@ fr:
         here_to_help: "La communauté Diaspora est là !"
         need_help: "Besoin d'aide ?"
         satisfaction: "%{link} : Support par la communauté"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutoriels créés par la communauté, how-to, et infos"
       introduce_yourself: "Ceci est votre flux. Rejoignez-nous et présentez-vous."
       keep_us_running: "Permettez à %{pod} de fonctionner rapidement et achetez une dose de café par mois à nos serveurs !"
@@ -552,7 +555,7 @@ fr:
       invalid_ext: "{file} a une extension invalide. Seules {extensions} sont autorisées."
       size_error: "{file} est trop grand, la taille maximum pour un fichier est {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "ou faites votre choix parmi vos"
+      or_select_one_existing: "ou choisissez parmi vos photos existantes %{photos}"
       upload: "Mettre une nouvelle photo de profil !"
     photo: 
       view_all: "voir toute les photos de %{name}"
@@ -573,7 +576,7 @@ fr:
       not_found: "Désolé, nous n'avons pas pu trouver ce message."
       permalink: "lien permanent"
   previous: "précédent"
-  privacy: "Privacy"
+  privacy: "Vie privée"
   profile: "Profil"
   profiles: 
     edit: 
@@ -693,7 +696,7 @@ fr:
   settings: "Options"
   share_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      post_hidden_and_muted: "La publication de %{name} a été masquée ainsi que les notifications."
       see_it_on_their_profile: "Si vous souhaitez voir des mises à jour de ce message, visitez la page de profil de %{name}."
   shared: 
     add_contact: 
@@ -818,8 +821,8 @@ fr:
       failure: "Erreur lors de la demande de suivi de #%{name}. Le suivez-vous déjà ?"
       success: "Yep ! Vous suivez maintenant #%{name}."
     destroy: 
-      failure: "Erreur lors de la demande d'arrêt du suivit de : #%{name}"
-      success: "L'arrêt du suivit de #%{name} est un succès"
+      failure: "Erreur lors de la demande d'arrêt du suivi de : #%{name}"
+      success: "L'arrêt du suivi de #%{name} est un succès"
   tags: 
     show: 
       follow: "Suivre #%{tag}"
@@ -849,9 +852,9 @@ fr:
       email_confirmed: "Email %{email} activé"
       email_not_confirmed: "L'email n'a pas pu être activé. Lien erroné ?"
     destroy: 
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Veuillez introduire votre mot de passe actuel pour fermer votre compte."
+      success: "Votre compte a été bloqué. 20 minutes pourraient être nécessaires pour la finalisation de sa fermeture. Merci d'avoir essayé d'utiliser Diaspora."
+      wrong_password: "Le mot de passe introduit ne correspond pas à  votre mot de passe actuel."
     edit: 
       also_commented: "…quelqu'un d'autre commente une publication de votre contact ?"
       change: "Modifier"
@@ -900,7 +903,7 @@ fr:
       works_on_modern: "Fonctionne sur tous les smartphones modernes"
     privacy_settings: 
       ignored_users: "Utilisateurs ignorés"
-      stop_ignoring: "Stop ignoring"
+      stop_ignoring: "Arrêter d'ignorer."
       title: "Paramètres de confidentialité"
     public: 
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index b7e0b60f4..453f2e221 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -111,6 +111,9 @@ ga:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ ga:
       invalid_ext: "Tá iarmhír míbhaillí ag {file}. Níl ag {extensions} ceadaithe."
       size_error: "Tá {file} ró-mhór, tá an méid is mó {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "nó pioc cean ó do cinn ann cheanna féin"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Úaslódáil pictiúr próifíl nua!"
     photo: 
       view_all: "feach ar gach pictiúr %{name}"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index a4d7fee5a..13218780e 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -111,6 +111,9 @@ he:
         here_to_help: "קהילת דיאספורה לרשותך!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "כדי שהפוד %{pod} ימשיך לפעול במהירות ולרכוש שרתים נוספים שימו כמה דולרים כל חודש כדי לממן להם איזה כוס קפה!"
@@ -552,7 +555,7 @@ he:
       invalid_ext: "לקובץ {file} יש סיומת בלתי מוכרת. רק הסיומות {extensions} מותרות לשימוש."
       size_error: "הקובץ {file} גדול מדי, גודל הקובץ המרבי הוא {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "או לבחור באחת הקיימות"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "העלאת תמונת פרופיל חדש!"
     photo: 
       view_all: "צפייה בכל התמונות של %{name}"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index c1a55fbf6..eb34e8af8 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -111,6 +111,9 @@ hu:
         here_to_help: "A Diaspora közösség megérkezett!"
         need_help: "Segítségre van szüksége?"
         satisfaction: "%{link}: Közösségi támogatás"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Közösségi leckék, módszerek, hírek"
       introduce_yourself: "Ez a te Hírfolyamod. Kezdd is el gyorsan egy bemutatkozással."
       keep_us_running: "Hogy gyors maradjon ez a pod (%{pod}), kérlek adományozz pénzt."
@@ -552,7 +555,7 @@ hu:
       invalid_ext: "{file} érvénytelen kiterjesztés. Csak {extensions} kiterjesztések megengedettek."
       size_error: "{file} túl nagy, maximum fájlméret {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "vagy válassz a már feltöltött"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Új profilkép feltöltése!"
     photo: 
       view_all: "%{name} összes képének megtekintése"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 9977f70b3..fc7b8511b 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -111,6 +111,9 @@ id:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ id:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} is too large, maximum file size is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "view all of %{name}'s photos"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 9197b5e91..ced0683fa 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -111,6 +111,9 @@ is:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ is:
       invalid_ext: "{file} hefur ógilt viðskeyti. Aðeins {extensions} eru leyfð."
       size_error: "{file} skráin er of stór, mesta stærð er {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "eða veldu eitthvað úr núverandi "
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Setja upp nýja mynd!"
     photo: 
       view_all: "skoða allar myndir hjá notandanum %{name}'"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index cf76f5f2e..b6ff32f61 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -111,6 +111,9 @@ it:
         here_to_help: "La comunità di Diaspora è qui!"
         need_help: "Hai bisogno di aiuto?"
         satisfaction: "%{link}: Per avere supporto dalla comunità"
+        tag_bug: "#bug"
+        tag_feature: "#funzionalità"
+        tag_question: "#domanda"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Per le ultime notizie, le guide e i suggerimenti della comunità"
       introduce_yourself: "Questo è il tuo stream. Sali a bordo e presentati!"
       keep_us_running: "Mantieni %{pod} veloce e scattante, la tua donazione mensile sarà il caffè per i nostri server!"
@@ -552,7 +555,7 @@ it:
       invalid_ext: "{file} ha un'estensione non valida. Sono permesse soltanto {extensions}."
       size_error: "{file} è troppo grande, la dimensione massima è {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "oppure selezionane uno da quelli già esistenti"
+      or_select_one_existing: "oppure seleziona una delle %{photos} che hai caricato"
       upload: "Carica una nuova foto profilo!"
     photo: 
       view_all: "guarda tutte le foto di %{name}"
@@ -671,7 +674,7 @@ it:
     failure: 
       error: "si è verificato un errore durante la connessione a quel servizio"
     finder: 
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora sta importando i tuoi amici di %{service}, il risultato sarà visibile tra alcuni minuti."
       no_friends: "Non ho trovato amici su Facebook."
       service_friends: "Amici su %{service}"
     index: 
@@ -849,9 +852,9 @@ it:
       email_confirmed: "Email %{email} attivata"
       email_not_confirmed: "L'email non è stata attivata. C'è un errore nel link?"
     destroy: 
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Per favore inserisci la password per chiudere l'account."
+      success: "Il tuo account è stato bloccato. Il processo di chiusura dovrebbe essere completato in circa 20 minuti. Grazie per aver provato Diaspora."
+      wrong_password: "Hai inserito una password che non corrisponde a quella attuale."
     edit: 
       also_commented: "...qualcuno commenta un post dopo di te?"
       change: "Cambia"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index da959a7f7..e75358136 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -111,6 +111,9 @@ ja:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ ja:
       invalid_ext: "{file}のファイル名は不正です。{extensions}以外の拡張子は使えません。"
       size_error: "{file}は大きすぎます。ファイルサイズの上限は{sizeLimit}です。"
     new_profile_photo: 
-      or_select_one: "或いは既存のから選択する"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: 新しいプロフィール写真をアップロードする！
     photo: 
       view_all: "%{name}の写真をすべてみる"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 08354e7c9..490e38556 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -111,6 +111,9 @@ ko:
         here_to_help: "디아스포라 커뮤니티가 도와드립니다!"
         need_help: "도움이 필요하세요?"
         satisfaction: "%{link}: 커뮤니티 지원"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial}과 %{wiki}와  %{forum}: 커뮤니티가 운영하는 튜토리얼, 사용 방법과 소식"
       introduce_yourself: "내 스트림에서 스스로를 나타내십시오."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ ko:
       invalid_ext: "{file} 파일은 유효하지 않은 형식입니다. {extensions} 형식의 파일을 올려주세요."
       size_error: "{file} 파일이 {sizeLimit} 보다 큽니다"
     new_profile_photo: 
-      or_select_one: "올려둔 사진 가운데 고르기"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "새 프로필 사진 업로드하기!"
     photo: 
       view_all: "%{name}님의 모든 사진 보기"
@@ -671,7 +674,7 @@ ko:
     failure: 
       error: "서비스 연결중 에러가 발생했습니다."
     finder: 
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "디아스포라가 %{service} 서비스의 친구들을 채우고 있습니다. 몇 분 뒤에 다시 확인하시기 바랍니다."
       no_friends: "페이스북 친구를 찾을 수 없습니다."
       service_friends: "%{service} 친구"
     index: 
@@ -849,9 +852,9 @@ ko:
       email_confirmed: "%{email} 이메일이 활성화되었습니다"
       email_not_confirmed: "이메일을 활성화할 수 없습니다. 링크를 확인해주세요."
     destroy: 
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "계정을 없애기 위해 현재 암호를 입력하시기 바랍니다."
+      success: "내 계정이 잠겼습니다. 계정을 없애기까지 20분 정도 걸릴 수 있습니다. 디아스포라를 이용해 주셔서 고맙습니다."
+      wrong_password: "입력하신 암호가 현재 암호와 맞지 않습니다."
     edit: 
       also_commented: "댓글 달았던 공유물에 내 컨택도 댓글을 달았을 때"
       change: "바꾸기"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index d21b5515b..ff3f9c815 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -111,6 +111,9 @@ lt:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ lt:
       invalid_ext: "{file} turi neteisingą galūnę. Yra leidžiamos tik {extensions}."
       size_error: "{file} yra per didelis, maksimalus failo dydis yra {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "rodyti visas nuotraukas, kurias įkėlė %{name}"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 446033630..d4fd05f38 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -111,6 +111,9 @@ mk:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ mk:
       invalid_ext: "{file} има невалидна екстензија. Само овие {extensions} се дозволени."
       size_error: "{file} е премногу голема, максимална големина на датотека е {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "погледни ги сите слики на %{name}"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 9550f1572..c2bb68501 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -111,6 +111,9 @@ nb:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Trenger du hjelp?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -440,9 +443,9 @@ nb:
       two: "%{actors} reshared your deleted post."
       zero: "%{actors} reshared your deleted post."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
+      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."
       zero: "%{actors} started sharing with you."
@@ -552,7 +555,7 @@ nb:
       invalid_ext: "{file} er en ugyldig filtype. Bare {extensions} er tillatt."
       size_error: "{file} er for stor, maks filstørrelse er {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "eller velg fra dine allerede eksisterende"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Last opp et nytt profilbilde!"
     photo: 
       view_all: "se alle bildene til %{name}"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 0f3b5a98b..d5832cf0a 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -61,11 +61,11 @@ nl:
       done_editing: "klaar met bewerken"
     aspect_listings: 
       add_an_aspect: "+ Voeg aspect toe"
-      deselect_all: "Deselect all"
-      edit_aspect: "Edit %{name}"
-      select_all: "Select all"
+      deselect_all: "Deselecteer alles"
+      edit_aspect: "Bewerk %{name}"
+      select_all: "Selecteer alles"
     aspect_stream: 
-      stay_updated: "Stay Updated"
+      stay_updated: "Blijf up-to-date"
       stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacten in dit aspect zullen elkaar niet kunnen zien."
     contacts_visible: "Contacten in dit aspect zullen elkaar kunnen zien."
@@ -111,13 +111,16 @@ nl:
         here_to_help: "De Diaspora community staat voor je klaar!"
         need_help: "Hulp nodig?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
-      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
+      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: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Volg %{link} en verwelkom nieuwe Diaspora* gebruikers!"
+        learn_more: "Leer meer"
+        title: "Verwelkom Nieuwe Gebruikers"
       no_contacts: "Geen contacten"
       no_tags: "+ Vind een tag"
       people_sharing_with_you: "Mensen die met jou delen"
@@ -126,7 +129,7 @@ nl:
         content: "Je kunt de volgende service met Diaspora verbinden:"
         heading: "Verbind Services"
       unfollow_tag: "Stop met volgen van #%{tag}"
-      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
+      welcome_to_diaspora: "Welkom bij Diaspora, %{name}!"
       your_aspects: "Jouw Aspecten"
     many: "%{count} aspecten"
     move_contact: 
@@ -169,11 +172,11 @@ nl:
   back: "Terug"
   blocks: 
     create: 
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "I couldn't ignore that user. #evasion"
+      success: "Oké, deze gebruiker zul je niet meer in je stream zien. #silencio!"
     destroy: 
       failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      success: "Eens zien wat ze te zeggen hebben! #zeghallo"
   bookmarklet: 
     explanation: "Post vanaf overal naar Diaspora door %{link} op te slaan."
     explanation_link_text: "deze link"
@@ -298,7 +301,7 @@ nl:
       comma_seperated_plz: "Je kunt meerdere e-mailadressen invullen, gescheiden door komma's."
       if_they_accept_info: "als hij of zij accepteert zal hij of zij toegevoegd worden aan het aspect waarvoor je hem of haar uitgenodigd hebt."
       invite_someone_to_join: "Nodig iemand uit om lid te worden op Diaspora!"
-      language: "Language"
+      language: "Taal"
       personal_message: "Persoonlijk bericht"
       resend: "Stuur opnieuw"
       send_an_invitation: "Stuur een uitnodiging"
@@ -514,7 +517,7 @@ nl:
     show: 
       does_not_exist: "Die persoon bestaat niet!"
       has_not_shared_with_you_yet: "%{name} heeft nog geen posts met je gedeeld!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Je negeert alle posts van %{name}."
       incoming_request: "%{name} wil met je delen"
       mention: "Noemen"
       message: "Bericht"
@@ -552,7 +555,7 @@ nl:
       invalid_ext: "{file} heeft een ongeldige extensie. Alleen {extensions} zijn toegestaan."
       size_error: "{file} is te groot, de maximale bestandsgrootte is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "of selecteer een van je reeds bestaande"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload een nieuwe profielfoto!"
     photo: 
       view_all: "bekijk al %{name}'s foto's"
@@ -663,8 +666,8 @@ nl:
   search: "Zoek"
   services: 
     create: 
-      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
-      failure: "Authentication failed."
+      already_authorized: "Een gebruiker met diaspora id %{diaspora_id} heeft dat %{service_name} account al geauthoriseerd."
+      failure: "Authentificatie mislukt."
       success: "Authenticatie succesvol."
     destroy: 
       success: "Authenticatie succesvol vernietigd."
@@ -693,7 +696,7 @@ nl:
   settings: "Instellingen"
   share_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      post_hidden_and_muted: "%{name}'s bericht is verborgen, en notificaties worden niet getoond."
       see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
   shared: 
     add_contact: 
@@ -732,20 +735,20 @@ nl:
       control_your_audience: "Control your Audience"
       logged_in: "verbonden met %{service}"
       manage: "beheer verbonden services"
-      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      new_user_welcome_message: "Gebruik #hashtags om je berichten te classificeren en mensen te vinden die je interesses delen. Vermeld toffe mensen met @Mentions."
       outside: "Openbare berichten zijn zichtbaar voor mensen buiten Diaspora."
-      share: "Share"
+      share: "Deel"
       title: "Stel verbonden services in"
-      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
+      visibility_dropdown: "Gebruik dit dropdown menu om de zichtbaarheid van je post aan te selecteren. (We suggereren je eerste post publiek te maken.)"
     publisher: 
       all: "al"
       all_contacts: "alle contacten"
       discard_post: "Maak veld leeg"
       make_public: "maak openbaar"
       new_user_prefill: 
-        hello: "Hey everyone, I'm #%{new_user_tag}. "
-        i_like: "I'm interested in %{tags}."
-        invited_by: "Thanks for the invite, "
+        hello: "Hallo iedereen, ik ben #%{new_user_tag}. "
+        i_like: "Ik ben geïnteresseerd in %{tags}."
+        invited_by: "Bedankt voor de invite,"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: Plaatsen...
       publishing_to: "delen met: "
@@ -756,12 +759,12 @@ nl:
     reshare: 
       reshare: "Herdeel"
     stream_element: 
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
+      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"
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      ignore_user: "Negeer %{name}"
+      ignore_user_description: "Gebruiker negeren en hem uit alle aspecten verwijderen?"
       like: "Vind ik leuk"
       shared_with: "Gedeeld met: %{aspect_names}"
       unlike: "vind ik niet meer leuk"
@@ -788,14 +791,14 @@ nl:
     show_more_comments: "Toon %{number} meer reacties"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
+      title: "Jouw Aspecten"
+    aspects_stream: "Aspecten"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
-      add_a_tag: "Add a tag"
+      add_a_tag: "Voeg een tag toe"
       contacts_title: "People who dig these tags"
-      follow: "Follow"
+      follow: "Volg"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -803,13 +806,13 @@ nl:
       contacts_title: "Mensen die jou hebben genoemd"
       title: "Your Mentions"
     multi: 
-      contacts_title: "People in your Stream"
+      contacts_title: "Gebuikers in je Stream"
       title: "Stream"
-    posted: "posted"
+    posted: "geplaatst"
     public: 
       contacts_title: "Recent Posters"
-      title: "Public Activity"
-    recently: "recently:"
+      title: "Publieke activiteit"
+    recently: "recentelijk:"
     tags: 
       contacts_title: "People who dig these tags"
       title: "Posts getagged: %{tags}"
@@ -823,7 +826,7 @@ nl:
   tags: 
     show: 
       follow: "Volg #%{tag}"
-      followed_by: "followed by"
+      followed_by: "gevolgd door"
       following: "Volgt #%{tag}"
       nobody_talking: "Nog niemand heeft het over %{tag}."
       people_tagged_with: "Personen gemerkt met %{tag}"
@@ -849,9 +852,9 @@ nl:
       email_confirmed: "E-mail %{email} geactiveerd"
       email_not_confirmed: "E-mail kon niet worden geactiveerd. Verkeerde link?"
     destroy: 
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Voer a.u.b. je huidige wachtwoord in om je account te sluiten."
+      success: "Je account is op slot gezet. Het kan tot 20 minuten duren voordat het sluiten van je account voltooid is. Bedankt voor het proberen van Diaspora."
+      wrong_password: "Het ingevoerde wachtwoord komt niet overeen met je huidige wachtwoord."
     edit: 
       also_commented: "...iemand na jou op de post van jouw contact reageert?"
       change: "Verander"
@@ -870,7 +873,7 @@ nl:
       liked: "... iemand je post leuk vind?"
       mentioned: "...je genoemd word in een post?"
       new_password: "Nieuw wachtwoord"
-      photo_export_unavailable: "Photo exporting currently unavailable"
+      photo_export_unavailable: "Foto's exporteren is op dit moment niet beschikbaar"
       private_message: "...je een privébericht ontvangt?"
       receive_email_notifications: "Ontvang e-mail notificaties wanneer..."
       reshared: "...iemand je post doorgeeft?"
@@ -884,24 +887,24 @@ nl:
       awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "De Diaspora gemeenschap is verheugd je aan boord te hebben!"
       hashtag_explanation: "Hashtags laten je gemakkelijk jou interesses volgen. Bovendien kunnen ze je helpen bij het vinden van nieuwe contacten op Diaspora."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
-      saved: Saved!
-      we_can_speed_things_up: "We can speed things up a bit by"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
+      hashtag_suggestions: "Probeer het volgen van tags zoals #art, #movies, #gif, etc. eens uit."
+      hooking_up_fb: "verbinden met je Facebook account"
+      saved: Opgeslagen!
+      we_can_speed_things_up: "We kunnen het wat sneller maken door"
+      well_hello_there: "O, hallo daar!"
+      what_are_you_in_to: "Wat interesseert je?"
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
-      who_are_you: "Who are you?"
+      who_are_you: "Wie ben je?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
-      signed_out: "You've signed out of Diaspora*"
-      simply_visit: "Simply visit"
-      works_on_modern: "Works on all modern smartphones"
+      signed_out: "Je bent nu uitgelogd uit Diaspora*"
+      simply_visit: "Bezoek simpelweg"
+      works_on_modern: "Werkt op alle moderne smartphones"
     privacy_settings: 
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "Genegeerde Gebruikers"
+      stop_ignoring: "Stop negeren"
+      title: "Privacy Instellingen"
     public: 
       does_not_exist: "Gebruiker %{username} bestaat niet!"
     update: 
@@ -910,8 +913,8 @@ nl:
       language_not_changed: "Taal wijzigen mislukt"
       password_changed: "Wachtwoord gewijzigd. Je kunt nu inloggen met je nieuwe wachtwoord."
       password_not_changed: "Wachtwoord wijzigen mislukt"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Instellingen aanpassen mislukt"
+      settings_updated: "Instellingen aangepast"
       unconfirmed_email_changed: "E-mail gewijzigd. Nog te activeren."
       unconfirmed_email_not_changed: "E-mail wijzigen mislukt"
   webfinger: 
@@ -920,4 +923,4 @@ nl:
     no_person_constructed: "Er kon geen persoon worden gemaakt van deze hcard."
     not_enabled: "webfinger lijkt niet aan te staan voor %{account}'s provider"
     xrd_fetch_failed: "er was een probleem bij het verkrijgen van de xrd van het account %{account}"
-  welcome: Welcome!
+  welcome: Welkom!
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index d94c0044a..002b7aed6 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -111,6 +111,9 @@ nn:
         here_to_help: "Diaspora-felleskapen er her!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Sjå til at %{pod} kjører raskt. Gjev tenarane ein kveik ved å gje ein månadleg donasjon."
@@ -552,7 +555,7 @@ nn:
       invalid_ext: "{file} har ein ugyldig filtype. Berre {extensions} er tillatne."
       size_error: "{file} er for stor, kan ikkje vera større enn {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "eller vel eitt frå dei du allereie har"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Last opp eit nytt profilbilete."
     photo: 
       view_all: "syn alle bileta til %{name} "
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 1b2810d18..6d356ca84 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -111,6 +111,9 @@ pa:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ pa:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} is too large, maximum file size is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "view all of %{name}'s photos"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 8b06455ca..9e28233f4 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -105,12 +105,15 @@ pl:
       help: 
         do_you: "Czy:"
         email_feedback: "%{link} swoje zgłoszenie, jeśli chcesz"
-        feature_suggestion: "... masz %{link} sugestie?"
+        feature_suggestion: "... masz propozycję (%{link})?"
         find_a_bug: "... znal@{m:azłeś|f:azłaś|n:eziono} %{link}?"
         have_a_question: "... masz %{link}?"
         here_to_help: "Społeczności Diaspory jest tutaj!"
         need_help: "Potrzebujesz pomocy?"
         satisfaction: "%{link}: Strona wsparcia społeczności"
+        tag_bug: "#błąd"
+        tag_feature: "funkcja"
+        tag_question: "#pytanie"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Samouczki, instrukcje i aktualności dostarczane przez Społeczność"
       introduce_yourself: "Oto Twoj strumień. Wskocz do niego i przedstaw się."
       keep_us_running: "Aby %{pod} działał szybko podaruj serwerom dawkę kofeiny w postaci miesięcznej darowizny!"
@@ -552,7 +555,7 @@ pl:
       invalid_ext: "Plik {file} ma niewłaściwe rozszerzenie. Akceptowane rozszerzenia: {extensions}"
       size_error: "Plik {file} jest zbyt duży, maksymalny rozmiar to {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "lub wybierz jeden z już istniejących"
+      or_select_one_existing: "lub wybierz któreś z istniejących %{photos}"
       upload: "Prześlij nowe zdjęcie profilowe!"
     photo: 
       view_all: "wyświetl wszystkie zdjęcia należące do: %{name}"
@@ -671,7 +674,7 @@ pl:
     failure: 
       error: "wystąpił błąd podczas łączenia z tą usługą"
     finder: 
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora zaprasza Twoich znajomych z  %{service}, wróć ponownie za kilka minut."
       no_friends: "Nie znaleziono znajomych z Facebooka."
       service_friends: "Znajomi z %{service} "
     index: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 8e8a1e4e8..15e7a2faa 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -111,6 +111,9 @@ pt-BR:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Quer Ajuda?"
         satisfaction: "%{link}: Comunidade de suporte"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Mantenha %{pod} rodando mais rápido, comprando nossos servidores e garantindo o nosso café mensal!"
@@ -552,7 +555,7 @@ pt-BR:
       invalid_ext: "{file} possui uma extensão inválida. Somente {extensions} são permitidos."
       size_error: "{file} é muito grande, o tamanho máximo para arquivos é {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "ou escolha uma das que você já possui"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Envie uma foto nova para o perfil!"
     photo: 
       view_all: "Ver todas as fotos do(a) %{name}"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 058405db2..cc4cc985e 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -111,6 +111,9 @@ pt-PT:
         here_to_help: "A comunidade do Diaspora está aqui!"
         need_help: "Precisa de ajuda?"
         satisfaction: "%{link}: Apoio da comunidade"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Este é o seu stream.  Venha daí e apresente-se."
       keep_us_running: "Mantenha o %{pod} a funcionar rapidamente e compre aos servidores a sua dose de café com uma doação mensal!"
@@ -552,7 +555,7 @@ pt-PT:
       invalid_ext: "{file} tem uma extensão inválida. Apenas são permitidas as extensões {extensions}."
       size_error: "{file} é demasiado grande, o tamanho máximo é {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "ou seleccione alguma das que já tem"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Envie uma fotografia de perfil nova!"
     photo: 
       view_all: "ver todas as fotografias de %{name}"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 16b75fd88..9287a4edc 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -111,6 +111,9 @@ ro:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ ro:
       invalid_ext: "{file} are o extensie invalidă. Doar extensiile {extensions} sunt permise."
       size_error: "{file} este prea mare, mărimea maximă a unui fişier este {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "sau selectaţi una din cele existente in albumul"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Încarcă o fotografie de profil nouă!"
     photo: 
       view_all: "vizualizează toate fotografiile lui %{name}"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1395dcd70..8f24e79d3 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -111,6 +111,9 @@ ru:
         here_to_help: "Сообщество Диаспоры всегда рядом!"
         need_help: "Нужна помощь?"
         satisfaction: "%{link}: осуществляемая сообществом поддержка"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
         tutorials_wiki_and_forum: "%{tutorial}, %{wiki} и %{forum}: составляемые сообществом справочные пособия, инструкции и новости."
       introduce_yourself: "Это ваш поток. Ныряйте и осваивайтесь здесь."
       keep_us_running: "Помогите %{pod} работать быстро — купите нашим серверам дозу кофе, сделав ежемесячное пожертвование!"
@@ -552,7 +555,7 @@ ru:
       invalid_ext: "{file} имеет недопустимое расширение. Разрешены только {extensions}."
       size_error: "{file} слишком большой, максимальный размер файла {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "или выбрать одну из загруженных"
+      or_select_one_existing: "или выберете одну из уже загруженных %{photos}"
       upload: "Загрузить новое фото для профиля!"
     photo: 
       view_all: "Посмотреть все фотографии %{name}"
@@ -874,7 +877,7 @@ ru:
       private_message: "... вы получаете личное сообщение?"
       receive_email_notifications: "Получать уведомление по электронной почте, когда..."
       reshared: "...кто-то делится вашей записью?"
-      show_community_spotlight: "Показывать рекомендуемых пользователей в Потоке?"
+      show_community_spotlight: "Показывать рекомендуемых пользователей в потоке?"
       show_getting_started: "Вернуть информацию для начинающих"
       started_sharing: "...кто-то начинает делиться с вами?"
       stream_preferences: "Настройки потока"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index ed014616f..86e7a7522 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -111,6 +111,9 @@ sk:
         here_to_help: "Komunita Diaspory je tu!"
         need_help: "Potrebujete pomoc?"
         satisfaction: "%{link}: podpora od ostatných používateľov"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Toto je vaša nástenka.  Poďte sa predstaviť."
       keep_us_running: "Na udržanie %{pod} v dobrej kondícii kúpte svojím príspevkom našim serverom ich mesačnú dávku kávy vo forme opráv!"
@@ -552,7 +555,7 @@ sk:
       invalid_ext: "{file} má neplatnú príponu. Povolené sú len prípony {extensions}."
       size_error: "{file} je príliš veľký, maximálna povolená veľkosť je {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "alebo vyberte jeden z tých, ktoré už existujú"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Nahrať novú profilovú fotku!"
     photo: 
       view_all: "zobraziť všetky fotky použ. %{name}"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 0118b1dc7..56eb2effe 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -4,13 +4,13 @@
 
 
 sl: 
-  _applications: "Applications"
+  _applications: "Aplikacije"
   _comments: "Komentarji"
   _contacts: "Stiki"
   _home: "Domov"
   _photos: "slike"
   _services: "Storitve"
-  account: "Uporabniki raun"
+  account: "Uporabniki račun"
   activerecord: 
     errors: 
       models: 
@@ -21,31 +21,24 @@ sl:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: !binary |
-                  amUgnmUgemFzZWRlbi4=
+              taken: "je že zaseden."
         request: 
           attributes: 
             from_id: 
-              taken: !binary |
-                  amUgZHZvam5payB2bG9nZSwga2kgnmUgb2JzdGFqYS4=
+              taken: "je dvojnik vloge, ki že obstaja."
         reshare: 
           attributes: 
             root_guid: 
-              taken: !binary |
-                  VG8gb2JqYXZvIHN0ZSCeZSBkZWxpbGkh
+              taken: "To objavo ste že delili!"
         user: 
           attributes: 
             email: 
-              taken: !binary |
-                  amUgnmUgemFzZWRlbi4=
+              taken: "je že zaseden."
             person: 
               invalid: "je neveljaven."
             username: 
-              invalid: !binary |
-                  amUgbmV2ZWxqYXZlbi4gRG92b2xqZW5hIGplIHVwb3JhYmEgbGUg6HJrLCCa
-                  dGV2aWxrIGluICBwb2TocnRhamV2
-              taken: !binary |
-                  amUgnmUgemFzZWRlbi4=
+              invalid: "je neveljaven. Dovoljena je uporaba le črk, številk in  podčrtajev"
+              taken: "je že zaseden."
   ago: "%{time} nazaj"
   all_aspects: "Vsi pogledi"
   application: 
@@ -54,187 +47,143 @@ sl:
       unknown_person: "neznana oseba"
       video_title: 
         unknown: "Neznani naslov videa"
-  are_you_sure: !binary |
-      U3RlIHByZXByaehhbmk/
+  are_you_sure: "Ste prepričani?"
   aspect_memberships: 
     destroy: 
-      failure: !binary |
-          T2RzdHJhbml0ZXYgb3NlYmUgaXogcG9nbGVkYSBuaSBiaWxhIHVzcGWabmE=
+      failure: "Odstranitev osebe iz pogleda ni bila uspešna"
       no_membership: "Oseba ni bila najdena znotraj tega pogleda"
-      success: !binary |
-          T3NlYmEgamUgYmlsYSBpeiBwb2dsZWRhIHVzcGWabm8gb2RzdHJhbmplbmE=
+      success: "Oseba je bila iz pogleda uspešno odstranjena"
   aspects: 
     add_to_aspect: 
       failure: "Dodajanje stika v pogled ni uspelo."
       success: "Dodajanje stika v pogled je uspelo."
     aspect_contacts: 
-      done_editing: !binary |
-          emFrbGp16GkgdXJlamFuamU=
+      done_editing: "zaključi urejanje"
     aspect_listings: 
       add_an_aspect: "+ Dodaj pogled"
-      deselect_all: "Deselect all"
-      edit_aspect: "Edit %{name}"
-      select_all: "Select all"
+      deselect_all: "Označi nobenega"
+      edit_aspect: "Uredi %{name}"
+      select_all: "Označi vse"
     aspect_stream: 
-      stay_updated: "Stay Updated"
+      stay_updated: "Ostanite na tekočem"
       stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Stiki v tem pogledu drug drugega ne bodo videli."
     contacts_visible: "Stiki v tem pogledu drug drugega lahko vidijo."
     create: 
       failure: "Ustvarjanje pogleda ni uspelo."
-      success: "Pogled %{name} je ustvarjena"
+      success: "Pogled %{name} je ustvarjen."
     destroy: 
-      failure: !binary |
-          JXtuYW1lfSBuaSBwcmF6ZW4gaW4gZ2EgbmkgbW9nb+hlIG9kc3RyYW5pdGku
-      success: !binary |
-          JXtuYW1lfSBqZSB1c3Blmm5vIG9kc3RyYW5qZW4u
+      failure: "%{name} ni prazen in ga ni mogoče odstraniti."
+      success: "%{name} je uspešno odstranjen."
     edit: 
-      add_existing: !binary |
-          RG9kYWogb2JzdG9qZeggc3Rpaw==
+      add_existing: "Dodaj obstoječi stik"
       aspect_list_is_not_visible: "seznam pogledov ni viden drugim stikom  pogleda"
       aspect_list_is_visible: "seznam pogledov je viden drugim stikom pogleda"
-      confirm_remove_aspect: !binary |
-          U3RlIHByZXByaehhbmksIGRhIGJpIHJhZGkgaXpicmlzYWxpIHRhIHBvZ2xl
-          ZD8=
-      done: !binary |
-          S29u6GFubw==
-      make_aspect_list_visible: !binary |
-          b3puYehpIHNlem5hbSBwb2dsZWRvdiBrb3QgdmlkZW4/
-      remove_aspect: !binary |
-          SXpicmmaaSB0YSBwb2dsZWQ=
+      confirm_remove_aspect: "Ali ste prepričani, da bi radi izbrisali ta pogled?"
+      done: "Končano"
+      make_aspect_list_visible: "označi seznam pogledov kot viden?"
+      remove_aspect: "Izbriši ta pogled"
       rename: "preimenuj"
       update: "posodobi"
       updating: "posodabljam"
-    few: "%{count} pogledov"
+    few: "%{count} pogledi"
     helper: 
-      are_you_sure: !binary |
-          U3RlIHByZXByaehhbmksIGRhIJ5lbGl0ZSBpemJyaXNhdGkgdGEgcG9nbGVk
-          Pw==
+      are_you_sure: "Ste prepričani, da želite izbrisati ta pogled?"
       aspect_not_empty: "Pogled vsebuje stike"
       remove: "odstrani"
     index: 
       cubbies: 
-        explanation: "Cubbi.es je prva Diaspora aplikacija v razvoju."
-        heading: !binary |
-            UG92ZZ5pIHNlIHogQ3ViYmkuZXM=
-        learn_more: !binary |
-            VmXoIGluZm9ybWFjaWo=
+        explanation: "Cubbi.es je prva aplikacija Diaspore in je v razvoju."
+        heading: "Poveži se z Cubbi.es"
+        learn_more: "Več informacij"
       diaspora_id: 
-        content_1: !binary |
-            VmGaIERpYXNwb3JhIElEIGplOg==
-        content_2: !binary |
-            U3ZvaiBEaWFzcG9yYSBJRCBkZWxpdGUgeiBkcnVnaW1pLCBkYSB2YXMgYm9k
-            byBsYWhrbyBuYZpsaS4=
+        content_1: "Vaš Diaspora ID je:"
+        content_2: "Svoj Diaspora ID delite z drugimi, da vas bodo lahko našli."
         heading: "Diaspora ID"
       donate: "Prispevaj"
-      handle_explanation: !binary |
-          VG8gamUgdmGaIERpYXNwb3JhIElEIG5hc2xvdi4gVGFrbyBrb3QgdmGaIGUt
-          bmFzbG92LCAgZ2EgbGFoa28gdXBvcmFiaXRlIGtvdCBuYXNsb3YgcyBwb21v
-          6GpvIGthdGVyZWdhIGRydWdpIHN0b3Bpam8gdiBzdGlrIHogdmFtaS4=
+      handle_explanation: "To je vaš Diaspora ID naslov. Tako kot vaš e-naslov,  ga lahko uporabite kot naslov s pomočjo katerega drugi stopijo v stik z vami."
       help: 
         do_you: "Do you:"
-        email_feedback: "%{link} your feedback, if you prefer"
+        email_feedback: "%{link} povratno informacijo, če želite"
         feature_suggestion: "... imeli %{link} predlog?"
-        find_a_bug: !binary |
-            Li4uIG5hmmxpICV7bGlua30/
+        find_a_bug: "... našli %{link}?"
         have_a_question: "... imeli %{link}?"
-        here_to_help: "Diaspora skupnost je tukaj, da vam pomaga!"
-        need_help: !binary |
-            UG90cmVidWpldGUgcG9tb+g/
+        here_to_help: "Skupnost Diaspora je tukaj!"
+        need_help: "Potrebujete pomoč?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "hrošč"
+        tag_feature: "funkcija"
+        tag_question: "vprašanje"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
-      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
-      keep_us_running: !binary |
-          UG9tYWdhanRlICV7cG9kfSwgZGEgYm8gdGVrZWwgaGl0cmVqZSwga3VwaXRl
-          IG5hmmltICBzdHJlnm5pa29tIG1lc2Xobm8gZG96byBrYXZlIQ==
+      introduce_yourself: "To je vaš tok. Vskoči in predstavi se."
+      keep_us_running: "Pomagajte %{pod}, da bo tekel hitreje, kupite našim  strežnikom mesečno dozo kave!"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
+        follow: "Sledite %{link} in pozdravite nove uporabnike *Diaspore!"
+        learn_more: "Več o tem"
         title: "Welcome New Users"
       no_contacts: "Ni stikov"
-      no_tags: "Ni oznak"
+      no_tags: "+ Za sledenje poišči oznako"
       people_sharing_with_you: "Ljudje, ki delijo z vami"
-      post_a_message: !binary |
-          b2JqYXZpIHNwb3Jv6GlsbyA+Pg==
+      post_a_message: "objavi sporočilo >>"
       services: 
-        content: !binary |
-            WiB2YZppbSBEaWFzcG9yYSBuYXNsb3ZvbSBsYWhrbyBwb3ZlnmV0ZSBuYXNs
-            ZWRuamUgc3Rvcml0dmU=
-        heading: !binary |
-            UG92ZZ5pIHN0b3JpdHZl
+        content: "Z vašim Diaspora naslovom lahko povežete naslednje storitve"
+        heading: "Poveži storitve"
       unfollow_tag: "Nehaj slediti #%{tag}"
-      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
-      your_aspects: !binary |
-          VmGaaSBwb2dsZWRp
+      welcome_to_diaspora: "Dobrodošli v Diaspori, %{name}!"
+      your_aspects: "Vaši pogledi"
     many: "%{count} pogledov"
     move_contact: 
-      error: !binary |
-          UHJlc3RhdmxqYW5qZSBzdGlrYSBuZXVzcGWabm86ICV7aW5zcGVjdH0=
+      error: "Prestavljanje stika neuspešno: %{inspect}"
       failure: "ni uspelo %{inspect}"
       success: "Oseba je prestavljena v novo skupino"
     new: 
       create: "Ustvari"
-      name: "Ime"
+      name: "Ime (vidno samo tebi)"
     no_contacts_message: 
       community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: !binary |
-          WiB6Z29ybmppbSBva25vbSBsYWhrbyBwb2ma6GV0ZSwgeiBkZXNuaW0gIHBh
-          IHBvdmFiaXRlIHZl6CBzdGlrb3Yu
-      you_should_add_some_more_contacts: !binary |
-          TGFoa28gYmkgZG9kYWxpIJplIGtha5pubyBvc2VibyE=
+      or_spotlight: "Ali pa lahko delite z %{link}"
+      try_adding_some_more_contacts: "Poiščete ali povabite lahko več stikov."
+      you_should_add_some_more_contacts: "Lahko bi dodali še kakšno osebo!"
     no_posts_message: 
-      start_talking: !binary |
-          VHJlbnV0bm8gbmkgmmUgbmlo6GUgbmnoZXNhciBvYmphdmlsLiBaYehuaXRl
-          IHZpIQ==
+      start_talking: "Trenutno ni še nihče ničesar objavil. Začnite vi!"
     one: "1 pogled"
     other: "%{count} pogledov"
     seed: 
       acquaintances: "Poznanstva"
-      family: !binary |
-          RHJ1nmluYQ==
+      family: "Družina"
       friends: "Prijatelji"
-      work: !binary |
-          U2x1nmJh
+      work: "Služba"
     selected_contacts: 
       manage_your_aspects: "Urejanje pogledov."
-      no_contacts: !binary |
-          WmFlbmtyYXQgc3RlIJplIGJyZXogc3Rpa292Lg==
+      no_contacts: "Zaenkrat ste še brez stikov."
       view_all_community_spotlight: "See all community spotlight"
       view_all_contacts: "Poglej vse stike"
     show: 
       edit_aspect: "uredi pogled"
     two: "%{count} pogledov"
     update: 
-      failure: !binary |
-          UG9nbGVkICV7bmFtZX0gaW1hIHByZWRvbGdvIGltZSwgemF0byBnYSBuaSBt
-          b2dv6GUgc2hyYW5pdGku
-      success: !binary |
-          VmGaIHBvZ2xlZCAle25hbWV9IGplIGJpbGEgdXNwZZpubyBwb3NvZG9ibGpl
-          bi4=
+      failure: "Pogled %{name} ima predolgo ime, zato ga ni mogoče shraniti."
+      success: "Vaš pogled %{name} je bila uspešno posodobljen."
     zero: "brez pogledov"
   authorizations: 
     index: 
-      no_applications: !binary |
-          TmlzdGUgcG92ZXphbGkgmmUgbm9iZW5lIGFwbGlrYWNpamUu
-      revoke_access: !binary |
-          UHJla2xp6GkgZG9zdG9w
+      no_applications: "Niste povezali še nobene aplikacije."
+      revoke_access: "Prekliči dostop"
   back: "Nazaj"
   blocks: 
     create: 
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "Nisem mogel ignorirati tega uporabnika. #evasion"
+      success: "V redu, v vašem toku ne boste več videli tega uporabnika. #silencio!"
     destroy: 
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "Nisem mogel ignorirati tega uporabnika. #evasion"
+      success: "Pa poglejmo, kaj imajo povedati! #sayhello"
   bookmarklet: 
     explanation: "%{link} od kjerkoli - dodajte to povezavo med priljubljene."
     explanation_link_text: "Objavi na Diaspora"
     heading: "Diaspora zaznamek"
     post_something: "Objavite kaj na Diaspora"
     post_success: "Objavljeno! Zapiram!"
-  cancel: !binary |
-      UHJla2xp6Gk=
+  cancel: "Prekliči"
   comments: 
     few: "%{count} komentarjev"
     many: "%{count} komentarjev"
@@ -247,28 +196,21 @@ sl:
     zero: "brez komentarjev"
   contacts: 
     create: 
-      failure: !binary |
-          VXN0dmFyamFuamUgc3Rpa2EgbmkgYmlsbyBtb2dv6GU=
-    few: "%{count} stikov"
+      failure: "Ustvarjanje stika ni bilo mogoče"
+    few: "%{count} stiki"
     index: 
       add_a_new_aspect: "Dodaj nov pogled"
-      add_to_aspect: "Add contacts to %{name}"
+      add_to_aspect: "Dodaj stik k %{name}"
       all_contacts: "Vsi stiki"
-      check_out: "Check out"
-      many_people_are_you_sure: !binary |
-          U3RlIHByZXByaehhbmksIGRhIJ5lbGl0ZSB6YehldGkgemFzZWJuaSAgcG9n
-          b3ZvciB6IHZl6CBrb3QgJXtzdWdnZXN0ZWRfbGltaXR9IHN0aWtpPyBNb3Jk
-          YSBiaSBiaWxvIGJvbGplLCBkYSBiaSAgc3Bvcm/oaWxvIG9iamF2aWxpIHYg
-          cG9nbGVkdS4=
+      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."
       only_sharing_with_me: "Delijo samo z mano"
       remove_person_from_aspect: "Odstrani %{person_name} iz \"%{aspect_name}\""
-      start_a_conversation: !binary |
-          WmHobmkgcG9nb3Zvcg==
+      start_a_conversation: "Začni pogovor"
       title: "Stiki"
-      your_contacts: !binary |
-          VmGaaSBzdGlraQ==
+      your_contacts: "Vaši stiki"
     many: "%{count} stikov"
     one: "1 stik"
     other: "%{count} stikov"
@@ -276,57 +218,39 @@ sl:
       people_sharing: "Ljudje, ki delijo z vami:"
     spotlight: 
       community_spotlight: "Community Spotlight"
-    two: "%{count} stikov"
-    zero: "ni stikov"
+    two: "%{count} stika"
+    zero: "stiki"
   conversations: 
     create: 
-      fail: !binary |
-          TmV2ZWxqYXZubyBzcG9yb+hpbG8=
-      sent: !binary |
-          U3Bvcm/oaWxvIHBvc2xhbm8=
+      fail: "Neveljavno sporočilo"
+      sent: "Sporočilo poslano"
     destroy: 
-      success: !binary |
-          UG9nb3ZvciB1c3Blmm5vIG9kc3RyYW5qZW4=
+      success: "Pogovor uspešno odstranjen"
     helper: 
       new_messages: 
-        few: !binary |
-            JXtjb3VudH0gbm92aWggc3Bvcm/oaWw=
-        many: !binary |
-            JXtjb3VudH0gbm92aWggc3Bvcm/oaWw=
-        one: !binary |
-            MSBub3ZvIHNwb3Jv6Glsbw==
-        other: !binary |
-            JXtjb3VudH0gbm92aWggc3Bvcm/oaWw=
-        two: !binary |
-            JXtjb3VudH0gbm92aSBzcG9yb+hpbGk=
-        zero: !binary |
-            bmkgbm92aWggc3Bvcm/oaWw=
+        few: "%{count} nova sporočila"
+        many: "%{count} novih sporočil"
+        one: "1 novo sporočilo"
+        other: "%{count} novih sporočil"
+        two: "%{count} novi sporočili"
+        zero: "ni novih sporočil"
     index: 
-      create_a_new_message: !binary |
-          dXN0dmFyaSBub3ZvIHNwb3Jv6Glsbw==
+      create_a_new_message: "ustvari novo sporočilo"
       inbox: "Prejeto"
-      message_inbox: !binary |
-          UHJlamV0YSBzcG9yb+hpbGE=
-      new_message: !binary |
-          Tm92byBzcG9yb+hpbG8=
-      no_conversation_selected: !binary |
-          b3puYehlbiBuaSBiaWwgbm9iZW4gcG9nb3Zvcg==
-      no_messages: !binary |
-          bmkgc3Bvcm/oaWw=
+      message_inbox: "Prejeta sporočila"
+      new_message: "Novo sporočilo"
+      no_conversation_selected: "označen ni bil noben pogovor"
+      no_messages: "ni sporočil"
     new: 
       abandon_changes: "Opusti spremembe?"
-      send: !binary |
-          UG+abGpp
-      sending: !binary |
-          UG+aaWxqYW0uLi4=
+      send: "Pošlji"
+      sending: Pošiljam...
       subject: "zadeva"
       to: "za"
     new_message: 
-      fail: !binary |
-          TmV2ZWxqYXZubyBzcG9yb+hpbG8=
+      fail: "Neveljavno sporočilo"
     show: 
-      delete: !binary |
-          aXpicmmaaSBpbiBibG9raXJhaiBwb2dvdm9y
+      delete: "izbriši in blokiraj pogovor"
       reply: "odgovori"
       replying: Odgovarjam...
   date: 
@@ -334,94 +258,54 @@ sl:
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
-  delete: !binary |
-      SXpicmmaaQ==
-  email: !binary |
-      RS1wb5p0YQ==
+  delete: "Izbriši"
+  email: E-pošta
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Popravite naslednje napake  in poskusite znova."
       invalid_fields: "Neveljavna polja"
   fill_me_out: "Izpolni me"
-  find_people: "Find people"
+  find_people: "Najdi ljudi ali #tage"
   hide: "Skrij"
   home: 
     show: 
-      already_account: !binary |
-          nmUgaW1hdGUgdXBvcmFibmmaa2kgcmHodW4/
+      already_account: "Že imate uporabniški račun?"
       choice: "Izbira"
-      choice_explanation: !binary |
-          ViBvbXJlnmp1IERpYXNwb3JhIGxhaGtvIHZhmmUgc3Rpa2UgcmF6dnKa6GF0
-          ZSBzIHBvbW/oam8gcG9nbGVkb3YuIFBvZ2xlZGkga290IHRha5puaSBzbyB1
-          bmlrYXRuaSBpbiB2YW0gb21vZ2/oYWpvLCBkYSBzbyB2YZplIHNsaWtlLCB6
-          Z29kYmUgaW4gmmFsZSBkb3N0b3BuZSBsZSBvc2ViYW0ga2F0ZXJpbSBzdGUg
-          amloIG5hbWVuaWxpLg==
-      learn_about_host: !binary |
-          UHJlYmVyaXRlIHZl6CBvIHRlbSwga2FrbyBnb3N0aXRpIGxhc3RlbiBEaWFz
-          cG9yYSAgc3RyZZ5uaWsu
+      choice_explanation: "V omrežju Diaspora lahko vaše stike razvrščate s pomočjo pogledov. Pogledi kot takšni so unikatni in vam omogočajo, da so vaše slike, zgodbe in šale dostopne le osebam katerim ste jih namenili."
+      learn_about_host: "Preberite več o tem, kako gostiti lasten Diaspora  strežnik."
       login_here: "prijavite se tukaj"
-      ownership: !binary |
-          TGFzdG5pmnR2bw==
-      ownership_explanation: !binary |
-          VmGaZSBzbGlrZSBzbyB2YZphIGxhc3QgaW4gemF0byBqZSBwcmF2LCBkYSBq
-          aWggbGFoa28gZGVsaXRlLCBuZSBkYSBiaSBqaWggcyB0ZW0ga29tZXJrb2xp
-          IHBvc3JlZG92YWxpLiBWc2ViaW5hLCBraSBqbyBkZWxpdGUgdiAgb21yZZ5q
-          dSBEaWFzcG9yYSwgc2Ugb2hyYW5pIHYgdmGaaSBsYXN0aSwga290IHR1ZGkg
-          a29udHJvbGEgbmFkIGRpc3RyaWJ1Y2lqbyBsZS10ZS4=
-      share_what_you_want: !binary |
-          RGVsaXRlIGthciCeZWxpdGUsIHMga29tZXJrb2xpIJ5lbGl0ZS4=
+      ownership: "Lastništvo"
+      ownership_explanation: "Vaše slike so vaša last in zato je prav, da jih lahko delite, ne da bi jih s tem komerkoli posredovali. Vsebina, ki jo delite v  omrežju Diaspora, se ohrani v vaši lasti, kot tudi kontrola nad distribucijo le-te."
+      share_what_you_want: "Delite kar želite, s komerkoli želite."
       simplicity: "Preprostost"
-      simplicity_explanation: !binary |
-          RGlhc3BvcmEgb21vZ2/oYSBwcmVwcm9zdG8gaXptZW5qYXZvIHogdXBvmnRl
-          dmFuamVtIHZhmmUgemFzZWJub3N0aS4gWmEgb2hyYW5qYW5qZSB6YXNlYm5v
-          c3RpIHYgRGlhc3BvcmkgbmkgcG90cmVibm8gc2tvemkgbmVza29u6GVuIHNl
-          em5hbSByYXpsaehuaWggbmFzdGF2aXRldiBpbiBtb55ub3N0aS4=
-      tagline_first_half: !binary |
-          RGVsaXRlIGthciCeZWxpdGUs
-      tagline_second_half: !binary |
-          cyBrb21lcmtvbGkgnmVsaXRlLg==
+      simplicity_explanation: "Diaspora omogoča preprosto izmenjavo z upoštevanjem vaše zasebnosti. Za ohranjanje zasebnosti v Diaspori ni potrebno skozi neskončen seznam različnih nastavitev in možnosti."
+      tagline_first_half: "Delite kar želite,"
+      tagline_second_half: "s komerkoli želite."
   invitations: 
     a_facebook_user: "Facebook uporabnik"
     check_token: 
       not_found: "Povabilo ni bilo najdeno"
     create: 
-      already_contacts: !binary |
-          UyB0byBvc2VibyBzdGUgnmUgcG92ZXphbmk=
-      already_sent: !binary |
-          VG8gb3NlYm8gc3RlIJ5lIHBvdmFiaWxpLg==
-      no_more: !binary |
-          TmltYXRlIHZl6CBwb3ZhYmlsLg==
+      already_contacts: "S to osebo ste če povezani"
+      already_sent: "To osebo ste že povabili."
+      no_more: "Nimate več povabil."
       own_address: "Povabila ne morete poslati na lasten e-naslov."
-      rejected: !binary |
-          TmFzbGVkbmppIGUtbmFzbG92aSBpbWFqbyB0ZZ5hdmUgeiBkb3N0YXZvIHBv
-          dmFiaWxhOiA=
+      rejected: "Naslednji e-naslovi imajo težave z dostavo povabila: "
       sent: "Povabila so bila poslana naslednjim: "
     edit: 
-      accept_your_invitation: !binary |
-          U3ByZWptaXRlIHZhmmUgcG92YWJpbG8=
-      your_account_awaits: !binary |
-          VmGaIHJh6HVuIHZhcyCeZSDoYWthIQ==
+      accept_your_invitation: "Sprejmite vaše povabilo"
+      your_account_awaits: "Vaš račun vas že čaka!"
     new: 
-      already_invited: !binary |
-          nmUgcG92YWJsamVuaQ==
+      already_invited: "Naslednje osebe še niso potrdile vašega povabila:"
       aspect: "Pogled"
-      comma_seperated_plz: !binary |
-          Vm5lc2V0ZSBsYWhrbyB2ZeggZS1uYXNsb3Zvdiwga2kgbmFqIGJvZG8gbWVk
-          IHNlYm9qIGxv6GVuaSB6IHZlamljby4=
-      if_they_accept_info: !binary |
-          diBrb2xpa29yIHNwcmVqbWVqbyB2YZplIHBvdmFiaWxvLCBib2RvIHNhbW9k
-          ZWpubyAgZG9kYW5pIHBvZ2xlZG9tIHYga2F0ZXJlIHN0ZSBqaWggcG92YWJp
-          bGku
-      invite_someone_to_join: !binary |
-          UG92YWJpdGUgbmVrb2dhIHYgb21yZZ5qZSBEaWFzcG9yYSE=
-      language: "Language"
-      personal_message: !binary |
-          T3NlYm5vIHNwb3Jv6Glsbw==
-      resend: "Resend"
-      send_an_invitation: !binary |
-          UG+abGppIHBvdmFiaWxv
-      send_invitation: !binary |
-          UG+abGppIHBvdmFiaWxv
+      comma_seperated_plz: "Vnesete lahko več e-naslovov, ki naj bodo med seboj ločeni z vejico."
+      if_they_accept_info: "v kolikor sprejmejo vaše povabilo, bodo samodejno  dodani pogledom v katere ste jih povabili."
+      invite_someone_to_join: "Povabite nekoga v omrežje Diaspora!"
+      language: "Jezik"
+      personal_message: "Osebno sporočilo"
+      resend: "Ponovno pošlji"
+      send_an_invitation: "Pošlji povabilo"
+      send_invitation: "Pošlji povabilo"
       to: "Za"
   layouts: 
     application: 
@@ -429,47 +313,44 @@ sl:
       public_feed: "Javne Diaspora objave za %{name}"
       toggle: "vklop/izklop mobilne strani"
       whats_new: "kaj je novega?"
-      your_aspects: !binary |
-          dmGaZSBza3VwaW5l
+      your_aspects: "vaše skupine"
     header: 
-      admin: "admin"
+      admin: "administrator"
       blog: "blog"
-      code: !binary |
-          mmlmcmE=
+      code: "šifra"
       login: "prijava"
-      logout: "odjavi me"
-      profile: "profil"
+      logout: "Odjavi me"
+      profile: "Profil"
       recent_notifications: "Nedavna obvestila"
-      settings: "settings"
-      view_all: "View all"
+      settings: "Nastavitve"
+      view_all: "Prikaži vse"
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} people disliked this"
-        many: "%{count} people disliked this"
-        one: "1 person disliked this"
-        other: "%{count} people disliked this"
-        two: "%{count} dislikes"
-        zero: "no people disliked this"
+        few: "%{count} osebe ne marajo"
+        many: "%{count} oseb ne mara"
+        one: "1 oseba ne mara"
+        other: "%{count} oseb ne mara"
+        two: "%{count} osebi ne marata"
+        zero: "ni osebe, ki ne mara"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        two: "%{count} likes"
-        zero: "no people liked this"
+        few: "%{count} osebam je všeč"
+        many: "% {Count} osebam je všeč"
+        one: "1 osebi je všeč"
+        other: "%{count} osebam je všeč"
+        two: "%{count} osebama je všeč"
+        zero: "nobenemu ni všeč"
       people_like_this_comment: 
-        few: "%{count} likes"
-        many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
-        two: "%{count} likes"
-        zero: "no likes"
-  limited: "Limited"
-  more: !binary |
-      VmXo
+        few: "%{count} osebam je všeč"
+        many: "%{count} osebam je všeč"
+        one: "%{count} osebi je všeč"
+        other: "%{count} osebam je všeč."
+        two: "%{count} osebama je všeč"
+        zero: "nobenemu ni všeč"
+  limited: "Omejeno"
+  more: "Več"
   next: "naslednja"
-  no_results: "No Results Found"
+  no_results: "Ni zadetkov"
   notifications: 
     also_commented: 
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -479,40 +360,38 @@ sl:
       two: "%{actors} also commented on %{post_author}'s %{post_link}."
       zero: "%{actors} also commented on %{post_author}'s %{post_link}."
     also_commented_deleted: 
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
-      two: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      few: "%{actors} so komentirali izbrisano objavo."
+      many: "%{actors} jih je komentiralo na izbrisano objavo."
+      one: "%{actors} je komentiral izbrisano objavo."
+      other: "%{actors} so komentirali izbrisano objavo."
+      two: "%{actors} sta komentirala na izbrisano objavo."
+      zero: "Noben ni komentiral izbrisane objave."
     comment_on_post: 
       few: "%{actors} commented on your %{post_link}."
       many: "%{actors} commented on your %{post_link}."
       one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
+      other: "%{actors} jih je komentiralo na vašo %{post_link}."
       two: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      zero: "%{actors} jih ni komentiralo na vašo %{post_link}."
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        two: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} nova obvestila"
+        many: "%{count} novih obvestil"
+        one: "1 novo obvestilo"
+        other: "%{count} novih obvestil"
+        two: "%{count} nova obvestila"
+        zero: "Ni novih obvestil"
     index: 
-      and: "and"
+      and: "in"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        two: "and %{count} others"
-        zero: "and nobody else"
-      mark_all_as_read: !binary |
-          T3puYehpIHZzZSBrb3QgcHJlYnJhbm8=
-      notifications: !binary |
-          U3Bvcm/oaWxh
+        few: "in %{count} drugi"
+        many: "in %{count} drugih"
+        one: "in %{count} drugi"
+        other: "in %{count} drugi"
+        two: "in %{count} druga"
+        zero: "in nihče drug"
+      mark_all_as_read: "Označi vse kot prebrano"
+      notifications: "Sporočila"
     liked: 
       few: "%{actors} has just liked your %{post_link}."
       many: "%{actors} has just liked your %{post_link}."
@@ -521,41 +400,41 @@ sl:
       two: "%{actors} has just liked your %{post_link}."
       zero: "%{actors} has just liked your %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
-      two: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      few: "%{actors} je všeč vaša izbrisana objava."
+      many: "%{actors} je všeč vaša izbrisana objava."
+      one: "%{actors} je všeč vaša izbrisana objava."
+      other: "%{actors} je všeč vaša izbrisana objava."
+      two: "%{actors} je všeč vaša izbrisana objava."
+      zero: "%{actors} ni všeč vaša izbrisana objava."
     mentioned: 
-      few: "%{actors} has mentioned you in a %{post_link}."
-      many: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      few: "%{actors} so vas omenili v %{post_link}."
+      many: "%{actors} so vas omenili v %{post_link}."
+      one: "%{actors} vas je omenil v %{post_link}."
+      other: "%{actors} so vas omenili v %{post_link}."
+      two: "%{actors} sta vas omenila v %{post_link}."
+      zero: "%{actors} jih ni omenilo vas v %{post_link}."
     mentioned_deleted: 
-      few: "%{actors} mentioned you in a deleted post."
-      many: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
-      other: "%{actors} mentioned you in a deleted post."
-      two: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
-    post: "prispevek"
+      few: "%{actors} so vas omenili v izbrisani objavi."
+      many: "%{actors} je omenilo vas v izbrisani objavi."
+      one: "%{actors} vas je omenil v izbrisani objavi."
+      other: "%{actors} so vas omenili v izbrisani objavi."
+      two: "%{actors} sta vas omenila v izbrisani objavi."
+      zero: "%{actors}  je omenilo vas v izbrisani objavi."
+    post: "objava"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      two: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} so vam poslali sporočilo."
+      many: "%{actors} jih je poslalo sporočilo."
+      one: "%{actors} vam je poslal sporočilo."
+      other: "%{actors} so vam pslali sporočilo."
+      two: "%{actors} sta vam poslala sporočilo."
+      zero: "Nihče vam ni poslal sporočila."
     reshared: 
-      few: "%{actors} has reshared your %{post_link}."
-      many: "%{actors} has reshared your %{post_link}."
-      one: "%{actors} has reshared your %{post_link}."
-      other: "%{actors} has reshared your %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} has reshared your %{post_link}."
+      few: "%{actors} so delili vaš {post_link}."
+      many: "%{actors} jih je delilo %{post_link}."
+      one: "%{actors} je delil vašo %{post_link}."
+      other: "%{actors} so delili vaš %{post_link}."
+      two: "%{actors} sta delila %{post_link}."
+      zero: "%{actors} niso delili vaš %{post_link}."
     reshared_post_deleted: 
       few: "%{actors} reshared your deleted post."
       many: "%{actors} reshared your deleted post."
@@ -564,42 +443,40 @@ sl:
       two: "%{actors} reshared your deleted post."
       zero: "%{actors} reshared your deleted post."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-      two: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      few: "%{actors} jih je začelo deliti z vami."
+      many: "%{actors} jih je začelo deliti z vami."
+      one: "%{actors} je začel deliti z vami."
+      other: "%{actors} jih je začelo deliti z vami."
+      two: "%{actors} sta začela deliti z vami."
+      zero: "%{actors} jih ni začelo deliti z vami."
   notifier: 
-    a_post_you_shared: "a post."
-    click_here: "click here"
+    a_post_you_shared: objava.
+    click_here: "kliknite tukaj"
     comment_on_post: 
       reply: "Reply or view %{name}'s post >"
     confirm_email: 
       click_link: "To activate your new e-mail address %{unconfirmed_email},  please click this link:"
-      subject: "Please activate your new e-mail address %{unconfirmed_email}"
-    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to  stop getting emails like this,"
+      subject: "Prosimo, aktivirajte vaš novi e-poštni naslov %{unconfirmed_email}"
+    email_sent_by_diaspora: "Ta e-pošta je bila poslana z Diaspore. Če ne želite prejemati e-poštnih sporočil, kot je ta,"
     hello: "Pozdravljeni %{name}!"
     liked: 
-      liked: "%{name} has just liked your post: "
-      view_post: "View post >"
+      liked: "Osebi %{name} je všeč vaša objava: "
+      view_post: "Poglej objavo >"
     mentioned: 
       mentioned: "mentioned you in a post:"
-      subject: "%{name} has mentioned you on Diaspora*"
+      subject: "%{name} vas je omenil v Diaspori*"
     private_message: 
       reply_to_or_view: "Reply to or view this conversation >"
     reshared: 
-      reshared: "%{name} just reshared your post"
-      view_post: "View post >"
+      reshared: "%{name} je delil vašo objavo"
+      view_post: "Poglej objavo >"
     single_admin: 
-      admin: !binary |
-          VmGaIGFkbWluaXN0cmF0b3IgRGlhc3BvcmU=
-      subject: !binary |
-          U3Bvcm/oaWxvIG8gdmGaZW0gRGlhc3BvcmEgcmHodW51Og==
+      admin: "Vaš administrator Diaspore"
+      subject: "Sporočilo o vašem Diaspora računu:"
     started_sharing: 
-      sharing: "has started sharing with you!"
-      subject: "%{name} has started sharing with you on Diaspora*"
-      view_profile: "View %{name}'s profile"
+      sharing: "je začel deliti z vami!"
+      subject: "%{name} je začel deliti z vami na Diaspori*"
+      view_profile: "Poglej profil osebe %{name}"
     thanks: "Hvala,"
     to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
@@ -608,77 +485,63 @@ sl:
   password_confirmation: "Potrditev gesla"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "dodaj osebo iz zaznamka"
     aspect_list: 
-      edit_membership: !binary |
-          dXJlZGkg6GxhbmUgc2t1cGlu
-    few: "%{count} people"
+      edit_membership: "uredi člane skupin"
+    few: "%{count} osebe"
     helper: 
       people_on_pod_are_aware_of: " ljudje v 'podu' so seznanjeni o"
       results_for: "zadetkov za %{params}"
     index: 
-      couldnt_find_them_send_invite: !binary |
-          SmloIG5pc3RlIG5hmmxpPyBQb5psaml0ZSBwb3ZhYmlsbyE=
-      no_one_found: !binary |
-          Li4ubmlrb2dhciBuaSBiaWxvIG1vZ2/oZSBuYWp0aS4=
+      couldnt_find_them_send_invite: "Jih niste našli? Pošljite povabilo!"
+      no_one_found: "...nikogar ni bilo mogoče najti."
       no_results: "Ja, halo! Za iskanje je potrebno vpisati pogoj."
       results_for: "rezultati iskanja za"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} oseb"
+    one: "1 oseba"
+    other: "%{count} oseb"
     person: 
       add_contact: "dodaj stik"
-      already_connected: !binary |
-          U3RlIJ5lIHBvdmV6YW5p
-      pending_request: !binary |
-          xIxha2Fqb+hlIHphaHRldmU=
+      already_connected: "Ste že povezani"
+      pending_request: "Čakajoče zahteve"
       thats_you: "To ste vi!"
     profile_sidebar: 
-      bio: !binary |
-          nml2bGplbmplcGlz
+      bio: "Življenjepis"
       born: "datum rojstva"
       edit_my_profile: "Uredi moj profil"
       gender: "spol"
       in_aspects: "v skupinah"
-      location: "location"
+      location: "lokacija"
       remove_contact: "odstrani stik"
       remove_from: "Ali odstranim %{name} iz skupine %{aspect}?"
     show: 
       does_not_exist: "Oseba ne obstaja!"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you  yet!"
-      ignoring: "You are ignoring all posts from %{name}."
-      incoming_request: !binary |
-          JXtuYW1lfSCeZWxpIGRlbGl0aSB6IHZhbWku
-      mention: "Mention"
-      message: "Message"
+      has_not_shared_with_you_yet: "%{name} še ni izmenjalo objave z vami!"
+      ignoring: "Vi ignorirate vse prispevke osebe %{name}."
+      incoming_request: "%{name} želi deliti z vami."
+      mention: "Omemba"
+      message: "Sporočilo"
       not_connected: "S to osebo ne delite"
       recent_posts: "Zadnje objave"
       recent_public_posts: "Zadnje javne objave"
-      return_to_aspects: !binary |
-          VnJuaXRlIHNlIG5hIHZhmm8gc3RyYW4gcyBza3VwaW5hbWk=
-      see_all: "See all"
-      start_sharing: !binary |
-          emHobmkgZGVsaXRp
+      return_to_aspects: "Vrnite se na vašo stran s skupinami"
+      see_all: "Oglejte si vse"
+      start_sharing: "začni deliti"
       to_accept_or_ignore: "sprejmite ali zavrnite."
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
-    two: "%{count} people"
+      add_some: "dodaj nekaj"
+      edit: "uredi"
+      you_have_no_tags: "Nimate nobene oznake!"
+    two: "%{count} osebi"
     webfinger: 
-      fail: !binary |
-          nmFsIG5pIGJpbG8gbW9nb+hlIG5hanRpICV7aGFuZGxlfS4=
-    zero: "no people"
+      fail: "Žal ni bilo mogoče najti %{handle}."
+    zero: "ni oseb"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "Fotografija osebe %{name} "
     create: 
-      integrity_error: !binary |
-          TmFsYWdhbmplIHNsaWtlIG5pIHVzcGVsby4gU3RlIHByZXByaehhbmksIGRh
-          IGplIGJpbGEgIGl6YnJhbmEgc2xpa2E/
+      integrity_error: "Nalaganje slike ni uspelo. Ste prepričani, da je bila  izbrana slika?"
       runtime_error: "Nalaganje slike ni uspelo. Imate pripet varnostni pas?"
-      type_error: !binary |
-          TmFsYWdhbmplIHNsaWtlIG5pIHVzcGVsby4gU3RlIHByZXByaehhbmksIGRh
-          IGplIGJpbGEgZG9kYW5hICBzbGlrYT8=
+      type_error: "Nalaganje slike ni uspelo. Ste prepričani, da je bila dodana  slika?"
     destroy: 
       notice: "Slika izbrisana."
     edit: 
@@ -690,413 +553,356 @@ sl:
     new_photo: 
       empty: "Datoteka {file} je prazna, prosimo ponovno izberite datoteke brez  nje."
       invalid_ext: "Datoteka {file} ni veljavna. Dovoljene so samo naslednje  vrste datotek {extensions}."
-      size_error: !binary |
-          RGF0b3Rla2Ege2ZpbGV9IGplIHByZXZlbGlrYSwgbmFqdmXoamEgZG92b2xq
-          ZW5hIHZlbGlrb3N0IGplICB7c2l6ZUxpbWl0fS4=
+      size_error: "Datoteka {file} je prevelika, največja dovoljena velikost je  {sizeLimit}."
     new_profile_photo: 
-      or_select_one: !binary |
-          YWxpIGl6YmVyaXRlIGVubyBvZCB2YZppaCBvYnN0b2pl6Glo
-      upload: !binary |
-          TmFsb55pIG5vdm8gc2xpa28gcHJvZmlsYSE=
+      or_select_one_existing: |+
+          ali pa izberite eno od vaših že obstoječih slik: %{photos}
+          
+      upload: "Naloži novo sliko profila!"
     photo: 
       view_all: "ogled vseh slik osebe %{name}"
     show: 
       collection_permalink: "collection permalink"
-      delete_photo: !binary |
-          SXpicmmaaSBzbGlrbw==
+      delete_photo: "Izbriši sliko"
       edit: "uredi"
-      edit_delete_photo: !binary |
-          RG9kYWogb3BpcyBzbGlrZSBhbGkgaXpicmmaaSBzbGlrbw==
+      edit_delete_photo: "Dodaj opis slike ali izbriši sliko"
       make_profile_photo: "uporabi sliko za moj profil"
-      show_original_post: "Show original post"
+      show_original_post: "Prikaži originalno objavo"
       update_photo: "Posodobi sliko"
     update: 
       error: "Urejanje slike ni uspelo."
-      notice: !binary |
-          U2xpa2EgdXNwZZpubyBwb3NvZG9ibGplbmEu
+      notice: "Slika uspešno posodobljena."
   posts: 
     show: 
-      destroy: "Delete"
-      not_found: "Sorry, we couldn't find that post."
+      destroy: "Izbriši"
+      not_found: "Oprostite, te objave nismo mogli najti."
       permalink: "permalink"
-  previous: !binary |
-      cHJlappuamE=
-  privacy: "Privacy"
+  previous: "prejšnja"
+  privacy: "Zasebnost"
   profile: "Profil"
   profiles: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
-      last_name: "Last name"
-      update_profile: "Update Profile"
+      allow_search: "Dovoli, da te drugi lahko iščejo v Diaspori"
+      edit_profile: "Uredi profil"
+      first_name: "Ime"
+      last_name: "Priimek"
+      update_profile: "Posodobi profil"
       your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_birthday: "Tvoj rojstni dan"
+      your_gender: "Vaš spol"
+      your_location: "Vaša lokacija"
+      your_name: "Vaše ime"
+      your_photo: "Vaša fotografija"
+      your_private_profile: "Vaš privatni profil"
+      your_public_profile: "Vaš javni profil"
+      your_tags: "Opišite se v petih besedah"
+      your_tags_placeholder: "npr. #movies #kittens #travel #teacher #newyork"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
-  public: "Public"
+      failed: "Posodobitev profila ni uspela"
+      updated: "Profil posodobljen"
+  public: "Javni"
   reactions: 
-    few: "%{count} reactions"
-    many: "%{count} reactions"
-    one: "1 reaction"
-    other: "%{count} reactions"
-    two: "%{count} reactions"
-    zero: "0 reactions"
+    few: "%{count} reakcije"
+    many: "%{count} reakcij"
+    one: "1 reakcija"
+    other: "%{count} reakcij"
+    two: "%{count} reakciji"
+    zero: "0 reakcij"
   registrations: 
-    closed: !binary |
-        WmEgdGEgJ0RpYXNwb3JhIHBvZCcgcmVnaXN0cmFjaWplIHRyZW50bm8gbmlz
-        byBvbW9nb+hlbmUu
+    closed: "Za ta 'Diaspora pod' registracije trenutno niso omogočene."
     create: 
-      success: !binary |
-          UHJpZHJ1nmlsaSBzdGUgc2UgdiBEaWFzcG9ybyE=
+      success: "Pridružili ste se v Diasporo!"
     edit: 
-      cancel_my_account: !binary |
-          UHJla2xp6GkgbW9qIHVwb3JhYm5pmmtpIHJh6HVu
+      cancel_my_account: "Prekliči moj uporabniški račun"
       edit: "Uredi %{name}"
-      leave_blank: !binary |
-          KHYga29saWtvciBuZSCeZWxpdGUgc3ByZW1lbml0aSBwdXN0aXRlIHByYXpu
-          byk=
-      password_to_confirm: !binary |
-          KHNwcmVtZW1ibyBqZSBwb3RyZWJubyBwb3RyZGl0aSB6IHZhmmltIHRyZW51
-          dG5pbSAgZ2VzbG9tKQ==
+      leave_blank: "(v kolikor ne želite spremeniti pustite prazno)"
+      password_to_confirm: "(spremembo je potrebno potrditi z vašim trenutnim  geslom)"
       unhappy: "Ste nezadovoljni?"
       update: "Posodobi"
     new: 
-      create_my_account: "Create my account"
-      enter_email: !binary |
-          VnBpmml0ZSBlLW5hc2xvdg==
-      enter_password: !binary |
-          VnBpmml0ZSBnZXNsbw==
-      enter_password_again: !binary |
-          UG9ub3ZubyB2cGmaaXRlIGlzdG8gZ2VzbG8=
-      enter_username: !binary |
-          SXpiZXJpdGUgdXBvcmFibmmaa28gaW1lIChzYW1vIOhya2UsIJp0ZXZpbGtl
-          IGluICBwb2TocnRhamkp
-      join_the_movement: "Join the movement!"
-      sign_up_message: "Social Networking with a <3"
+      create_my_account: "Ustvari moj račun!"
+      enter_email: "Vpišite e-naslov"
+      enter_password: "Vpišite geslo"
+      enter_password_again: "Ponovno vpišite isto geslo"
+      enter_username: "Izberite uporabniško ime (samo črke, številke in  podčrtaji)"
+      join_the_movement: "Pridružite se gibanju!"
+      sign_up_message: "Socialno omrežje s <3"
   requests: 
     create: 
-      sending: !binary |
-          UG+aaWxqYW0=
-      sent: !binary |
-          JXtuYW1lfSBzdGUgdnByYZphbGksIOhlIGJpIGRlbGlsaSB6IHZhbWkuIFZh
-          mmUgdnByYZphbmplIGJvZG8gIHZpZGVsaSwga28gc2UgYm9kbyBwcmlqYXZp
-          bGkgdiBEaWFzcG9yby4=
+      sending: "Pošiljam"
+      sent: "%{name} ste vprašali, če bi delili z vami. Vaše vprašanje bodo  videli, ko se bodo prijavili v Diasporo."
     destroy: 
       error: "Prosim izberite skupino!"
-      ignore: !binary |
-          UHJvmm5qYSB6YSBzdGlrIGplIHphdnJuamVuYS4=
-      success: "Zdaj sta prijatelja."
+      ignore: "Prošnja za stik je zavrnjena."
+      success: "Sedaj deliš."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        two: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} nove prošnje!"
+        many: "%{count} novih prošnj!"
+        one: "nova prošnja!"
+        other: "%{count} novih prošenj!"
+        two: "%{count} novi prošnji!"
+        zero: "ni novih prošenj"
     manage_aspect_contacts: 
-      existing: !binary |
-          T2JzdG9qZehpIHN0aWtp
+      existing: "Obstoječi stiki"
       manage_within: "Uredi stike znotraj"
     new_request_to_person: 
       sent: poslano!
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
-      failure: "There was an error resharing this post."
+      failure: "Prišlo je do napake pri ponovni delitvi objave."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "Avtor je izbrisal izvirno objavo."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
+        few: "%{count} delitve"
+        many: "%{count} delitev"
+        one: "1 delitev"
+        other: "%{count} delitev"
         two: "%{count} reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      reshare_original: "Reshare orignial"
-      reshared_via: "reshared via"
-      show_original: "Show Original"
+        zero: "Ponovno deli"
+      reshare_confirmation: "Deli objavo osebe %{author}?"
+      reshare_original: "Deli izvirnik"
+      reshared_via: "ponovno deljeno preko"
+      show_original: "Prikaži izvirnik"
   search: "Najdi"
   services: 
     create: 
-      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
-      failure: "Authentication failed."
+      already_authorized: "Uporabnik z diaspora id %{diaspora_id} je že dovolil ta %{service_name} račun."
+      failure: "Preverjanje pristnosti ni uspelo."
       success: "Preverjanje istovetnosti je uspelo."
     destroy: 
-      success: !binary |
-          UHJldmVyamFuamUgaXN0b3ZldG5vc3RpIGplIHVzcGWabm8gaXpicmlzYW5v
-          Lg==
+      success: "Preverjanje istovetnosti je uspešno izbrisano."
     failure: 
-      error: !binary |
-          cHJpIHBvdmV6b3Zhbmp1IHMgc2Vydmlzb20gamUgcHJpmmxvIGRvIG5hcGFr
-          ZQ==
+      error: "pri povezovanju s servisom je prišlo do napake"
     finder: 
       fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "Noben prijatelj s Facebook-a ni bil najden."
+      service_friends: "%{service} Prijatelji"
     index: 
-      connect_to_facebook: !binary |
-          UG92ZZ5pIHNlIHMgZmFjZWJvb2s=
-      connect_to_tumblr: "Connect to Tumblr"
-      connect_to_twitter: !binary |
-          UG92ZZ5pIHNlIHMgdHdpdHRlcg==
+      connect_to_facebook: "Poveži se s Facebook-om"
+      connect_to_tumblr: "Povežite se Tumblr-jem"
+      connect_to_twitter: "Poveži se s Twitter-jem"
       disconnect: "povezava prekinjena"
       edit_services: "Uredi servise"
       logged_in_as: "prijavljeni ste kot"
-      no_services: "You have not connected any services yet."
+      no_services: "Niste še povezani z nobeno storitvijo."
       really_disconnect: "prekinem povezavo s servisom %{service}?"
     inviter: 
-      click_link_to_accept_invitation: !binary |
-          S2xpa25pdGUgbmEgcG92ZXphdm8gemEgcG90cmRpdGV2ICB2YZplZ2EgcG92
-          YWJpbGE=
-      join_me_on_diaspora: !binary |
-          UHJpZHJ1nmkgc2UgbWkgbmEgRElBU1BPUkkq
+      click_link_to_accept_invitation: "Kliknite na povezavo za potrditev vašega povabila"
+      join_me_on_diaspora: "Pridruži se mi na DIASPORI*"
     remote_friend: 
       invite: "povabi"
-      not_on_diaspora: "Not yet on Diaspora"
-      resend: !binary |
-          cG+abGppIHBvbm92bm8=
+      not_on_diaspora: "Še nisi na Diaspori"
+      resend: "pošlji ponovno"
   settings: "Nastavitve"
   share_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "Objava osebe %{name} je bila skrita in vsa obvestila za to objavo so bila onemogočena."
+      see_it_on_their_profile: "Če želite videti posodobitve te objave, obiščite profil osebe %{name}."
   shared: 
     add_contact: 
-      add_new_contact: "Add a new contact"
-      create_request: !binary |
-          UG9pmuhpIHBvIERpYXNwb3JhIGltZW51
-      diaspora_handle: diaspora@handle.org
-      enter_a_diaspora_username: !binary |
-          VnBpmml0ZSBEaWFzcG9yYSB1cG9yYWJuaZprbyBpbWU6
+      add_new_contact: "Dodaj nov stik"
+      create_request: "Poišči po Diaspora imenu"
+      diaspora_handle: diaspora@pod.org
+      enter_a_diaspora_username: "Vpišite Diaspora uporabniško ime:"
       know_email: "Ali poznate njihove naslove e-naslove? Povabite jih"
-      your_diaspora_username_is: !binary |
-          VmGaZSBEaWFzcG9yYSB1cG9yYWJuaZprbyBpbWUgamU6ICAle2RpYXNwb3Jh
-          X2hhbmRsZX0=
+      your_diaspora_username_is: "Vaše Diaspora uporabniško ime je:  %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Dodaj stik"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        two: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "V %{count} pogledih"
+        many: "V %{count} pogledih"
+        one: "V %{count} pogledu"
+        other: "V %{count} pogledih"
+        two: "V %{count} pogledih"
+        zero: "Dodaj stik"
     contact_list: 
       all_contacts: "Vsi stiki"
     footer: 
-      logged_in_as: "logged in as %{name}"
-      your_aspects: "your aspects"
+      logged_in_as: "prijavljen kot %{name}"
+      your_aspects: "vaši pogledi"
     invitations: 
-      by_email: !binary |
-          cG8gZS1wb5p0aQ==
-      dont_have_now: !binary |
-          VHJlbnV0bm8gbmltYXRlIHBvdmFiaWwsIHZlbmRhciBqaWggbGFoa28gdiBr
-          cmF0a2VtICBwcmnoYWt1amV0ZSE=
+      by_email: "po e-pošti"
+      dont_have_now: "Trenutno nimate povabil, vendar jih lahko v kratkem  pričakujete!"
       from_facebook: "iz Facebook-a"
-      invitations_left: !binary |
-          KJplICV7Y291bnR9KQ==
+      invitations_left: "(še %{count})"
       invite_someone: "Povabi osebo"
       invite_your_friends: "Povabi prijatelje"
       invites: "Povabila"
-      invites_closed: !binary |
-          WmEgdGEgJ0RpYXNwb3JhIHBvZCcgc28gcG92YWJpbGEgdHJlbnV0bm8gb25l
-          bW9nb+hlbmEu
+      invites_closed: "Za ta 'Diaspora pod' so povabila trenutno onemogočena."
     notification: 
       new: "Novo %{type} od %{from}"
     public_explain: 
-      control_your_audience: "Control your Audience"
+      control_your_audience: "Nadzor ciljne skupine"
       logged_in: "prijavljeni ste v %{service}"
       manage: "uredi povezane servise"
       new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
-      outside: !binary |
-          SmF2bmEgc3Bvcm/oaWxhIGJvZG8gbmEgb2dsZWQgdHVkaSBvc2ViYW0gaXp2
-          ZW4gRGlhc3BvcmUu
-      share: "Share"
-      title: !binary |
-          T2JqYXZpbGkgYm9zdGUgamF2bm8gc3Bvcm/oaWxvIQ==
-      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
+      outside: "Javna sporočila bodo na ogled tudi osebam izven Diaspore."
+      share: "Deli"
+      title: "Objavili boste javno sporočilo!"
+      visibility_dropdown: "Uporabite ta spustni seznam za spremembo vidnosti vaše objave. (Priporočamo vam da naj bo prva javna.)"
     publisher: 
       all: "vsi"
       all_contacts: "vsi stiki"
-      discard_post: "Discard post"
+      discard_post: "Zavrzi objavo"
       make_public: "objavi kot javno"
       new_user_prefill: 
-        hello: "Hey everyone, I'm #%{new_user_tag}. "
-        i_like: "I'm interested in %{tags}."
-        invited_by: "Thanks for the invite, "
-      post_a_message_to: !binary |
-          T2JqYXZpIHNwb3Jv6GlsbyB2ICV7YXNwZWN0fQ==
+        hello: "Zdravo vsem. Jaz sem #%{new_user_tag}. "
+        i_like: "Zanimajo me naslednje oznake %{tags}."
+        invited_by: "Hvala za povabilo,"
+      post_a_message_to: "Objavi sporočilo v %{aspect}"
       posting: Objavljam...
       publishing_to: "publishing to: "
       share: "Objavi"
       share_with: "deli s/z"
-      upload_photos: "Upload photos"
-      whats_on_your_mind: !binary |
-          Ymkga2FqIJ5lbGVsaSBzcG9yb+hpdGk/
+      upload_photos: "Naložite fotografije"
+      whats_on_your_mind: "bi kaj želeli sporočiti?"
     reshare: 
-      reshare: !binary |
-          T2JqYXZpIJplIHY=
+      reshare: "Objavi še v"
     stream_element: 
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
-      dislike: "I dislike this"
-      hide_and_mute: "Hide and Mute"
+      connect_to_comment: "Da bi komentirali njegove objave, se povežite s tem uporabnikom."
+      currently_unavailable: "komentiranje trenutno ni na voljo"
+      dislike: "Nimam rad"
+      hide_and_mute: "Skrij in utišaj objavo"
       ignore_user: "Ignore %{name}"
       ignore_user_description: "Ignore and remove user from all aspects?"
-      like: "I like this"
-      shared_with: "Shared with: %{aspect_names}"
-      unlike: "Unlike"
-      via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      like: "Več mi je"
+      shared_with: "Deljeno z: %{aspect_names}"
+      unlike: "Ni mi všeč"
+      via: "preko %{link}"
+      viewable_to_anyone: "Ta objava je vidna vsakomur na spletu"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "Uspešno omenjeni: %{names}"
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Ni bilo mogoče izbrisati objave"
     helper: 
-      no_message_to_display: !binary |
-          Tmkgc3Bvcm/oaWwu
+      no_message_to_display: "Ni sporočil."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Navedba: %{person}"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      two: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+      few: "Vaša sporočila morajo vsebovati manj kot %{count} znake."
+      many: "Vaša sporočila morajo vsebovati manj kot %{count} znakov."
+      one: "Vaša sporočila morajo vsebovati manj kot %{count} znak."
+      other: "Vaša sporočila morajo vsebovati manj kot %{count} znakov."
+      two: "Vaša sporočila morajo vsebovati manj kot %{count} znaka."
+      zero: "Vaša sporočila morajo vsebovati manj kot %{count} znakov."
   stream_helper: 
-    hide_comments: "skrij komentarje"
+    hide_comments: "Skrij vse komentarje"
     show_more_comments: "Show %{number} more comments"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
+      title: "Vaši pogledi"
+    aspects_stream: "Pogledi"
+    commented_on: "komentiral na"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
-      add_a_tag: "Add a tag"
-      contacts_title: "People who dig these tags"
-      follow: "Follow"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
+      add_a_tag: "Dodaj oznako"
+      contacts_title: "Ljudje, ki so izbrskali te oznake"
+      follow: "Sledite"
+      title: "#Sledi zaznamkom"
+    followed_tags_stream: "#Sledene objave"
     mentioned_stream: "@Mentions"
     mentions: 
-      contacts_title: "People who mentioned you"
-      title: "Your Mentions"
+      contacts_title: "Ljudje, ki so vas omenili"
+      title: "@Omembe"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Ljudje v vašem toku"
+      title: "Vir"
+    posted: "objavljeno"
     public: 
-      contacts_title: "Recent Posters"
-      title: "Public Activity"
-    recently: "recently:"
+      contacts_title: "Zadnji objavljajoči"
+      title: "Javna aktivnost"
+    recently: "v zadnjem času:"
     tags: 
-      contacts_title: "People who dig these tags"
-      title: "Posts tagged: %{tags}"
+      contacts_title: "Ljudje, ki so izbrskali ta zaznamek"
+      title: "Objave označene z: %{tags}"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Sledenje #%{name} ni uspelo. Ali že sledite?"
+      success: "Hura! Sedaj sledite #%{name}."
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Ni mogoče prekiniti sledenja #%{name}. Mogoče ste že prekinili sledenje?"
+      success: "Žal več ne sledite #%{name}."
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      followed_by: "followed by"
-      following: "Following #%{tag}"
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-      posts_tagged_with: "Posts tagged with #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      follow: "Sledite #%{tag}"
+      followed_by: "sledi"
+      following: "Sledenje #%{tag}"
+      nobody_talking: "Nihče še ni govoril o %{tag}."
+      people_tagged_with: "Ljudje, označeni z %{tag}"
+      posts_tagged_with: "Objave označene z #%{tag}"
+      stop_following: "Prenehaj slediti #%{tag}"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as  filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect  to a new application without creating an account separate from your one on  Diaspora."
-      love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
+      connect_to_cubbies: "Povežite se Cubbi.es"
+      connecting_is_simple: "Povezovanje računa Diaspore je preprosta! Samo vnesite svoj ID Diaspore (<b>%{diaspora_id}</b>) iz vaše cubbies  <a href='%{href_link}'>nastavitvene strani</a> in kliknite poveži."
+      daniels_account: "Danielov Diasporin račun"
+      log_in_with_diaspora_is_comming: "Kmalu se boste lahko za povezali na novo aplikacijo, ne da bi ustvarili račun ločen od Diaspore."
+      love_to_try: "Radi bi da jo preizkusite."
+      making_the_connection: "Ustvarjanje stika"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to  %{link2}."
-      sign_up_today: "Sign up today!"
-      typical_userpage: "A typical cubbi.es userpage"
-      via: "(via %{link})"
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.   It's also the best way to collect photos online."
-  undo: Undo?
-  username: !binary |
-      VXBvcmFibmmaa28gaW1l
+      sign_up_today: "Registriraj se še danes!"
+      typical_userpage: "Tipična uporabniška stran cubbi.es"
+      via: "(preko %{link})"
+      what_is_cubbies: "Cubbi.es je prva aplikacija  Diaspore na svetu. Ta aplikacija je tudi najboljši način za zbiranje fotografij na spletu."
+  undo: Razveljavi?
+  username: "Uporabniško ime"
   users: 
     confirm_email: 
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "Elektronski naslov %{email} aktiviran"
+      email_not_confirmed: "Elektronski naslov ni bilo mogoče aktivirati. Napačna povezava?"
     destroy: 
       no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
+      success: "Vaš račun je bil zaklenjen. To lahko traja 20 minut za nas, da končamo zapiranje računa. Hvala, ker ste poskusili Diasporo."
       wrong_password: "The entered password didn't match your current password."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
+      also_commented: "...nekdo tudi komentira objavo vašega stika?"
       change: "Spremeni"
-      change_email: "Change E-Mail"
+      change_email: "Spremeni e-naslov"
       change_language: "Spremeni jezik"
       change_password: "Spremeni geslo"
-      close_account: !binary |
-          WmFwcmkgdXBvcmFibmmaa2kgcmHodW4=
-      comment_on_post: "...someone comments on your post?"
+      close_account: "Zapri uporabniški račun"
+      comment_on_post: "...nekdo komentira vašo objavo?"
       current_password: "Trenutno geslo"
-      download_photos: "prenesi slike"
+      download_photos: "prenesi moje slike"
       download_xml: "prenesi v xml"
-      edit_account: "Uredi uporabniki raun"
-      email_awaiting_confirmation: "We have sent you an activation link to  %{unconfirmed_email}. Till you follow this link and activate the new address,  we will continue to use your original address %{email}."
+      edit_account: "Uredi uporabniški račun"
+      email_awaiting_confirmation: "Poslali smo vam povezavo za aktiviranje na %{unconfirmed_email}. Dokler ne sledite tej povezavi in ​​aktivirate nov naslov, bomo še naprej uporabljati vaš stari naslov %{email}."
       export_data: "Izvozi podatke"
-      getting_started: "New User Prefrences"
-      liked: "...someone likes your post?"
-      mentioned: "...you are mentioned in a post?"
+      getting_started: "Nastavitve novega uporabnika"
+      liked: "...je nekomu všeč vaša objava?"
+      mentioned: "...ste omenjeni v objavi?"
       new_password: "Novo geslo"
-      photo_export_unavailable: "Photo exporting currently unavailable"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: !binary |
-          nmVsaXRlIHByZWplbWF0aSBvYnZlc3RpbGEgcG8gZS1wb5p0aSwga28uLi4g
-      reshared: "...someone reshares your post?"
+      photo_export_unavailable: "Izvoz slik trenutno ni na voljo"
+      private_message: "...prejmete privatno sporočilo?"
+      receive_email_notifications: "Želite prejemati obvestila po e-pošti, ko... "
+      reshared: "...nekdo deli vašo objavo?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
-      show_getting_started: "Re-enable Getting Started"
-      started_sharing: "...someone starts sharing with you?"
-      stream_preferences: "Stream Preferences"
-      your_email: !binary |
-          VmGaIGUtbmFzbG92
-      your_handle: !binary |
-          VmGaIGRpYXNwb3JhIG5hc2xvdg==
+      show_getting_started: "Ponovno omogočite Kako začeti"
+      started_sharing: "... nekdo začne skupno rabo z vami?"
+      stream_preferences: "Nastavitve toka"
+      your_email: "Vaš e-naslov"
+      your_handle: "Vaš diaspora naslov"
     getting_started: 
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
-      community_welcome: "Diaspora's community is happy to have you aboard!"
-      hashtag_explanation: "Hashtags allow you to talk about and follow your  interests.  They're also a great way to find new people on Diaspora."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
-      saved: Saved!
-      we_can_speed_things_up: "We can speed things up a bit by"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
+      awesome_take_me_to_diaspora: "Super! Popelji me v Diasporo*"
+      community_welcome: "Skupnosti Diaspora je vesela, da vas ima na krovu!"
+      hashtag_explanation: "Zaznamki vam omogočajo, da govorimo o in sledite vašim interesom. So tudi dober način za iskanje novih ljudi na Diaspori."
+      hashtag_suggestions: "Poskusite naslednje oznake, kot so #art, #movies, #gif in podobno"
+      hooking_up_fb: "povežite vaš Facebook račun"
+      saved: Shranjeno!
+      we_can_speed_things_up: "Mi lahko malo pospešimo stvari z"
+      well_hello_there: "No, Pozdravljeni!"
+      what_are_you_in_to: "Kaj vas zanima?"
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
-      who_are_you: "Who are you?"
+      who_are_you: "Kdo si?"
     logged_out: 
-      go_mobile: "Now go mobile."
-      on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
-      signed_out: "You've signed out of Diaspora*"
-      simply_visit: "Simply visit"
-      works_on_modern: "Works on all modern smartphones"
+      go_mobile: "Zdaj pa pojdi mobilno."
+      on_your_mobile_device: "na mobilni napravi za dostop do Diaspora* mobile."
+      signed_out: "Odjavili ste se z Diaspore*"
+      simply_visit: "Preprost obisk"
+      works_on_modern: "Deluje na vseh sodobnih pametnih telefonih"
     privacy_settings: 
       ignored_users: "Ignored Users"
       stop_ignoring: "Stop ignoring"
@@ -1104,30 +910,19 @@ sl:
     public: 
       does_not_exist: "Uporabnik %{username} ne obstaja!"
     update: 
-      email_notifications_changed: !binary |
-          T2J2ZZroYW5qZSBwbyBlLXBvmnRpIHNwcmVtZW5qZW5v
+      email_notifications_changed: "Obveščanje po e-pošti spremenjeno"
       language_changed: "Jezik spremenjen"
       language_not_changed: "Sprememba jezika ni uspela"
-      password_changed: "Geslo spremenjeno"
+      password_changed: "Geslo spremenjeno. Sedaj se lahko prijavite z novim geslom."
       password_not_changed: "Sprememba gesla ni uspela"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      settings_not_updated: "Posodobitev nastavitev ni uspela"
+      settings_updated: "Nastavitve posodobljene"
+      unconfirmed_email_changed: "E-pošta spremenjena. Potrebna aktivacija."
+      unconfirmed_email_not_changed: "Sprememba e-naslova ni uspela"
   webfinger: 
-    fetch_failed: !binary |
-        J3dlYmZpbmdlcicgcHJvZmlsIG5pIGJpbG8gbW9nb+hlIHByZW5lc3RpIHph
-        ICV7cHJvZmlsZV91cmx9
-    hcard_fetch_failed: !binary |
-        cHJpmmxvIGplIGRvIHRlnmF2ZSBwcmkgcHJlbm9zdSAnaENhcmQnIGthcnRp
-        Y2UgemEgICV7YWNjb3VudH0=
-    no_person_constructed: !binary |
-        SXogdGUgJ2hDYXJkJyBrYXJ0aWNlIG5pIGJpbG8gbW9nb+hlIHJhenBvem5h
-        dGkgIG9zZWJlLg==
-    not_enabled: !binary |
-        cmHodW4gZ29zdGl0ZWxqYSAoaG9zdCkgJXthY2NvdW50fSBzZSBuZSBvZHpp
-        dmEgbmEgICd3ZWJmaW5nZXInIHByb3Rva29s
-    xrd_fetch_failed: !binary |
-        cHJpIHByaWRvYml2YW5qdSAnWFJEJyBpeiB1cG9yYWJuaZprZWdhIHJh6HVu
-        YSAgJXthY2NvdW50fSBqZSBwcmmabG8gZG8gbmFwYWtl
-  welcome: Welcome!
+    fetch_failed: "'webfinger' profil ni bilo mogoče prenesti za %{profile_url}"
+    hcard_fetch_failed: "prišlo je do težave pri prenosu 'hCard' kartice za  %{account}"
+    no_person_constructed: "Iz te 'hCard' kartice ni bilo mogoče razpoznati nobene osebe."
+    not_enabled: "račun gostitelja (host) %{account} se ne odziva na  'webfinger' protokol"
+    xrd_fetch_failed: "pri pridobivanju 'XRD' iz uporabniškega računa  %{account} je prišlo do napake"
+  welcome: Dobrodošli!
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index a9d3a0c47..4ed0d4d8f 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -111,6 +111,9 @@ sq:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ sq:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} është shumë e madhe, madhësia maksimale është {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "ose zgjedhni nga egzistueset"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Ngarko një foto të re profili!"
     photo: 
       view_all: "view all of %{name}'s photos"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 1cea14607..0fdadef70 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -111,6 +111,9 @@ sv:
         here_to_help: "Diaspora communityn finns här!"
         need_help: "Behöver du hjälp?"
         satisfaction: "%{link}: Support ifrån communityn"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Håll farten hos %{pod} uppe och köp kaffe till servrarna genom en månadsdonation!"
@@ -552,7 +555,7 @@ sv:
       invalid_ext: "{file} har en ogiltig filändelse. Endast {extensions} är tillåtna."
       size_error: "{file} är för stor, maximal tillåten filstorlek är {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "eller välj en av dina befintliga"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Ladda upp en ny profilbild!"
     photo: 
       view_all: "visa alla foton som %{name} laddat upp"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 85abdf18b..119f2161c 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -111,6 +111,9 @@ tr:
         here_to_help: "Diaspora topluluğu olarak yardım etmek için buradayız!"
         need_help: "Yardıma mı ihtiyacın var?"
         satisfaction: "%{link}: Topluluk desteği"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Bu sizin akışınızdır. Atla ve kendini tanıt."
       keep_us_running: "%{pod} ağının daha hızlı ve hatasız olması için geliştiricilere aylık kahve ısmarlayın!"
@@ -552,7 +555,7 @@ tr:
       invalid_ext: "{file} geçersiz uzantıya sahip. sadece {extensions} uzantılarına izin verilir."
       size_error: "{file} çok büyük, en büyük dosya boyutu {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "ya da varolanlardan birini seç"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Yeni bir profil fotoğrafı yükle!"
     photo: 
       view_all: "%{name}'in bütün fotoğraflarını göster"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 41c1d99e1..94bfdd54a 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -111,6 +111,9 @@ uk:
         here_to_help: "Товариство Діаспори до ваших послуг!"
         need_help: "Потрібна допомога?"
         satisfaction: "%{link}: здійснювана товариством підтримка"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial}, %{wiki} і %{forum}: довідкові посібники, що складаються товариством, інструкції та новини."
       introduce_yourself: "Це ваш потік. Пірнайте і освоюйтеся."
       keep_us_running: "Допоможіть %{pod} працювати швидко - купіть нашим серверам дозу кави, зробивши щомісячне пожертвування!"
@@ -552,7 +555,7 @@ uk:
       invalid_ext: "{file} має неприпустиме розширення. Дозволені тільки {extensions}."
       size_error: "{file} занадто великий, максимальний розмір файлу {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "чи вибрати одну із завантажених"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Завантажити нове фото для профілю!"
     photo: 
       view_all: "Подивитися усі фотографії %{name}"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 71e8fc60a..c68a43138 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -111,6 +111,9 @@ ur-PK:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ ur-PK:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} is too large, maximum file size is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "view all of %{name}'s photos"
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 05a02f0d8..f258fbfc4 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -111,6 +111,9 @@ vi:
         here_to_help: "The Diaspora community is here!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
@@ -552,7 +555,7 @@ vi:
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} is too large, maximum file size is {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: "Upload a new profile photo!"
     photo: 
       view_all: "view all of %{name}'s photos"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index a5956c1e9..c38daa100 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -111,6 +111,9 @@ zh-CN:
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
+        tag_bug: "#bug"
+        tag_feature: "#feature"
+        tag_question: "#question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -552,7 +555,7 @@ zh-CN:
       invalid_ext: "不支持文件 {file} 的格式。只接受{extensions}。"
       size_error: "文件 {file} 太大了，上限是 {sizeLimit}。"
     new_profile_photo: 
-      or_select_one: "或从既有照片中挑选一张"
+      or_select_one_existing: "or select one from your already existing %{photos}"
       upload: 上传新的头像！
     photo: 
       view_all: "查看 %{name} 所有的照片"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 9db0fdc68..89af26a1c 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -111,11 +111,14 @@ zh-TW:
         here_to_help: "Diaspora 社群就在這裡!"
         need_help: 要幫忙嗎?
         satisfaction: "%{link}: 社群支援的客服網站"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tag_bug: "臭蟲"
+        tag_feature: "特色"
+        tag_question: "問題"
+        tutorials_wiki_and_forum: "%{tutorial} 和 %{wiki} 和 %{forum}: 社群運作的入門, 指南, 與新聞網站"
       introduce_yourself: "這是你的流水帳. 跳進來介紹你自己吧."
       keep_us_running: "為了讓 %{pod} 高速奔馳, 用每月捐款來提供些咖啡存量給我們的伺服器吧!"
       new_here: 
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        follow: "追蹤 %{link} 來歡迎 Diaspora* 的新使用者!"
         learn_more: "了解詳情"
         title: "歡迎新使用者"
       no_contacts: "沒有任何聯絡人"
@@ -514,7 +517,7 @@ zh-TW:
     show: 
       does_not_exist: 聯絡人不存在!
       has_not_shared_with_you_yet: "%{name} 尚未跟你分享任何貼文!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "你目前會忽視 %{name} 的所有貼文."
       incoming_request: "%{name} 希望能和你分享"
       mention: "指指點點"
       message: "送訊息"
@@ -552,7 +555,7 @@ zh-TW:
       invalid_ext: "檔案 {file} 的副檔名不合格. 只接受{extensions}."
       size_error: "檔案 {file} 太大了, 上限是{sizeLimit}."
     new_profile_photo: 
-      or_select_one: "或從既有相片中挑選一張"
+      or_select_one_existing: "或從你既有的%{photos}中挑選一張"
       upload: 上傳新的個人照!
     photo: 
       view_all: "檢視 %{name} 所有的相片"
@@ -671,7 +674,7 @@ zh-TW:
     failure: 
       error: "與該服務連結時有錯誤"
     finder: 
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora 正在取得你在 %{service} 的朋友資料, 請幾分鐘後再來看看."
       no_friends: "沒有 Facebook 朋友."
       service_friends: "%{service} 朋友"
     index: 
@@ -693,8 +696,8 @@ zh-TW:
   settings: "設定"
   share_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "%{name} 的貼文已經隱藏了, 異動時也不會有消息通知."
+      see_it_on_their_profile: "如果你想看這篇貼文的更新, 請到 %{name} 的個人頁面."
   shared: 
     add_contact: 
       add_new_contact: "加入新聯絡人"
@@ -745,7 +748,7 @@ zh-TW:
       new_user_prefill: 
         hello: "大家好, 我是 #%{new_user_tag}. "
         i_like: "我對 %{tags} 有興趣."
-        invited_by: "Thanks for the invite, "
+        invited_by: "謝謝你的邀請, "
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: 發表中...
       publishing_to: "發表至: "
@@ -760,8 +763,8 @@ zh-TW:
       currently_unavailable: "目前無法回應"
       dislike: "遜"
       hide_and_mute: "將貼文隱藏且消音"
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      ignore_user: "忽視 %{name}"
+      ignore_user_description: "是否要忽視該使用者, 並將其從所有面向中移除?"
       like: "讚"
       shared_with: "分享給: %{aspect_names}"
       unlike: "收回讚"
@@ -833,7 +836,7 @@ zh-TW:
     show: 
       connect_to_cubbies: "與 Cubbi.es 連結"
       connecting_is_simple: "跟 Diapora 帳號連結很簡單! 只要從 cubbies <a href='%{href_link}'>設定頁面</a>輸入你的 Diaspora 識別碼, 再按下\"連結\"就可以了."
-      daniels_account: "Daniel的 Diaspora 帳號"
+      daniels_account: "Daniel 的 Diaspora 帳號"
       log_in_with_diaspora_is_comming: "很快你就可以使用 Diaspora 帳號連線至新的應用程式, 而不用另外再開新的帳號了."
       love_to_try: 希望你能試試看.
       making_the_connection: "建立連結"
@@ -849,9 +852,9 @@ zh-TW:
       email_confirmed: "E-Mail %{email} 已經啟用了"
       email_not_confirmed: "無法啟用E-Mail. 連結有誤嗎?"
     destroy: 
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: 請輸入你目前的密碼來關閉帳號.
+      success: "你的帳號已經鎖定了. 完成關閉帳號大約還需要 20 分鐘的時間. 感謝你試用 Diaspora."
+      wrong_password: 輸入的密碼與你目前的密碼不符.
     edit: 
       also_commented: "...當有人也對你的聯絡人的貼文發表意見時?"
       change: "更改"
@@ -899,9 +902,9 @@ zh-TW:
       simply_visit: "只要在你的行動設備上輸入"
       works_on_modern: "適用於所有新潮的智慧型手機"
     privacy_settings: 
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "忽視的使用者"
+      stop_ignoring: "停止忽視"
+      title: "隱私設定"
     public: 
       does_not_exist: "不存在 %{username} 這個使用者!"
     update: 
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 352e90766..9ec5df8e5 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -8,7 +8,7 @@ de:
     aspect_dropdown: 
       add_to_aspect: "Kontakt hinzufügen"
       all_aspects: "Alle Aspekte"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Konnte nicht anfangen, mit {{name}} zu teilen. Ignorierst du sie/ihn?"
       select_aspects: "Wähle Aspekte aus"
       started_sharing_with: "Du hast angefangen, mit {{name}} zu teilen!"
       stopped_sharing_with: "Du hast aufgehört, mit {{name}} zu teilen!"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index ec266b7a5..c8d168073 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -10,7 +10,7 @@ es:
       all_aspects: "Todos los aspectos"
       error: "No podría empezar a compartir con {{name}}.  ¿Vas a ignonarl@?"
       select_aspects: "Elige los aspectos"
-      started_sharing_with: "¡Has empezado a compartir con {{name}}!"
+      started_sharing_with: "¡Ahora sigues los mensajes públicos de {{name}}!"
       stopped_sharing_with: "Ya no compartes más con {{name}}."
       toggle: 
         few: "En {{count}} aspectos"
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index ffc3bbade..1530216cc 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -8,7 +8,7 @@ nn:
     aspect_dropdown: 
       add_to_aspect: "Legg til kontakt"
       all_aspects: "Alle aspekta"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Klarte ikkje å byrja å dela med {{name}}.  Ignorerer du dei?"
       select_aspects: "Vel aspekt"
       started_sharing_with: "Du har byrja å dela med {{name}}."
       stopped_sharing_with: "Du deler ikkje lenger med {{name}}."
@@ -33,7 +33,7 @@ nn:
       alright_ill_wait: "Greitt, eg ventar."
       hey: "Hei, {{name}}!"
       no_tags: "Du har ikkje følgt nokon etikett. Vil du likevel halda fram?"
-      preparing_your_stream: "Lagar ein tilpassa straum …"
+      preparing_your_stream: "Lagar den tilpassa straumen din …"
     infinite_scroll: 
       no_more: "Ingen fleire meldingar."
     photo_uploader: 
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 455fa6eed..2f581da57 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -8,7 +8,7 @@ ru:
     aspect_dropdown: 
       add_to_aspect: "Добавить контакт"
       all_aspects: "Все аспекты"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Невозможно начать делиться с пользователем {{name}}.  Возможно, вы его заблокировали?"
       select_aspects: "Выбрать аспекты"
       started_sharing_with: "Вы начали делиться с {{name}}!"
       stopped_sharing_with: "Вы перестали делиться с {{name}}."
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index ede185999..094465b46 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -6,84 +6,66 @@
 sl: 
   javascripts: 
     aspect_dropdown: 
-      add_to_aspect: "Dodaj pogledu"
+      add_to_aspect: "Dodaj stik"
       all_aspects: "Vsi pogledi"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
-      select_aspects: "Select aspects"
-      started_sharing_with: "You have started sharing with {{name}}!"
-      stopped_sharing_with: "You have stopped sharing with {{name}}."
+      error: "Ne morem začeti deliti s {{name}}. Ali ste jih ignorirali?"
+      select_aspects: "Izberi poglede"
+      started_sharing_with: "Začeli ste deliti z {{name}}!"
+      stopped_sharing_with: "Prenehali ste deliti z {{name}}."
       toggle: 
         few: "V {{count}} pogledih"
         many: "V {{count}} pogledih"
         one: "V {{count}} pogledu"
         other: "V {{count}} pogledih"
         two: "V {{count}} pogledih"
-        zero: "Dodaj pogledu"
+        zero: "Izberi pogled"
     aspect_navigation: 
-      deselect_all: "Deselect all"
-      no_aspects: "No aspects selected"
-      select_all: "Select all"
+      deselect_all: "Ne izberi nobenega"
+      no_aspects: "Noben pogled ni izbran"
+      select_all: "Izberi vse"
     comments: 
       hide: "skrij komentarje"
-      show: !binary |
-          cHJpa2GeaSB2c2Uga29tZW50YXJqZQ==
-    confirm_dialog: !binary |
-        U3RlIHByZXByaehhbmk=
-    failed_to_like: !binary |
-        T3puYehldmFuamUgbmkgdXNwZWxvIQ==
+      show: "prikaži vse komentarje"
+    confirm_dialog: "Ste prepričani"
+    failed_to_like: "Označevanje ni uspelo!"
     failed_to_post_message: "Objava ni uspela!"
     getting_started: 
-      alright_ill_wait: "Alright, I'll wait."
-      hey: "Hey, {{name}}!"
-      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
-      preparing_your_stream: "Preparing your personialized stream..."
+      alright_ill_wait: "V redu, bom počakal."
+      hey: "Hej, {{name}}!"
+      no_tags: "Hej, niste sledili nobeni oznaki! Vseeno nadaljuj?"
+      preparing_your_stream: "Pripravljanje vašega osebnega toka ..."
     infinite_scroll: 
       no_more: "Konec objav."
     photo_uploader: 
-      looking_good: "OMG, you look awesome!"
+      looking_good: "OMG, izgledaš super!"
     publisher: 
       at_least_one_aspect: "Objaviti morate v vsaj enem pogledu"
-      limited: !binary |
-          T21lamVubyAtIFZhmmEgb2JqYXZhIGJvIHZpZG5hIGxlIGxqdWRlbSwgcyBr
-          YXRlcmltaSBkZWxpdGU=
-      public: !binary |
-          SmF2bm8gLSBWYZphIG9iamF2YSBibyB2aWRuYSB2c2VtLCBwcmlrYXphbmEg
-          Ym8gdHVkaSB2IHNwbGV0bmloICBpc2thbG5pa2lo
+      limited: "Omejeno - Vaša objava bo vidna le ljudem, s katerimi delite"
+      public: "Javno - Vaša objava bo vidna vsem, prikazana bo tudi v spletnih  iskalnikih"
     reshares: 
-      duplicate: !binary |
-          VG8gb2JqYXZvIHN0ZSCeZSBwb25vdm5vIGRlbGlsaQ==
-    search_for: !binary |
-        SZroaSB7e25hbWV9fQ==
-    show_more: !binary |
-        cG9rYZ5pIHZl6A==
+      duplicate: "To objavo ste že ponovno delili"
+    search_for: "Išči {{name}}"
+    show_more: "pokaži več"
     tags: 
-      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+      wasnt_that_interesting: "Vredu, mislim, da zaznamek #{{tagName}} ni bil tako zanimiv ..."
     timeago: 
-      day: !binary |
-          duhlcmFq
+      day: "včeraj"
       days: "pred %d dnem"
-      hour: !binary |
-          cHJlZCBwcmlibGmebm8gdXJv
-      hours: !binary |
-          cHJlZCBwcmlibGmebm8gJWQgdXJhbWk=
-      minute: !binary |
-          cHJlZHByaWJsaZ5ubyBtaW51dG8=
+      hour: "pred približno uro"
+      hours: "pred približno %d urami"
+      minute: "predpribližno minuto"
       minutes: "pred %d minutami"
-      month: !binary |
-          cHJlZCBwcmlibGmebm8gbWVzZWNlbQ==
+      month: "pred približno mesecem"
       months: "pred %d meseci"
       prefixAgo: ""
       prefixFromNow: ""
       seconds: "pred manj kot minuto"
       suffixAgo: ""
       suffixFromNow: ""
-      year: !binary |
-          cHJlZCBwcmlibGmebm8gbGV0b20gZG5p
+      year: "pred približno letom dni"
       years: "pred %d leti"
     videos: 
       unknown: "Neznan tip videa"
       watch: "Glej ta video na {{provider}}"
     web_sockets: 
-      disconnected: !binary |
-          VGEgd2Vic29ja2V0IGplIHphcHJ0OyBvYmphdmUgc2UgbmUgYm9kbyB2Zegg
-          cHJlbmGaYWxlIHYgIJ5pdm8u
+      disconnected: "Ta websocket je zaprt; objave se ne bodo več prenašale v  živo."