updated locales

config/locales/diaspora/ar.yml

@@ -97,13 +97,6 @@ ar:
       no_contacts: "لا أعضاء"
       people_sharing_with_you: "أعضاء يتشاركون معك"
       post_a_message: "انشر رسالة >>"
-    manage: 
-      add_a_new_aspect: "أضف فئة جديدة"
-      add_a_new_contact: "أضف عضوا جديدا"
-      drag_to_add: "اسحب لإضافة أعضاء"
-      manage_aspects: "إدارة الفئات"
-      no_requests: "لا طلبات إضافة جديدة"
-      requests: "طلبات"
     many: "%{count} فئات"
     move_contact: 
       error: "خطأ خلال تحريك عضو: %{inspect}"
@@ -146,6 +139,15 @@ ar:
     create: 
       failure: "فشل في إنشاء الإتصال"
     few: "%{count} أعضاء"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} أعضاء"
     one: "1 عضو"
     other: "%{count} أعضاء"
@@ -556,6 +558,7 @@ ar:
   settings: "إعدادات"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "ابحث باستخدام وسيط دياسبرا"
       diaspora_handle: "وسيط دياسبرا"
       enter_a_diaspora_username: "أدخل وسيط دياسبرا:"

config/locales/diaspora/bg.yml

@@ -97,13 +97,6 @@ bg:
       no_contacts: "Няма контакти"
       people_sharing_with_you: "Хора споделящи с вас"
       post_a_message: "публикуване на съобщение >>"
-    manage: 
-      add_a_new_aspect: "Създаване на аспект"
-      add_a_new_contact: "Добавяне на контакт"
-      drag_to_add: "Влачете за да добавите хора"
-      manage_aspects: "Управление на аспектите"
-      no_requests: "Няма нови покани"
-      requests: "Покани"
     many: "%{count} аспекта"
     move_contact: 
       error: "Грешка при преместване на контакт: %{inspect}"
@@ -146,6 +139,15 @@ bg:
     create: 
       failure: "Контактът не бе създаден"
     few: "%{count} контакта"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} контакта"
     one: "1 контакт"
     other: "%{count} контакта"
@@ -556,6 +558,7 @@ bg:
   settings: "Настройки"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Търси по Diaspora адрес"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Въведете потребителско име от Diaspora:"

config/locales/diaspora/br.yml

@@ -97,13 +97,6 @@ br:
       no_contacts: "Darempred ebet"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Add a new aspect"
-      add_a_new_contact: "Ouzhpennañ un darempred nevez"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
-      requests: "Requests"
     many: "%{count} arvez"
     move_contact: 
       error: "Error moving contact: %{inspect}"
@@ -146,6 +139,15 @@ br:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} a zarempredoù"
     one: "1 darempred"
     other: "%{count} a zarempredoù"
@@ -556,6 +558,7 @@ br:
   settings: "Settings"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Klask diwar ar skor Diaspora"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Enter a Diaspora username:"

config/locales/diaspora/cs.yml

@@ -97,13 +97,6 @@ cs:
       no_contacts: "Žádné kontakty"
       people_sharing_with_you: "Lidé, kteří s vámi sdílí"
       post_a_message: "odeslat příspěvek >>"
-    manage: 
-      add_a_new_aspect: "Přidat aspekt"
-      add_a_new_contact: "Přidat nový kontakt"
-      drag_to_add: "Přetáhněte kontakty"
-      manage_aspects: "Upravit aspekty"
-      no_requests: "Žádné nové žádosti"
-      requests: "Žádosti"
     many: "%{count} aspektů"
     move_contact: 
       error: "Chyba při přesunu kontaktu: %{inspect}"
@@ -146,6 +139,15 @@ cs:
     create: 
       failure: "Nepodařilo se vytvořit kontakt"
     few: "%{count} kontaktů"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} kontaktů"
     one: "1 kontakt"
     other: "%{count} kontaktů"
@@ -556,6 +558,7 @@ cs:
   settings: "Nastavení"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Hledat podle Diaspora identifikátoru"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Zadejte uživatelské jméno na Diaspoře:"

config/locales/diaspora/cy.yml

@@ -97,13 +97,6 @@ cy:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Add a new aspect"
-      add_a_new_contact: "Add a new contact"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
-      requests: "Requests"
     many: "%{count} aspects"
     move_contact: 
       error: "Error moving contact: %{inspect}"
@@ -146,6 +139,15 @@ cy:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
@@ -556,6 +558,7 @@ cy:
   settings: "Settings"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Enter a Diaspora username:"

config/locales/diaspora/da.yml

@@ -97,13 +97,6 @@ da:
       no_contacts: "Ingen kontakter"
       people_sharing_with_you: "Personer der deler med dig"
       post_a_message: "post en besked >>"
-    manage: 
-      add_a_new_aspect: "Tilføj et nyt aspekt"
-      add_a_new_contact: "Tilføj en ny kontaktperson"
-      drag_to_add: "Træk for at tilføje personer"
-      manage_aspects: "Administrér aspekter"
-      no_requests: "Ingen nye anmodninger"
-      requests: "Anmodninger"
     many: "%{count} aspekter"
     move_contact: 
       error: "Kunne ikke flytte kontaktperson: %{inspect}"
@@ -146,6 +139,15 @@ da:
     create: 
       failure: "Kunne ikke oprette kontakt"
     few: "%{count} kontaktpersoner"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} kontakter"
     one: "Én kontaktperson"
     other: "%{count} kontaktpersoner"
@@ -556,6 +558,7 @@ da:
   settings: "Indstillinger"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find med Diaspora handle"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Indtast et Diaspora handle:"

config/locales/diaspora/de.yml

@@ -97,13 +97,6 @@ de:
       no_contacts: "Keine Kontakte"
       people_sharing_with_you: "Leute die mit dir teilen"
       post_a_message: "schreibe eine Nachricht >>"
-    manage: 
-      add_a_new_aspect: "Neuen Aspekt hinzufügen"
-      add_a_new_contact: "Neuen Kontakt hinzufügen"
-      drag_to_add: "Ziehe, um Leute hinzuzufügen"
-      manage_aspects: "Aspekte verwalten"
-      no_requests: "Keine neuen Anfragen"
-      requests: "Anfragen"
     many: "%{count} Aspekte"
     move_contact: 
       error: "Fehler beim Verschieben des Kontakts: %{inspect}"
@@ -146,6 +139,15 @@ de:
     create: 
       failure: "Konnte Kontakt nicht erstellen"
     few: "%{count} Kontakte"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} Kontakte"
     one: "1 Kontakt"
     other: "%{count} Kontakte"
@@ -556,6 +558,7 @@ de:
   settings: "Einstellungen"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Über die Diaspora-Adresse finden"
       diaspora_handle: "diaspora@beispiel.org"
       enter_a_diaspora_username: "Gib einen Diaspora-Benutzernamen ein:"

config/locales/diaspora/el.yml

@@ -97,13 +97,6 @@ el:
       no_contacts: "Καμία επαφή"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
       post_a_message: "δημοσιεύστε ένα μήνυμα >>"
-    manage: 
-      add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
-      add_a_new_contact: "Προσθήκη νέας επαφής"
-      drag_to_add: "Σείρε για να προσθέσεις άτομα"
-      manage_aspects: "Διαχείρηση πτυχών"
-      no_requests: "Κανένα νέο αίτημα"
-      requests: "Αιτήματα"
     many: "%{count} πτυχές"
     move_contact: 
       error: "Σφάλμα μεταφοράς επαφής: %{inspect}"
@@ -146,6 +139,15 @@ el:
     create: 
       failure: "Αποτυχία δημιουργίας επαφής"
     few: "%{count} επαφές"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} επαφές"
     one: "1 επαφή"
     other: "%{count} επαφές"
@@ -278,8 +280,8 @@ el:
       few: "Οι χρήστες %{actors} σχολίασαν τη %{post_link}."
       many: "Οι χρήστες %{actors} σχολίασαν τη %{post_link}."
       one: "Ο χρήστης %{actors} σχολίασε τη %{post_link}."
-      other: "Οι χρήστες %{actors} σχολίασαν τη δημοσίευση %{post_link}."
+      other: "Οι χρήστες %{actors} σχολίασαν τη %{post_link}."
-      zero: "Οι χρήστες %{actors} σχολίασαν τη δημοσίευση %{post_link}."
+      zero: "Οι χρήστες %{actors} σχολίασαν τη %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} νέες ειδοποιήσεις"
@@ -312,9 +314,9 @@ el:
     mentioned: 
       few: "Οι χρήστες %{actors} σας ανέφεραν στο %{post_link}."
       many: "Οι χρήστες %{actors} σας ανέφεραν στο %{post_link}."
-      one: "Ο χρήστης %{actors} σας ανέφερε στο %{post_link}."
+      one: "Ο χρήστης %{actors} σας ανέφερε στη %{post_link}."
       other: "Οι χρήστες %{actors} σας ανέφεραν στο %{post_link}."
-      zero: "Ο χρήστης %{actors} σας ανέφερε στο %{post_link}."
+      zero: "Ο χρήστης %{actors} σας ανέφερε στη %{post_link}."
     mentioned_deleted: 
       few: "Οι χρήστες %{actors} σας ανέφεραν σε μια διαγεγραμμένη δημοσίευση."
       many: "Οι χρήστες %{actors} σας ανέφεραν σε μια διαγεγραμμένη δημοσίευση."
@@ -338,7 +340,7 @@ el:
     also_commented: 
       commented: "σχολίασε επίσης τη δημοσίευση του χρήστη %{post_author} :"
       sign_in: "Συνδεθείτε για να το δείτε."
-      subject: "Ο/Η %{name} επίσης σχολίασε τη δημοσίευση του %{post_author}."
+      subject: "Ο/Η %{name} επίσης σχολίασε τη δημοσίευση του χρήστη %{post_author}."
     comment_on_post: 
       commented: "έχει σχολιάσει σε δημοσίευση σας:"
       sign_in: "Συνδεθείτε για να το δείτε."
@@ -556,6 +558,7 @@ el:
   settings: "Ρυθμίσεις"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Εύρεση βάσει αναγνωριστικού Diaspora"
       diaspora_handle: "Αναγνωριστικό Diaspora"
       enter_a_diaspora_username: "Εισάγετε όνομα χρήστη Diaspora:"

config/locales/diaspora/en_shaw.yml

@@ -97,13 +97,6 @@ en_shaw:
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿"
       post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>"
-    manage: 
-      add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
-      add_a_new_contact: "𐑨𐑛 𐑩 𐑯𐑿 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
-      drag_to_add: "𐑛𐑮𐑨𐑜 𐑑 𐑨𐑛 𐑐𐑰𐑐𐑩𐑤"
-      manage_aspects: "𐑥𐑨𐑯𐑩𐑡 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-      no_requests: "𐑯𐑴 𐑯𐑿 𐑮𐑦𐑒𐑢𐑧𐑕𐑑𐑕"
-      requests: "𐑮𐑦𐑒𐑢𐑧𐑕𐑑𐑕"
     many: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     move_contact: 
       error: "𐑺𐑼 𐑥𐑵𐑝𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑: %{inspect}"
@@ -146,6 +139,15 @@ en_shaw:
     create: 
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑒𐑮𐑦𐑱𐑑 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     few: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     one: "1 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     other: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
@@ -556,6 +558,7 @@ en_shaw:
   settings: "𐑕𐑧𐑑𐑦𐑙𐑟"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "𐑓𐑲𐑯𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "𐑧𐑯𐑑𐑼 𐑩 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑿𐑟𐑼𐑯𐑱𐑥:"

config/locales/diaspora/eo.yml

@@ -97,13 +97,6 @@ eo:
       no_contacts: "Nul kontaktoj"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
       post_a_message: "Afiŝi mesaĝon »"
-    manage: 
-      add_a_new_aspect: "Aldoni novan aspekton"
-      add_a_new_contact: "Aldoni novan kontakton"
-      drag_to_add: "Trenu por aldoni homojn"
-      manage_aspects: "Administri aspektojn"
-      no_requests: "Neniujn novajn petojn "
-      requests: "Petoj"
     many: "%{count} aspektoj"
     move_contact: 
       error: "Ne povis movi kontakton: %{inspect}"
@@ -146,6 +139,15 @@ eo:
     create: 
       failure: "Ne povis krei kontakton"
     few: "%{count} kontaktoj"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} kontaktoj"
     one: "1 kontakto"
     other: "%{count} kontaktoj"
@@ -556,6 +558,7 @@ eo:
   settings: "Agordoj"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Trovi per DIASPORA* uzantnomo"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Aldonu DIASPORA* uzantnomo:"

config/locales/diaspora/es-AR.yml

@@ -97,13 +97,6 @@ es-AR:
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Comparten con vos"
       post_a_message: "publicar un mensaje >>"
-    manage: 
-      add_a_new_aspect: "Agregar un nuevo aspecto"
-      add_a_new_contact: "Agregar un nuevo contacto"
-      drag_to_add: "Arrastrar para agregar"
-      manage_aspects: "Gestión de aspectos"
-      no_requests: "No hay nuevas solicitudes"
-      requests: "Solicitudes"
     many: "%{count} aspectos"
     move_contact: 
       error: "Se produjo un error al mover el contacto: %{inspect}"
@@ -146,6 +139,15 @@ es-AR:
     create: 
       failure: "No pudo crearse el contacto"
     few: "%{count} contactos"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contactos"
     one: "1 contacto"
     other: "%{count} contactos"
@@ -556,6 +558,7 @@ es-AR:
   settings: "Configuración"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Buscar por la dirección Diáspora*"
       diaspora_handle: "direcc@diasp.org"
       enter_a_diaspora_username: "Ingresá el nombre de usuario de Diáspora*:"

config/locales/diaspora/es-CL.yml

@@ -97,13 +97,6 @@ es-CL:
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Personas compartiendo contigo"
       post_a_message: "postea un mensaje >>"
-    manage: 
-      add_a_new_aspect: "Agregar un nuevo aspecto"
-      add_a_new_contact: "Agregar un nuevo contacto"
-      drag_to_add: "Arrastrar para agregar personas"
-      manage_aspects: "Manejar aspectos"
-      no_requests: "No hay nuevas solicitudes"
-      requests: "Solicitudes"
     many: "%{count} aspectos"
     move_contact: 
       error: "Error al mover el contacto: %{inspect}"
@@ -146,6 +139,15 @@ es-CL:
     create: 
       failure: "Error al crear contacto"
     few: "%{count} contactos"
+    index: 
+      add_a_new_aspect: "Agregar un nuevo aspecto"
+      all_contacts: "Todos los Contactos"
+      my_contacts: "Mis Contactos"
+      no_contacts: "Sin Contactos."
+      only_sharing_with_me: "Solo compartiendo conmigo"
+      remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
+      title: "Contactos"
+      your_contacts: "Tus Contactos"
     many: "%{count} contactos"
     one: "1 contacto"
     other: "%{count} contactos"
@@ -479,8 +481,8 @@ es-CL:
       your_photo: "Tu foto"
       your_private_profile: "Tú perfil privado"
       your_public_profile: "Tú perfil publico"
-      your_tags: "Tú: en 5 #etiquetas"
+      your_tags: "Describite en 5 palabras"
-      your_tags_placeholder: "p.ej. #diaspora #carrete #gatitos #musica"
+      your_tags_placeholder: "como #peliculas #carrete #gatitos #viajes #profesora"
     update: 
       failed: "Error al actualizar perfil"
       updated: "Perfil actualizado"
@@ -556,6 +558,7 @@ es-CL:
   settings: "Configuración"
   shared: 
     add_contact: 
+      add_new_contact: "Agregar un nuevo contacto"
       create_request: "Encontrar por la dirección Diaspora"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Ingresa tu nombre de usuario Diaspora:"

config/locales/diaspora/es.yml

@@ -97,13 +97,6 @@ es:
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Comparten contigo"
       post_a_message: "publica un mensaje >>"
-    manage: 
-      add_a_new_aspect: "Añade un nuevo aspecto"
-      add_a_new_contact: "Añadir nuevo contacto"
-      drag_to_add: "Arrastrar para añadir"
-      manage_aspects: "Gestión de aspectos"
-      no_requests: "No hay nuevas solicitudes"
-      requests: "Solicitudes"
     many: "%{count} aspectos"
     move_contact: 
       error: "Error moviendo el contacto: %{inspect}"
@@ -146,6 +139,15 @@ es:
     create: 
       failure: "No se pudo crear el contacto"
     few: "%{count} contactos"
+    index: 
+      add_a_new_aspect: "Añadir un nuevo aspecto"
+      all_contacts: "Todos los Contactos"
+      my_contacts: "Mis Contactos"
+      no_contacts: "Sin contactos."
+      only_sharing_with_me: "Solo compartiendo conmigo"
+      remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
+      title: "Contactos"
+      your_contacts: "Tus Contactos"
     many: "%{count} contactos"
     one: "1 contacto"
     other: "%{count} contactos"
@@ -479,8 +481,8 @@ es:
       your_photo: "Foto"
       your_private_profile: "Perfil privado"
       your_public_profile: "Perfil público"
-      your_tags: "Tú: en 5 #etiquetas"
+      your_tags: "Describete en 5 palabras"
-      your_tags_placeholder: "p.ej. #diaspora #panqueque #gatitos #musica"
+      your_tags_placeholder: "como #peliculas #viajes #gatitos #profesora #panqueque"
     update: 
       failed: "Error actualizando el perfil"
       updated: "Perfil actualizado"
@@ -556,6 +558,7 @@ es:
   settings: "Configuración"
   shared: 
     add_contact: 
+      add_new_contact: "Añadir un nuevo contacto"
       create_request: "Encontrar por la dirección Diaspora*"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Introduce un nombre de usuario Diaspora*:"

config/locales/diaspora/eu.yml

@@ -97,13 +97,6 @@ eu:
       no_contacts: "Adiskiderik ez"
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
       post_a_message: "mezu bat bidali >>"
-    manage: 
-      add_a_new_aspect: "Alderdi berri bat sortu"
-      add_a_new_contact: "Adiskide berria gehitu"
-      drag_to_add: "Herresta egin ezazu jendea gehitzearren"
-      manage_aspects: "Alderdiak kudeatu"
-      no_requests: "Ez duzu eskaera berririk"
-      requests: "Eskaerak"
     many: "%{count} alderdi"
     move_contact: 
       error: "Huts adiskidea mugitzean: %{inspect}"
@@ -146,6 +139,15 @@ eu:
     create: 
       failure: "Akatsa adiskide berria sortzean"
     few: "%{count} adiskide"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} adiskide"
     one: "adiskide 1"
     other: "%{count} adiskide"
@@ -556,6 +558,7 @@ eu:
   settings: "Lehentasunak"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Diaspora helbide arabera bilatu"
       diaspora_handle: "diaspora@helbidea.org"
       enter_a_diaspora_username: "Diaspora erabiltzaile izena idatzi:"

config/locales/diaspora/fi.yml

@@ -97,13 +97,6 @@ fi:
       no_contacts: "Ei kontakteja"
       people_sharing_with_you: "Ihmiset jotka jakavat kanssasi"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Lisää uusi näkymä"
-      add_a_new_contact: "Lisää uusi kontakti"
-      drag_to_add: "Lisää ihmisiä raahaamalla"
-      manage_aspects: "Hallitse näkymiä"
-      no_requests: "Ei uusia pyyntöjä"
-      requests: "Pyynnöt"
     many: "%{count} näkymää"
     move_contact: 
       error: "Virhe siirrettäessä kontaktia: %{inspect}"
@@ -146,6 +139,15 @@ fi:
     create: 
       failure: "Kontaktin luonti epäonnistui"
     few: "%{count} kontaktia"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} kontaktia"
     one: "1 kontakti"
     other: "%{count} kontaktia"
@@ -556,6 +558,7 @@ fi:
   settings: "Asetukset"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Etsi Diaspora-tunnuksella"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Anna Diaspora-käyttäjätunnus:"

config/locales/diaspora/fr.yml

@@ -97,13 +97,6 @@ fr:
       no_contacts: "Aucun contact"
       people_sharing_with_you: "Personnes partageant avec vous"
       post_a_message: "publier un message >>"
-    manage: 
-      add_a_new_aspect: "Ajouter un nouvel aspect"
-      add_a_new_contact: "Ajouter un nouveau contact"
-      drag_to_add: "Faites glisser pour ajouter des personnes"
-      manage_aspects: "Gérer les aspects"
-      no_requests: "Pas de nouvelle requête"
-      requests: "Requêtes"
     many: "%{count} aspects"
     move_contact: 
       error: "Erreur lors du déplacement du contact : %{inspect}"
@@ -146,6 +139,15 @@ fr:
     create: 
       failure: "Impossible de créer le contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
@@ -556,6 +558,7 @@ fr:
   settings: "Options"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Rechercher par handle Diaspora"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"

config/locales/diaspora/ga.yml

@@ -97,13 +97,6 @@ ga:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Cuir gné nua leis"
-      add_a_new_contact: "Cuir teagmháil leis"
-      drag_to_add: "Tarraing chun duine nua a chur leis"
-      manage_aspects: "Bhainistiú gné"
-      no_requests: "Níl aon iarratas nua"
-      requests: "Iarratais"
     many: "%{count} aspects"
     move_contact: 
       error: "Earráid ag boga teagmháil: %{inspect}"
@@ -146,6 +139,15 @@ ga:
     create: 
       failure: "Failed to create contact"
     few: "%{count} teagmháil"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "teagmháil amháin"
     other: "%{count} teagmháil"
@@ -556,6 +558,7 @@ ga:
   settings: "Socraithe"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Líon isteach ainm úsáideora:"

config/locales/diaspora/he.yml

@@ -97,13 +97,6 @@ he:
       no_contacts: "אין אנשי קשר"
       people_sharing_with_you: "אנשים המשתפים אתך"
       post_a_message: "פרסום הודעה >>"
-    manage: 
-      add_a_new_aspect: "הוספת היבט חדש"
-      add_a_new_contact: "הוספת איש קשר חדש"
-      drag_to_add: "יש לגרור כדי להוסיף אנשי קשר"
-      manage_aspects: "ניהול היבטים"
-      no_requests: "אין בקשות חדשות"
-      requests: "בקשות"
     many: "%{count} היבטים"
     move_contact: 
       error: "שגיאה בהעברת איש הקשר: %{inspect}"
@@ -146,6 +139,15 @@ he:
     create: 
       failure: "אירע כשל ביצירת איש קשר"
     few: "%{count} אנשי קשר"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} אנשי קשר"
     one: "איש קשר אחד"
     other: "%{count} אנשי קשר"
@@ -556,6 +558,7 @@ he:
   settings: "הגדרות"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "חיפוש לפי שם משתמש בדיאספורה"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "נא להזין שם משתמש בדיאספורה:"

config/locales/diaspora/hu.yml

@@ -97,13 +97,6 @@ hu:
       no_contacts: "Nincs ismerős"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "üzenet küldése >>"
-    manage: 
-      add_a_new_aspect: "Új csoport hozzáadása"
-      add_a_new_contact: "Új ismerős hozzáadása"
-      drag_to_add: "Fogd meg és húzd ide az embereket."
-      manage_aspects: "Csoportok kezelése"
-      no_requests: "Nincs új felkérés"
-      requests: "Felkérések"
     many: "%{count} csoport"
     move_contact: 
       error: "Hiba a kapcsolat mozgatásakor: %{inspect}"
@@ -146,6 +139,15 @@ hu:
     create: 
       failure: "Kapcsolat létrehozása sikertelen"
     few: "%{count} ismerős"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} ismerős"
     one: "1 ismerős"
     other: "%{count} ismerős"
@@ -556,6 +558,7 @@ hu:
   settings: "Beállítások"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Keresés Diaspora felhasználónév alapján"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Diaspora felhasználónév:"

config/locales/diaspora/id.yml

@@ -97,13 +97,6 @@ id:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Tambah aspek baru"
-      add_a_new_contact: "Add a new contact"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
-      requests: "Permintaan"
     many: "%{count} aspects"
     move_contact: 
       error: "Error moving contact: %{inspect}"
@@ -146,6 +139,15 @@ id:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
@@ -556,6 +558,7 @@ id:
   settings: "Settings"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Enter a Diaspora username:"

config/locales/diaspora/is.yml

@@ -97,13 +97,6 @@ is:
       no_contacts: "Engir tengiliðir"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Bæta við nýrri ásýnd"
-      add_a_new_contact: "Bæta nýjum tengilið við"
-      drag_to_add: "Dragðu til að bæta fólki við"
-      manage_aspects: "Stjórna ásýndum"
-      no_requests: "Engar nýjar beiðnir"
-      requests: "Beiðnir"
     many: "%{count} aspects"
     move_contact: 
       error: "Villa við að breyta tengiliði: %{inspect}"
@@ -146,6 +139,15 @@ is:
     create: 
       failure: "Ekki tókst að mynda tengsl"
     few: "%{count} tengsl"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "Ein tengsl"
     other: "%{count} tengsl"
@@ -556,6 +558,7 @@ is:
   settings: "Stillingar"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Finna fólk eftir Díaspora netfangi"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Skrifaðu notandanafn hjá Diaspora:"

config/locales/diaspora/it.yml

@@ -97,13 +97,6 @@ it:
       no_contacts: "Nessun contatto"
       people_sharing_with_you: "Persone in condivisione con te"
       post_a_message: "invia un messaggio >>"
-    manage: 
-      add_a_new_aspect: "Aggiungi aspetto della vita"
-      add_a_new_contact: "Aggiungi un nuovo contatto"
-      drag_to_add: "Trascina per aggiungere qualcuno"
-      manage_aspects: "Amministra gli aspetti della tua vita"
-      no_requests: "Nessuna nuova richiesta"
-      requests: "Richieste"
     many: "%{count} aspetti"
     move_contact: 
       error: "Errore nello spostare il contatto: %{inspect}"
@@ -146,6 +139,15 @@ it:
     create: 
       failure: "Impossibile creare il contatto"
     few: "%{count} contatti"
+    index: 
+      add_a_new_aspect: "Aggiungi un nuovo aspetto"
+      all_contacts: "Tutti i contatti"
+      my_contacts: "I miei contatti"
+      no_contacts: "Nessun contatto."
+      only_sharing_with_me: "Condividono con me"
+      remove_person_from_aspect: "Rimuovi %{person_name} da \"%{aspect_name}\""
+      title: "Contatti"
+      your_contacts: "I tuoi contatti"
     many: "%{count} contatti"
     one: "1 contatto"
     other: "%{count} contatti"
@@ -209,7 +211,7 @@ it:
     check_token: 
       not_found: "Token di invito non trovato"
     create: 
-      already_contacts: "Sei già connessa con questa persona"
+      already_contacts: "Questa persona è già tra i tuoi contatti"
       already_sent: "Hai già invitato questa persona."
       no_more: "Non hai più inviti a disposizione"
       own_address: "Non puoi inviare un invito al tuo indirizzo."
@@ -556,6 +558,7 @@ it:
   settings: "Impostazioni"
   shared: 
     add_contact: 
+      add_new_contact: "Aggiungi un nuovo contatto"
       create_request: "Cerca fra i nomi utente Diaspora"
       diaspora_handle: "Contatto Diaspora"
       enter_a_diaspora_username: "Inserisci un nome utente Diaspora"

config/locales/diaspora/ja.yml

@@ -97,13 +97,6 @@ ja:
       no_contacts: "連絡先無し"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "投稿する"
-    manage: 
-      add_a_new_aspect: "新しいアスペクトを追加する"
-      add_a_new_contact: "新しい連絡先を追加する"
-      drag_to_add: "追加したい連絡先をドラッグしてください"
-      manage_aspects: "アスペクトの管理"
-      no_requests: "新リクエスト無し"
-      requests: "リクエスト"
     many: "アスペクト%{count}集"
     move_contact: 
       error: "連絡先の移動にエラーが発生しました： %{inspect}"
@@ -146,6 +139,15 @@ ja:
     create: 
       failure: "連絡先を作成するのに失敗しました。"
     few: "連絡先%{count}件"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "連絡先%{count}件"
     one: "連絡先1件"
     other: "連絡先%{count}件"
@@ -556,6 +558,7 @@ ja:
   settings: "設定"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "ダイアスポラのハンドル名で検索"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "ダイアスポラのユーザ名を入力してください。"

config/locales/diaspora/ko.yml

@@ -97,13 +97,6 @@ ko:
       no_contacts: "컨택 없음"
       people_sharing_with_you: "나와 공유하는 사람들"
       post_a_message: "새 메시지 올리기 >>"
-    manage: 
-      add_a_new_aspect: "애스펙 추가"
-      add_a_new_contact: "컨택 추가"
-      drag_to_add: "추가할 사람을 끌어놓으세요"
-      manage_aspects: "애스펙 관리"
-      no_requests: "새 요청 없음"
-      requests: "요청"
     many: "애스펙 %{count}개"
     move_contact: 
       error: "%{inspect} 컨택을 옮기는데 에러가 발생했습니다."
@@ -146,6 +139,15 @@ ko:
     create: 
       failure: "컨택을 만들 수 없습니다"
     few: "컨택 %{count}명"
+    index: 
+      add_a_new_aspect: "새 애스펙 추가"
+      all_contacts: "모든 컨택"
+      my_contacts: "내 컨택"
+      no_contacts: "컨택 없음."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "\"%{aspect_name} 애스펙에서 %{person_name}님 지우기"
+      title: "컨택"
+      your_contacts: "내 컨택"
     many: "컨택 %{count}명"
     one: "컨택 한 명"
     other: "컨택 %{count}명"
@@ -556,6 +558,7 @@ ko:
   settings: "설정"
   shared: 
     add_contact: 
+      add_new_contact: "새 컨택 추가"
       create_request: "디아스포라 핸들로 찾기"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "디아스포라 사용자명을 입력하세요:"

config/locales/diaspora/lt.yml

@@ -97,13 +97,6 @@ lt:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Pridėti naują aspektą"
-      add_a_new_contact: "Pridėti naują kontaktą"
-      drag_to_add: "Pridėk žmones tempdamas juos pele"
-      manage_aspects: "Tvarkyti aspektus"
-      no_requests: "Nėra naujų aspektų"
-      requests: "Prašymai"
     many: "%{count} aspects"
     move_contact: 
       error: "Klaida perkeliant kontaktą: %{inspect}"
@@ -146,6 +139,15 @@ lt:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
@@ -556,6 +558,7 @@ lt:
   settings: "Nustatymai"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Rask pagal Diasporos vartotojo vardą"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Įvesk Diasporos vartotojo vardą:"

config/locales/diaspora/mk.yml

@@ -97,13 +97,6 @@ mk:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Додај нов аспект"
-      add_a_new_contact: "Додај нов контакт"
-      drag_to_add: "Влечи за да додадеш луѓе"
-      manage_aspects: "Менаџирај аспекти"
-      no_requests: "Нема нови барања"
-      requests: "Барања"
     many: "%{count} aspects"
     move_contact: 
       error: "Грешка при преместувањето на контактот: %{inspect}"
@@ -146,6 +139,15 @@ mk:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacts"
@@ -556,6 +558,7 @@ mk:
   settings: "Подесувања"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Најди според Diaspora корисничко име"
       diaspora_handle: "Diaspora корисничко име"
       enter_a_diaspora_username: "Внеси Diaspora корисничко име:"

config/locales/diaspora/nb.yml

@@ -97,13 +97,6 @@ nb:
       no_contacts: "Ingen kontakter"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Legg til et nytt aspekt"
-      add_a_new_contact: "Legg til ny kontakt"
-      drag_to_add: "Dra hit for å legge til"
-      manage_aspects: "Behandle aspekter"
-      no_requests: "Ingen nye forespørsler"
-      requests: "Forespørsler"
     many: "%{count} aspekter"
     move_contact: 
       error: "Feil ved flytting av kontakt: %{inspect}"
@@ -146,6 +139,15 @@ nb:
     create: 
       failure: "Kunne ikke opprette kontakt"
     few: "%{count} kontakter"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} kontakter"
     one: "1 kontakt"
     other: "%{count} kontakter"
@@ -556,6 +558,7 @@ nb:
   settings: "Innstillinger"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Finn etter Diaspora brukernavn"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Skriv inn et Diaspora brukernavn:"

config/locales/diaspora/nl.yml

@@ -97,13 +97,6 @@ nl:
       no_contacts: "Geen contacten"
       people_sharing_with_you: "Mensen die met jou delen"
       post_a_message: "plaats een bericht >>"
-    manage: 
-      add_a_new_aspect: "Voeg een nieuw aspect toe"
-      add_a_new_contact: "Voeg contact toe"
-      drag_to_add: "Sleep om toe te voegen"
-      manage_aspects: "Beheer aspecten"
-      no_requests: "Geen nieuwe verzoeken"
-      requests: "Contactverzoeken"
     many: "%{count} aspecten"
     move_contact: 
       error: "Probleem bij het verplaatsen van contact: %{inspect}"
@@ -146,6 +139,15 @@ nl:
     create: 
       failure: "Verbinding maken mislukt"
     few: "%{count} contacten"
+    index: 
+      add_a_new_aspect: "Voeg een aspect toe"
+      all_contacts: "Alle Contacten"
+      my_contacts: "Mijn Contacten"
+      no_contacts: "Geen contacten."
+      only_sharing_with_me: "Delen alleen met mij"
+      remove_person_from_aspect: "Verwijder %{person_name} uit \"%{aspect_name}\""
+      title: "Contacten"
+      your_contacts: "Jouw Contacten"
     many: "%{count} contacten"
     one: "1 contact"
     other: "%{count} contacten"
@@ -348,7 +350,7 @@ nl:
     liked: 
       liked: "%{name} vind je post leuk: "
       sign_in: "Sign to view it"
-      subject: "%{name} vind jou post leuk"
+      subject: "%{name} vindt jouw post leuk"
     love: "liefs,"
     manage_your_email_settings: "beheer je e-mail instellingen"
     mentioned: 
@@ -474,7 +476,7 @@ nl:
       your_bio: "Jouw bio"
       your_birthday: "Je verjaardag"
       your_gender: "Je geslacht"
-      your_location: "Jou locatie"
+      your_location: "Jouw locatie"
       your_name: "Je naam"
       your_photo: "Je profielfoto"
       your_private_profile: "Je privé-profiel"
@@ -556,6 +558,7 @@ nl:
   settings: "Instellingen"
   shared: 
     add_contact: 
+      add_new_contact: "Voeg een contact toe"
       create_request: "Vind door middel van Diaspora handle"
       diaspora_handle: "gebruikersnaam@pod.org"
       enter_a_diaspora_username: "Vul een Diaspora gebruikersnaam in:"
@@ -565,7 +568,7 @@ nl:
       all_contacts: "Alle contacten"
     footer: 
       logged_in_as: "ingelogd als %{name}"
-      your_aspects: "jou aspecten"
+      your_aspects: "jouw aspecten"
     invitations: 
       by_email: "via E-mail"
       dont_have_now: "Momenteel heb je er geen, maar meer uitnodigingen volgen spoedig!"
@@ -651,12 +654,12 @@ nl:
   users: 
     destroy: "Je account is geblokkeerd. Het sluiten van je account kan twintig minuten in beslag nemen. Bedankt voor je interesse in Diaspora."
     edit: 
-      also_commented: "...iemand na jou op de post van jou contact reageert?"
+      also_commented: "...iemand na jou op de post van jouw contact reageert?"
       change: "Verander"
       change_language: "Taal wijzigen"
       change_password: "Verander wachtwoord"
       close_account: "Verwijder account"
-      comment_on_post: "...iemand op jou post reageert?"
+      comment_on_post: "...iemand op jouw post reageert?"
       current_password: "Huidig wachtwoord"
       download_photos: "download mijn foto's"
       download_xml: "download mijn xml"

config/locales/diaspora/pa.yml

@@ -97,13 +97,6 @@ pa:
       no_contacts: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Add a new aspect"
-      add_a_new_contact: "Add a new contact"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
-      requests: "Requests"
     many: "%{count} aspects"
     move_contact: 
       error: "Error moving contact: %{inspect}"
@@ -146,6 +139,15 @@ pa:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 ਸੰਪਰਕ"
     other: "%{count} ਸੰਪਰਕ"
@@ -556,6 +558,7 @@ pa:
   settings: "Settings"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Enter a Diaspora username:"

config/locales/diaspora/pl.yml

@@ -97,13 +97,6 @@ pl:
       no_contacts: "Brak kontaktów"
       people_sharing_with_you: "Osoby dzielące się z tobą"
       post_a_message: "napisz wiadomość >>"
-    manage: 
-      add_a_new_aspect: "Dodaj nowy aspekt"
-      add_a_new_contact: "Dodaj nowy kontakt"
-      drag_to_add: "Przeciągnij, aby dodać ludzi"
-      manage_aspects: "Zarządzanie aspektami"
-      no_requests: "Brak nowych zaproszeń"
-      requests: "Zaproszenia"
     many: "%{count} aspektów"
     move_contact: 
       error: "Błąd przy przenoszeniu kontaktu: %{inspect}"
@@ -146,6 +139,15 @@ pl:
     create: 
       failure: "Nie udało się utworzyć kontaktu"
     few: "%{count} kontakty"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} kontaktów"
     one: "1 kontakt"
     other: "%{count} kontaktów"
@@ -556,6 +558,7 @@ pl:
   settings: "Ustawienia"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Znajdź po identyfikatorze Diaspory"
       diaspora_handle: "identyfikator@diaspory"
       enter_a_diaspora_username: "Wpisz nazwę użytkownika Diaspory:"

config/locales/diaspora/pt-BR.yml

@@ -97,13 +97,6 @@ pt-BR:
       no_contacts: "Nenhum contato"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Adicionar um novo aspecto"
-      add_a_new_contact: "Novo contato"
-      drag_to_add: "Arraste para adicioná-lo"
-      manage_aspects: "Gerenciar aspectos"
-      no_requests: "Sem novos pedidos"
-      requests: "Pedidos"
     many: "%{count} aspects"
     move_contact: 
       error: "Erro ao mover contato: %{inspect}"
@@ -146,6 +139,15 @@ pt-BR:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contatos"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 contato"
     other: "%{count} contatos"
@@ -556,6 +558,7 @@ pt-BR:
   settings: "Configurações"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Procurar pelo endereço Diaspora*"
       diaspora_handle: "Endereço Diaspora*"
       enter_a_diaspora_username: "Digite um usuário Diaspora*"

config/locales/diaspora/pt-PT.yml

@@ -97,13 +97,6 @@ pt-PT:
       no_contacts: "Não há contactos"
       people_sharing_with_you: "Pessoas a partilhar consigo"
       post_a_message: "publicar uma mensagem >>"
-    manage: 
-      add_a_new_aspect: "Adicionar um novo aspecto"
-      add_a_new_contact: "Adicionar um novo contacto"
-      drag_to_add: "Arraste para adicionar pessoas"
-      manage_aspects: "Gerir aspectos"
-      no_requests: "Não existem novos pedidos"
-      requests: "Pedidos"
     many: "%{count} aspectos"
     move_contact: 
       error: "Erro ao mover o contacto: %{inspect}"
@@ -146,6 +139,15 @@ pt-PT:
     create: 
       failure: "Erro ao criar contacto"
     few: "%{count} contactos"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contactos"
     one: "1 contacto"
     other: "%{count} contactos"
@@ -556,6 +558,7 @@ pt-PT:
   settings: "Definições"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Encontrar através do endereço do Diaspora"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Introduza um nome de utilizador do Diaspora:"

config/locales/diaspora/ro.yml

@@ -97,13 +97,6 @@ ro:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Adaugă un nou aspect"
-      add_a_new_contact: "Adaugă un contact nou"
-      drag_to_add: "Glisaţi pentru a adăuga persoane"
-      manage_aspects: "Gestionează aspectele"
-      no_requests: "Nici o cerere nouă"
-      requests: "Cereri"
     many: "%{count} aspects"
     move_contact: 
       error: "Error moving contact: %{inspect}"
@@ -146,6 +139,15 @@ ro:
     create: 
       failure: "Failed to create contact"
     few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 contact"
     other: "%{count} contacte"
@@ -556,6 +558,7 @@ ro:
   settings: "Setări"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Enter a Diaspora username:"

config/locales/diaspora/ru.yml

@@ -74,8 +74,8 @@ ru:
       success: "%{name} успешно удалён."
     edit: 
       add_existing: "Добавить существующий контакт"
-      aspect_list_is_not_visible: "список аспектов скрыт для других пользователей"
+      aspect_list_is_not_visible: "список аспектов скрыт от других пользователей"
-      aspect_list_is_visible: "список аспект виден другим пользователям"
+      aspect_list_is_visible: "список аспектов виден другим пользователям"
       confirm_remove_aspect: "Вы уверены, что хотите удалить этот аспект?"
       done: "Выполнено"
       make_aspect_list_visible: "сделать список аспектов видимым?"
@@ -95,15 +95,8 @@ ru:
         learn_more: "Узнать больше"
       handle_explanation: "Это идентификатор вашей Диаспоры. Так же как адрес электронной почты, который вы можете дать людям, для связи с вами."
       no_contacts: "Контакты отсутствуют"
-      people_sharing_with_you: "Люди делятса с вами"
+      people_sharing_with_you: "Люди делятся с вами"
       post_a_message: "опубликовать сообщение>>"
-    manage: 
-      add_a_new_aspect: "Добавить новый аспект"
-      add_a_new_contact: "Добавить новый контакт"
-      drag_to_add: "Потяните для добавления в аспект"
-      manage_aspects: "Настройка аспектов"
-      no_requests: "Новых запросов нет"
-      requests: "Запросы"
     many: "%{count} аспект[-а, -ов]"
     move_contact: 
       error: "Ошибка при перемещении контакта: %{inspect}"
@@ -146,6 +139,15 @@ ru:
     create: 
       failure: "Не удалось создать контакт"
     few: "%{count} контакт[-а, -ов]"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} контакт[-а, -ов]"
     one: "1 контакт"
     other: "%{count} контакт[-а, -ов]"
@@ -173,7 +175,7 @@ ru:
       no_messages: "нет сообщений"
     new: 
       send: "Отправить"
-      subject: "предмет"
+      subject: "тема"
       to: "к"
     show: 
       delete: "удалить и заблокировать разговор"
@@ -294,7 +296,7 @@ ru:
         many: "и %{count} другим"
         one: "и еще один"
         other: "и %{count} другим"
-        zero: "и больше кикому"
+        zero: "и больше никому"
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
     liked: 
@@ -437,7 +439,7 @@ ru:
       post_it: "Опубликовать!"
     new_photo: 
       empty: "{file} пуст, выберите пожалуйста файл повторно."
-      invalid_ext: "{file} имеет не допустимое расширение. Разрешены только {extensions}."
+      invalid_ext: "{file} имеет недопустимое расширение. Разрешены только {extensions}."
       size_error: "{file} слишком большой, максимальный размер файла {sizeLimit}."
     new_profile_photo: 
       or_select_one: "или выбрать один из существующих"
@@ -556,10 +558,11 @@ ru:
   settings: "Настройки"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Поиск по Диаспоре"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Введите имя пользователя Диаспоры:"
-      know_email: "Знаете из email адреса? Вы должны предложить им присоединится к Диаспоре "
+      know_email: "Знаете их email адреса? Вы должны предложить им присоединится к Диаспоре "
       your_diaspora_username_is: "Ваше имя пользователя Диаспоры: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Все контакты"
@@ -570,7 +573,7 @@ ru:
       by_email: "по электронной почте"
       dont_have_now: "У вас больше нет приглашений, но новые будут уже скоро!"
       from_facebook: "из Facebook"
-      invitations_left: "%{count} слева"
+      invitations_left: "осталось %{count}"
       invite_someone: "Пригласить кого-нибудь"
       invite_your_friends: "Пригласить своих друзей"
       invites: "Приглашения"
@@ -590,7 +593,7 @@ ru:
       make_public: "сделать публичным"
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка..."
-      public: "Общеее"
+      public: "Общее"
       publishing_to: "публикация в:"
       share: "Поделиться"
       share_with: "поделиться с"
@@ -656,7 +659,7 @@ ru:
       change_language: "Изменить язык"
       change_password: "Сменить пароль"
       close_account: "Закрыть аккаунт"
-      comment_on_post: "... кто-то комментарии на ваше сообщение?"
+      comment_on_post: "... кто-то прокомментировал ваше сообщение?"
       current_password: "Текущий пароль"
       download_photos: "Скачать мои фотографии"
       download_xml: "Скачать мою информацию в xml"
@@ -667,7 +670,7 @@ ru:
       new_password: "Новый пароль"
       private_message: "... Вы получаете личное сообщение?"
       receive_email_notifications: "Получать извещение электронной почтой (email), если..."
-      started_sharing: "... кто-то начинает делится с вами?"
+      started_sharing: "... кто-то начинает делиться с вами?"
       your_email: "Ваш адрес электронной почты (email)"
       your_handle: "Ваше управление Диаспорой"
     getting_started: 
@@ -677,7 +680,7 @@ ru:
       edit_profile: "Отредактировать профиль"
       finished: "Готово!"
       save_and_continue: "Сохранить и продолжить"
-      signup_steps: "Для заверщения вашей регистрации выполните эти три шага:"
+      signup_steps: "Для завершения вашей регистрации выполните эти три шага:"
       skip: "пропускать при старте"
       step_2: 
         find_your_friends_on_diaspora: "Хотели бы Вы найти своих Facebook друзей в диаспоре?"

config/locales/diaspora/sk.yml

@@ -97,13 +97,6 @@ sk:
       no_contacts: "Žiadne kontakty"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Pridať nový aspekt"
-      add_a_new_contact: "Pridať nový kontakt"
-      drag_to_add: "Kontakt sem pridáte pretiahnutím miniatúry"
-      manage_aspects: "Spravovať aspekty"
-      no_requests: "Žiadne nové žiadosti"
-      requests: "Žiadosti"
     many: "%{count} aspects"
     move_contact: 
       error: "Chyba pri presúvaní kontaktu: %{inspect}"
@@ -146,6 +139,15 @@ sk:
     create: 
       failure: "Failed to create contact"
     few: "kontakty (%{count})"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 kontakt"
     other: "kontakty (%{count})"
@@ -556,6 +558,7 @@ sk:
   settings: "Nastavenia"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Užívateľská príručka Diaspory"
       enter_a_diaspora_username: "Zadajte užívateľské meno:"

config/locales/diaspora/sl.yml

@@ -97,13 +97,6 @@ sl:
       no_contacts: "Ni kontaktov"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Dodaj novo skupino"
-      add_a_new_contact: "Dodaj nov stik"
-      drag_to_add: "Za dodajanje osebe povleci"
-      manage_aspects: "Uredi skupine"
-      no_requests: "Ni novih prošenj"
-      requests: "Prošnje"
     many: "%{count} aspects"
     move_contact: 
       error: "Prestavljanje stika neuspešno: %{inspect}"
@@ -146,6 +139,15 @@ sl:
     create: 
       failure: "Failed to create contact"
     few: "število stikov %{count}"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 stik"
     other: "število stikov %{count}"
@@ -556,6 +558,7 @@ sl:
   settings: "Nastavitve"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Poišči po Diaspora imenu"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Vpišite Diaspora uporabniško ime:"

config/locales/diaspora/sv.yml

@@ -97,13 +97,6 @@ sv:
       no_contacts: "Inga kontakter"
       people_sharing_with_you: "Personer som delar med dig"
       post_a_message: "skriv ett inlägg >>"
-    manage: 
-      add_a_new_aspect: "Lägg till en ny aspekt"
-      add_a_new_contact: "Lägg till en ny kontakt"
-      drag_to_add: "Dra för att lägga till personer"
-      manage_aspects: "Hantera aspekter"
-      no_requests: "Inga nya förfrågningar"
-      requests: "Kontaktförfrågningar"
     many: "%{count} aspekter"
     move_contact: 
       error: "Kunde inte flytta kontakt: %{inspect}"
@@ -146,6 +139,15 @@ sv:
     create: 
       failure: "Misslyckades med att skapa kontakt"
     few: "%{count} kontakter"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} kontakter"
     one: "1 kontakt"
     other: "%{count} kontakter"
@@ -556,6 +558,7 @@ sv:
   settings: "Inställningar"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Sök på Diaspora-användarnamn"
       diaspora_handle: "Diaspora-användarnamn"
       enter_a_diaspora_username: "Ange ett Diaspora-användarnamn:"

config/locales/diaspora/tr.yml

@@ -97,13 +97,6 @@ tr:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-    manage: 
-      add_a_new_aspect: "Yeni bir yan ekle"
-      add_a_new_contact: "Yeni kişi ekleyin"
-      drag_to_add: "Yeni kişi eklemek için taşıyın"
-      manage_aspects: "Manage aspects"
-      no_requests: "Yeni istek yok"
-      requests: "İstekler"
     many: "%{count} aspects"
     move_contact: 
       error: "Kontak taşıma problemi: %{inspect}"
@@ -146,6 +139,15 @@ tr:
     create: 
       failure: "Failed to create contact"
     few: "%{count} kişi"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count} contacts"
     one: "1 kişi"
     other: "%{count} kişi"
@@ -556,6 +558,7 @@ tr:
   settings: "Ayarlar"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Enter a Diaspora username:"

config/locales/diaspora/zh-CN.yml

@@ -97,13 +97,6 @@ zh-CN:
       no_contacts: "没有任何好友"
       people_sharing_with_you: "与您分享的人"
       post_a_message: "发布站内信>>"
-    manage: 
-      add_a_new_aspect: "添加视图"
-      add_a_new_contact: "添加新的好友"
-      drag_to_add: "拖动以添加好友"
-      manage_aspects: "视图管理"
-      no_requests: "没有新请求"
-      requests: "请求"
     many: "%{count}个视图"
     move_contact: 
       error: "好友移动错误：%{inspect}"
@@ -146,6 +139,15 @@ zh-CN:
     create: 
       failure: "添加好友失败"
     few: "%{count}个好友"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      title: "Contacts"
+      your_contacts: "Your Contacts"
     many: "%{count}个好友"
     one: "1个好友"
     other: "%{count}个好友"
@@ -556,6 +558,7 @@ zh-CN:
   settings: "设置"
   shared: 
     add_contact: 
+      add_new_contact: "Add a new contact"
       create_request: "用 Diaspora 帐号搜索"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "输入 Diaspora 帐号："

config/locales/diaspora/zh-TW.yml

@@ -97,13 +97,6 @@ zh-TW:
       no_contacts: "沒有任何聯繫"
       people_sharing_with_you: "跟你分享的人"
       post_a_message: "發表訊息 >>"
-    manage: 
-      add_a_new_aspect: "新增面向"
-      add_a_new_contact: "加入新的聯繫"
-      drag_to_add: "拖拉移動人以加入他們"
-      manage_aspects: "面向管理"
-      no_requests: "沒有新要求"
-      requests: "請求"
     many: "%{count}個面向"
     move_contact: 
       error: "聯繫移動錯誤: %{inspect}"
@@ -146,6 +139,15 @@ zh-TW:
     create: 
       failure: "建立聯繫失敗"
     few: "%{count}個聯繫"
+    index: 
+      add_a_new_aspect: "加入新面向"
+      all_contacts: "全部聯絡人"
+      my_contacts: "我的聯絡人"
+      no_contacts: "沒有聯絡人."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "將 %{person_name} 從\"%{aspect_name}\"中移除"
+      title: "聯絡人"
+      your_contacts: "你的聯絡人"
     many: "%{count}個聯繫"
     one: "1個聯繫"
     other: "%{count}個聯繫"
@@ -479,8 +481,8 @@ zh-TW:
       your_photo: "你的相片"
       your_private_profile: "你的私人檔案"
       your_public_profile: "你的公開檔案"
-      your_tags: "你: 可以有5個\"#標籤\""
+      your_tags: "用五個詞來表現你自己"
-      your_tags_placeholder: "像是: #diaspora #燙髮 #貓咪 #音樂"
+      your_tags_placeholder: "像是: #電影 #貓咪 #旅行 #老師 #紐約"
     update: 
       failed: "個人檔案更新失敗"
       updated: "個人檔案已更新"
@@ -556,6 +558,7 @@ zh-TW:
   settings: "設定"
   shared: 
     add_contact: 
+      add_new_contact: "加入新聯繫"
       create_request: "以 Diaspora 識別碼搜尋"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "輸入 Diaspora 用戶名稱:"

config/locales/rails-i18n/tr.yml

@@ -179,4 +179,3 @@ tr:
         odd: "tek olmalı"
         even: "çift olmalı"
         record_invalid: "Doğrulama başarısız oldu: %{errors}"
-      models: