diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 477538260..949913327 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -279,7 +279,6 @@ ar:
       to: "إلى"
   layouts: 
     application: 
-      have_a_problem: "واجهت مشكلة؟ اعثر على حل هنا"
       powered_by: "بدعم DIASPORA*"
       public_feed: "ملقم دياسبرا العام لـ %{name}"
       toggle: "حَوِّل لموقع الهواتف المحمولة"
@@ -601,14 +600,8 @@ ar:
     failure: 
       error: "خطأ خلال محاولة الإتصال بالخدمة"
     finder: 
-      friends: 
-        few: "%{count} أصدقاء"
-        many: "%{count} أصدقاء"
-        one: "1 أصدقاء"
-        other: "%{count} أصدقاء"
-        zero: "لا أصدقاء"
-      invite_your_friends_from: "دعوة أصدقائك من %{service}"
-      not_connected: "غير متصل"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "إتصل بـ فيسبوك"
       connect_to_tumblr: "صل حسابك بـ Tumblr"
@@ -623,6 +616,7 @@ ar:
       join_me_on_diaspora: "انضم إلي في DIASPORA*"
     remote_friend: 
       invite: "دعوة"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "إعادة إرسال"
   settings: "إعدادات"
   shared: 
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 063b7644a..9c1702865 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -279,7 +279,6 @@ bg:
       to: "До"
   layouts: 
     application: 
-      have_a_problem: "Имате проблем? Открийте решението тук"
       powered_by: "Благодарение на DIASPORA*"
       public_feed: "Публична емисия от Diaspora за %{name}"
       toggle: "вкл./изкл. на мобилния изглед"
@@ -601,14 +600,8 @@ bg:
     failure: 
       error: "възникна грешка при свързването с услугата"
     finder: 
-      friends: 
-        few: "%{count} приятеля"
-        many: "%{count} приятеля"
-        one: "1 приятел"
-        other: "%{count} приятеля"
-        zero: "няма приятели"
-      invite_your_friends_from: "Поканете приятелите си от %{service}"
-      not_connected: "не съществува връзка"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Свързване с facebook"
       connect_to_tumblr: "Свързване с tumblr"
@@ -623,6 +616,7 @@ bg:
       join_me_on_diaspora: "Присъединете се към мен в DIASPORA*"
     remote_friend: 
       invite: "покани"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "повторно изпращане"
   settings: "Настройки"
   shared: 
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index ae076027a..a1076a802 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -279,7 +279,6 @@ br:
       to: "Da"
   layouts: 
     application: 
-      have_a_problem: "Ur gudenn? Klaskit respontoù amañ"
       powered_by: "DEGASET GANT DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ br:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 mignon"
-        other: "%{count} mignon"
-        zero: "mignon ebet"
-      invite_your_friends_from: "Kasit pedadennoù d'ho mignoned diwar %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Connect to facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ br:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Settings"
   shared: 
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 4728ff2c1..211b63d1f 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -279,7 +279,6 @@ cs:
       to: "Pro"
   layouts: 
     application: 
-      have_a_problem: "Máte problém? Zde najdete odpověď"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Veřejný Diaspora feed %{name}"
       toggle: "přepnout mobilní stránku"
@@ -601,14 +600,8 @@ cs:
     failure: 
       error: "nastala chyba při připojení ke službě"
     finder: 
-      friends: 
-        few: "%{count} přátele"
-        many: "%{count} přátel"
-        one: "1 přítel"
-        other: "%{count} přátel"
-        zero: "žádní přátelé"
-      invite_your_friends_from: "Pozvěte vaše přátele z %{service}"
-      not_connected: "nepřipojen"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Připojit na Facebook"
       connect_to_tumblr: "Připojit na Tumblr"
@@ -623,6 +616,7 @@ cs:
       join_me_on_diaspora: "Připoj se ke mě na DIASPORU*"
     remote_friend: 
       invite: "pozvat"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "přeposlat"
   settings: "Nastavení"
   shared: 
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index b222cdcba..970be678b 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -279,7 +279,6 @@ cy:
       to: "To"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ cy:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Connect to facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ cy:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Settings"
   shared: 
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 1e4ae5490..7dad7e8c0 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -279,7 +279,6 @@ da:
       to: "Til"
   layouts: 
     application: 
-      have_a_problem: "Har du et problem? Find svaret her"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Offentligt Diaspora nyheds feed for  %{name}"
       toggle: "skift mobil side"
@@ -601,14 +600,8 @@ da:
     failure: 
       error: "der opstod en fejl i at forbinde til den service"
     finder: 
-      friends: 
-        few: "%{count} venner"
-        many: "%{count} venner"
-        one: "1 ven"
-        other: "%{count} venner"
-        zero: "ingen venner"
-      invite_your_friends_from: "inviter dine venner fra %{service}"
-      not_connected: "ikke forbundet"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Tilslut til Facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ da:
       join_me_on_diaspora: "Kom over til mig på DIASPORA*"
     remote_friend: 
       invite: "inviter"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "Send igen"
   settings: "Indstillinger"
   shared: 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 654f6be17..ea290b8d7 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -279,7 +279,6 @@ de:
       to: "An"
   layouts: 
     application: 
-      have_a_problem: "Du hast ein Problem? Finde hier eine Antwort (Englisch)"
       powered_by: "BETRIEBEN MIT DIASPORA*"
       public_feed: "Öffentlicher Diaspora Feed von %{name}"
       toggle: "Mobile Ansicht umschalten"
@@ -601,14 +600,8 @@ de:
     failure: 
       error: "es gab einen Fehler beim Verbinden mit diesem Dienst"
     finder: 
-      friends: 
-        few: "%{count} Freunde"
-        many: "%{count} Freunde"
-        one: "Ein Freund"
-        other: "%{count} Freunde"
-        zero: "Keine Freunde"
-      invite_your_friends_from: "Lade deine Freunde von %{service} ein"
-      not_connected: "nicht verbunden"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Mit Facebook verbinden"
       connect_to_tumblr: "Mit Tumblr verbinden"
@@ -623,6 +616,7 @@ de:
       join_me_on_diaspora: "Folge mir auf DIASPORA*"
     remote_friend: 
       invite: "Einladen"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "Erneut senden"
   settings: "Einstellungen"
   shared: 
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index eefca1033..8cf3c38b6 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -279,7 +279,6 @@ el:
       to: "Στον"
   layouts: 
     application: 
-      have_a_problem: "Έχετε κάποιο πρόβλημα; Βρείτε την απάντηση εδώ!"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Δημόσια ανατροφοδότηση (feed) του Diaspora για τον χρήστη %{name}"
       toggle: "εναλλαγή ιστοσελίδας κινητού"
@@ -601,14 +600,8 @@ el:
     failure: 
       error: "εμφανίστηκε ένα σφάλμα κατά τη σύνδεση με αυτή την υπηρεσία"
     finder: 
-      friends: 
-        few: "%{count} φίλοι"
-        many: "%{count} φίλοι"
-        one: "1 φίλος"
-        other: "%{count} φίλοι"
-        zero: "κανένας φίλος"
-      invite_your_friends_from: "Προσκαλέστε τους φίλους σας απο %{service}"
-      not_connected: "δεν είναι συνδεδεμένο"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Σύνδεση με Facebook"
       connect_to_tumblr: "Σύνδεση με το Tumblr"
@@ -623,6 +616,7 @@ el:
       join_me_on_diaspora: "Συνδεθείτε μαζί μου στο DIASPORA*"
     remote_friend: 
       invite: "πρόσκληση"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "αποστολή ξανά"
   settings: "Ρυθμίσεις"
   shared: 
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index f2bbc4bf1..e44cb4c25 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -279,7 +279,6 @@ en_pirate:
       to: "To"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ en_pirate:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Connect to Facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ en_pirate:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Settings"
   shared: 
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 3de548884..4981a57b7 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -279,7 +279,6 @@ en_shaw:
       to: "𐑑"
   layouts: 
     application: 
-      have_a_problem: "𐑣𐑨𐑝 𐑩 𐑐𐑮𐑪𐑚𐑤𐑩𐑥, 𐑓𐑲𐑯𐑛 𐑩𐑯 𐑨𐑯𐑕𐑼 𐑣𐑽"
       powered_by: "𐑐𐑬𐑮𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
       public_feed: "𐑐𐑳𐑚𐑤𐑦𐑒 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑰𐑛 𐑓𐑹 %{name}"
       toggle: "𐑑𐑪𐑜𐑩𐑤 𐑥𐑴𐑚𐑩𐑤 𐑕𐑲𐑑"
@@ -601,14 +600,8 @@ en_shaw:
     failure: 
       error: "𐑞𐑺 𐑢𐑪𐑟 𐑩𐑯 𐑺𐑼 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑞𐑨𐑑 𐑕𐑻𐑝𐑩𐑕"
     finder: 
-      friends: 
-        few: "%{count} 𐑓𐑮𐑧𐑯𐑛𐑟"
-        many: "%{count} 𐑓𐑮𐑧𐑯𐑛𐑟"
-        one: "1 𐑓𐑮𐑧𐑯𐑛"
-        other: "%{count} 𐑓𐑮𐑧𐑯𐑛𐑟"
-        zero: "𐑯𐑴 𐑓𐑮𐑧𐑯𐑛𐑟"
-      invite_your_friends_from: "𐑦𐑯𐑝𐑲𐑑 𐑿𐑼 𐑓𐑮𐑧𐑯𐑛𐑟 𐑓𐑮𐑪𐑥 %{service}"
-      not_connected: "𐑯𐑪𐑑 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Facebook"
       connect_to_tumblr: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Tumblr"
@@ -623,6 +616,7 @@ en_shaw:
       join_me_on_diaspora: "𐑡𐑶𐑯 𐑥𐑰 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
     remote_friend: 
       invite: "𐑦𐑯𐑝𐑲𐑑"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "𐑮𐑦𐑕𐑧𐑯𐑛"
   settings: "𐑕𐑧𐑑𐑦𐑙𐑟"
   shared: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 2c37c46a6..82e0873b8 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -176,7 +176,7 @@ eo:
     create: 
       failure: "Ne povis krei kontakton"
     featured: 
-      featured_users: "Mojosaj Uzantoj"
+      featured_users: "Prezentataj Uzantoj"
     few: "%{count} kontaktoj"
     index: 
       add_a_new_aspect: "Aldoni novan aspekton"
@@ -279,7 +279,6 @@ eo:
       to: "Al"
   layouts: 
     application: 
-      have_a_problem: "Ĉu vi havas problemon?  Trovu riparon tie ĉi."
       powered_by: "FUNKCIAS PER DIASPORA*"
       public_feed: "Publika DIASPORA* Afiŝostrio de %{name}"
       toggle: "inversigi al poŝtelefona retpaĝaro"
@@ -601,17 +600,11 @@ eo:
     failure: 
       error: "estis eraro, kiam ni provis konektigi tiun servon"
     finder: 
-      friends: 
-        few: "%{count} amikoj"
-        many: "%{count} amikoj"
-        one: "1 amiko"
-        other: "%{count} amikoj"
-        zero: "nul amikoj"
-      invite_your_friends_from: "Invitu viajn amikojn el %{service}"
-      not_connected: "ne ligita"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Ligi al Facebook"
-      connect_to_tumblr: "Konekti al Tumblr"
+      connect_to_tumblr: "Ligi al Tumblr"
       connect_to_twitter: "Ligi al Twitter"
       disconnect: "malkonekti"
       edit_services: "Redakti servojn"
@@ -623,6 +616,7 @@ eo:
       join_me_on_diaspora: "Kuniĝu kun mi ĉe DIASPORA*"
     remote_friend: 
       invite: "inviti"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resendi"
   settings: "Agordoj"
   shared: 
@@ -753,31 +747,31 @@ eo:
       your_handle: "Via DIASPORA* uzantnomo"
     getting_started: 
       aspects: "aspects"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_with_people: "Connect with cool people"
+      connect_to: "Ligi al"
+      connect_to_your_other_social_networks: "Ligi al viaj aliaj sociaj retoj"
+      connect_with_people: "Koniĝi kun mojosaj homoj"
       connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
       connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      featured_tags: "Featured tags"
-      featured_users: "Featured users"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Finita!"
-      follow_your_interests: "Follow your interests"
-      hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
+      featured_tags: "Prezentataj etikedoj"
+      featured_users: "Prezentataj uzantoj"
+      fill_out_your_profile: "Kompletigu vian profilon"
+      find_friends: "Trovi amikojn"
+      find_friends_from_facebook: "trovi amikojn per Facebook"
+      finished: "Finita"
+      follow_your_interests: "Aboni viajn interesigojn"
+      hashtag_explanation: "Etikedoj lasu vin pridiri kaj aboni viajn interesigojn.  Ili ankaŭ estas bona metodo trovi novajn homojn ĉe DIASPORA*."
       profile_description: "Make it easier for people to find you by filling out your profile information."
       profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      see_all_featured_users: "See all featured users"
-      welcome: "Bonvenon al DIASPORA*!"
-      welcome_with_name: "Welcome, %{name}!"
+        bio: "Pri vi"
+        birthday: "Naskiĝtago"
+        gender: "Sekso"
+        location: "Loko"
+        name: "Nomo"
+        photo: "Profilbildo"
+        tags: "Etikedoj"
+      see_all_featured_users: "Vidi ĉiujn prezentatajn uzantojn"
+      welcome: "Bonvenon!"
+      welcome_with_name: "Bonvenon, %{name}!"
     public: 
       does_not_exist: "Uzanto %{username} ne ekzistas!"
     update: 
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index ed5441dd4..0eb526af6 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -279,7 +279,6 @@ es-AR:
       to: "Para"
   layouts: 
     application: 
-      have_a_problem: "¿Tenés un problema? Encontrá una respuesta acá"
       powered_by: "IMPULSADO POR DIÁSPORA*"
       public_feed: "Canal público para %{name}"
       toggle: "cambiar al sitio para móviles"
@@ -601,14 +600,8 @@ es-AR:
     failure: 
       error: "hubo un error al conectar al servicio"
     finder: 
-      friends: 
-        few: "%{count} amigos"
-        many: "%{count} amigos"
-        one: "1 amigo"
-        other: "%{count} amigos"
-        zero: "ningún amigo"
-      invite_your_friends_from: "Invitá a tus amigos de %{service}"
-      not_connected: "sin conexión"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Conectar a Facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ es-AR:
       join_me_on_diaspora: "Unite, estoy en DIÁSPORA*"
     remote_friend: 
       invite: "invitar"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "reenviar"
   settings: "Configuración"
   shared: 
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 297ce24c9..572643859 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -279,7 +279,6 @@ es-CL:
       to: "A"
   layouts: 
     application: 
-      have_a_problem: "¿Tienes un problema? Encuentra la respuesta aquí"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Canal publico de %{name}"
       toggle: "cambiar sitio móvil"
@@ -601,14 +600,8 @@ es-CL:
     failure: 
       error: "ocurrió un error al conectarse con ese servicio"
     finder: 
-      friends: 
-        few: "%{count} amigo/s"
-        many: "%{count} amigos"
-        one: "1 Amigo"
-        other: "%{count} Amigos"
-        zero: "No tiene amigos"
-      invite_your_friends_from: "Invita a tus amigos de %{service}"
-      not_connected: "No Conectado"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Conectar a facebook"
       connect_to_tumblr: "Conectar a Tumblr"
@@ -623,6 +616,7 @@ es-CL:
       join_me_on_diaspora: "Únete a mi en DIASPORA*"
     remote_friend: 
       invite: "invitar"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "reenviar"
   settings: "Configuración"
   shared: 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index c44023865..1f887d3e0 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -37,7 +37,7 @@ es:
             person: 
               invalid: "no es válido."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "no es válido. Solo se permiten letras, números y guiones bajos"
               taken: "ya está ocupado."
   ago: "hace %{time} "
   all_aspects: "Todos los aspectos"
@@ -118,7 +118,7 @@ es:
         content: "Ahora puedes enlazar los siguientes servicios a Diaspora*:"
         heading: "Servicios enlazados"
       tags_following: "Etiquetas"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "Dejar de seguir a #%{tag}"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -253,7 +253,7 @@ es:
       tagline_first_half: "Comparte lo que quieras, "
       tagline_second_half: "con quien te gustaría"
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Un usuario de Facebook"
     check_token: 
       not_found: "Identificación de invitación no encontrada"
     create: 
@@ -279,7 +279,6 @@ es:
       to: "Para"
   layouts: 
     application: 
-      have_a_problem: "¿Algún problema? Encuentra una solución aquí"
       powered_by: "IMPULSADO POR DIASPORA*"
       public_feed: "Canal público de %{name} "
       toggle: "cambiar al sitio móvil"
@@ -393,7 +392,7 @@ es:
       other: "%{actors} comenzaron a compartir contigo."
       zero: "%{actors} comenzó a compartir contigo."
   notifier: 
-    a_post_you_shared: "a post."
+    a_post_you_shared: "una publicación."
     click_here: "pulsa aquí"
     comment_on_post: 
       reply: "Responder o ver los comentarios de %{name} >"
@@ -474,7 +473,7 @@ es:
       fail: "Perdona, no pudimos encontrar %{handle}"
     zero: "ninguna persona"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "fotografía de %{name}"
     create: 
       integrity_error: "Error subiendo la foto. ¿Seguro que era una imagen?"
       runtime_error: "Error subiendo la foto. ¿Alguna restricción de seguridad?"
@@ -502,7 +501,7 @@ es:
       edit: "editar"
       edit_delete_photo: "Editar pie de foto / eliminar foto"
       make_profile_photo: "convertir en foto de perfil"
-      show_original_post: "Show original post"
+      show_original_post: "Muestra el comentario original"
       update_photo: "Actualizar foto"
     update: 
       error: "Error editando la foto."
@@ -578,7 +577,7 @@ es:
     new_request_to_person: 
       sent: "¡Enviado!"
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "%{resharer} a vuelto a compartir la publicación de %{author}"
     create: 
       failure: "Ocurrió un error al volver a compartir este comentario."
     reshare: 
@@ -601,14 +600,8 @@ es:
     failure: 
       error: "hubo un error conectando ese servicio"
     finder: 
-      friends: 
-        few: "%{count} amigos"
-        many: "%{count} amigos"
-        one: "1 amigo"
-        other: "%{count} amigos"
-        zero: "no hay amigos"
-      invite_your_friends_from: "Invita a tus amigos desde %{service}"
-      not_connected: "no conectado"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Conecta con Facebook"
       connect_to_tumblr: "Conecta con Tumblr"
@@ -623,6 +616,7 @@ es:
       join_me_on_diaspora: "Comparte conmigo en DIASPORA*."
     remote_friend: 
       invite: "invitar"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "reenviar"
   settings: "Configuración"
   shared: 
@@ -752,12 +746,12 @@ es:
       your_email: "Tu email"
       your_handle: "Tu dirección Diaspora*"
     getting_started: 
-      aspects: "aspects"
+      aspects: "aspectos"
       connect_to: "Conectar a"
       connect_to_your_other_social_networks: "Conéctate a tus otras redes sociales"
       connect_with_people: "Conectate con gente interesante"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
+      connect_with_people_explanation_pt1: "Comparte con gente añadiéndola en uno o más de tus"
+      connect_with_people_explanation_pt2: "Los Aspectos son una manera intuitiva de agrupar contactos nuevos o caras familiares, de forma privada, permitiéndote el filtrado o compartir cosas con subgrupos de entre tus contactos muy fácilmente."
       featured_tags: "Etiquetas ofrecidas"
       featured_users: "Usuarios ofrecidos"
       fill_out_your_profile: ""
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 0e75a5e78..d3e501ee7 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -279,7 +279,6 @@ eu:
       to: "Jasotzailea:"
   layouts: 
     application: 
-      have_a_problem: "Arazoren bat? Aurkitu erantzuna hemen"
       powered_by: "DIASPORAK ESKAINIA"
       public_feed: "%{name}(r)en Diaspora Feed publikoa"
       toggle: "aldatu mugikorreko orrialdera"
@@ -601,14 +600,8 @@ eu:
     failure: 
       error: "huts zerbitzu hori konektatzean"
     finder: 
-      friends: 
-        few: "%{count} adiskide"
-        many: "%{count} adiskide"
-        one: "adiskide 1"
-        other: "%{count} adiskide"
-        zero: "adiskiderik ez"
-      invite_your_friends_from: "Gonbidatu lagunak %{service}(e)tik"
-      not_connected: "harremanik ez"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Facebookera lotu"
       connect_to_tumblr: "Tumblrera lotu"
@@ -623,6 +616,7 @@ eu:
       join_me_on_diaspora: "Bat egin nirekin DIASPORAN"
     remote_friend: 
       invite: "gonbidapena"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "berbidali"
   settings: "Lehentasunak"
   shared: 
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 89dc3f1e6..884df5c55 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -279,7 +279,6 @@ fi:
       to: "Vastaanottaja"
   layouts: 
     application: 
-      have_a_problem: "Ongelmia? Löydä ratkaisu täältä"
       powered_by: "PALVELUN TARJOAA DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "vaihda mobiili sivustoon"
@@ -601,14 +600,8 @@ fi:
     failure: 
       error: "palvelun yhdistämisessä tapahtui virhe"
     finder: 
-      friends: 
-        few: "%{count} ystävää"
-        many: "%{count} kaveria"
-        one: "1 ystävä"
-        other: "%{count} ystävää"
-        zero: "ei ystäviä"
-      invite_your_friends_from: "Kutsu ystäväsi palvelusta %{service}"
-      not_connected: "ei yhdistetty"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Yhdistä palveluun facebook"
       connect_to_tumblr: "Yhdistä Tumblr:iin"
@@ -623,6 +616,7 @@ fi:
       join_me_on_diaspora: "DIASPORA* kutsuu!"
     remote_friend: 
       invite: "kutsu"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "lähetä uudelleen"
   settings: "Asetukset"
   shared: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 7da48a69f..edb0d71d1 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -279,7 +279,6 @@ fr:
       to: "À"
   layouts: 
     application: 
-      have_a_problem: "Un problème ? Trouvez une réponse ici"
       powered_by: "PROPULSÉ PAR DIASPORA*"
       public_feed: "Flux Diaspora public pour %{name}"
       toggle: "activer/désactiver le site mobile"
@@ -601,14 +600,8 @@ fr:
     failure: 
       error: "une erreur s'est produite lors de la connexion avec ce service"
     finder: 
-      friends: 
-        few: "%{count} amis"
-        many: "%{count} amis"
-        one: "1 ami"
-        other: "%{count} amis"
-        zero: "aucun ami"
-      invite_your_friends_from: "Inviter vos amis depuis %{service}"
-      not_connected: "non connecté"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Connecter à Facebook"
       connect_to_tumblr: "Connecter à Tumblr"
@@ -623,6 +616,7 @@ fr:
       join_me_on_diaspora: "Rejoignez-moi sur DIASPORA*"
     remote_friend: 
       invite: "inviter"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "envoyer à nouveau"
   settings: "Options"
   shared: 
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 3fa00c603..ea2d747a4 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -279,7 +279,6 @@ ga:
       to: "Go dtí"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "AG ÚSÁID DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ ga:
     failure: 
       error: "bhí earráid ag nasc leis an seirbhís sin"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Nasc le facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ ga:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Socraithe"
   shared: 
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 79a3f5efc..20f729748 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -279,7 +279,6 @@ he:
       to: "אל"
   layouts: 
     application: 
-      have_a_problem: "נתקלת בבעיות? ניתן למצוא את התשובה להלן"
       powered_by: "מופעל על גבי דיאספורה*"
       public_feed: "הזנת דיאספורה ציבורית עבור %{name}"
       toggle: "הפעלה/נטרול האתר לניידים"
@@ -601,14 +600,8 @@ he:
     failure: 
       error: "אירעה שגיאה בעת ההתחברות לשירות זה"
     finder: 
-      friends: 
-        few: "%{count} חברים"
-        many: "%{count} חברים"
-        one: "חבר אחד"
-        other: "%{count} חברים"
-        zero: "אין חברים"
-      invite_your_friends_from: "הזמנת החברים שלך מ־%{service}"
-      not_connected: "לא מחובר"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "התחברות לפייסבוק"
       connect_to_tumblr: "התחברות ל־Tumblr"
@@ -623,6 +616,7 @@ he:
       join_me_on_diaspora: "למה שלא להצטרף אלי ב־DIASPORA*"
     remote_friend: 
       invite: "הזמנה"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "שליחה שוב"
   settings: "הגדרות"
   shared: 
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index f0ccd4664..adf661cc8 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -279,7 +279,6 @@ hu:
       to: "Címzett"
   layouts: 
     application: 
-      have_a_problem: "Problémád van?"
       powered_by: "DIASPORA* fordította ADAMEX"
       public_feed: "Nyílvános Diaspora hírfolyam neki: %{name}"
       toggle: "mobil változat"
@@ -601,14 +600,8 @@ hu:
     failure: 
       error: "Hiba történt a szolgáltatáshoz kapcsolódás közben"
     finder: 
-      friends: 
-        few: "%{count} barát"
-        many: "%{count} barát"
-        one: "1 barát"
-        other: "%{count} barát"
-        zero: "itt nincs barátod"
-      invite_your_friends_from: "Hívd meg a barátaidat innen: %{service}"
-      not_connected: "nem kapcsolódik"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Csatlakozás facebook-hoz"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ hu:
       join_me_on_diaspora: "Találkozzunk a DIASPORA*-n"
     remote_friend: 
       invite: "meghív"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "újraküld"
   settings: "Beállítások"
   shared: 
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 9c49f6840..bcc7c391a 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -279,7 +279,6 @@ id:
       to: "To"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ id:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Connect to facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ id:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Settings"
   shared: 
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 07de3151f..e1c7bb8b3 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -279,7 +279,6 @@ is:
       to: "Til"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "DÍASPORA* STJÓRNAR HÉR"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ is:
     failure: 
       error: "villa kom upp við að tengjast þeirri þjónustu"
     finder: 
-      friends: 
-        few: "%{count} vinir"
-        many: "%{count} friends"
-        one: "1 vinur"
-        other: "%{count} vinir"
-        zero: "engir vinir"
-      invite_your_friends_from: "Bjóddu vinum þínum frá %{service}"
-      not_connected: "ekki tengt"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Tengja við facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ is:
       join_me_on_diaspora: "Tengstu mér á DIASPORA*"
     remote_friend: 
       invite: "bjóða"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "endursenda"
   settings: "Stillingar"
   shared: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index d3fbfe163..c00999fe5 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -37,7 +37,7 @@ it:
             person: 
               invalid: "non è valido."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "non è valido. Sono permessi solamente lettere, numeri e underscore"
               taken: "è già stato preso."
   ago: "%{time} fa"
   all_aspects: "Tutti gli aspetti"
@@ -118,7 +118,7 @@ it:
         content: "Puoi abbinare a Diaspora i seguenti servizi:"
         heading: "Servizi connessi"
       tags_following: "Tag che segui"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "Smetti di seguire #%{tag}"
       your_aspects: "I tuoi aspetti"
     many: "%{count} aspetti"
     move_contact: 
@@ -253,7 +253,7 @@ it:
       tagline_first_half: "Condividi ciò che desideri,"
       tagline_second_half: "con chi vuoi."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Un utente Facebook"
     check_token: 
       not_found: "Token di invito non trovato"
     create: 
@@ -279,7 +279,6 @@ it:
       to: "A"
   layouts: 
     application: 
-      have_a_problem: "Hai un problema? Trova qui la soluzione"
       powered_by: "CREATO CON DIASPORA*"
       public_feed: "Feed pubblici Diaspora di %{name}"
       toggle: "attiva/disattiva sito mobile"
@@ -393,7 +392,7 @@ it:
       other: "%{actors} hanno iniziato a condividere con te."
       zero: "%{actors} ha iniziato a condividere con te."
   notifier: 
-    a_post_you_shared: "a post."
+    a_post_you_shared: "un post."
     click_here: "clicca qui"
     comment_on_post: 
       reply: "Rispondi o leggi il post di %{name} >"
@@ -474,7 +473,7 @@ it:
       fail: "Spiacenti, non possiamo trovare %{handle}."
     zero: "nessuna persona"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "La foto di %{name}"
     create: 
       integrity_error: "Il caricamento della foto non è riuscito. Sei sicuro che fosse un'immagine?"
       runtime_error: "La fotografia non si è caricata. Hai dimenticato forse di allacciare la cintura?"
@@ -502,7 +501,7 @@ it:
       edit: "modifica"
       edit_delete_photo: "Modifica descrizione della foto / elimina foto"
       make_profile_photo: "usa come immagine del profilo"
-      show_original_post: "Show original post"
+      show_original_post: "Mostra il post originale"
       update_photo: "Aggiorna Foto"
     update: 
       error: "Modifica della foto fallita."
@@ -578,7 +577,7 @@ it:
     new_request_to_person: 
       sent: "richiesta inviata!"
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "La condivisione di %{resharer} del post di %{author}"
     create: 
       failure: "C'è stato un errore nel condividere questo post."
     reshare: 
@@ -601,14 +600,8 @@ it:
     failure: 
       error: "si è verificato un errore durante la connessione a quel servizio"
     finder: 
-      friends: 
-        few: "%{count} amici"
-        many: "%{count} amici"
-        one: "1 amico"
-        other: "%{count} amici"
-        zero: "nessun amico"
-      invite_your_friends_from: "Invita i tuoi amici da %{service}"
-      not_connected: "non connesso"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Connettiti a Facebook"
       connect_to_tumblr: "Connettiti a Tumblr"
@@ -623,6 +616,7 @@ it:
       join_me_on_diaspora: "Vieni anche tu su DIASPORA*"
     remote_friend: 
       invite: "invita"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "reinvia"
   settings: "Impostazioni"
   shared: 
@@ -752,12 +746,12 @@ it:
       your_email: "La tua email"
       your_handle: "Il tuo ID"
     getting_started: 
-      aspects: "aspects"
+      aspects: "aspetti"
       connect_to: "Connettiti a"
       connect_to_your_other_social_networks: "Connetti altri social network"
       connect_with_people: "Connettiti con gente speciale"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
+      connect_with_people_explanation_pt1: "Stai in contatto con le persone mettendole in uno o più dei tuoi "
+      connect_with_people_explanation_pt2: "Gli aspetti sono un sistema intuitivo per raggruppare vecchie e nuove conoscenze in modo riservato, così potrai filtrare o condividere i contenuti con chi vuoi e con facilità."
       featured_tags: "Tag consigliati"
       featured_users: "Utenti consigliati"
       fill_out_your_profile: "Riempi il tuo profilo"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 6fde4f542..c1e66a757 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -279,7 +279,6 @@ ja:
       to: "宛先："
   layouts: 
     application: 
-      have_a_problem: "質問がありましたら、ここからアンサーを"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "%{name}さんの公開ダイアスポラフィード"
       toggle: "携帯サイトを切替える"
@@ -601,14 +600,8 @@ ja:
     failure: 
       error: "サービスへ接続中にエラーが発生しました。"
     finder: 
-      friends: 
-        few: "%{count}人の連絡先"
-        many: "%{count}人の連絡先"
-        one: "1人の連絡先"
-        other: "%{count}人の連絡先"
-        zero: "連絡先無し"
-      invite_your_friends_from: "%{service}の連絡先を招待する"
-      not_connected: "未接続"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Facebookに接続する"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ ja:
       join_me_on_diaspora: "ダイアスポラ＊に参加しませんか。"
     remote_friend: 
       invite: "招待"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "再送"
   settings: "設定"
   shared: 
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 4f2c50137..d7eda5caf 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -37,7 +37,7 @@ ko:
             person: 
               invalid: "유효하지 않습니다."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: ": 유효하지 않은 사용자명입니다. 로마자, 아라비아 숫자, 언더스코어만 쓸 수 있습니다"
               taken: "이미 쓰이고 있습니다."
   ago: "%{time} 전"
   all_aspects: "모든 애스펙"
@@ -118,7 +118,7 @@ ko:
         content: "다음의 여러 서비스를 디아스포라에 연결할 수 있습니다"
         heading: "서비스 연결"
       tags_following: "팔로우된 태그들"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "#%{tag} 태그 팔로우 멈추기"
       your_aspects: "내 애스펙"
     many: "애스펙 %{count}개"
     move_contact: 
@@ -253,7 +253,7 @@ ko:
       tagline_first_half: "Share what you want,"
       tagline_second_half: "with whom you want."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "페이스북 사욤자"
     check_token: 
       not_found: "초대장 토큰을 찾을 수 없습니다"
     create: 
@@ -279,7 +279,6 @@ ko:
       to: "받는이"
   layouts: 
     application: 
-      have_a_problem: "문제가 있습니까? 여기서 해결하세요"
       powered_by: "디아스포라* 제공"
       public_feed: "%{name}님의 공개 디아스포라 피드"
       toggle: "모바일 사이트 전환"
@@ -393,7 +392,7 @@ ko:
       other: "%{actors}님이 나와 공유를 시작했습니다."
       zero: "%{actors}님이 나와 공유를 시작했습니다."
   notifier: 
-    a_post_you_shared: "a post."
+    a_post_you_shared: "공유물"
     click_here: "여기를 클릭하세요"
     comment_on_post: 
       reply: "%{name}님의 공유물에 댓글달기 >"
@@ -474,7 +473,7 @@ ko:
       fail: "%{handle} 핸들을 찾을 수 없습니다."
     zero: "없음"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "%{name}님의 사진"
     create: 
       integrity_error: "사진 업로드할 수 없습니다. 이미지가 맞습니까?"
       runtime_error: "사진을 업로드할 수 없습니다. 안전벨트를 확인하셨습니까?"
@@ -502,7 +501,7 @@ ko:
       edit: "고치기"
       edit_delete_photo: "사진 설명 고치기 / 사진 지우기"
       make_profile_photo: "프로필 사진 만들기"
-      show_original_post: "Show original post"
+      show_original_post: "원래 공유물 보기"
       update_photo: "사진 갱신"
     update: 
       error: "사진 고치기 실패."
@@ -578,7 +577,7 @@ ko:
     new_request_to_person: 
       sent: "보냈습니다."
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "%{resharer}님이 재공유한 %{author}님의 공유물"
     create: 
       failure: "이 공유물을 재공유하는데 오류가 발생했습니다."
     reshare: 
@@ -601,14 +600,8 @@ ko:
     failure: 
       error: "서비스 연결중 에러가 발생했습니다."
     finder: 
-      friends: 
-        few: "친구 %{count}명"
-        many: "친구 %{count}명"
-        one: "친구 한 명"
-        other: "친구 %{count}명"
-        zero: "친구 없음"
-      invite_your_friends_from: "%{service} 서비스에서 친구 초대하기"
-      not_connected: "연결 없음"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "페이스북에 연결"
       connect_to_tumblr: "Tumblr에 연결하기"
@@ -623,6 +616,7 @@ ko:
       join_me_on_diaspora: "디아스포라*에서 만나요!"
     remote_friend: 
       invite: "초대하기"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "다시 보내기"
   settings: "설정"
   shared: 
@@ -752,7 +746,7 @@ ko:
       your_email: "이메일 주소"
       your_handle: "디아스포라 핸들"
     getting_started: 
-      aspects: "aspects"
+      aspects: "애스펙"
       connect_to: "연결하기:"
       connect_to_your_other_social_networks: "내 다른 소셜네트워크와 연결하기"
       connect_with_people: "멋진 사람들과 연결하기"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 9650002d0..651fae359 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -279,7 +279,6 @@ lt:
       to: "Kam"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "TINKLAPĮ LEIDŽIA DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ lt:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Prijungti facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ lt:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Nustatymai"
   shared: 
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index d7fff01bb..cb9000274 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -279,7 +279,6 @@ mk:
       to: "До"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ mk:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Конектирај се со facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ mk:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Подесувања"
   shared: 
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 385d7a68a..d58c8126c 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -279,7 +279,6 @@ nb:
       to: "Til"
   layouts: 
     application: 
-      have_a_problem: "Har du et problem? Få svar her"
       powered_by: "DREVET AV DIASPORA*"
       public_feed: "Offentlig Diaspora feed for %{name}"
       toggle: "vis mobilsiden"
@@ -601,14 +600,8 @@ nb:
     failure: 
       error: "feil under tilkobling av tjenesten"
     finder: 
-      friends: 
-        few: "%{count} venner"
-        many: "%{count} venner"
-        one: "1 venn"
-        other: "%{count} venner"
-        zero: "ingen venner"
-      invite_your_friends_from: "Inviter dine venner fra  %{service}"
-      not_connected: "ikke tilkoblet"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Koble til facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ nb:
       join_me_on_diaspora: "Bli med meg på DIASPORA*"
     remote_friend: 
       invite: "inviter"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "send på nytt"
   settings: "Innstillinger"
   shared: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 6564cac29..d3fa545ab 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -279,7 +279,6 @@ nl:
       to: "Aan"
   layouts: 
     application: 
-      have_a_problem: "Probleem? Vind hier een antwoord"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Publieke Diaspora Feed van %{name}"
       toggle: "switch mobiele versie"
@@ -601,14 +600,8 @@ nl:
     failure: 
       error: "er ging iets mis bij het verbinden met die service"
     finder: 
-      friends: 
-        few: "%{count} contacten"
-        many: "%{count} vrienden"
-        one: "1 contact"
-        other: "%{count} contacten"
-        zero: "geen contacten"
-      invite_your_friends_from: "Nodig je %{service} contacten uit"
-      not_connected: "niet verbonden"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Verbind met Facebook"
       connect_to_tumblr: "Verbind met Tumblr"
@@ -623,6 +616,7 @@ nl:
       join_me_on_diaspora: "Volg me op DIASPORA*"
     remote_friend: 
       invite: "uitnodigen"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "herstuur"
   settings: "Instellingen"
   shared: 
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index ed09ce5e7..acbfdc92d 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -279,7 +279,6 @@ pa:
       to: "To"
   layouts: 
     application: 
-      have_a_problem: "ਕੋਈ ਸਮੱਸਿਆ ਹੈ? ਹੱਲ਼ ਇੱਥੇ ਲੱਭੋ।"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ pa:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "ਫੇਸਬੁੱਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ pa:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "ਸੱਦਾ"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "ਮੁੜ-ਭੇਜੋ"
   settings: "Settings"
   shared: 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 6311ab7ed..9f6990eb7 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -279,7 +279,6 @@ pl:
       to: "Do"
   layouts: 
     application: 
-      have_a_problem: "Masz problem? Tu znajdziesz rozwiązanie"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Publiczny kanał Diaspory użytkownika %{name}"
       toggle: "przełącz widok mobilny"
@@ -601,14 +600,8 @@ pl:
     failure: 
       error: "wystąpił błąd podczas łączenia z tą usługą"
     finder: 
-      friends: 
-        few: "%{count} znajomych"
-        many: "%{count} znajomych"
-        one: "1 znajomy"
-        other: "%{count} znajomych"
-        zero: "żadnych znajomych"
-      invite_your_friends_from: "Zaproś swoich znajomych z serwisu %{service}"
-      not_connected: "nie połączono"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Połącz z Facebookiem"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ pl:
       join_me_on_diaspora: "Dołącz do mnie w serwisie DIASPORA*"
     remote_friend: 
       invite: "zaproś"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "wyślij ponownie"
   settings: "Ustawienia"
   shared: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 148aed6f9..a1d866b60 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -279,7 +279,6 @@ pt-BR:
       to: "Para"
   layouts: 
     application: 
-      have_a_problem: "Problemas? Encontre sua resposta aqui."
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ pt-BR:
     failure: 
       error: "Ocorreu um erro ao conectar a esse serviço"
     finder: 
-      friends: 
-        few: "%{count} amigos"
-        many: "%{count} friends"
-        one: "1 amigo"
-        other: "%{count} amigos"
-        zero: "nenhum amigo"
-      invite_your_friends_from: "Convide seus amigos de %{service}"
-      not_connected: "desconectado"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Conectar com o Facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ pt-BR:
       join_me_on_diaspora: "Junte-se a mim na DIASPORA*"
     remote_friend: 
       invite: "Convidar"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "Reenviar"
   settings: "Configurações"
   shared: 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 19ec8b7fe..40d992571 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -279,7 +279,6 @@ pt-PT:
       to: "Para"
   layouts: 
     application: 
-      have_a_problem: "Tem um problema? Encontre uma resposta aqui"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Fonte Pública do Diaspora para %{name}"
       toggle: "ligar site móvel"
@@ -601,14 +600,8 @@ pt-PT:
     failure: 
       error: "ocorreu um erro ao ligar a esse serviço"
     finder: 
-      friends: 
-        few: "%{count} amigos"
-        many: "%{count} amigos"
-        one: "1 amigo"
-        other: "%{count} amigos"
-        zero: "nenhum amigo"
-      invite_your_friends_from: "Convide os seus amigos do %{service}"
-      not_connected: "desligado"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Ligar ao Facebook"
       connect_to_tumblr: "Ligar ao Tumblr"
@@ -623,6 +616,7 @@ pt-PT:
       join_me_on_diaspora: "Junte-se a mim no DIASPORA*"
     remote_friend: 
       invite: "convite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "reenviar"
   settings: "Definições"
   shared: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 9e37b28b8..459610042 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -279,7 +279,6 @@ ro:
       to: "Pentru"
   layouts: 
     application: 
-      have_a_problem: "Ai o problemă? Găseşte un răspuns aici"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ ro:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} prieteni"
-        many: "%{count} friends"
-        one: "1 prieten"
-        other: "%{count} prieteni"
-        zero: "nici un prieten"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "nu este conectat"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Conectează cu Facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ ro:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Setări"
   shared: 
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index e462b6422..4100519db 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -279,7 +279,6 @@ ru:
       to: "Для"
   layouts: 
     application: 
-      have_a_problem: "Столкнулись с проблемой? Попробуйте найти ответ здесь"
       powered_by: "ПОДДЕРЖИВАЕТСЯ ДИАСПОРОЙ*"
       public_feed: "Общественный канал диаспоры для %{name}"
       toggle: "переключить на мобильный сайт"
@@ -601,14 +600,8 @@ ru:
     failure: 
       error: "Произошла ошибка при подключении этого сервиса"
     finder: 
-      friends: 
-        few: "%{count} друг[-а, -зей]"
-        many: "%{count} друга[-зей]"
-        one: "1 друг"
-        other: "%{count} друг[-а, -зей]"
-        zero: "нет друзей"
-      invite_your_friends_from: "Пригласить своих друзей из %{service}"
-      not_connected: "не соединён"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Подключение к Facebook"
       connect_to_tumblr: "Подключение к Tumblr"
@@ -623,6 +616,7 @@ ru:
       join_me_on_diaspora: "Присоединяйтесь ко мне в DIASPORЕ*"
     remote_friend: 
       invite: "приглашение"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "отправить повторно"
   settings: "Настройки"
   shared: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index d874c6335..6c0793d88 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -279,7 +279,6 @@ sk:
       to: "Komu"
   layouts: 
     application: 
-      have_a_problem: "Máte problém? Nájdite odpoveď tu"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "Zapnúť mobilné zobrazenie"
@@ -601,14 +600,8 @@ sk:
     failure: 
       error: "Pripojenie k službe zlyhalo."
     finder: 
-      friends: 
-        few: "Počet priateľov %{count}"
-        many: "%{count} friends"
-        one: "1 priateľ"
-        other: "Počet priateľov : %{count} "
-        zero: "žiadni priatelia"
-      invite_your_friends_from: "Pozvite svojich priateľov z %{service}"
-      not_connected: "nepripojený"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Pripojiť k Facebooku"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ sk:
       join_me_on_diaspora: "Pridať sa k službe DIASPORA*"
     remote_friend: 
       invite: "pozvať"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "preposlať"
   settings: "Nastavenia"
   shared: 
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index ae2e7a4d8..56a09e64c 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -279,7 +279,6 @@ sl:
       to: "Za"
   layouts: 
     application: 
-      have_a_problem: "Ste naleteli na težavo? Tukaj poiščite odgovor"
       powered_by: "STRAN POGANJA DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ sl:
     failure: 
       error: "pri povezovanju s servisom je prišlo do napake"
     finder: 
-      friends: 
-        few: "%{count} prijateljev"
-        many: "%{count} friends"
-        one: "1 prijatelj"
-        other: "%{count} prijateljev"
-        zero: "brez prijateljev"
-      invite_your_friends_from: "Povabi prijatelje iz %{service}"
-      not_connected: "ni povezano"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Poveži se s facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ sl:
       join_me_on_diaspora: "Pridruži se mi na DIASPORI*"
     remote_friend: 
       invite: "povabi"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "pošlji ponovno"
   settings: "Nastavitve"
   shared: 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 9c538674f..fca6707bc 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -279,7 +279,6 @@ sv:
       to: "Till"
   layouts: 
     application: 
-      have_a_problem: "Stött på problem? Hitta lösningen här"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Offentligt Diaspora flöde för %{name}"
       toggle: "byt till mobil version"
@@ -601,14 +600,8 @@ sv:
     failure: 
       error: "Det blev ett fel vid anslutning till tjänsten"
     finder: 
-      friends: 
-        few: "%{count} vänner"
-        many: "%{count} vänner"
-        one: "1 vän"
-        other: "%{count} vänner"
-        zero: "inga vänner"
-      invite_your_friends_from: "Bjud in dina vänner från %{service}"
-      not_connected: "inte ansluten"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "Anslut till facebook"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ sv:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "bjud in"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "skicka igen"
   settings: "Inställningar"
   shared: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 9542135b4..009a31aa5 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -279,7 +279,6 @@ tr:
       to: "To"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
@@ -601,14 +600,8 @@ tr:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      friends: 
-        few: "%{count} friends"
-        many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "facebook bağlan"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ tr:
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "resend"
   settings: "Ayarlar"
   shared: 
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 10c774ab6..5e50b455c 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -279,7 +279,6 @@ zh-CN:
       to: "收件人"
   layouts: 
     application: 
-      have_a_problem: "遇到问题？在这里可以找到解决方案"
       powered_by: "Powered by DIASPORA*"
       public_feed: "%{name} 的 Diaspora RSS Feed"
       toggle: "切换为手机网页"
@@ -601,14 +600,8 @@ zh-CN:
     failure: 
       error: "与该服务连接时有错误"
     finder: 
-      friends: 
-        few: "%{count}个朋友"
-        many: "%{count}个朋友"
-        one: "1个朋友"
-        other: "%{count}个朋友"
-        zero: "没有朋友"
-      invite_your_friends_from: "邀请您在 %{service} 的朋友"
-      not_connected: "未连接"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "与 facebook 连接"
       connect_to_tumblr: "Connect to Tumblr"
@@ -623,6 +616,7 @@ zh-CN:
       join_me_on_diaspora: "跟我一起加入 DIASPORA*"
     remote_friend: 
       invite: "邀请"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "重新发送"
   settings: "设置"
   shared: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 391ebf9d1..2d72f75b2 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -279,7 +279,6 @@ zh-TW:
       to: "收件人"
   layouts: 
     application: 
-      have_a_problem: "有問題嗎? 這裡有解答"
       powered_by: "強力配置 DIASPORA*"
       public_feed: "%{name} 的 Diaspora 公開資訊源"
       toggle: "行動網站切換"
@@ -601,14 +600,8 @@ zh-TW:
     failure: 
       error: "與該服務連結時有錯誤"
     finder: 
-      friends: 
-        few: "%{count}個朋友"
-        many: "%{count}個朋友"
-        one: "1個朋友"
-        other: "%{count}個朋友"
-        zero: "沒有朋友"
-      invite_your_friends_from: "邀請你在 %{service} 的朋友"
-      not_connected: "未連結"
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
     index: 
       connect_to_facebook: "與 Facebook 連結"
       connect_to_tumblr: "與 Tumblr 連結"
@@ -623,6 +616,7 @@ zh-TW:
       join_me_on_diaspora: "跟我一起加入 DIASPORA*"
     remote_friend: 
       invite: "邀請"
+      not_on_diaspora: "Not yet on Diaspora"
       resend: "重送"
   settings: "設定"
   shared: