From 473642234dcc8f599e55b5a1c14faf27935cef5e Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Mon, 19 Sep 2011 15:35:41 +0200
Subject: [PATCH] updated locales and pulled in NN

---
 config/locale_settings.yml                  |   1 +
 config/locales/cldr/nn_plurals.rb           |   1 +
 config/locales/devise/devise.nn.yml         |  97 +++
 config/locales/diaspora/ar.yml              | 224 +++---
 config/locales/diaspora/nn.yml              | 842 ++++++++++++++++++++
 config/locales/diaspora/ru.yml              |  92 +--
 config/locales/diaspora/zh-TW.yml           |  14 +-
 config/locales/javascript/javascript.nn.yml |  54 ++
 8 files changed, 1160 insertions(+), 165 deletions(-)
 create mode 100644 config/locales/cldr/nn_plurals.rb
 create mode 100644 config/locales/devise/devise.nn.yml
 create mode 100644 config/locales/diaspora/nn.yml
 create mode 100644 config/locales/javascript/javascript.nn.yml

diff --git a/config/locale_settings.yml b/config/locale_settings.yml
index cf5b2f49bc..2ba2eacf4f 100644
--- a/config/locale_settings.yml
+++ b/config/locale_settings.yml
@@ -33,6 +33,7 @@ available:
   ml: "മലയാളം"
   nb: "Norske"
   nl: "Nederlands"
+  nn: "Nynorsk"
   pa: "ਪੰਜਾਬੀ"
   pl: "polski"
   pt-BR: "Português"
diff --git a/config/locales/cldr/nn_plurals.rb b/config/locales/cldr/nn_plurals.rb
new file mode 100644
index 0000000000..d13a87120a
--- /dev/null
+++ b/config/locales/cldr/nn_plurals.rb
@@ -0,0 +1 @@
+{ :nn => { :i18n => {:plural => { :keys => [:one, :other], :rule => lambda { |n| n == 1 ? :one : :other } } } } }
\ No newline at end of file
diff --git a/config/locales/devise/devise.nn.yml b/config/locales/devise/devise.nn.yml
new file mode 100644
index 0000000000..4373ea5a51
--- /dev/null
+++ b/config/locales/devise/devise.nn.yml
@@ -0,0 +1,97 @@
+#   Copyright (c) 2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+nn: 
+  devise: 
+    confirmations: 
+      confirmed: "Your account was successfully confirmed. You are now signed in."
+      new: 
+        resend_confirmation: "Resend confirmation instructions"
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+    failure: 
+      inactive: "Your account was not activated yet."
+      invalid: "Brukarnamnet eller passordet er ugyldig."
+      invalid_token: "Invalid authentication token."
+      locked: "Your account is locked."
+      timeout: "Økta finst ikkje lenger. Logg deg på att."
+      unauthenticated: "Du må logga deg på eller melda deg inn før du kan halda fram."
+      unconfirmed: "You have to confirm your account before continuing."
+    invitations: 
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      send_instructions: "Your invitation has been sent."
+      updated: "Your password was set successfully. You are now signed in."
+    mailer: 
+      confirmation_instructions: 
+        confirm: "Confirm my account"
+        subject: "Confirmation instructions"
+        you_can_confirm: "You can confirm your account through the link below:"
+      hello: "Hello %{email}!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
+      inviter: 
+        accept_at: "at %{url}, you can accept it through the link below."
+        has_invited_you: "%{name}"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+      reset_password_instructions: 
+        change: "Change my password"
+        ignore: "If you didn't request this, please ignore this email."
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        subject: "Reset password instructions"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        subject: "Unlock Instructions"
+        unlock: "Unlock my account"
+      welcome: "Welcome %{email}!"
+    passwords: 
+      edit: 
+        change_password: "Change my password"
+      new: 
+        forgot_password: "Forgot your password?"
+        no_account: "No account with this email exists.  If you are waiting for an invite, we are rolling them out as soon as possible"
+        send_password_instructions: "Send me reset password instructions"
+      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      updated: "Your password was changed successfully. You are now signed in."
+    registrations: 
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
+      updated: "You updated your account successfully."
+    sessions: 
+      new: 
+        alpha_software: "You are about to use alpha software."
+        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
+        login: "Login"
+        modern_browsers: "only supports modern browsers."
+        password: "Password"
+        remember_me: "Remember me"
+        sign_in: "Sign in"
+        username: "Username"
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+    shared: 
+      links: 
+        forgot_your_password: "Forgot your password?"
+        receive_confirmation: "Didn't receive confirmation instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"
+        sign_in: "Sign in"
+        sign_up: "Sign up"
+        sign_up_closed: "Open signups are closed at this time."
+      mail_signup_form: 
+        sign_up_for_an_invite: "Sign up for an invite!"
+    unlocks: 
+      new: 
+        resend_unlock: "Resend unlock instructions"
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      unlocked: "Your account was successfully unlocked. You are now signed in."
+  errors: 
+    messages: 
+      already_confirmed: "var allereie stadfesta"
+      not_found: "ikkje funnen"
+      not_locked: "vart ikkje låst"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 3f3f199785..336a95a36a 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -37,7 +37,7 @@ ar:
             person: 
               invalid: "غير صالح."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "غير صالح، يُسمح بالحروف، الأرقام وخطوط التأكيد (-_) فقط"
               taken: "حُجِزَ بالفعل."
   ago: "منذ %{time}"
   all_aspects: "كل الفئات"
@@ -99,18 +99,18 @@ ar:
         content_1: "وسيط ديسبورا خاصتك هو:"
         content_2: "أعطه لأي شخص وسيتمكن من إيجادك على ديسبورا."
         heading: "وسيط ديسبورا"
-      donate: "Donate"
+      donate: "تبرّع"
       handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني، يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم."
-      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      keep_us_running: "أبقِ %{pod} سريعا عبر تأمين قيمة صيانته الشهرية"
       no_contacts: "لا أعضاء"
-      no_tags: "لا وسوم"
+      no_tags: "+ جِـد وسما لمتابعته"
       people_sharing_with_you: "أعضاء يتشاركون معك"
       post_a_message: "انشر رسالة >>"
       services: 
         content: "يمكنك وصل حساب ديسبورا الخاص بك بالخدمات الآتية:"
         heading: "صل حسابك بالخدمات"
       tags_following: "الوسوم المتابعة"
-      unfollow_tag: "Stop following #%{tag}"
+      unfollow_tag: "أَوقِف متابعة #%{tag}"
       your_aspects: "فئاتك"
     many: "%{count} فئات"
     move_contact: 
@@ -121,18 +121,18 @@ ar:
       create: "أنشئ"
       name: "إسم"
     no_contacts_message: 
-      featured_users: "featured users"
-      or_featured: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
-      you_should_add_some_more_contacts: "You should add some more contacts!"
+      featured_users: "المستخدمون الشّرفِيون"
+      or_featured: "أو يمكنك المشاركة عبر %{link}"
+      try_adding_some_more_contacts: "إبحث عن (أنظر بالأعلى) أو أُدعُ (أُنظر يمينا) أعضاءً جددا."
+      you_should_add_some_more_contacts: "يُستحسن إضافة مزيد من الأعضاء"
     no_posts_message: 
       start_talking: "لم يتحدث أحد بعد!"
     one: "فئة"
     other: "%{count} فئات"
     seed: 
-      acquaintances: "Acquaintances"
+      acquaintances: "معارِفي"
       family: "العائلة"
-      friends: "Friends"
+      friends: "الأصدقاء"
       work: "العمل"
     selected_contacts: 
       manage_your_aspects: "أَدِر فئاتك."
@@ -140,14 +140,14 @@ ar:
       view_all_contacts: "أظهر كل جهات الاتصال"
     show: 
       edit_aspect: "تحرير الفئة"
-    two: "%{count} aspects"
+    two: "%{count} فئتان"
     update: 
       failure: "فئتك, %{name}, اسمها طويل ولا يمكن حفظها."
       success: ".بنجاح %{name} تم تعديل"
     zero: "لا فئات"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "لم تُسجِّل أي تطبيقات بعد."
       revoke_access: "إلغاء الوصول"
   back: "عودة"
   bookmarklet: 
@@ -165,13 +165,13 @@ ar:
       commenting: "يُرسل التعليق ..."
     one: "تعليقٌ واحد"
     other: "%{count} تعليق"
-    two: "%{count} comments"
+    two: "%{count} تعليقان"
     zero: "لا تعليقات"
   contacts: 
     create: 
       failure: "فشل في إنشاء الإتصال"
     featured: 
-      featured_users: "Featured Users"
+      featured_users: "المستخدمون الشَّرفِيون"
     few: "%{count} أعضاء"
     index: 
       add_a_new_aspect: "أضف فئة جديدة"
@@ -190,11 +190,11 @@ ar:
     other: "%{count} أعضاء"
     sharing: 
       people_sharing: "أعضاء يتشاركون معك:"
-    two: "%{count} contacts"
+    two: "%{count} عضوان"
     zero: "لا يوجد أعضاء"
   conversations: 
     create: 
-      fail: "Invalid message"
+      fail: "رسالة غير صالحة"
       sent: "أُرْسِلَت الرسالة"
     destroy: 
       success: "حُذِفَت المحادثة بنجاح"
@@ -204,7 +204,7 @@ ar:
         many: "%{count} رسالةً جديدة"
         one: "رسالةٌ واحدةٌ جديدة"
         other: "%{count} رسالة جديدة"
-        two: "%{count} new messages"
+        two: "%{count} رسالتان جديدتان"
         zero: "لا يوجد رسائل جديدة"
     index: 
       create_a_new_message: "اكتُب رسالةً جديدة"
@@ -216,15 +216,15 @@ ar:
     new: 
       abandon_changes: "أأتجاهل التغييرات؟"
       send: "أَرْسِل"
-      sending: "Sending..."
+      sending: "يُرسـَل..."
       subject: "العنوان"
       to: "إلى"
     new_message: 
-      fail: "Invalid message"
+      fail: "رسالة غير صالحة"
     show: 
       delete: "احْذِف واحْظُر المحادثة"
       reply: "رُدَّ"
-      replying: "Replying..."
+      replying: "يُجيب..."
   date: 
     formats: 
       birthday: "%d %B"
@@ -254,7 +254,7 @@ ar:
       tagline_first_half: "شارك ما تريد،"
       tagline_second_half: "مع من تريد."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "مستخدم فايسبوك"
     check_token: 
       not_found: "الدعوة الرمزية غير موجودة"
     create: 
@@ -265,8 +265,8 @@ ar:
       rejected: "واجه هذا البريد الإلكتروني مشاكلا:  "
       sent: "تم إرسال دعوتك"
     edit: 
-      accept_your_invitation: "Accept your invitation"
-      your_account_awaits: "Your account awaits!"
+      accept_your_invitation: "قبِل دعوتك"
+      your_account_awaits: "حسابك ينتظر."
     new: 
       already_invited: "لم يقبل هؤلاء الأشخاص دعوتك:"
       aspect: "فئة"
@@ -302,21 +302,21 @@ ar:
         many: "%{count} كرهوا هذا"
         one: "كره هذا شخصُ واحد"
         other: "%{count} كرهو هذا"
-        two: "%{count} dislikes"
+        two: "%{count} كرها"
         zero: "لا أحد يكره هذا"
       people_like_this: 
         few: "%{count} إعجابات"
         many: "%{count} إعجابًا"
         one: "إعجابٌ واحد"
         other: "%{count} إعجابًا"
-        two: "%{count} likes"
+        two: "%{count} إعجابان"
         zero: "لا إعجابات"
       people_like_this_comment: 
         few: "%{count} إعجابات"
         many: "%{count} إعجابًا"
         one: "إعجابٌ واحد"
         other: "%{count} إعجاب"
-        two: "%{count} likes"
+        two: "%{count} أعجبهما"
         zero: "لا إعجابات"
   limited: "محدود"
   more: "أكثر"
@@ -328,21 +328,21 @@ ar:
       many: "%{actors} علق أيضا على %{post_link} %{post_author}."
       one: "%{actors} علق أيضا على %{post_link} %{post_author}."
       other: "%{actors} علق أيضا على %{post_link} %{post_author}."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
+      two: "%{actors} علقا أيضا على %{post_link} مشاركة %{post_author}."
       zero: "%{actors} علق أيضا على %{post_link} %{post_author}."
     also_commented_deleted: 
       few: "%{actors} علقوا على المنشور المحذوف."
       many: "%{actors} علقوا على المنشور المحذوف."
       one: "%{actors} علق على المنشور المحذوف."
       other: "%{actors} علقوا على المنشور المحذوف."
-      two: "%{actors} commented on a deleted post."
+      two: "%{actors} علقا على مشاركتك المحذوفة."
       zero: "%{actors} علق على المنشور المحذوف."
     comment_on_post: 
       few: "%{actors} علقوا على %{post_link}."
       many: "%{actors} علقوا على %{post_link}."
       one: "%{actors} علق على %{post_link}."
       other: "%{actors} علقوا على %{post_link}."
-      two: "%{actors} commented on your %{post_link}."
+      two: "%{actors} علقا على %{post_link}."
       zero: "%{actors} علق على %{post_link}."
     helper: 
       new_notifications: 
@@ -350,7 +350,7 @@ ar:
         many: "%{count} تنبيهات جديدة"
         one: "1 تنبيه جديد"
         other: "%{count} تنبيهات جديدة"
-        two: "%{count} new notifications"
+        two: "%{count} تنبيهان"
         zero: "لا تنبيهات جديدة"
     index: 
       and: "Ùˆ"
@@ -359,7 +359,7 @@ ar:
         many: "و %{count} آخرون"
         one: "و آخر"
         other: "و %{count} آخرون"
-        two: "and %{count} others"
+        two: "و %{count} آخرين"
         zero: "و لا أحد"
       mark_all_as_read: "وضع الجميع كمقروء"
       notifications: "تنبيهات"
@@ -368,28 +368,28 @@ ar:
       many: "%{actors} أعجبوا لتوهم بـ %{post_link}."
       one: "%{actors} أعجب لتوه بـ %{post_link}."
       other: "%{actors} أعجبوا لتوهم بـ %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
+      two: "%{actors} أعجبا لتوهما بـ %{post_link}."
       zero: "%{actors} أعجب لتوه بـ %{post_link}."
     liked_post_deleted: 
       few: "%{actors} أعجبوا بالمنشور المحذوف."
       many: "%{actors} أعجبوا بالمنشور المحذوف."
       one: "%{actors} أعجب بالمنشور المحذوف."
       other: "%{actors} أعجبوا بالمنشور المحذوف."
-      two: "%{actors} liked your deleted post."
+      two: "%{actors} أعجبتهما مشاركتك المحذوفة."
       zero: "%{actors} أعجب بالمنشور المحذوف."
     mentioned: 
       few: "%{actors} أشاروا إليك في %{post_link}."
       many: "%{actors} أشاروا إليك في %{post_link}."
       one: "%{actors} أشار إليك في %{post_link}."
       other: "%{actors} أشاروا إليك في %{post_link}."
-      two: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors} أشارا إليك في %{post_link}."
       zero: "%{actors} أشار إليك في %{post_link}."
     mentioned_deleted: 
       few: "%{actors} أشاروا إليك في منشور محذوف."
       many: "%{actors} أشاروا إليك في منشور محذوف."
       one: "%{actors} أشار إليك في منشور محذوف."
       other: "%{actors} أشاروا إليك في منشور محذوف."
-      two: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} أشارا إليك في مشاركة محذوفة."
       zero: "%{actors} أشار إليك في منشور محذوف."
     post: "مشاركة"
     private_message: 
@@ -397,31 +397,31 @@ ar:
       many: "%{actors} راسلوك."
       one: "%{actors} راسلك."
       other: "%{actors} راسلوك."
-      two: "%{actors} sent you a message."
+      two: "%{actors} راسلاك."
       zero: "%{actors} راسلك."
     reshared: 
-      few: "%{actors} has reshared your %{post_link}."
-      many: "%{actors} has reshared your %{post_link}."
-      one: "%{actors} has reshared your %{post_link}."
-      other: "%{actors} has reshared your %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} has reshared your %{post_link}."
+      few: "%{actors} أعادوا نشر %{post_link}."
+      many: "%{actors} أعادوا نشر %{post_link}."
+      one: "%{actors} أعاد نشر %{post_link}."
+      other: "%{actors} أعادوا نشر %{post_link}."
+      two: "%{actors} أعادا نشر %{post_link}."
+      zero: "%{actors} أعاد نشر %{post_link}."
     reshared_post_deleted: 
-      few: "%{actors} reshared your deleted post."
-      many: "%{actors} reshared your deleted post."
-      one: "%{actors} reshared your deleted post."
-      other: "%{actors} reshared your deleted post."
-      two: "%{actors} reshared your deleted post."
-      zero: "%{actors} reshared your deleted post."
+      few: "%{actors} أعادوا نشر مشاركتك المحذوفة."
+      many: "%{actors} أعادوا نشر مشاركتك المحذوفة."
+      one: "%{actors} أعاد نشر مشاركتك المحذوفة."
+      other: "%{actors} أعادوا نشر مشاركتك المحذوفة."
+      two: "%{actors} أعادا نشر مشاركتك المحذوفة."
+      zero: "%{actors} أعاد نشر مشاركتك المحذوفة"
     started_sharing: 
       few: "%{actors} بدؤوا المشاركة معك."
       many: "%{actors} بدؤوا المشاركة معك."
       one: "%{actors} بدأ المشاركة معك."
       other: "%{actors} بدؤوا المشاركة معك."
-      two: "%{actors} started sharing with you."
+      two: "%{actors} بدآ المشاركة معك."
       zero: "%{actors} بدأ المشاركة معك."
   notifier: 
-    a_post_you_shared: "a post."
+    a_post_you_shared: "مشاركة."
     click_here: "اضغط هنا"
     comment_on_post: 
       reply: "رُد أو اعرض مشاركة %{name} >"
@@ -439,8 +439,8 @@ ar:
     private_message: 
       reply_to_or_view: "رُد أو اعرض هذه المحادثة >"
     reshared: 
-      reshared: "%{name} just reshared your post"
-      view_post: "View post >"
+      reshared: "%{name} أعاد نشر مشاركتك."
+      view_post: "إعرِض المشاركة >"
     single_admin: 
       admin: "إدارة دياسبرا"
       subject: "رسالة من إدارة دياسبرا:"
@@ -487,7 +487,7 @@ ar:
       remove_from: "حذف %{name} من %{aspect}?"
     show: 
       does_not_exist: "هذا العضو غير موجود"
-      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      has_not_shared_with_you_yet: "%{name} لمْ يشارك أي مشاركة معك بعد"
       incoming_request: "%{name} يريد المشاركة معك"
       mention: "إشارة"
       message: "رسالة"
@@ -499,15 +499,15 @@ ar:
       start_sharing: "بدء المشاركة"
       to_accept_or_ignore: "للقبول أو التجاهل"
     sub_header: 
-      add_some: "add some"
-      edit: "edit"
-      you_have_no_tags: "you have no tags!"
-    two: "%{count} people"
+      add_some: "أضف بعض"
+      edit: "عدِّل"
+      you_have_no_tags: "لا تتوفر على وسوم"
+    two: "%{count} عضوان"
     webfinger: 
       fail: "للأسف، لم نجد %{handle}."
     zero: "لا أحد"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "صور %{name}"
     create: 
       integrity_error: "فشل رفع الصورة، أواثقٌ أن هذا الملف صورة؟"
       runtime_error: "فشل رفع الصورة، هل قمت بربطها مع نص؟"
@@ -535,15 +535,15 @@ ar:
       edit: "عَدِّل"
       edit_delete_photo: "عَدِّل وصف الصورة / احْذِف الصورة"
       make_profile_photo: "اجعلها صورة شخصية"
-      show_original_post: "Show original post"
+      show_original_post: "إِعرِضْ المشاركة الأصلية"
       update_photo: "حَدِّث الصورة"
     update: 
       error: "فشل تحرير الصورة."
       notice: "حُدِّثَت الصورة بنجاح."
   post_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "أُخفِيت مشاركة %{name}، وعُطِلت تنبيهاتها"
+      see_it_on_their_profile: "راجع صفحة %{name} الشخصية إن رغبت في الإطلاع على جديد هاته المشاركة"
   posts: 
     show: 
       destroy: "احذف"
@@ -584,13 +584,13 @@ ar:
       unhappy: "غير راض?"
       update: "تحديث"
     new: 
-      create_my_account: "Create my account"
+      create_my_account: "أًنشِئ حسابي"
       enter_email: "أدخل عنوان بريد إلكتروني"
       enter_password: "أدخل كلمة مرور"
       enter_password_again: "أعد إدخال كلمة المرور"
       enter_username: "اختر معرف (فقط حروف, أرقام, و الإشارات الخطية)"
-      join_the_movement: "Join the movement!"
-      sign_up_today: "Sign up today"
+      join_the_movement: "إنضم للرّكب"
+      sign_up_today: "سجِّل الآن"
   requests: 
     create: 
       sending: "يُرسِل ..."
@@ -605,7 +605,7 @@ ar:
         many: "%{count} طلب تشارك جديد!"
         one: "طلب تشارك جديد!"
         other: "%{count} طلب تشارك جديد!"
-        two: "%{count} new requests!"
+        two: "%{count} طلبان جديدان!"
         zero: "لا يوجد طلبات مشاركة جديدة"
     manage_aspect_contacts: 
       existing: "جهات الإتصال الموجودة مسبقًا"
@@ -613,19 +613,19 @@ ar:
     new_request_to_person: 
       sent: "أُرْسِلَت!"
   reshares: 
-    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    comment_email_subject: "نشر %{resharer} المُعاد لمشاركة %{author}"
     create: 
       failure: "هناك خطأ ما في إعادة نشر هذه المشاركة."
     reshare: 
       deleted: "لقد حذف المؤلف مشاركته الأصلية."
       reshare: 
-        few: "أُعِيدَ نشرها %{count} مرات"
-        many: "أُعِيدَ نشرها %{count} مرة"
+        few: "%{count} إعادة نشر"
+        many: "%{count} إعادة نشر"
         one: "أُعِيدَ نشرها مرة واحدة"
-        other: "أُعِيدَ نشرها %{count} مرة"
-        two: "%{count} reshares"
+        other: "%{count} إعادة نشر"
+        two: "%{count} إعادتا نشر"
         zero: "أَعِد النشر"
-      reshare_confirmation: "هل أُعِد نشر مشاركة %{author} - ومحتواها: %{text} ?"
+      reshare_confirmation: "هل أُعِيد نشر مشاركة %{author} ؟"
       reshare_original: "أعد نشر المشاركة الأصلية"
       show_original: "اعرض الأصلية"
   search: "بحث"
@@ -637,8 +637,8 @@ ar:
     failure: 
       error: "خطأ خلال محاولة الإتصال بالخدمة"
     finder: 
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "لم يُعثَر على أصدقاء فايسبوك."
+      service_friends: "%{service} الأصدقاء"
     index: 
       connect_to_facebook: "إتصل بـ فيسبوك"
       connect_to_tumblr: "صل حسابك بـ Tumblr"
@@ -653,7 +653,7 @@ ar:
       join_me_on_diaspora: "انضم إلي في DIASPORA*"
     remote_friend: 
       invite: "دعوة"
-      not_on_diaspora: "Not yet on Diaspora"
+      not_on_diaspora: "ليس بعد على دياسبرا"
       resend: "إعادة إرسال"
   settings: "إعدادات"
   shared: 
@@ -665,14 +665,14 @@ ar:
       know_email: "أتَعرِف بُرُدَهم الإلكترونية؟ يَجدر بك دعوتهم"
       your_diaspora_username_is: "وسيط دياسبورا خاصتك هو: %{diaspora_handle}"
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "أضف إلى فئة"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        two: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "في %{count} فئات"
+        many: "في %{count} فئات"
+        one: "في %{count} فئات"
+        other: "في %{count} فئة"
+        two: "في %{count} فئتين"
+        zero: "أشف إلى فئة"
     contact_list: 
       all_contacts: "جميع الأعضاء"
     footer: 
@@ -711,7 +711,7 @@ ar:
       reshare: "أَعِد النشر"
     stream_element: 
       dislike: "لم يعجبني"
-      hide_and_mute: "Hide and Mute"
+      hide_and_mute: "أخْـفِ وأسْكِـتْ"
       like: "أعجبني"
       shared_with: "مُشَارك مع: %{aspect_names}"
       unlike: "إلغاء إعجابي"
@@ -731,7 +731,7 @@ ar:
       many: "رجاءًا لا تتجاوز حد %{count} حرفا في مشاركاتك"
       one: "رجاءًا لا تتجاوز حد الحرف الواحد في مشاركاتك"
       other: "رجاء لا تتجاوز حد %{count} حرفًا في مشاركاتك"
-      two: "please make your status messages less than %{count} characters"
+      two: "رجاء لا تتجاوز %{count} حرفا في مشاركاتك"
       zero: "رجاءًا لا تضع في مشاركاتك أية حروف "
   stream_helper: 
     hide_comments: "أخْفِ كل التعليقات"
@@ -790,40 +790,40 @@ ar:
       new_password: "كلمة مرور جديدة"
       private_message: "...وصلتك راسلة خاصة"
       receive_email_notifications: "استقبال تنبيهات عبر البريد الإلكتروني؟"
-      reshared: "...someone reshares your post?"
+      reshared: "...أعاد أحدهم نشر مشاركتك?"
       started_sharing: "...بدأ أحدهم المشاركة معك؟"
       your_email: "بريدك الإلكتروني"
       your_handle: "وسيط ديسبورا الخاص بك"
     getting_started: 
-      bold: "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_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."
-      edit_profile: "Edit Profile"
-      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"
+      bold: "فئات"
+      connect_to: "إتصل بـ"
+      connect_to_your_other_social_networks: "إتصل بشبكات اجتماعية أخرى"
+      connect_with_people: "إتصل بأحلى ناس"
+      connect_with_people_explanation_pt1: "إتصل مع الآخرين فقط بوضعهم في إحدى أو عديد %{bold}."
+      connect_with_people_explanation_pt2: "الفئات وسيلة ذكية لتصنيف مراسليك حسب رغبتك وخيارك وتمنحك امكانية المشاركة مع مجموعة من الأصدقاء دون أخرى."
+      edit_profile: "حرِّر الملف الشخصي"
+      featured_tags: "وسوم مميزة"
+      featured_users: "المستخدمون الشّرفِيون"
+      fill_out_your_profile: "إملأ بياناتك الشخصية"
+      find_friends: "جِـدْ أصدقائك"
+      find_friends_from_facebook: "جـِدْ أصدقائك بفايسبوك"
       finished: "تم"
-      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."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
+      follow_your_interests: "تابع اهتماماتك"
+      hashtag_explanation: "الوسوم تسمح لك بالحديث عن اهتماماتك ومتابعتها.  وهي أيضا طريقة عبقرية للعثور على أناس جدد بدياسبرا."
+      profile_description: "سَـهِّل مهمة العثور عليك عبر ملأ بياناتك الشخصية."
       profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_featured_users: "See all featured users"
-      welcome: "مرحبا بك في دياسبرا!"
-      welcome_with_name: "Welcome, %{name}!"
+        bio: "سيرة ذاتية"
+        birthday: "تاريخ الميلاد"
+        gender: "الجنس"
+        location: "محل الإقامة"
+        name: "الإسم"
+        photo: "صورة"
+        tags: "وسوم"
+      search_for_hashtags: "إبحث عن #وسوم"
+      search_for_people: "إبحث عن أصدقاء"
+      see_all_featured_users: "شاهِد جميع المستخدمين الشرفِيّين"
+      welcome: "السلام عليكم ورحمة الله تعالى وبركاته"
+      welcome_with_name: "مرحبا، %{name}!"
     public: 
       does_not_exist: "هذا المستخدم %{username} غير موجود"
     update: 
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
new file mode 100644
index 0000000000..bf2805d751
--- /dev/null
+++ b/config/locales/diaspora/nn.yml
@@ -0,0 +1,842 @@
+#   Copyright (c) 2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+nn: 
+  _applications: "Applications"
+  _comments: "Comments"
+  _contacts: "Contacts"
+  _home: "Home"
+  _photos: "photos"
+  _services: "Services"
+  account: "Account"
+  activerecord: 
+    errors: 
+      models: 
+        contact: 
+          attributes: 
+            person_id: 
+              taken: "must be unique among this user's contacts."
+        person: 
+          attributes: 
+            diaspora_handle: 
+              taken: "is already taken."
+        request: 
+          attributes: 
+            from_id: 
+              taken: "is a duplicate of a pre-existing request."
+        reshare: 
+          attributes: 
+            root_guid: 
+              taken: "You've already reshared that post!"
+        user: 
+          attributes: 
+            email: 
+              taken: "is already taken."
+            person: 
+              invalid: "is invalid."
+            username: 
+              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              taken: "is already taken."
+  ago: "%{time} ago"
+  all_aspects: "All Aspects"
+  application: 
+    helper: 
+      diaspora_alpha: "DIASPORA* ALPHA"
+      unknown_person: "unknown person"
+      video_title: 
+        unknown: "Unknown Video Title"
+  are_you_sure: "Are you sure?"
+  aspect_memberships: 
+    destroy: 
+      failure: "Failed to remove person from aspect"
+      no_membership: "Could not find the selected person in that aspect"
+      success: "Successfully removed person from aspect"
+  aspects: 
+    add_to_aspect: 
+      failure: "Failed to add contact to aspect."
+      success: "Successfully added contact to aspect."
+    aspect_contacts: 
+      done_editing: "done editing"
+    aspect_listings: 
+      add_an_aspect: "+ Add an aspect"
+    aspect_stream: 
+      commented_on: "commented on"
+      posted: "posted"
+      recently: "recently:"
+      stream: "Stream"
+    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
+    contacts_visible: "Contacts in this aspect will be able to see each other."
+    create: 
+      failure: "Aspect creation failed."
+      success: "Your new aspect %{name} was created"
+    destroy: 
+      failure: "%{name} is not empty and could not be removed."
+      success: "%{name} was successfully removed."
+    edit: 
+      add_existing: "Add an existing contact"
+      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
+      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      done: "Done"
+      make_aspect_list_visible: "make aspect list visible?"
+      remove_aspect: "Delete this aspect"
+      rename: "rename"
+      update: "update"
+      updating: "updating"
+    few: "%{count} aspects"
+    helper: 
+      are_you_sure: "Are you sure you want to delete this aspect?"
+      aspect_not_empty: "Aspect not empty"
+      remove: "remove"
+    index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
+      diaspora_id: 
+        content_1: "Your Diaspora ID is:"
+        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
+        heading: "Diaspora ID"
+      donate: "Donate"
+      handle_explanation: "This is your diaspora id. Like an email address, you can give this to people to reach you."
+      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      no_contacts: "No contacts"
+      no_tags: "+ Find a tag to follow"
+      people_sharing_with_you: "People sharing with you"
+      post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
+      unfollow_tag: "Stop following #%{tag}"
+      your_aspects: "Your Aspects"
+    many: "%{count} aspects"
+    move_contact: 
+      error: "Error moving contact: %{inspect}"
+      failure: "didn't work %{inspect}"
+      success: "Person moved to new aspect"
+    new: 
+      create: "Create"
+      name: "Name"
+    no_contacts_message: 
+      featured_users: "featured users"
+      or_featured: "Or you can share with %{link}"
+      try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
+      you_should_add_some_more_contacts: "You should add some more contacts!"
+    no_posts_message: 
+      start_talking: "Nobody has said anything yet!"
+    one: "1 aspect"
+    other: "%{count} aspects"
+    seed: 
+      acquaintances: "Acquaintances"
+      family: "Family"
+      friends: "Friends"
+      work: "Work"
+    selected_contacts: 
+      manage_your_aspects: "Manage your aspects."
+      no_contacts: "You don't have any contacts here yet."
+      view_all_contacts: "View all contacts"
+    show: 
+      edit_aspect: "edit aspect"
+    two: "%{count} aspects"
+    update: 
+      failure: "Your aspect, %{name}, had too long name to be saved."
+      success: "Your aspect, %{name}, has been successfully edited."
+    zero: "no aspects"
+  authorizations: 
+    index: 
+      no_applications: "You haven't registered any applications yet."
+      revoke_access: "Revoke Access"
+  back: "Back"
+  bookmarklet: 
+    explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
+    explanation_link_text: "this link"
+    heading: "Bookmarklet"
+    post_something: "Post something to Diaspora"
+    post_success: "Posted! Closing!"
+  cancel: "Cancel"
+  comments: 
+    few: "%{count} comments"
+    many: "%{count} comments"
+    new_comment: 
+      comment: "Comment"
+      commenting: "Commenting..."
+    one: "1 comment"
+    other: "%{count} comments"
+    two: "%{count} comments"
+    zero: "no comments"
+  contacts: 
+    create: 
+      failure: "Failed to create contact"
+    featured: 
+      featured_users: "Featured Users"
+    few: "%{count} contacts"
+    index: 
+      add_a_new_aspect: "Add a new aspect"
+      all_contacts: "All Contacts"
+      edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      my_contacts: "My Contacts"
+      no_contacts: "No contacts."
+      only_sharing_with_me: "Only sharing with me"
+      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      start_a_conversation: "Start a conversation"
+      title: "Contacts"
+      your_contacts: "Your Contacts"
+    many: "%{count} contacts"
+    one: "1 contact"
+    other: "%{count} contacts"
+    sharing: 
+      people_sharing: "People sharing with you:"
+    two: "%{count} contacts"
+    zero: "no contacts"
+  conversations: 
+    create: 
+      fail: "Invalid message"
+      sent: "Message sent"
+    destroy: 
+      success: "Conversation successfully removed"
+    helper: 
+      new_messages: 
+        few: "%{count} new messages"
+        many: "%{count} new messages"
+        one: "1 new messages"
+        other: "%{count} new messages"
+        two: "%{count} new messages"
+        zero: "No new messages"
+    index: 
+      create_a_new_message: "create a new message"
+      inbox: "Inbox"
+      message_inbox: "Message Inbox"
+      new_message: "New Message"
+      no_conversation_selected: "no conversation selected"
+      no_messages: "no messages"
+    new: 
+      abandon_changes: "Abandon changes?"
+      send: "Send"
+      sending: "Sending..."
+      subject: "subject"
+      to: "to"
+    new_message: 
+      fail: "Invalid message"
+    show: 
+      delete: "delete and block conversation"
+      reply: "reply"
+      replying: "Replying..."
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
+  delete: "Delete"
+  email: "Email"
+  error_messages: 
+    helper: 
+      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      invalid_fields: "Invalid Fields"
+  fill_me_out: "Fill me out"
+  find_people: "Find people or #tags"
+  hide: "Hide"
+  home: 
+    show: 
+      already_account: "already have an account?"
+      choice: "Choice"
+      choice_explanation: "Diaspora lets you sort your connections into groups called aspects. Unique to Diaspora, aspects ensure that your photos, stories and jokes are shared only with the people you intend."
+      learn_about_host: "Learn about how to host your own Diaspora server."
+      login_here: "log in here"
+      ownership: "Ownership"
+      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
+      share_what_you_want: "Share what you want, with whom you want."
+      simplicity: "Simplicity"
+      simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
+      tagline_first_half: "Share what you want,"
+      tagline_second_half: "with whom you want."
+  invitations: 
+    a_facebook_user: "A Facebook user"
+    check_token: 
+      not_found: "Invitation token not found"
+    create: 
+      already_contacts: "You are already connected with this person"
+      already_sent: "You already invited this person."
+      no_more: "You have no more invitations."
+      own_address: "You can't send an invitation to your own address."
+      rejected: "The following email addresses had problems: "
+      sent: "Invitations have been sent to: "
+    edit: 
+      accept_your_invitation: "Accept your invitation"
+      your_account_awaits: "Your account awaits!"
+    new: 
+      already_invited: "The following people have not accepted your invitation:"
+      aspect: "Aspect"
+      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
+      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
+      invite_someone_to_join: "Invite someone to join Diaspora!"
+      personal_message: "Personal message"
+      resend: "Resend"
+      send_an_invitation: "Send an invitation"
+      send_invitation: "Send invitation"
+      to: "To"
+  layouts: 
+    application: 
+      powered_by: "POWERED BY DIASPORA*"
+      public_feed: "Public Diaspora Feed for %{name}"
+      toggle: "toggle mobile site"
+      whats_new: "what's new?"
+      your_aspects: "your aspects"
+    header: 
+      admin: "admin"
+      blog: "blog"
+      code: "code"
+      login: "log in"
+      logout: "log out"
+      profile: "profile"
+      recent_notifications: "Recent notifications"
+      settings: "settings"
+      view_all: "View all"
+  likes: 
+    likes: 
+      people_dislike_this: 
+        few: "%{count} dislikes"
+        many: "%{count} dislikes"
+        one: "%{count} dislike"
+        other: "%{count} dislikes"
+        two: "%{count} dislikes"
+        zero: "no dislikes"
+      people_like_this: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        two: "%{count} likes"
+        zero: "no likes"
+      people_like_this_comment: 
+        few: "%{count} likes"
+        many: "%{count} likes"
+        one: "%{count} like"
+        other: "%{count} likes"
+        two: "%{count} likes"
+        zero: "no likes"
+  limited: "Limited"
+  more: "More"
+  next: "next"
+  no_results: "No Results Found"
+  notifications: 
+    also_commented: 
+      few: "%{actors} also commented on %{post_author}'s %{post_link}."
+      many: "%{actors} also commented on %{post_author}'s %{post_link}."
+      one: "%{actors} also commented on %{post_author}'s %{post_link}."
+      other: "%{actors} also commented on %{post_author}'s %{post_link}."
+      two: "%{actors} also commented on %{post_author}'s %{post_link}."
+      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+    also_commented_deleted: 
+      few: "%{actors} commented on a deleted post."
+      many: "%{actors} commented on a deleted post."
+      one: "%{actors} commented on a deleted post."
+      other: "%{actors} commented on a deleted post."
+      two: "%{actors} commented on a deleted post."
+      zero: "%{actors} commented on a deleted post."
+    comment_on_post: 
+      few: "%{actors} commented on your %{post_link}."
+      many: "%{actors} commented on your %{post_link}."
+      one: "%{actors} commented on your %{post_link}."
+      other: "%{actors} commented on your %{post_link}."
+      two: "%{actors} commented on your %{post_link}."
+      zero: "%{actors} commented on your %{post_link}."
+    helper: 
+      new_notifications: 
+        few: "%{count} new notifications"
+        many: "%{count} new notifications"
+        one: "1 new notifications"
+        other: "%{count} new notifications"
+        two: "%{count} new notifications"
+        zero: "No new notifications"
+    index: 
+      and: "and"
+      and_others: 
+        few: "and %{count} others"
+        many: "and %{count} others"
+        one: "and one more"
+        other: "and %{count} others"
+        two: "and %{count} others"
+        zero: "and nobody else"
+      mark_all_as_read: "Mark All as Read"
+      notifications: "Notifications"
+    liked: 
+      few: "%{actors} has just liked your %{post_link}."
+      many: "%{actors} has just liked your %{post_link}."
+      one: "%{actors} has just liked your %{post_link}."
+      other: "%{actors} has just liked your %{post_link}."
+      two: "%{actors} has just liked your %{post_link}."
+      zero: "%{actors} has just liked your %{post_link}."
+    liked_post_deleted: 
+      few: "%{actors} liked your deleted post."
+      many: "%{actors} liked your deleted post."
+      one: "%{actors} liked your deleted post."
+      other: "%{actors} liked your deleted post."
+      two: "%{actors} liked your deleted post."
+      zero: "%{actors} liked your deleted post."
+    mentioned: 
+      few: "%{actors} has mentioned you in a %{post_link}."
+      many: "%{actors} has mentioned you in a %{post_link}."
+      one: "%{actors} has mentioned you in a %{post_link}."
+      other: "%{actors} has mentioned you in a %{post_link}."
+      two: "%{actors} has mentioned you in a %{post_link}."
+      zero: "%{actors} has mentioned you in a %{post_link}."
+    mentioned_deleted: 
+      few: "%{actors} mentioned you in a deleted post."
+      many: "%{actors} mentioned you in a deleted post."
+      one: "%{actors} mentioned you in a deleted post."
+      other: "%{actors} mentioned you in a deleted post."
+      two: "%{actors} mentioned you in a deleted post."
+      zero: "%{actors} mentioned you in a deleted post."
+    post: "post"
+    private_message: 
+      few: "%{actors} sent you a message."
+      many: "%{actors} sent you a message."
+      one: "%{actors} sent you a message."
+      other: "%{actors} sent you a message."
+      two: "%{actors} sent you a message."
+      zero: "%{actors} sent you a message."
+    reshared: 
+      few: "%{actors} has reshared your %{post_link}."
+      many: "%{actors} has reshared your %{post_link}."
+      one: "%{actors} has reshared your %{post_link}."
+      other: "%{actors} has reshared your %{post_link}."
+      two: "%{actors} has reshared your %{post_link}."
+      zero: "%{actors} has reshared your %{post_link}."
+    reshared_post_deleted: 
+      few: "%{actors} reshared your deleted post."
+      many: "%{actors} reshared your deleted post."
+      one: "%{actors} reshared your deleted post."
+      other: "%{actors} reshared your deleted post."
+      two: "%{actors} reshared your deleted post."
+      zero: "%{actors} reshared your deleted post."
+    started_sharing: 
+      few: "%{actors} started sharing with you."
+      many: "%{actors} started sharing with you."
+      one: "%{actors} started sharing with you."
+      other: "%{actors} started sharing with you."
+      two: "%{actors} started sharing with you."
+      zero: "%{actors} started sharing with you."
+  notifier: 
+    a_post_you_shared: "a post."
+    click_here: "click here"
+    comment_on_post: 
+      reply: "Reply or view %{name}'s post >"
+    confirm_email: 
+      click_link: "To activate your new email address %{unconfirmed_email}, please click this link:"
+      subject: "Please activate your new email address %{unconfirmed_email}"
+    email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
+    hello: "Hello %{name}!"
+    liked: 
+      liked: "%{name} just liked your post"
+      view_post: "View post >"
+    mentioned: 
+      mentioned: "mentioned you in a post:"
+      subject: "%{name} has mentioned you on Diaspora*"
+    private_message: 
+      reply_to_or_view: "Reply to or view this conversation >"
+    reshared: 
+      reshared: "%{name} just reshared your post"
+      view_post: "View post >"
+    single_admin: 
+      admin: "Your Diaspora administrator"
+      subject: "A message about your Diaspora account:"
+    started_sharing: 
+      sharing: "has started sharing with you!"
+      subject: "%{name} started sharing with you on Diaspora*"
+      view_profile: "View %{name}'s profile"
+    thanks: "Thanks,"
+    to_change_your_notification_settings: "to change your notification settings"
+  ok: "OK"
+  or: "or"
+  password: "Password"
+  password_confirmation: "Password confirmation"
+  people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
+    aspect_list: 
+      edit_membership: "edit aspect membership"
+    few: "%{count} people"
+    helper: 
+      people_on_pod_are_aware_of: " people on pod are aware of"
+      results_for: " results for %{params}"
+    index: 
+      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      no_one_found: "...and no one was found."
+      no_results: "Hey! You need to search for something."
+      results_for: "search results for"
+    many: "%{count} people"
+    one: "1 person"
+    other: "%{count} people"
+    person: 
+      add_contact: "add contact"
+      already_connected: "Already connected"
+      pending_request: "Pending request"
+      thats_you: "That's you!"
+    profile_sidebar: 
+      bio: "bio"
+      born: "birthday"
+      edit_my_profile: "Edit my profile"
+      gender: "gender"
+      in_aspects: "in aspects"
+      location: "location"
+      remove_contact: "remove contact"
+      remove_from: "Remove %{name} from %{aspect}?"
+    show: 
+      does_not_exist: "Person does not exist!"
+      has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
+      incoming_request: "%{name} wants to share with you"
+      mention: "Mention"
+      message: "Message"
+      not_connected: "You are not sharing with this person"
+      recent_posts: "Recent Posts"
+      recent_public_posts: "Recent Public Posts"
+      return_to_aspects: "Return to your aspects page"
+      see_all: "See all"
+      start_sharing: "start sharing"
+      to_accept_or_ignore: "to accept or ignore it."
+    sub_header: 
+      add_some: "add some"
+      edit: "edit"
+      you_have_no_tags: "you have no tags!"
+    two: "%{count} people"
+    webfinger: 
+      fail: "Sorry, we couldn't find %{handle}."
+    zero: "no people"
+  photos: 
+    comment_email_subject: "%{name}'s photo"
+    create: 
+      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
+      type_error: "Photo upload failed.  Are you sure an image was added?"
+    destroy: 
+      notice: "Photo deleted."
+    edit: 
+      editing: "Editing"
+    new: 
+      back_to_list: "Back to List"
+      new_photo: "New Photo"
+      post_it: "post it!"
+    new_photo: 
+      empty: "{file} is empty, please select files again without it."
+      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+    new_profile_photo: 
+      or_select_one: "or select one from your already existing"
+      upload: "Upload a new profile photo!"
+    photo: 
+      view_all: "view all of %{name}'s photos"
+    show: 
+      collection_permalink: "collection permalink"
+      delete_photo: "Delete Photo"
+      edit: "edit"
+      edit_delete_photo: "Edit photo description / delete photo"
+      make_profile_photo: "make profile photo"
+      show_original_post: "Show original post"
+      update_photo: "Update Photo"
+    update: 
+      error: "Failed to edit photo."
+      notice: "Photo successfully updated."
+  post_visibilites: 
+    update: 
+      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
+      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+  posts: 
+    show: 
+      destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
+      permalink: "permalink"
+  previous: "previous"
+  profile: "Profile"
+  profiles: 
+    edit: 
+      allow_search: "Allow for people to search for you within Diaspora"
+      edit_profile: "Edit profile"
+      first_name: "First name"
+      last_name: "Last name"
+      update_profile: "Update Profile"
+      your_bio: "Your bio"
+      your_birthday: "Your birthday"
+      your_gender: "Your gender"
+      your_location: "Your location"
+      your_name: "Your name"
+      your_photo: "Your photo"
+      your_private_profile: "Your private profile"
+      your_public_profile: "Your public profile"
+      your_tags: "Describe yourself in 5 words"
+      your_tags_placeholder: "like #movies #kittens #travel #teacher #newyork"
+    update: 
+      failed: "Failed to update profile"
+      updated: "Profile updated"
+  public: "Public"
+  registrations: 
+    closed: "Signups are closed on this Diaspora pod."
+    create: 
+      success: "You've joined Diaspora!"
+    edit: 
+      cancel_my_account: "Cancel my account"
+      edit: "Edit %{name}"
+      leave_blank: "(leave blank if you don't want to change it)"
+      password_to_confirm: "(we need your current password to confirm your changes)"
+      unhappy: "Unhappy?"
+      update: "Update"
+    new: 
+      create_my_account: "Create my account"
+      enter_email: "Enter an email"
+      enter_password: "Enter a password"
+      enter_password_again: "Enter the same password as before"
+      enter_username: "Pick a username (only letters, numbers, and underscores)"
+      join_the_movement: "Join the movement!"
+      sign_up_today: "Sign up today"
+  requests: 
+    create: 
+      sending: "Sending"
+      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+    destroy: 
+      error: "Please select an aspect!"
+      ignore: "Ignored contact request."
+      success: "You are now sharing."
+    helper: 
+      new_requests: 
+        few: "%{count} new requests!"
+        many: "%{count} new requests!"
+        one: "new request!"
+        other: "%{count} new requests!"
+        two: "%{count} new requests!"
+        zero: "no new requests"
+    manage_aspect_contacts: 
+      existing: "Existing contacts"
+      manage_within: "Manage contacts within"
+    new_request_to_person: 
+      sent: "sent!"
+  reshares: 
+    comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
+    create: 
+      failure: "There was an error resharing this post."
+    reshare: 
+      deleted: "Original post deleted by author."
+      reshare: 
+        few: "%{count} reshares"
+        many: "%{count} reshares"
+        one: "1 reshare"
+        other: "%{count} reshares"
+        two: "%{count} reshares"
+        zero: "Reshare"
+      reshare_confirmation: "Reshare %{author}'s post?"
+      reshare_original: "Reshare original"
+      show_original: "Show original"
+  search: "Search"
+  services: 
+    create: 
+      success: "Authentication successful."
+    destroy: 
+      success: "Successfully deleted authentication."
+    failure: 
+      error: "there was an error connecting that service"
+    finder: 
+      no_friends: "No Facebook friends found."
+      service_friends: "%{service} Friends"
+    index: 
+      connect_to_facebook: "Connect to Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
+      connect_to_twitter: "Connect to Twitter"
+      disconnect: "disconnect"
+      edit_services: "Edit services"
+      logged_in_as: "logged in as"
+      no_services: "You have not connected any services yet."
+      really_disconnect: "disconnect %{service}?"
+    inviter: 
+      click_link_to_accept_invitation: "Click this link to accept your invitation"
+      join_me_on_diaspora: "Join me on DIASPORA*"
+    remote_friend: 
+      invite: "invite"
+      not_on_diaspora: "Not yet on Diaspora"
+      resend: "resend"
+  settings: "Settings"
+  shared: 
+    add_contact: 
+      add_new_contact: "Add a new contact"
+      create_request: "Find by Diaspora ID"
+      diaspora_handle: "diaspora@pod.org"
+      enter_a_diaspora_username: "Enter a Diaspora username:"
+      know_email: "Know their email address? You should invite them"
+      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+    aspect_dropdown: 
+      add_to_aspect: "Add to aspect"
+      toggle: 
+        few: "In %{count} aspects"
+        many: "In %{count} aspects"
+        one: "In %{count} aspect"
+        other: "In %{count} aspects"
+        two: "In %{count} aspects"
+        zero: "Add to aspect"
+    contact_list: 
+      all_contacts: "All contacts"
+    footer: 
+      logged_in_as: "logged in as %{name}"
+      your_aspects: "your aspects"
+    invitations: 
+      by_email: "By email"
+      dont_have_now: "You don't have any right now, but more invites are coming soon!"
+      from_facebook: "From Facebook"
+      invitations_left: "%{count} left"
+      invite_someone: "Invite someone"
+      invite_your_friends: "Invite your friends"
+      invites: "Invites"
+      invites_closed: "Invites are currently closed on this Diaspora pod"
+    notification: 
+      new: "New %{type} from %{from}"
+    public_explain: 
+      logged_in: "logged in to %{service}"
+      manage: "manage connected services"
+      outside: "Public messages will be available for others outside of Diaspora to see."
+      title: "Set up connected services"
+    publisher: 
+      all: "all"
+      all_contacts: "all contacts"
+      click_to_share_with: "Click to share with: "
+      discard_post: "Discard post"
+      make_public: "make public"
+      post_a_message_to: "Post a message to %{aspect}"
+      posting: "Posting..."
+      publishing_to: "publishing to: "
+      share: "Share"
+      share_with: "share with"
+      upload_photos: "Upload photos"
+      whats_on_your_mind: "What's on your mind?"
+    reshare: 
+      reshare: "Reshare"
+    stream_element: 
+      dislike: "Dislike"
+      hide_and_mute: "Hide and Mute"
+      like: "Like"
+      shared_with: "Shared with: %{aspect_names}"
+      unlike: "Unlike"
+      via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
+  status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
+    destroy: 
+      failure: "Failed to delete post"
+    helper: 
+      no_message_to_display: "No message to display."
+    new: 
+      mentioning: "Mentioning: %{person}"
+    too_long: 
+      few: "please make your status messages less than %{count} characters"
+      many: "please make your status messages less than %{count} characters"
+      one: "please make your status messages less than %{count} character"
+      other: "please make your status messages less than %{count} characters"
+      two: "please make your status messages less than %{count} characters"
+      zero: "please make your status messages less than %{count} characters"
+  stream_helper: 
+    hide_comments: "Hide all comments"
+    show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
+  tags: 
+    show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
+      nobody_talking: "Nobody is talking about %{tag} yet."
+      people_tagged_with: "People tagged with %{tag}"
+      posts_tagged_with: "Posts tagged with #%{tag}"
+      stop_following: "Stop Following #%{tag}"
+  tokens: 
+    show: 
+      connect_to_cubbies: "Connect to Cubbi.es"
+      connecting_is_simple: "Connecting your Diaspora account is simple!  Just enter your Diaspora ID (<b>%{diaspora_id}</b>) from your cubbies <a href='%{href_link}'>settings page</a> and hit connect."
+      daniels_account: "Daniel's Diaspora account"
+      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      love_to_try: "We'd love for you to try it out."
+      making_the_connection: "Making the Connection"
+      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
+      sign_up_today: "Sign up today!"
+      typical_userpage: "A typical cubbi.es userpage"
+      via: "(via %{link})"
+      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
+  undo: "Undo?"
+  username: "Username"
+  users: 
+    confirm_email: 
+      email_confirmed: "Email %{email} activated"
+      email_not_confirmed: "Email could not be activated. Wrong link?"
+    destroy: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
+    edit: 
+      also_commented: "...someone also comments on your contact's post?"
+      change: "Change"
+      change_email: "Change email"
+      change_language: "Change language"
+      change_password: "Change password"
+      close_account: "Close Account"
+      comment_on_post: "...someone comments on your post?"
+      current_password: "Current password"
+      download_photos: "download my photos"
+      download_xml: "download my xml"
+      edit_account: "Edit account"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
+      export_data: "Export Data"
+      liked: "...someone likes your post?"
+      mentioned: "...you are mentioned in a post?"
+      new_password: "New password"
+      private_message: "...you receive a private message?"
+      receive_email_notifications: "Receive email notifications when..."
+      reshared: "...someone reshares your post?"
+      started_sharing: "...someone starts sharing with you?"
+      your_email: "Your email"
+      your_handle: "Your diaspora id"
+    getting_started: 
+      bold: "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_with_people_explanation_pt1: "Connect with people by placing them into one or more of your %{bold}."
+      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."
+      edit_profile: "Edit Profile"
+      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: "Finished"
+      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."
+      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"
+      search_for_hashtags: "Search for #hashtags"
+      search_for_people: "Search for people"
+      see_all_featured_users: "See all featured users"
+      welcome: "Welcome!"
+      welcome_with_name: "Welcome, %{name}!"
+    public: 
+      does_not_exist: "User %{username} does not exist!"
+    update: 
+      email_notifications_changed: "Email notifications changed"
+      language_changed: "Language changed"
+      language_not_changed: "Language change failed"
+      password_changed: "Password changed.  You can now log in with your new password."
+      password_not_changed: "Password change failed"
+      unconfirmed_email_changed: "Email changed. Needs activation."
+      unconfirmed_email_not_changed: "Email change failed"
+  webfinger: 
+    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
+    hcard_fetch_failed: "there was a problem fetching the hcard for %{account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1f1fe4513a..0b19045b62 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -154,7 +154,7 @@ ru:
     explanation: "Пишите в Диаспору с любой страницы с помощью %{link}."
     explanation_link_text: "этой закладки"
     heading: "Букмарклет Диаспоры"
-    post_something: "Сообщите что-нибудь диаспоре"
+    post_something: "Сообщите что-нибудь Диаспоре"
     post_success: "Опубликовано! Закрытие!"
   cancel: "Отмена"
   comments: 
@@ -174,7 +174,7 @@ ru:
       featured_users: "Рекомендуемые пользователи"
     few: "%{count} контакт[-а, -ов]"
     index: 
-      add_a_new_aspect: "Добавить аспект"
+      add_a_new_aspect: "Новый аспект"
       all_contacts: "Все контакты"
       edit_aspect: "Редактировать аспект %{name}"
       many_people_are_you_sure: "Вы уверены, что хотите начать приватную беседу с числом контактов более %{suggested_limit}? Возможно, лучше просто написать сообщение в этот аспект."
@@ -200,10 +200,10 @@ ru:
       success: "Разговор успешно удален"
     helper: 
       new_messages: 
-        few: "%{count} новoe[-ых] сообщениe[-ий]"
-        many: "%{count} новoe[-ых] сообщениe[-ий]"
+        few: "Новые сообщения: %{count}"
+        many: "Новые сообщения: %{count}"
         one: "1 новое сообщение"
-        other: "%{count} новoe[-ых] сообщениe[-ий]"
+        other: "Новые сообщения: %{count}"
         two: "%{count} новых сообщений"
         zero: "Новых сообщений нет"
     index: 
@@ -324,12 +324,12 @@ ru:
   no_results: "Результатов не найдено"
   notifications: 
     also_commented: 
-      few: "%{actors} прокомментировали %{post_author}'s %{post_link}."
-      many: "%{actors} прокомментировали %{post_author}'s %{post_link}."
-      one: "%{actors} прокомментировали %{post_author}'s %{post_link}."
-      other: "%{actors} также прокомментировал %{post_author}'s %{post_link}."
-      two: "%{actors} также прокомментировали запись %{post_author} %{post_link}."
-      zero: "%{actors} также прокомментировал %{post_author}'s %{post_link}."
+      few: "%{actors} также прокомментировали %{post_link} %{post_author}."
+      many: "%{actors} также прокомментировали %{post_link} %{post_author}."
+      one: "%{actors} также прокомментировал(а) %{post_link} %{post_author}."
+      other: "%{actors} также прокомментировали %{post_link} %{post_author}."
+      two: "%{actors} также прокомментировали %{post_link} %{post_author}."
+      zero: "%{actors} также прокомментировали %{post_link} %{post_author}."
     also_commented_deleted: 
       few: "%{actors} комментировали ваше удаленое сообщение."
       many: "%{actors} комментировали ваше удаленое сообщение."
@@ -338,18 +338,18 @@ ru:
       two: "%{actors} комментировали удаленое сообщение."
       zero: "%{actors} комментировали ваше удаленое сообщение."
     comment_on_post: 
-      few: "%{actors} прокомментировал(а) ваше %{post_link}."
-      many: "%{actors} прокомментировал(а) ваше %{post_link}."
-      one: "%{actors} прокомментировал(а) ваше %{post_link}."
-      other: "%{actors} прокомментировал(а) ваше %{post_link}."
-      two: "%{actors} прокомментировали ваш %{post_link}."
-      zero: "%{actors} прокомментировал(а) ваше %{post_link}."
+      few: "%{actors} прокомментировали вашу %{post_link}."
+      many: "%{actors} прокомментировали вашу %{post_link}."
+      one: "%{actors} прокомментировал(а) вашу %{post_link}."
+      other: "%{actors} прокомментировали вашу %{post_link}."
+      two: "%{actors} прокомментировали вашу %{post_link}."
+      zero: "%{actors} прокомментировали вашу %{post_link}."
     helper: 
       new_notifications: 
-        few: "%{count} новое[-ых] извещение[-ий]"
-        many: "%{count} новое[-ых] извещение[-ий]"
+        few: "Новые извещения: %{count}"
+        many: "Новые извещения: %{count}"
         one: "1 новое извещение"
-        other: "%{count} новое[-ых] извещение[-ий]"
+        other: "Новые извещения: %{count}"
         two: "%{count} новых уведомлений"
         zero: "Новых извещений нет"
     index: 
@@ -364,25 +364,25 @@ ru:
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
     liked: 
-      few: "%{actors} понравилось ваш %{post_link}."
-      many: "%{actors} понравилось ваш %{post_link}."
-      one: "%{actors} понравилось ваш %{post_link}."
-      other: "%{actors} понравилось ваш %{post_link}."
-      two: "%{actors} понравилась ваша запись %{post_link}."
-      zero: "%{actors} понравилось ваш %{post_link}."
+      few: "%{actors} понравилась ваша %{post_link}."
+      many: "%{actors} понравилась ваша %{post_link}."
+      one: "%{actors} понравилась ваша %{post_link}."
+      other: "%{actors} понравилась ваша %{post_link}."
+      two: "%{actors} понравилась ваша %{post_link}."
+      zero: "%{actors} понравилась ваша %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} нравилось ваше удаленое сообщение."
-      many: "%{actors} нравилось ваше удаленое сообщение."
-      one: "%{actors} нравилось ваше удаленое сообщение."
-      other: "%{actors} нравилось ваше удаленое сообщение."
-      two: "%{actors} нравилoсь ваше удаленноe сообщение."
-      zero: "%{actors} нравилось ваше удаленое сообщение."
+      few: "%{actors} нравилась ваша удаленая запись."
+      many: "%{actors} нравилась ваша удаленая запись."
+      one: "%{actors} нравилась ваша удаленая запись."
+      other: "%{actors} нравилась ваша удаленая запись."
+      two: "%{actors} нравилась ваша удаленная запись."
+      zero: "%{actors} нравилась ваша удаленая запись."
     mentioned: 
       few: "%{actors} упомянули вас в %{post_link}."
       many: "%{actors} упомянули вас в %{post_link}."
-      one: "%{actors} упомянули вас в %{post_link}."
+      one: "%{actors} упомянул(а) вас в %{post_link}."
       other: "%{actors} упомянули вас в %{post_link}."
-      two: "%{actors} упомянул[и] вас в %{post_link}."
+      two: "%{actors} упомянули вас в %{post_link}."
       zero: "%{actors} упомянули вас в %{post_link}."
     mentioned_deleted: 
       few: "%{actors} упомянули вас в удаленом сообщение."
@@ -391,7 +391,7 @@ ru:
       other: "%{actors} упомянули вас в удаленом сообщение."
       two: "%{actors} упомянули вас в удаленной записи."
       zero: "%{actors} упомянули вас в удаленом сообщение."
-    post: "сообщение"
+    post: "запись"
     private_message: 
       few: "%{actors} послали вам сообщение."
       many: "%{actors} послали вам сообщение."
@@ -400,16 +400,16 @@ ru:
       two: "%{actors} отправили вам сообщение."
       zero: "%{actors} послали Вам сообщение."
     reshared: 
-      few: "%{actors} поделились вашей записью %{post_link}."
-      many: "%{actors} поделились вашей записью %{post_link}."
-      one: "%{actors} поделился вашей записью %{post_link}."
-      other: "%{actors} поделились вашей записью %{post_link}."
-      two: "%{actors} поделились вашей записью %{post_link}."
-      zero: "%{actors} поделились вашей записью %{post_link}."
+      few: "%{actors} поделились вашей %{post_link}."
+      many: "%{actors} поделились вашей %{post_link}."
+      one: "%{actors} поделился(лась) вашей %{post_link}."
+      other: "%{actors} поделились вашей %{post_link}."
+      two: "%{actors} поделились вашей %{post_link}."
+      zero: "%{actors} поделились вашей %{post_link}."
     reshared_post_deleted: 
       few: "%{actors} поделились вашей удаленной записью."
       many: "%{actors} поделились вашей удаленной записью."
-      one: "%{actors} поделился вашей удаленной записью."
+      one: "%{actors} поделился(лась) вашей удаленной записью."
       other: "%{actors} поделились вашей удаленной записью."
       two: "%{actors} поделились вашей удаленной записью."
       zero: "%{actors} поделились вашей удаленной записью."
@@ -439,7 +439,7 @@ ru:
     private_message: 
       reply_to_or_view: "Ответить или посмотреть эту беседу >"
     reshared: 
-      reshared: "%{name} только что поделился вашей записью"
+      reshared: "%{name} только что поделился(лась) вашей записью"
       view_post: "Посмотреть запись >"
     single_admin: 
       admin: "Ваш администратор Диаспоры"
@@ -492,7 +492,7 @@ ru:
       mention: "Упоминание"
       message: "Сообщение"
       not_connected: "Вы не делитесь с этим человеком"
-      recent_posts: "Последние сообщения"
+      recent_posts: "Последние записи"
       recent_public_posts: "Последние Публичные Посты"
       return_to_aspects: "Вернуться на страницу аспектов"
       see_all: "Показать все"
@@ -749,7 +749,7 @@ ru:
       following: "Вы следите за меткой #%{tag}"
       nobody_talking: "Никто пока не говорил о %{tag}."
       people_tagged_with: "Люди с меткой %{tag}"
-      posts_tagged_with: "Сообщения с меткой #%{tag}"
+      posts_tagged_with: "Записи с меткой #%{tag}"
       stop_following: "Не следить за меткой #%{tag}"
   tokens: 
     show: 
@@ -778,7 +778,7 @@ ru:
       change_language: "Изменить язык"
       change_password: "Изменить пароль"
       close_account: "Закрыть аккаунт"
-      comment_on_post: "... кто-то прокомментировал ваше сообщение?"
+      comment_on_post: "... кто-то прокомментировал вашу запись?"
       current_password: "Текущий пароль"
       download_photos: "Скачать мои фотографии"
       download_xml: "Скачать мою информацию в xml"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index fba15215c1..e20312eebe 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -147,7 +147,7 @@ zh-TW:
     zero: "沒有面向"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "尚未註冊任何應用程式."
       revoke_access: "撤銷存取權"
   back: "後退"
   bookmarklet: 
@@ -542,8 +542,8 @@ zh-TW:
       notice: "相片更新成功."
   post_visibilites: 
     update: 
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "%{name} 的貼文設定為隱藏了, 且異動時不會送出消息通知."
+      see_it_on_their_profile: "如果你想要看這篇貼文的異動, 請見 %{name} 的個人檔案頁面."
   posts: 
     show: 
       destroy: "刪除"
@@ -711,7 +711,7 @@ zh-TW:
       reshare: "轉貼"
     stream_element: 
       dislike: "遜"
-      hide_and_mute: "Hide and Mute"
+      hide_and_mute: "隱藏且消音"
       like: "讚"
       shared_with: "分享給: %{aspect_names}"
       unlike: "收回讚"
@@ -801,7 +801,7 @@ zh-TW:
       connect_with_people: "與酷咖連結"
       connect_with_people_explanation_pt1: "將別人放進你的任何一個或多個%{bold}中來與他們建立聯繫."
       connect_with_people_explanation_pt2: "面向是區分新人或熟人的直覺方式, 並且只有你自己知道, 讓你可以輕易過濾他們, 或只和部份聯絡人分享."
-      edit_profile: "Edit Profile"
+      edit_profile: "編輯個人檔案"
       featured_tags: "特色標籤"
       featured_users: "特色使用者"
       fill_out_your_profile: "填寫個人檔案"
@@ -819,8 +819,8 @@ zh-TW:
         name: "名字"
         photo: "相片"
         tags: "標籤"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
+      search_for_hashtags: "搜尋\"#雜湊標籤\""
+      search_for_people: "搜尋人"
       see_all_featured_users: "看所有的特色使用者"
       welcome: "歡迎光臨!"
       welcome_with_name: "歡迎光臨, %{name}!"
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
new file mode 100644
index 0000000000..1d39822d85
--- /dev/null
+++ b/config/locales/javascript/javascript.nn.yml
@@ -0,0 +1,54 @@
+#   Copyright (c) 2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+nn: 
+  javascripts: 
+    aspect_dropdown: 
+      add_to_aspect: "Legg til aspektet"
+      all_aspects: "Alle aspekta"
+      toggle: 
+        few: "I {{count}} aspekt"
+        many: "I {{count}} aspekt"
+        one: "I {{count}} aspekt"
+        other: "I {{count}} aspekt"
+        two: "I {{count}} aspekt"
+        zero: "Legg til aspektet"
+    comments: 
+      hide: "gøym merknader"
+      show: "syn alle merknadene"
+    confirm_dialog: "Er du sikker?"
+    failed_to_like: "Like-funksjonen feila."
+    failed_to_post_message: "Klarte ikkje å senda meldinga."
+    infinite_scroll: 
+      no_more: "Ingen fleire meldingar."
+    publisher: 
+      at_least_one_aspect: "Du må offentleggjera til minst eitt aspekt"
+      limited: "Avgrensa - berre personar du deler med vil kunna sjå meldinga"
+      public: "Offentleg - alle kan sjå meldinga di og ho kan bli funnen av søkjemotorar"
+    reshares: 
+      duplicate: "Du har allereie delt den meldinga."
+    search_for: "Leit etter {{name}}"
+    show_more: "syn meir"
+    timeago: 
+      day: "om dagen"
+      days: "%d dagar"
+      hour: "om lag ein time"
+      hours: "om lag %d timar"
+      minute: "om lag eit minutt"
+      minutes: "%d minutt"
+      month: "om lag ein månad"
+      months: "%d månader"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "mindre enn eit minutt"
+      suffixAgo: "sidan"
+      suffixFromNow: "frå no"
+      year: "om lag eit år"
+      years: "%d år"
+    videos: 
+      unknown: "Ukjend videotype"
+      watch: "Sjå denne videoen hos {{provider}}"
+    web_sockets: 
+      disconnected: "Nettendepunktet er lukka - meldingane vil ikkje lenger kunna strøymast direkte."
-- 
GitLab