From 3ae76cd5eb67457ca377b424b9bec65f7b477156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Thu, 6 Sep 2012 15:47:32 +0200
Subject: [PATCH] updated 14 locale files [ci skip]

---
 config/locales/devise/devise.hu.yml           |  20 +-
 config/locales/devise/devise.ml.yml           |  14 +-
 config/locales/devise/devise.nl.yml           |  14 +-
 config/locales/devise/devise.pl.yml           |   4 +-
 config/locales/devise/devise.zh-CN.yml        |  48 +-
 config/locales/diaspora/hu.yml                |  10 +-
 config/locales/diaspora/nb.yml                |   2 +-
 config/locales/diaspora/nl.yml                |  32 +-
 config/locales/diaspora/si.yml                |  25 +
 config/locales/diaspora/sv.yml                |   2 +-
 config/locales/diaspora/zh-CN.yml             | 747 +++++++++++++-----
 config/locales/javascript/javascript.nl.yml   |   8 +-
 config/locales/javascript/javascript.si.yml   |   4 +-
 .../locales/javascript/javascript.zh-CN.yml   | 122 ++-
 14 files changed, 755 insertions(+), 297 deletions(-)

diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index 61f5d7a721..6483a89d10 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -14,10 +14,10 @@ hu:
     failure:
       inactive: "A fiókod nem aktiváltad még."
       invalid: "Érvénytelen felhasználónév vagy jelszó."
-      invalid_token: "Érvénytelen hitelesítési token."
+      invalid_token: "Érvénytelen hitelesítési jel."
       locked: "A fiókod zárolva van."
       timeout: "A munkamenet lejárt, kérjük jelentkezz be újra."
-      unauthenticated: "Be kell jelentkezned, vagy regisztrálj."
+      unauthenticated: "A továbblépéshez jelentkezz be vagy iratkozz fel."
       unconfirmed: "Előbb meg kell erősítened fiókodat."
     invitations:
       invitation_token_invalid: "Sajnáljuk, de a meghívás nem érvényes."
@@ -51,9 +51,9 @@ hu:
         love: "Szeretettel,"
         made_by_people: "A %{strong_diaspora} olyan emberek munkája, akik annyira szeretik az Internetet, mint te magad. %{jointeam}, vagy %{helpfund}!"
         more_people: "És még sokan mások is kíváncsian várnak rád!"
-        no_account_till: "A fiókod addig nem készül el amíg be nem lépsz a megadott linkkel és be nem regisztrálsz."
+        no_account_till: "A fiókod addig nem készül el amíg be nem lépsz a megadott linkkel és nem iratkozol fel."
         or: "vagy"
-        sign_up_now: "Regisztrálj most &rarr;"
+        sign_up_now: "Iratkozz fel most &rarr;"
         subject: "Meghívtak, hogy csatlakozz a Diaspora* közösségi hálóhoz."
         team_diaspora: "A Diaspora* csapat"
         unsubscribe: "Leiratkozáshoz kattints %{link}."
@@ -79,13 +79,13 @@ hu:
         change_password: "Megváltoztatom a jelszavamat"
       new:
         forgot_password: "Elfelejtetted a jelszavad?"
-        no_account: "Ehhez az emailhez nincs fiók regisztrálva. Ha meghívóra vársz, akkor légy türelmes. Hamarosan osztogatunk."
-        send_password_instructions: "Küldd el nekem jelszó alaphelyzetbe állításához szükséges utasítások"
-      send_instructions: "Néhány perc múlva kapni fog egy e-mailt arról, hogy miként állítsa alaphelyzetbe a jelszavát."
+        no_account: "Ehhez az e-mail címhez nem tartozik fiók."
+        send_password_instructions: "Küldd el nekem a jelszó alaphelyzetbe állításához szükséges utasításokat"
+      send_instructions: "Néhány perc múlva kapsz egy e-mailt arról, hogyan állíthatod alaphelyzetbe a jelszavadat."
       updated: "A jelszavad megváltozott. Be vagy jelentkezve vele."
     registrations:
       destroyed: "Viszlát! A fiókod törölve. Reméljük hamarosan újra látunk. =)"
-      signed_up: "Sikeresen regisztráltál. Ha engedélyezve van, akkor egy megerősítő e-mailt küldünk."
+      signed_up: "Sikeresen feliratkoztál. Ha engedélyezve van, akkor egy megerősítő e-mailt küldünk."
       updated: "Fiókod frissítve."
     sessions:
       new:
@@ -106,8 +106,8 @@ hu:
         receive_confirmation: "Nem kaptál megerősítési utasítást?"
         receive_unlock: "Nem kaptad meg feloldási utasítást?"
         sign_in: "Bejelentkezés"
-        sign_up: "Regisztrálj"
-        sign_up_closed: "Nincs nyílt regisztráció jelenleg."
+        sign_up: "Feliratkozás"
+        sign_up_closed: "Nincs nyílt feliratkozási lehetőség jelenleg."
       mail_signup_form:
         sign_up_for_an_invite: "Iratkozz fel egy meghívóra!"
     unlocks:
diff --git a/config/locales/devise/devise.ml.yml b/config/locales/devise/devise.ml.yml
index 2062818752..20ab6197fd 100644
--- a/config/locales/devise/devise.ml.yml
+++ b/config/locales/devise/devise.ml.yml
@@ -12,7 +12,7 @@ ml:
         resend_confirmation: "സ്ഥിരീകരിക്കുവാനുള്ള വിവരങ്ങള്‍ വീണ്ടും അയയ്ക്കുക"
       send_instructions: "താങ്കളുടെ അക്കൌണ്ട് സ്ഥിരീകരിക്കുന്നതിന് ആവശ്യമായ വിവരങ്ങള്‍ അടങ്ങിയ ഇമെയില്‍ അല്പസമയത്തിനകം ലഭിക്കുന്നതാണ്."
     failure:
-      inactive: "താങ്കളുടെ അക്കൌണ്ട് ഇതുവരെ ളപയോഗപ്രദമാക്കിയിട്ടില്ല."
+      inactive: "താങ്കളുടെ അക്കൌണ്ട് ഇതുവരെ ഉപയോഗപ്രദമാക്കിയിട്ടില്ല."
       invalid: "ഇമെയില്‍ അല്ലെങ്കില്‍ രഹസ്യവാക്ക് സാധുവല്ല."
       invalid_token: "Invalid authentication token."
       locked: "നിങ്ങളുടെ അക്കൌണ്ട് പൂട്ടിയിരിക്കുന്നു."
@@ -81,22 +81,22 @@ ml:
         forgot_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."
+      send_instructions: "രഹസ്യവാക്ക് മാറ്റുന്നതിനെ സംബന്ധിച്ചുള്ള നിർദ്ദേശങ്ങൾ അടങ്ങിയ ഇ മെയിൽ സന്ദേശം കുറച്ചു നിമിഷങ്ങൾക്കകം താങ്കൾക്ക് ലഭിക്കുന്നതായിരിക്കും."
+      updated: "താങ്കളുടെ രഹസ്യവാക്ക് വിജയകരമായി മാറ്റിയിരിക്കുന്നു. താങ്കൾ ഇപ്പോൾ അകത്ത് പ്രവേശിച്ചിരിക്കുകയാണ്."
     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: "താങ്കള്‍ അക്കൌണ്ട് വിജയകരമായി പുതുക്കി."
     sessions:
       new:
-        alpha_software: "You are about to use alpha software."
+        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: "ആധുനിക ബ്രൌസറുകള്‍ മാത്രം പിന്‍തുണയ്ക്കുന്നു."
         password: "രഹസ്യവാക്ക്"
-        remember_me: "ഓര്‍മ്മിക്കു"
-        sign_in: "പ്രവേശിക്കു"
+        remember_me: "ഓര്‍മ്മിക്കൂ‍"
+        sign_in: "പ്രവേശിക്കൂ"
         username: "ഉപയോക്തനാമം"
       signed_in: "വിജയകരമായി പ്രവേശിച്ചിരിക്കുന്നു."
       signed_out: "വിജയകരമായി പുറത്ത് കടന്നു."
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index dd7401426a..4e40ad60a2 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -10,10 +10,10 @@ nl:
       confirmed: "Je account is geactiveerd. Je bent nu ingelogd."
       new:
         resend_confirmation: "Stuur bevestigingsinstructies nogmaals"
-      send_instructions: "Je ontvangt een e-mail met instructies om je account te activeren."
+      send_instructions: "Je ontvangt binnen enkele minuten een e-mail met instructies om je account te activeren."
     failure:
       inactive: "Je account is nog niet geactiveerd."
-      invalid: "De gebruikersnaam of het wachtwoord is ongeldig."
+      invalid: "Gebruikersnaam of wachtwoord ongeldig."
       invalid_token: "Ongeldig authenticatietoken."
       locked: "Je account is geblokkeerd."
       timeout: "Je sessie is verlopen. Log opnieuw in om verder te gaan."
@@ -81,17 +81,17 @@ nl:
         forgot_password: "Wachtwoord vergeten?"
         no_account: "Er bestaat geen account met dit e-mailadres.  Mocht je op een uitnodiging wachten; deze komen zo snel mogelijk beschikbaar."
         send_password_instructions: "Stuur mij instructies om mijn wachtwoord te resetten"
-      send_instructions: "Je ontvangt een e-mail met instructies om je wachtwoord opnieuw in te stellen."
+      send_instructions: "Je ontvangt binnen enkele minuten een e-mail met instructies om je wachtwoord opnieuw in te stellen."
       updated: "Je wachtwoord is veranderd. Je bent nu ingelogd."
     registrations:
       destroyed: "Tot ziens! Je account is succesvol verwijderd. We hopen je snel terug te zien."
-      signed_up: "Je bent succesvol geregistreerd. Indien geactiveerd, ontvang je een bevestigingsmail."
+      signed_up: "Je bent succesvol geregistreerd. Indien aangevinkt is er een bevestiging naar je e-mail gestuurd."
       updated: "Je account is succesvol geüpdate."
     sessions:
       new:
         alpha_software: "Je staat op het punt om alpha-software te gebruiken."
-        bugs_and_feedback: "In dit stadium zul je waarschijnlijk nog bugs tegenkomen. We raden je aan de Feedback-button aan de rechterzijde van je browser te gebruiken om deze bugs te melden (in het Engels)!  Vervolgens zullen wij zo hard mogelijk werken om deze op te lossen."
-        bugs_and_feedback_mobile: "Wees je ervan bewust dat je zeker weten bugs zult tegenkomen.  We raden je aan deze vooral te rapporteren!  We doen onze uiterste best om deze problemen zo snel mogelijk op te lossen."
+        bugs_and_feedback: "Wees je ervan bewust dat je bugs tegen zult komen.  Gebruik de Feedback-button aan de rechterzijde van je browser om alle problemen melden (in het Engels)!  We doen ons uiterste best om problemen zo snel mogelijk op te lossen."
+        bugs_and_feedback_mobile: "Wees je ervan bewust dat je bugs tegen zult komen.  We vragen je alle problemen vooral te melden!  We doen ons uiterste best om problemen zo snel mogelijk op te lossen."
         login: "Inloggen"
         modern_browsers: "ondersteunt alleen moderne browsers."
         password: "Wachtwoord"
@@ -113,7 +113,7 @@ nl:
     unlocks:
       new:
         resend_unlock: "Stuur ontgrendelinstructies nogmaals"
-      send_instructions: "Je ontvangt een e-mail met instructies om je account te deblokkeren."
+      send_instructions: "Je ontvangt binnen enkele minuten een e-mail met instructies om je account te deblokkeren."
       unlocked: "Je account is succesvol gedeblokkeerd. Je bent nu ingelogd."
   errors:
     messages:
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 267bc2ef74..130b8952de 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -17,7 +17,7 @@ pl:
       invalid_token: "Nieprawidłowy token uwierzytelnienia."
       locked: "Twoje konto jest zablokowane."
       timeout: "Sesja wygasła, aby kontynuować zaloguj się ponownie."
-      unauthenticated: "Przed kontynuacją musisz się zalogować lub zarejestrować."
+      unauthenticated: "Aby kontynuować zaloguj się lub zarejestruj."
       unconfirmed: "Musisz aktywować swoje konto."
     invitations:
       invitation_token_invalid: "Token zaproszenia jest nieprawidłowy!"
@@ -25,7 +25,7 @@ pl:
       updated: "Hasło zostało pomyślnie zmienione. Zalogowano."
     mailer:
       confirmation_instructions:
-        confirm: "Aktywuj konto"
+        confirm: "Aktywuj moje konto"
         subject: "Instrukcja aktywacji"
         you_can_confirm: "Możesz aktywować swoje konto klikając poniższe łącze:"
       hello: "Cześć %{email}!"
diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml
index b6ce267be3..e1c972c736 100644
--- a/config/locales/devise/devise.zh-CN.yml
+++ b/config/locales/devise/devise.zh-CN.yml
@@ -12,13 +12,13 @@ zh-CN:
         resend_confirmation: "重送发送帐号确认邮件"
       send_instructions: "您会在几分钟内收到一封邮件，它将指引您完成帐号确认步骤。"
     failure:
-      inactive: "你的帐号尚未激活。"
+      inactive: "您的帐号尚未激活。"
       invalid: "邮箱或密码有误。"
       invalid_token: "验证信息不合法。"
       locked: "您的帐号已锁定。"
       timeout: "会话超时。若要继续，请重新登录。"
       unauthenticated: "请您登录或注册。"
-      unconfirmed: "你必须先验证帐号才能继续。"
+      unconfirmed: "友情提示：您将可能遇到 Bug。 遇到必须先验证帐号才能继续。"
     invitations:
       invitation_token_invalid: "邀请码验证失败。"
       send_instructions: "邀请发送成功。"
@@ -27,19 +27,41 @@ zh-CN:
       confirmation_instructions:
         confirm: "确认帐号"
         subject: "帐号确认步骤"
-        you_can_confirm: "你可以点击下面的链接确认帐号："
+        you_can_confirm: "您可以点击下面的链接确认帐号："
       hello: "您好, %{email}!"
       invitation_instructions:
         accept: "接收请求"
-        be_yourself: "就做你自己"
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        arrived: "您所期待的社交网络就在这。精心开发，更安全，更好玩。%{strong_diaspora}  准备好了帮助您，用崭新的方式分享与探索网络世界。"
+        be_yourself: "就做您自己"
+        be_yourself_paragraph: "互联网为我们创造了表达自己崭新的方式。%{strong_diaspora} 让您做自己，分享您的生活，无论您的名字是真是假。"
+        cubbies: "Cubbi.es"
+        displaying_correctly: "邮件没有正常显示？请在您的网页浏览器中访问 %{link}"
+        email_address: "questions@joindiaspora.com"
+        email_us: "对 Diaspora 如有任何疑问或需要帮助，请发送电子邮件至 %{email}"
+        finally: "终于 - 来了"
         friends_saying: "大家正在说...."
-        get_connected: "已连接"
+        get_connected: "连接"
+        get_connected_paragraph: "这是一个国际性的运动，%{strong_diaspora} 的最大特色就是拥有一个对更好的互联网有共同希望的社区。来和新面孔相遇，和朋友保持联络吧！"
+        have_fun: "尽情欢乐！"
+        have_fun_paragraph: "%{strong_diaspora} 用于探索互联网令人惊奇的新事物。%{link}，世界上第一个 %{strong_diaspora} 应用程序只是开始。在荣耀的互联网收集并分享它的一切吧！"
+        help_fund: "赞助 Diaspora"
+        here: "这里"
         ignore: "如果您不想接收这个邀请，请忽略这封邮件。"
+        join_team: "加入我们的团队"
+        love: "爱你的，"
+        made_by_people: "%{strong_diaspora} 是由和您一样热爱互联网的人所创造的。%{jointeam}， 或着%{helpfund}吧！"
+        more_people: "有更多希望见到您的人！"
         no_account_till: "只有在您点击上面的链接并注册后，您的帐号才会被创建。"
+        or: "或者"
         sign_up_now: "马上注册"
-        subject: "您被邀请加入Diaspora！"
-        view_in: "View in"
+        subject: "您被邀请加入 Diaspora！"
+        team_diaspora: "Diaspora 团队"
+        unsubscribe: "取消订阅？%{link}"
+        view_in: "在浏览器中查看。"
+      inviter:
+        accept_at: "在 %{url}， 您可以通过以下链接接受"
+        has_invited_you: "%{name}"
+        have_invited_you: "%{names} 邀请您加入 Diaspora"
       reset_password_instructions:
         change: "重置密码"
         ignore: "如果您并没有请求重置密码, 请忽略这封信件。"
@@ -57,7 +79,7 @@ zh-CN:
         change_password: "修改密码"
       new:
         forgot_password: "忘记密码？"
-        no_account: "没有与此邮箱关联的帐号。如果您在等待邀请函, 我们将尽快寄出."
+        no_account: "暂无与此邮箱关联的帐号。如果您在等待邀请函, 我们将尽快寄出."
         send_password_instructions: "请向我发送密码重置步骤"
       send_instructions: "几分钟内您将收到一封包含密码重置步骤的邮件。"
       updated: "密码修改成功。您已经登入了。"
@@ -67,9 +89,9 @@ zh-CN:
       updated: "帐号更新成功。"
     sessions:
       new:
-        alpha_software: "你即将使用处于开发初期的功能。"
-        bugs_and_feedback: "给您一个提醒, 你将可能遇到bug。 遇到任何问题，都请您点击浏览器右边的\"反馈\"按钮向我们反馈！ 我们会尽快处理您反馈的任何问题。"
-        bugs_and_feedback_mobile: "给您一个提醒, 你将可能遇到bug。 遇到任何问题都请你向我们反馈! 我们会尽快处理你反馈的任何问题."
+        alpha_software: "您即将使用处于开发初期的功能。"
+        bugs_and_feedback: "友情提示：您将可能遇到 Bug。 遇到任何问题，都请您点击浏览器右边的\"反馈\"按钮向我们反馈！ 我们会尽快处理您反馈的任何问题。"
+        bugs_and_feedback_mobile: "友情提示：您将可能遇到bug。 遇到任何问题都请您向我们反馈! 我们会尽快处理您反馈的任何问题。"
         login: "登录"
         modern_browsers: "只支持较新的浏览器。"
         password: "密码"
@@ -92,7 +114,7 @@ zh-CN:
       new:
         resend_unlock: "重新发送解锁步骤"
       send_instructions: "几分钟后您将收到一封邮件，它将指引您解锁您的帐号。"
-      unlocked: "帐号解锁成功。你已经登录。"
+      unlocked: "帐号解锁成功。您已经登录。"
   errors:
     messages:
       already_confirmed: "已确认"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index cd7efa3e15..7f3dbd4e9c 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -215,7 +215,7 @@ hu:
     zero: "nincs csoport"
   authorizations:
     index:
-      no_applications: "Még nem regisztráltál egyetlen alkalmazást sem."
+      no_applications: "Még nem kezdtél el használni egyetlen alkalmazást sem."
       revoke_access: "Hozzáférés visszavonása"
     new:
       authorize: "engedélyezés"
@@ -677,7 +677,7 @@ hu:
     other: "%{count} visszajelzés"
     zero: "nincs visszajelzés"
   registrations:
-    closed: "A regisztráció zárolva van ezen a Diaspora kiszolgálón."
+    closed: "A feliratkozási lehetőség zárolva van ezen a Diaspora kiszolgálón."
     create:
       success: "Csatlakoztál a Diaspora-hoz!"
     edit:
@@ -700,7 +700,7 @@ hu:
       hey_make: "GYERÜNK,<br/>CSINÁLJ<br/>VALAMIT!"
       join_the_movement: "Csatlakozz!"
       password: "JELSZÓ"
-      sign_up: "REGISZTRÁLJ"
+      sign_up: "Iratkozz fel!"
       sign_up_message: "Közösségi Hálózat <3"
       username: "AZONOSÍTÓ"
   requests:
@@ -941,7 +941,7 @@ hu:
       love_to_try: "Szeretnénk, ha kipróbálnád."
       making_the_connection: "Kapcsolat létrehozása"
       screenshot_explanation: "%{link1}.  Ez a cubby ehhez van linkelve: %{link2}."
-      sign_up_today: "Regisztrálj még ma!"
+      sign_up_today: "Iratkozz fel még ma!"
       typical_userpage: "Tipikus 'cubbi.es' oldal"
       via: "(forrás: %{link})"
       what_is_cubbies: "Cubbi.es a világ első Diaspora* alkalmazása. Egyben a legjobb mód az online fotógyűjtésre!"
@@ -967,7 +967,7 @@ hu:
       close_account:
         dont_go: "Hé, kérlek ne menj!"
         if_you_want_this: "Ha tényleg ezt akarod, írd be a jelszavad és kattints a \"Fiók törlése\" gombra."
-        lock_username: "Le tudod védeni a felhasználóneved, ha esetleg mégis úgy döntenél, hogy újra regisztrálsz."
+        lock_username: "Le tudod védeni a felhasználóneved, ha esetleg mégis úgy döntenél, hogy újra feliratkozol."
         locked_out: "Ki fogunk léptetni és kizárunk a fiókodból."
         make_diaspora_better: "Azt szeretnénk, ha segítenél hogy jobbá tehessük a Diaspora-t, így a távozásod helyett szívesebben vennénk ha közreműködnél. Ám ha el akarod hagyni az oldalt, kérlek olvasd el mi fog következni."
         mr_wiggles: "Vuk szomorú lesz, ha távozni lát."
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index f3ecb3af8e..3ceb3db23c 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -711,7 +711,7 @@ nb:
       error: "feil under tilkobling av tjenesten"
     finder:
       fetching_contacts: "Diaspora finner dine %{service} venner, vær så snill og sjekk igjen om noen få minutter."
-      service_friends: "%{service} Venner"
+      service_friends: "%{service}-venner"
     index:
       connect_to_facebook: "Koble til facebook"
       connect_to_tumblr: "Koble til Tumblr"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index c63df16796..b29c8ac69f 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -44,6 +44,7 @@ nl:
     admin_bar:
       pages: "Pagina's"
       pod_stats: "Pod Statistieken"
+      resque_overview: "Resque Overzicht"
       user_search: "Gebruiker Zoeken"
       weekly_user_stats: "Wekelijkse Gebruiker Statistieken"
     stats:
@@ -53,7 +54,9 @@ nl:
         one: "%{count} reactie"
         other: "%{count} reacties"
         zero: "%{count} reacties"
+      current_segment: "Het huidige segment heeft gemiddeld <b>%{post_yest}</b> berichten per gebruiker sinds <b>%{post_day}</b>"
       daily: "Dagelijks"
+      display_results: "Resultaten uit het <b>%{segment}</b>-segment"
       go: "gaan"
       month: "Maand"
       posts:
@@ -68,9 +71,18 @@ nl:
         zero: "%{count} gebruikers"
       week: "Week"
     user_search:
+      add_invites: "voeg uitnodigingen toe"
+      email_to: "E-mail om uit te nodigen"
       users:
         one: "%{count} gebruiker gevonden"
         other: "%{count} gebruikers gevonden"
+      you_currently: "je hebt nog %{user_invitation} uitnodiging(en) over %{link}"
+    weekly_user_stats:
+      amount_of:
+        one: "aantal nieuwe gebruikers deze week: %{count}"
+        other: "aantal nieuwe gebruikers deze week: %{count}"
+        zero: "aantal nieuwe gebruikers deze week: geen"
+      current_server: "Huidige server datum is %{date}"
   ago: "%{time} geleden"
   all_aspects: "Alle Aspecten"
   application:
@@ -151,6 +163,7 @@ nl:
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-gedreven tutorials, instructies, en nieuws."
       introduce_yourself: "Dit is jouw Stream.  Spring erin en introduceer jezelf."
       keep_diaspora_running: "Houdt de Diaspora ontwikkeling snel met een maandelijkse bijdrage!"
+      keep_pod_running: "Hou %{pod} draaiend en koop een cafeïneshot voor de servers met een maandelijkse donatie."
       new_here:
         follow: "Volg %{link} en verwelkom nieuwe Diaspora* gebruikers!"
         learn_more: "Meer informatie"
@@ -300,6 +313,8 @@ nl:
     helper:
       correct_the_following_errors_and_try_again: "Corrigeer de volgende fouten en probeer opnieuw."
       invalid_fields: "Ongeldige velden"
+    login_try_again: "<a href='%{login_link}'>Log in</a> en probeer het opnieuw."
+    post_not_public: "Het bericht dat je probeert de bekijken is niet openbaar!"
   fill_me_out: "Vul me in!"
   find_people: "Vind mensen of #tags"
   hide: "Verbergen"
@@ -323,10 +338,15 @@ nl:
       already_invited: "De volgende mensen hebben je uitnodiging niet geaccepteerd:"
       aspect: "Aspect"
       check_out_diaspora: "Kijk eens naar Diaspora!"
+      codes_left:
+        one: "Nog een uitnodiging over op deze code"
+        other: "Nog %{count} uitnodigingen over op deze code"
+        zero: "Geen uitnodigingen over op deze code"
       comma_separated_plz: "Je kan meerdere e-mail adressen toevoegen door ze te scheiden door komma's"
       if_they_accept_info: "als hij of zij accepteert zal hij of zij toegevoegd worden aan het aspect waarvoor je hem of haar uitgenodigd hebt."
       invite_someone_to_join: "Nodig iemand uit om lid te worden op Diaspora!"
       language: "Taal"
+      paste_link: "Deel deze link met je vrienden om ze uit te nodigen voor Diaspora*, of e-mail ze de link direct."
       personal_message: "Persoonlijk bericht"
       resend: "Stuur opnieuw"
       send_an_invitation: "Stuur een uitnodiging"
@@ -337,6 +357,7 @@ nl:
       back_to_top: "Terug naar top"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Publieke Diaspora Feed van %{name}"
+      source_package: "download het broncode pakket"
       toggle: "switch mobiele versie"
       whats_new: "wat is nieuw op Diaspora?"
       your_aspects: "jouw aspecten"
@@ -369,10 +390,10 @@ nl:
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
-        one: "%{count} like"
-        other: "%{count} likes"
+        one: "%{count} persoon vindt dit leuk"
+        other: "%{count} mensen vinden dit leuk"
         two: "%{count} leuk"
-        zero: "geen likes"
+        zero: "niemand vindt dit leuk"
   limited: "Beperkt"
   more: "Meer"
   next: "volgende"
@@ -384,7 +405,7 @@ nl:
       one: "%{actors} heeft ook op %{post_author} zijn %{post_link} gereageerd."
       other: "%{actors} hebben ook op %{post_author} zijn %{post_link} gereageerd."
       two: "%{actors} hebben ook gereageerd op %{post_author}'s %{post_link}."
-      zero: "%{actors} heeft ook %{post_author} zijn %{post_link} gereageerd."
+      zero: "%{actors} heeft ook op %{post_author} zijn %{post_link} gereageerd."
     also_commented_deleted:
       few: "%{actors} hebben gereageerd op een verwijderd bericht."
       many: "%{actors} heeft gereageerd op een verwijderde post."
@@ -448,7 +469,7 @@ nl:
       one: "%{actors} heeft je een bericht gestuurd."
       other: "%{actors} hebben je een bericht gestuurd."
       two: "%{actors} hebben je een bericht gestuurd."
-      zero: "%{actors} heeft jou een bericht gestuurd."
+      zero: "%{actors} heeft je een bericht gestuurd."
     reshared:
       few: "%{actors} hebben jouw %{post_link} doorgegeven."
       many: "%{actors} hebben jouw %{post_link} doorgegeven."
@@ -672,6 +693,7 @@ nl:
       password_to_confirm: "(we hebben je huidige wachtwoord nodig om de wijzigingen te bevestigen)"
       unhappy: "Ontevreden?"
       update: "Bijwerken"
+    invalid_invite: "De uitnodigingslink die je gebruikt is niet langer geldig!"
     new:
       continue: "Ga door"
       create_my_account: "Maak mijn account aan!"
diff --git a/config/locales/diaspora/si.yml b/config/locales/diaspora/si.yml
index 79f9cabc4e..ce92c69714 100644
--- a/config/locales/diaspora/si.yml
+++ b/config/locales/diaspora/si.yml
@@ -27,6 +27,7 @@ si:
       daily: "දවස් පතා"
       go: "යන්න"
       month: "මාසය"
+      week: "සතිය"
   application:
     helper:
       diaspora_alpha: "සංවර්ධනය වෙමින් පවතින DIASPORA*"
@@ -159,6 +160,7 @@ si:
   next: "ඊළගට"
   no_results: "කිසිදු ප්‍රතිඵලයක් හමු නොවුණි."
   notifier:
+    accept_invite: "ඔබගේ ඩයස්පෝරා* ආරාධානව අනුමත කරන්න!"
     click_here: "මෙතන click කරන්න"
     hello: "හෙලෝ %{name}!"
     thanks: "ස්තුතියි,"
@@ -214,7 +216,9 @@ si:
     zero: "ප්‍රතිචාර නැත"
   registrations:
     edit:
+      edit: "%{name} සංස්කරණය කරන්න"
       unhappy: "අසතුටෙන්ද ?"
+      update: "යාවත්කාලීන කරන්න"
     new:
       enter_email: "email එක ඇතුලත් කරන්න"
       enter_password: "මුර පදයක් ඇතුලත් කරන්න ( අවම වශයෙන්වත් අකුරු 6 ක් )"
@@ -238,15 +242,36 @@ si:
       resend: "නැවත යවන්න"
   settings: "සැකසුම්"
   shared:
+    add_contact:
+      create_request: "ඩයස්පෝරා ID එකෙන් සොයාගන්න"
+      enter_a_diaspora_username: "ඩයස්පෝරා පරිශීලක නාමය ඇතුලත් කරන්න:"
+      your_diaspora_username_is: "මෙය ඔබගේ ඩයස්පෝරා පරිශීලක නාමයයි : %{diaspora_handle}"
     invitations:
+      by_email: "email එකකින්"
       from_facebook: "Facebook එකෙන්"
+      invitations_left: "%{count} ඉතුරුයි"
+      invite_someone: "කාටහරි ආරාධනා කරන්න"
+      invite_your_friends: "ඔබේ මිතුරන්ට ආරාධනා කරන්න"
+      invites: "ආරාධනා කළා"
     public_explain:
       manage: "සම්බන්ධ සේවාවන් කළමනාකරණය කරන්න"
+    publisher:
+      all: "සියල්ල"
+      new_user_prefill:
+        invited_by: "ආරාධනා කලාට ස්තුතියි, "
     stream_element:
       dislike: "කමති නැත"
       like: "කැමතියි"
       show: "පෙන්වන්න"
       unlike: "අකැමතියි"
+      via_mobile: "ජංගම දුරකථනය හරහා"
+  status_messages:
+    create:
+      success: "සාර්ථක ලෙස සදහන්කරා: %{names}"
+    helper:
+      no_message_to_display: "පෙන්වීමට කිසිදු පනිවිඩයක් නැත."
+    new:
+      mentioning: "සදහන්කරන්න: %{person}"
   terms_and_conditions: "කොන්දේසි සහ තත්ත්වයන්"
   username: "පරිශ්‍රීලක නම"
   users:
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 0314b3e096..555ff75a9f 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -681,7 +681,7 @@ sv:
       password: "LÖSENORD"
       sign_up: "REGISTRERA"
       sign_up_message: "Socialt nätverkande med ♥"
-      username: "ANVÄNDARENAMN"
+      username: "ANVÄNDARNAMN"
   requests:
     create:
       sending: "Skickar"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 915a421db5..53ea6f5d5c 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -5,7 +5,9 @@
 
 
 zh-CN:
+  _applications: "应用"
   _comments: "评论"
+  _contacts: "好友"
   _home: "首页"
   _photos: "照片"
   _services: "服务"
@@ -28,7 +30,7 @@ zh-CN:
         reshare:
           attributes:
             root_guid:
-              taken: "You've already reshared that post!"
+              taken: "您已经转发过了。"
         user:
           attributes:
             email:
@@ -36,123 +38,245 @@ zh-CN:
             person:
               invalid: "不合法。"
             username:
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "不合法。用户名中只允许包含字母，数字和下划线。"
               taken: "已被注册。"
-  ago: "%{time}前"
-  all_aspects: "所有视图"
+  admins:
+    admin_bar:
+      correlations: "关联"
+      pages: "分页"
+      pod_stats: "Pod 统计资料"
+      resque_overview: "Resque 状态概要"
+      user_search: "搜索用户"
+      weekly_user_stats: "用户统计周报"
+    correlations:
+      correlations_count: "与登入次数的关系"
+    stats:
+      2weeks: "两周"
+      50_most: "50个最流行的标签"
+      comments:
+        other: "%{count} 个意见"
+        zero: "%{count} 个意见"
+      current_segment: "目前时间区间有 <b>%{post_day}</b> 天，平均每个使用者有 <b>%{post_yest}</b> 篇内容"
+      daily: "一天"
+      display_results: "显示时间在 <b>%{segment}</b> 内的结果"
+      go: "好"
+      month: "一月"
+      posts:
+        other: "%{count} 篇内容"
+        zero: "%{count} 篇内容"
+      shares:
+        other: "分享 %{count} 次"
+        zero: "分享 %{count} 次"
+      tag_name: "标签名： <b>%{name_tag}</b> 数目：<b>%{count_tag}</b>"
+      usage_statistic: "使用状况统计"
+      users:
+        other: "%{count} 个用户"
+        zero: "%{count} 个用户"
+      week: "一周"
+    user_search:
+      add_invites: "增加邀请次数"
+      email_to: "寄电子邮件邀请"
+      users:
+        other: "找到 %{count} 个用户"
+        zero: "找到 %{count} 个用户"
+      you_currently: "您目前还可以邀请 %{user_invitation} 次 %{link}"
+    weekly_user_stats:
+      amount_of:
+        other: "本周新用户数目：%{count}"
+        zero: "本周新用户数目：0"
+      current_server: "服务器当前日期：%{date}"
+  ago: "%{time} 前"
+  all_aspects: "所有分组"
   application:
     helper:
+      diaspora_alpha: "DIASPORA* 预览版"
       unknown_person: "未知用户"
       video_title:
         unknown: "未知影片标题"
-  are_you_sure: "你确定吗？"
-  are_you_sure_delete_account: "你真的确定要关闭您的户口吗? 关了就不能再开了哦!"
+  are_you_sure: "您确定吗？"
+  are_you_sure_delete_account: "您真的确定要关闭您的帐号吗? 此操作不可撤销。"
   aspect_memberships:
     destroy:
-      failure: "从视图中移除好友失败"
-      no_membership: "在视图中找不到选择的好友"
-      success: "从视图中移除好友成功"
+      failure: "从分组中移除好友失败"
+      no_membership: "在分组中找不到选择的好友"
+      success: "从分组中移除好友成功"
   aspects:
     add_to_aspect:
-      failure: "将好友添加到视图失败。"
-      success: "将好友添加到视图成功。"
+      failure: "将好友添加到分组失败。"
+      success: "将好友添加到分组成功。"
     aspect_contacts:
       done_editing: "编辑完成"
-    contacts_not_visible: "此视图中的好友相互不可见。"
-    contacts_visible: "此视图中的好友相互可见。"
+    aspect_listings:
+      add_an_aspect: "+ 新增分组"
+      deselect_all: "清空选择"
+      edit_aspect: "编辑 %{name}"
+      select_all: "全选"
+    aspect_stream:
+      make_something: "做点什么"
+      stay_updated: "随时更新"
+      stay_updated_explanation: "您的主动态会充满您的好友，您关注的标签，和有趣的群的内容。"
+    contacts_not_visible: "此分组中的好友相互不可见。"
+    contacts_visible: "此分组中的好友相互可见。"
     create:
-      failure: "添加视图失败。"
-      success: "添加新视图 %{name} 成功"
+      failure: "添加分组失败。"
+      success: "添加新分组 %{name} 成功"
     destroy:
       failure: "无法删除 %{name} ，它不是空的。"
       success: "删除 %{name} 成功。"
     edit:
       add_existing: "添加好友"
-      aspect_list_is_not_visible: "视图中的好友不能看见本视图的好友列表"
-      aspect_list_is_visible: "视图中的好友能够看见本视图的好友列表"
-      confirm_remove_aspect: "你确定要删除这个视图？"
+      aspect_list_is_not_visible: "分组中的好友不能看见此分组的好友列表"
+      aspect_list_is_visible: "分组中的好友能够看见此分组的好友列表"
+      confirm_remove_aspect: "您确定要删除这个分组？"
       done: "完成"
-      make_aspect_list_visible: "是否让其他人可以看见本视图的好友列表？"
-      remove_aspect: "删除这个视图"
+      make_aspect_list_visible: "是否让其他人可以看见此分组的好友列表？"
+      remove_aspect: "删除这个分组"
       rename: "重命名"
       update: "æ›´æ–°"
       updating: "更新中"
-    few: "%{count}个视图"
+    few: "%{count} 个分组"
     helper:
-      are_you_sure: "您确定要删除这个视图？"
-      aspect_not_empty: "此视图不是空的"
+      are_you_sure: "您确定要删除这个分组？"
+      aspect_not_empty: "此分组不是空的"
       remove: "删除"
     index:
-      handle_explanation: "这是您的 diaspora 帐号， 就像是邮箱一样，你可以把它提供给想好友您的人。"
+      cubbies:
+        explanation: "Cubbi.es 是 Diaspora 的第一个应用，目前正在开发。"
+        heading: "与 Cubbi.es 连接"
+        learn_more: "进一步了解。"
+      diaspora_id:
+        content_1: "您的 Diaspora 通行证是："
+        content_2: "把它告诉其他人，让他们可以在 Diaspora 找到您。"
+        heading: "Diaspora 通行证"
+      donate: "捐助"
+      handle_explanation: "这是您的 Diaspora 帐号， 就像是邮箱一样，您可以把它提供给想添加您为好友的人。"
       help:
-        here_to_help: "Diaspora community is here to help!"
+        do_you: "您是否："
+        email_feedback: "也可以来 %{link} 发表您的意见"
+        email_link: "寄信"
+        feature_suggestion: "...想建议 %{link}?"
+        find_a_bug: "...找到一只 %{link}？"
+        have_a_question: "...有 %{link} ？"
+        here_to_help: "Diaspora 社区很高兴帮助您！"
         need_help: "需要帮助吗？"
         tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
-      no_contacts: "没有任何好友"
-      no_tags: "No tags"
+        tag_feature: "#特色"
+        tag_question: "#问题"
+        tutorials_wiki_and_forum: "%{tutorial} 和 %{wiki} 和 %{forum}：社区运作的入门，指南和新闻网站"
+      introduce_yourself: "这是您的动态。介绍一下自己吧！"
+      keep_diaspora_running: "每月捐赠让 Diaspora 开发更快速！"
+      keep_pod_running: "让 %{pod} 高速运转，需要您的每月捐助，供应服务器的耗材！"
+      new_here:
+        follow: "关注 %{link} 。欢迎新用户！"
+        learn_more: "了解更多"
+        title: "欢迎新用户！"
+      no_contacts: "尚未添加好友"
+      no_tags: "+ 寻找并关注一个标签"
       people_sharing_with_you: "与您分享的人"
       post_a_message: "发布站内信>>"
-      welcome_to_diaspora: "%{name}，欢迎加入Diaspora!"
-    many: "%{count}个视图"
+      services:
+        content: "您可以将以下服务连接至 Diaspora："
+        heading: "连接服务"
+      unfollow_tag: "取消关注 #%{tag}"
+      welcome_to_diaspora: "%{name}，欢迎加入 Diaspora!"
+    many: "%{count} 个分组"
     move_contact:
       error: "好友移动错误：%{inspect}"
-      failure: "%{inspect}没有成功"
-      success: "好友成功添加到新视图"
+      failure: "%{inspect} 失败"
+      success: "好友成功添加到新分组"
     new:
       create: "创建"
       name: "名字"
     no_contacts_message:
-      try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
+      community_spotlight: "社区热点"
+      or_spotlight: "或者您也可以和 %{link} 分享内容"
+      try_adding_some_more_contacts: "您可以在顶端搜索，或者在右侧邀请更多好友。"
+      you_should_add_some_more_contacts: "添加更多好友！"
     no_posts_message:
-      start_talking: "还没人发布过内容。你发布第一条吧！"
-    one: "1个视图"
-    other: "%{count}个视图"
+      start_talking: "还没人发布过内容。您发布第一条吧！"
+    one: "1个分组"
+    other: "%{count} 个分组"
     seed:
+      acquaintances: "熟人"
       family: "家人"
-      friends: "好友"
+      friends: "朋友"
       work: "同事"
+    selected_contacts:
+      manage_your_aspects: "管理您的分组"
+      no_contacts: "您没有选择任何联系人。"
+      view_all_community_spotlight: "查看所有热点"
+      view_all_contacts: "查看所有好友"
     show:
-      edit_aspect: "编辑视图"
-    two: "%{count} aspects"
+      edit_aspect: "编辑分组"
+    two: "%{count} 个分组"
     update:
-      failure: "视图 %{name} 名称太长了，不能保存"
-      success: "视图 %{name} 编辑成功。"
-    zero: "没有视图"
+      failure: "分组 %{name} 名称太长了，不能保存"
+      success: "分组 %{name} 编辑成功。"
+    zero: "尚未添加分组"
+  authorizations:
+    index:
+      no_applications: "尚未注册任何应用。"
+      revoke_access: "取消权限"
+    new:
+      authorize: "授权"
+      cubbies_will: "Cubbies 将可以以您的身份发布照片"
+      nope: "不"
   back: "后退"
+  blocks:
+    create:
+      failure: "无法忽略用户。#借口"
+      success: "您不会再在动态中看到此用户了。#安静！"
+    destroy:
+      failure: "无法停止忽略用户。#借口"
+      success: "看看他们说什么！#打招呼"
   bookmarklet:
-    explanation: "%{link} 收藏这个链接，即可随时发布新内容"
-    heading: "Diaspora Bookmarklet"
-    post_something: "发布些新内容到Diaspora"
-    post_success: "发布完成！关闭中！"
+    explanation: "收藏<a href='%{link}'>这个链接</a>，即可随时发布新内容"
+    heading: "Diaspora 收藏夹"
+    post_something: "发布新内容到 Diaspora"
+    post_success: "发布完成！关闭中。"
   cancel: "取消"
   comments:
-    few: "%{count}条回复"
-    many: "%{count}条回复"
+    few: "%{count} 条回复"
+    many: "%{count} 条回复"
     new_comment:
-      comment: "发布回复"
-      commenting: "回复发布中……"
+      comment: "回复"
+      commenting: "回复中……"
     one: "1条回复"
-    other: "%{count}条回应"
-    two: "%{count} comments"
-    zero: "没有回复"
+    other: "%{count} 条回复"
+    two: "%{count} 条回复"
+    zero: "暂无回复"
   contacts:
     create:
       failure: "添加好友失败"
-    few: "%{count}个好友"
+    few: "%{count} 个好友"
     index:
-      add_to_aspect: "Add contacts to %{name}"
-      no_contacts: "No contacts."
-    many: "%{count}个好友"
-    one: "1个好友"
-    other: "%{count}个好友"
+      add_a_new_aspect: "加入新分组"
+      add_to_aspect: "将好友添加到 %{name}"
+      add_to_aspect_link: "添加好友至 %{name}"
+      all_contacts: "所有好友"
+      community_spotlight: "社区热点"
+      many_people_are_you_sure: "您确定要和 %{suggested_limit} 个好友对话？发布内容可能是更好的方式。"
+      my_contacts: "我的好友"
+      no_contacts: "尚未添加好友"
+      no_contacts_message: "来看看 %{community_spotlight}"
+      no_contacts_message_with_aspect: "来看看 %{community_spotlight} 或者 %{add_to_aspect_link}"
+      only_sharing_with_me: "和我分享内容的人"
+      remove_person_from_aspect: "将 %{person_name} 从 %{aspect_name} 中移除"
+      start_a_conversation: "开始对话"
+      title: "好友"
+      your_contacts: "您的好友"
+    many: "%{count} 个好友"
+    one: "1 个好友"
+    other: "%{count} 个好友"
     sharing:
       people_sharing: "与您分享的人："
-    two: "%{count} contacts"
-    zero: "没有好友"
+    spotlight:
+      community_spotlight: "社区热点"
+    two: "%{count} 个好友"
+    zero: "尚未添加好友"
   conversations:
     create:
+      fail: "无效的信息"
       sent: "消息发送成功"
     destroy:
       success: "消息移除成功"
@@ -161,23 +285,28 @@ zh-CN:
         few: "%{count}条新消息"
         many: "%{count}条新消息"
         one: "1条新消息"
-        other: "%{count}条新消息"
+        other: "%{count} 条新消息"
         two: "%{count} new messages"
-        zero: "没有新消息"
+        zero: "暂无新消息"
     index:
-      create_a_new_message: "发送一条新消息"
+      create_a_new_message: "发送消息"
       inbox: "收件箱"
       message_inbox: "消息收件箱"
       new_message: "新消息"
       no_conversation_selected: "未选择任何对话"
       no_messages: "没消息"
     new:
+      abandon_changes: "放弃当前修改？"
       send: "发送"
+      sending: "发送中..."
       subject: "主题"
       to: "收件人"
+    new_message:
+      fail: "无效的信息"
     show:
       delete: "删除并中止对话"
       reply: "回复"
+      replying: "回复中..."
   date:
     formats:
       birthday: "%m-%d"
@@ -189,25 +318,39 @@ zh-CN:
     helper:
       correct_the_following_errors_and_try_again: "修正以下错误后重试。"
       invalid_fields: "无效栏目"
-  fill_me_out: "填写我"
-  find_people: "Find people"
+    login_try_again: "请<a href='%{login_link}'>登入</a>后重试"
+    post_not_public: "您查看的内容没有公开"
+  fill_me_out: "补全信息"
+  find_people: "找人或#标签"
   hide: "隐藏"
+  invitation_codes:
+    excited: "%{name} 很高兴见到您。"
   invitations:
+    a_facebook_user: "Facebook 用户"
     check_token:
       not_found: "找不到该邀请码"
     create:
-      already_contacts: "你已经将他加为好友了"
-      already_sent: "你邀请过这个人了。"
-      no_more: "你没有邀请函了。"
+      already_contacts: "您已经将其加为好友了"
+      already_sent: "您已经邀请过这个人了。"
+      no_more: "您暂无邀请函。"
       own_address: "您不能发送邀请给自己。"
       rejected: "下列电子信箱有问题: "
       sent: "邀请函已经寄给: "
+    edit:
+      accept_your_invitation: "接受邀请"
+      your_account_awaits: "您的帐号在等待您！"
     new:
       already_invited: "已邀请过"
-      aspect: "视图"
-      if_they_accept_info: "如果他们接受，就会自动被加入到您所邀请的视图中。"
-      invite_someone_to_join: "邀请好友来加入到Diaspora！"
+      aspect: "分组"
+      check_out_diaspora: "来 Diaspora 看看吧！"
+      codes_left:
+        other: "还可以邀请 %{count} 人"
+        zero: "您已没有邀请函"
+      comma_separated_plz: "可以通过逗号分割输入多个电子邮箱"
+      if_they_accept_info: "如果他们接受，就会自动被加入到您所邀请的分组中。"
+      invite_someone_to_join: "邀请好友加入 Diaspora！"
       language: "语言"
+      paste_link: "将这个链接分享给您的朋友，邀请他们加入 Diaspora*，或者直接用电子邮件发送给他们。"
       personal_message: "个人信息"
       resend: "重寄"
       send_an_invitation: "发送邀请函"
@@ -217,10 +360,11 @@ zh-CN:
     application:
       back_to_top: "回到上面"
       powered_by: "Powered by DIASPORA*"
-      public_feed: "%{name} çš„ Diaspora RSS Feed"
-      toggle: "切换为手机网页"
-      whats_new: "有什么新内容？"
-      your_aspects: "您的视图"
+      public_feed: "%{name} 的 Diaspora RSS 订阅"
+      source_package: "下载源代码包"
+      toggle: "切换到手机版"
+      whats_new: "有什么新鲜事？"
+      your_aspects: "您的分组"
     header:
       admin: "管理员"
       blog: "博客"
@@ -228,30 +372,33 @@ zh-CN:
       login: "登录"
       logout: "登出"
       profile: "个人档案"
+      recent_notifications: "新通知"
       settings: "设置"
+      view_all: "查看所有"
   likes:
     likes:
       people_dislike_this:
         few: "有%{count}人觉得不好"
         many: "有%{count}人觉得不好"
         one: "有1个人觉得不好"
-        other: "有%{count}个人觉得不好"
+        other: "%{count} 个差"
         two: "%{count} dislikes"
-        zero: "没有人觉得不好"
+        zero: "æš‚æ— å·®"
       people_like_this:
         few: "有%{count}个人觉得好"
         many: "有%{count}个人觉得好"
         one: "有1个人觉得好"
-        other: "有%{count}个人觉得好"
+        other: "%{count} 个赞"
         two: "%{count} likes"
-        zero: "没有人觉得好"
+        zero: "暂无赞"
       people_like_this_comment:
         few: "%{count} likes"
         many: "%{count} likes"
         one: "%{count} like"
-        other: "%{count} likes"
+        other: "%{count} 个赞"
         two: "%{count} likes"
-        zero: "no likes"
+        zero: "暂无赞"
+  limited: "限制"
   more: "更多"
   next: "下一步"
   no_results: "没有找到符合条件的内容"
@@ -260,174 +407,217 @@ zh-CN:
       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}."
+      other: "%{actors} 也对 %{post_author} 的 %{post_link} 发表了评论。"
       two: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      zero: "%{actors} 也对 %{post_author} 的 %{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."
+      other: "%{actors} 对一个已被删除的内容发表了评论。"
       two: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      zero: "%{actors} 对一个已被删除的内容发表了评论。"
     comment_on_post:
       few: "%{actors} commented on your %{post_link}."
       many: "%{actors} commented on your %{post_link}."
       one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
+      other: "%{actors} 回复了您的 %{post_link}。"
       two: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      zero: "%{actors} 回复了您的 %{post_link}。"
     helper:
       new_notifications:
         few: "%{count}个新消息"
         many: "%{count}个新消息"
         one: "1个新消息"
-        other: "%{count}个新消息"
+        other: "%{count} 个新消息"
         two: "%{count} new notifications"
-        zero: "没有新消息"
+        zero: "暂无新消息"
     index:
       and: "和"
       and_others:
         few: "and %{count} others"
         many: "and %{count} others"
         one: "and one more"
-        other: "and %{count} others"
+        other: "和另 %{count} 人"
         two: "and %{count} others"
-        zero: "and nobody else"
+        zero: "一人"
       mark_all_as_read: "全部标示为已读"
+      mark_unread: "标记为未读"
       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}."
+      other: "%{actors} 刚刚赞了您的 %{post_link}."
       two: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      zero: "%{actors} 刚刚赞了您的 %{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."
+      other: "%{actors} 赞了您已删除的内容。"
       two: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      zero: "%{actors} 赞了您已删除的内容。"
     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}."
+      other: "%{actors} 在 %{post_link} 中提到了您。"
       two: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      zero: "%{actors} 在 %{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."
+      other: "%{actors} 在已删除的内容中提到了您。"
       two: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
+      zero: "%{actors} 在已删除的内容中提到了您。"
     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."
+      other: "%{actors} 向您发了一条信息。"
       two: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      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}."
+      other: "%{actors} 转发了您的 %{post_link}."
       two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} has reshared your %{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."
+      other: "%{actors} 转发了您已删除的内容。"
       two: "%{actors} reshared your deleted post."
-      zero: "%{actors} reshared your deleted post."
+      zero: "%{actors} 转发了您已删除的内容。"
     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."
+      other: "%{actors} 开始与您分享内容。"
       two: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      zero: "%{actors} 开始与您分享内容。"
   notifier:
+    a_post_you_shared: "一篇内容。"
+    accept_invite: "接受 Diaspora* 的邀请吧！"
+    click_here: "点这里"
+    comment_on_post:
+      reply: "回复或查看 %{name} 的内容"
     confirm_email:
-      click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
-      subject: "Please activate your new e-mail address %{unconfirmed_email}"
+      click_link: "请点击以下链接激活您的电子邮箱地址 %{unconfirmed_email} ："
+      subject: "请激活您的电子邮箱地址 %{unconfirmed_email}"
+    email_sent_by_diaspora: "这封电子邮件是由 %{pod_name} 寄出的。如果您不希望收到此类邮件，"
     hello: "您好 %{name}！"
+    invite:
+      message: |-
+          您好！
+
+          您被邀请加入 Diaspora* 了
+
+          请点击这个链接开始使用
+
+          [%{invite_url}][1]
+
+          祝您好运！
+
+          Diaspora* 电子邮件机器人敬上。
+
+          [1]: %{invite_url}
+    invited_you: "%{name} 邀请您使用 Diaspora*"
     liked:
-      liked: "%{name}刚说喜欢您发布的内容："
+      liked: "%{name} 刚赞了您发布的内容："
+      view_post: "查看内容 >"
     mentioned:
       mentioned: "在 Diaspora* 发布的内容中提到了您："
       subject: "%{name} 在 Diaspora* 上发布的内容中提到了您"
+    private_message:
+      reply_to_or_view: "回复或查看对话 >"
     reshared:
-      reshared: "%{name} just reshared your post"
+      reshared: "%{name} 转发了您的内容。"
+      view_post: "查看内容 >"
     single_admin:
       admin: "为您服务的 Diaspora 管理员"
       subject: "关于您 Diaspora 帐号的信息:"
     started_sharing:
-      sharing: "刚开始与您分享！"
-      subject: "%{name}刚开始在Diaspora*与您分享"
+      sharing: "刚开始与您分享内容！"
+      subject: "%{name} 刚开始在 Diaspora* 中与您分享内容"
+      view_profile: "看 %{name} 的个人资料"
     thanks: "谢谢，"
+    to_change_your_notification_settings: "来修改消息通知的设置"
+  nsfw: "NSFW(工作不宜)"
   ok: "确定"
   or: "或"
   password: "密码"
   password_confirmation: "密码确认"
   people:
+    add_contact:
+      invited_by: "邀请您的用户"
     add_contact_small:
-      add_contact_from_tag: "从标签添加好友"
+      add_contact_from_tag: "通过标签添加好友"
     aspect_list:
-      edit_membership: "编辑所属视图"
-    few: "%{count}个好友"
+      edit_membership: "编辑所属分组"
+    few: "%{count} 个好友"
     helper:
       people_on_pod_are_aware_of: " Pod上已知的人"
-      results_for: " %{params}的搜索结果"
+      results_for: " %{params} 的搜索结果"
     index:
-      couldnt_find_them_send_invite: "找不到他们？邀请他们加入Diaspora吧！"
-      no_one_found: "……找不到任何内容。"
+      couldnt_find_them_send_invite: "找不到他们？邀请加入 Diaspora 吧！"
+      looking_for: "在找标记为 %{tag_link} 的内容吗？"
+      no_one_found: "找不到相关内容。"
       no_results: "嘿！ 搜索必须要有目标呀。"
       results_for: "搜索结果："
-    many: "%{count}个好友"
-    one: "1个好友"
-    other: "%{count}个好友"
+      searching: "搜索中，请稍候…"
+    last_post: "最新内容"
+    many: "%{count} 个好友"
+    one: "1 个好友"
+    other: "%{count} 个好友"
     person:
       add_contact: "加为好友"
       already_connected: "已加为好友"
       pending_request: "请求等候中"
-      thats_you: "这是你自己！"
+      thats_you: "这是您自己！"
     profile_sidebar:
       bio: "自我介绍"
       born: "生日"
       edit_my_profile: "编辑我的个人档案"
       gender: "性别"
-      in_aspects: "所属视图"
+      in_aspects: "所属分组"
       location: "位置"
       remove_contact: "解除好友关系"
       remove_from: "要从 %{aspect} 删除 %{name} 吗？"
     show:
+      closed_account: "此帐号已经关闭"
       does_not_exist: "好友不存在！"
+      has_not_shared_with_you_yet: "%{name} 暂未和您分享内容！"
+      ignoring: "您忽略了 %{name} 的所有内容"
       incoming_request: "%{name} 希望能与您分享"
       mention: "提及"
       message: "消息"
-      not_connected: "你没有与他分享"
+      not_connected: "您没有与他分享内容"
       recent_posts: "最近的内容"
       recent_public_posts: "最近的公开内容"
-      return_to_aspects: "回到您的视图主页"
+      return_to_aspects: "回到您的分组主页"
       see_all: "查看全部"
       start_sharing: "开始分享"
       to_accept_or_ignore: "接受或忽略它。"
-    two: "%{count} people"
+    sub_header:
+      add_some: "加入一些"
+      edit: "编辑"
+      you_have_no_tags: "您没有任何标签！"
+    two: "%{count} 个好友"
     webfinger:
       fail: "抱歉，找不到 %{handle}。"
-    zero: "没有联络人"
+    zero: "暂无好友"
   photos:
+    comment_email_subject: "%{name} 的相片"
     create:
-      integrity_error: "照片上传失败。你确定它是图片吗？"
-      runtime_error: "照片上传失败。你确定有扣安全带吗？"
-      type_error: "照片上传失败。你确定有选择任何图片吗？"
+      integrity_error: "照片上传失败。您确定它是图片吗？"
+      runtime_error: "照片上传失败。您确定有扣安全带吗？"
+      type_error: "照片上传失败。您确定有选择任何图片吗？"
     destroy:
       notice: "照片删除成功。"
     edit:
@@ -438,9 +628,10 @@ zh-CN:
       post_it: "发布！"
     new_photo:
       empty: "文件 {file} 是空的，请重新选择文件，并且不要选中它。"
-      invalid_ext: "不支持文件 {file} 的格式。只接受{extensions}。"
+      invalid_ext: "不支持文件 {file} 的格式。只接受 {extensions}。"
       size_error: "文件 {file} 太大了，上限是 {sizeLimit}。"
     new_profile_photo:
+      or_select_one_existing: "或从您现有的 %{photos} 中挑选一张"
       upload: "上传新的头像！"
     photo:
       view_all: "查看 %{name} 所有的照片"
@@ -450,29 +641,39 @@ zh-CN:
       edit: "编辑"
       edit_delete_photo: "编辑照片描述或删除照片"
       make_profile_photo: "选为个人头像"
+      show_original_post: "显示原文"
       update_photo: "更新照片"
     update:
       error: "照片更新失败。"
       notice: "照片更新成功。"
   posts:
+    presenter:
+      title: "来自 %{name} 的内容"
     show:
       destroy: "删除"
+      not_found: "抱歉，找不到该内容。"
+      permalink: "永久连接"
       photos_by:
         few: "%{count} photos by %{author}"
         many: "%{count} photos by %{author}"
         one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
+        other: "%{author} 的 %{count} 张照片"
         two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        zero: "暂无来自 %{author} 的照片"
+      reshare_by: "%{author} 转发"
   previous: "上一步"
+  privacy: "隐私"
+  privacy_policy: "隐私政策"
   profile: "个人档案"
   profiles:
     edit:
-      allow_search: "允许别人在 Diaspora* 中搜索到你"
+      allow_search: "允许别人在 Diaspora* 中搜索到您"
       edit_profile: "编辑个人档案"
       first_name: "名"
       last_name: "姓"
       update_profile: "更新个人档案"
+      you_are_nsfw: "您将自己标记为 NSFW(工作不宜)，过滤争议内容的人将不会看到您的内容。"
+      you_are_safe_for_work: "您取消了 NSFW(工作不宜) 标记，表示您发布的内容符合社群共识。"
       your_bio: "您的自我介绍"
       your_birthday: "您的生日"
       your_gender: "您的性别"
@@ -481,42 +682,52 @@ zh-CN:
       your_photo: "您的照片"
       your_private_profile: "您的私人档案"
       your_public_profile: "您的公开档案"
-      your_tags: "你: 可以有5个“#标签”"
+      your_tags: "用五个#标签 描述您自己"
       your_tags_placeholder: "比如 #diaspora #烫发 #猫咪 #音乐"
     update:
       failed: "个人档案更新失败"
       updated: "个人档案更新成功"
+  public: "公开"
   reactions:
     few: "%{count} reactions"
     many: "%{count} reactions"
     one: "1 reaction"
-    other: "%{count} reactions"
+    other: "%{count} 个回应"
     two: "%{count} reactions"
-    zero: "0 reactions"
+    zero: "0 个回应"
   registrations:
-    closed: "本 Diaspora pod 不开放注册。"
+    closed: "此 Diaspora pod 不开放注册。"
     create:
-      success: "你已成功加入 Diaspora 了！"
+      success: "您已成功加入 Diaspora 了！"
     edit:
-      cancel_my_account: "取消我的帐号"
+      cancel_my_account: "关闭我的帐号"
       edit: "编辑 %{name}"
-      leave_blank: "(不想变更时请留空)"
-      password_to_confirm: "(我们需要您现在的密码以确认您要变更)"
+      leave_blank: "(不想修改请留空)"
+      password_to_confirm: "(我们需要您现在的密码以确认您要修改)"
       unhappy: "不满意？"
       update: "æ›´æ–°"
+    invalid_invite: "您提供的邀请链接已失效"
     new:
-      create_my_account: "Create my account"
+      continue: "继续"
+      create_my_account: "创建我的帐号"
+      diaspora: "爱你的 Diaspora*"
+      email: "电子邮箱"
       enter_email: "输入电子邮箱"
-      enter_password: "输入密码"
+      enter_password: "输入密码（至少6个字符）"
       enter_password_again: "再输入一遍密码"
-      enter_username: "选个帐号称(名称只能包含字母,数字和下划线“_”)"
-      sign_up_message: "Social Networking with a <3"
+      enter_username: "输入用户名(名称只能包含字母，数字和下划线“_”)"
+      hey_make: "嘿，<br/>做点<br/>什么吧！"
+      join_the_movement: "参加此行动"
+      password: "密码"
+      sign_up: "注册"
+      sign_up_message: "有 <3 的社交网络"
+      username: "用户名"
   requests:
     create:
       sending: "发送中"
-      sent: "您已经请求与 %{name} 分享。他们下次登入 Diaspora 时就会看见您的请求。"
+      sent: "您已经请求与 %{name} 分享内容。他们下次登入 Diaspora 时就会看见您的请求。"
     destroy:
-      error: "请选择一个视图！"
+      error: "请选择一个分组！"
       ignore: "忽略建立好友的请求。"
       success: "你们现在互相分享了。"
     helper:
@@ -526,198 +737,320 @@ zh-CN:
         one: "新的请求！"
         other: "%{count}个新请求！"
         two: "%{count} new requests!"
-        zero: "没有新请求"
+        zero: "暂无新请求"
     manage_aspect_contacts:
       existing: "当前好友"
       manage_within: "管理好友："
     new_request_to_person:
       sent: "发送成功！"
   reshares:
+    comment_email_subject: "%{resharer} 转发了 %{author} 的内容"
+    create:
+      failure: "转发时错误"
     reshare:
+      deleted: "原内容已被作者删除"
       reshare:
         few: "%{count} Reshares"
         many: "%{count} Reshares"
         one: "1 Reshare"
-        other: "%{count} Reshares"
+        other: "%{count}个转发"
         two: "%{count} reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      reshare_original: "Reshare orignial"
-      show_original: "Show Original"
+        zero: "转发"
+      reshare_confirmation: "您要转发 %{author} 的内容吗？"
+      reshare_original: "转发原文"
+      reshared_via: "转发自"
+      show_original: "显示原文"
   search: "搜索"
   services:
     create:
+      already_authorized: "已经有 Diaspora 通行证为 %{diaspora_id} 的用户被授权使用 %{service_name} 帐号了"
+      failure: "认证失败"
       success: "验证成功。"
     destroy:
       success: "验证删除成功。"
     failure:
       error: "与该服务连接时有错误"
+    finder:
+      fetching_contacts: "Diaspora 正在获取您在 %{service} 的好友列表，请几分钟后再来查看。"
+      no_friends: "没有 Facebook 好友"
+      service_friends: "%{service} 好友"
     index:
-      connect_to_facebook: "与 facebook 连接"
-      connect_to_twitter: "与 twitter 连接"
+      connect_to_facebook: "与 Facebook 连接"
+      connect_to_tumblr: "与 Tumblr 连接"
+      connect_to_twitter: "与 Twitter 连接"
       disconnect: "断开连接"
       edit_services: "编辑服务"
       logged_in_as: "登录为"
+      no_services: "您尚未和任何服务连接"
       really_disconnect: "切断与 %{service} 的连接？"
     inviter:
       click_link_to_accept_invitation: "点击这个链接以接受邀请"
       join_me_on_diaspora: "跟我一起加入 DIASPORA*"
     remote_friend:
       invite: "邀请"
+      not_on_diaspora: "不在 Diaspora 中"
       resend: "重新发送"
   settings: "设置"
+  share_visibilites:
+    update:
+      post_hidden_and_muted: "%{name} 的内容已经隐藏，也不会出现和其相关的通知。"
+      see_it_on_their_profile: "如果您希望看到此内容的更新，请查看 %{name} 的个人页面。"
   shared:
     add_contact:
-      create_request: "用 Diaspora 帐号搜索"
+      add_new_contact: "加入新好友"
+      create_request: "通过 Diaspora 帐号搜索"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "输入 Diaspora 帐号："
-      know_email: "知道他们的电子信箱吗？ 你可以邀请他们加入。"
+      know_email: "知道他们的电子信箱吗？ 您可以邀请他们加入。"
       your_diaspora_username_is: "您的 Diaspora 帐号是: %{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"
+        other: "在 %{count} 个分组中"
         two: "In %{count} aspects"
-        zero: "Add to aspect"
+        zero: "添加到分组"
     contact_list:
       all_contacts: "全部好友"
     footer:
       logged_in_as: "已用 %{name} 登录"
-      your_aspects: "您的视图"
+      your_aspects: "您的分组"
     invitations:
       by_email: "通过电子邮件"
-      dont_have_now: "目前你还不能邀请任何人，但很快就可以了！"
+      dont_have_now: "目前您还不能邀请任何人，但很快就可以了！"
       from_facebook: "从 Facebook"
-      invitations_left: "(剩余%{count}张)"
+      invitations_left: "(剩余 %{count} 张)"
       invite_someone: "邀请别人"
       invite_your_friends: "邀请您的好友"
       invites: "邀请"
-      invites_closed: "目前本 Diaspora pod 不开放邀请功能"
+      invites_closed: "目前此 Diaspora pod 不开放邀请功能"
+      share_this: "用这个链接来分享在电子邮件，博客或其他您喜爱的社交网络上！"
     notification:
       new: "%{from} 有新的 %{type}"
     public_explain:
+      atom_feed: "Atom 订阅"
+      control_your_audience: "控制您的听众"
       logged_in: "成功登录到 %{service}"
       manage: "管理已连线的服务"
+      new_user_welcome_message: "用 #标签 来区分您的内容，并找到和您有共同兴趣的人。用 @提到 别人。"
       outside: "不使用 Diaspora 的人也能看到公开讯息。"
       share: "分享"
       title: "设定连线服务"
+      visibility_dropdown: "用这个下拉菜单来改变内容的可见范围。  （建议您的第一篇内容为公开）"
     publisher:
       all: "全部"
       all_contacts: "全部的好友"
+      discard_post: "丢弃内容"
       make_public: "公开"
       new_user_prefill:
-        i_like: "I'm interested in %{tags}."
-      post_a_message_to: "在 %{aspect} 发布讯息"
+        hello: "大家好，我是 #%{new_user_tag}。 "
+        i_like: "我对 %{tags} 感兴趣。 "
+        invited_by: "谢谢您的邀请， "
+        newhere: "新用户"
+      post_a_message_to: "在 %{aspect} 发布信息"
       posting: "发布中……"
       publishing_to: "发布至："
       share: "分享"
       share_with: "与他分享："
       upload_photos: "上载照片"
-      whats_on_your_mind: "你想到了什么？"
+      whats_on_your_mind: "您想到了什么？"
     reshare:
       reshare: "重新分享"
     stream_element:
-      dislike: "不喜欢"
-      hide_and_mute: "Hide and Mute"
-      like: "喜欢"
-      unlike: "不喜欢"
+      connect_to_comment: "请和作者建立联系，以对其内容评论"
+      currently_unavailable: "目前无法发表评论"
+      dislike: "å·®"
+      hide_and_mute: "隐藏"
+      ignore_user: "忽略 %{name}"
+      ignore_user_description: "是否忽略此用户，并将其从所有分组中删除？"
+      like: "赞"
+      nsfw: "这篇内容被作者标记为 NSFW(工作不宜）。%{link}"
+      shared_with: "与 %{aspect_names} 分享"
+      show: "显示"
+      unlike: "å·®"
       via: "通过 %{link}"
+      via_mobile: "通过移动设备"
+      viewable_to_anyone: "任何互联网用户都能看到这篇内容"
   status_messages:
     create:
       success: "成功推荐了: %{names}"
     destroy:
       failure: "删除内容失败"
     helper:
-      no_message_to_display: "没有信息可显示。"
+      no_message_to_display: "暂无信息可显示。"
     new:
       mentioning: "提及发布中: %{person}"
     too_long:
       few: "请确认您的状态信息不超过%{count}个字符"
       many: "请确认您的状态信息不超过%{count}个字符"
       one: "请确认您的状态信息不超过%{count}个字符"
-      other: "请确认您的状态信息不超过%{count}个字符"
+      other: "请确保您的状态信息不超过 %{count} 个字符"
       two: "please make your status messages less than %{count} characters"
-      zero: "请确认您的状态信息不超过%{count}个字符"
+      zero: "请确保您的状态信息不超过 %{count} 个字符"
   stream_helper:
     hide_comments: "隐藏评论"
     show_comments:
       few: "Show %{count} more comments"
       many: "Show %{count} more comments"
       one: "Show one more comment"
-      other: "Show %{count} more comments"
+      other: "还有 %{count} 条评论"
       two: "Show two more comments"
-      zero: "No more comments"
+      zero: "无更多评论"
   streams:
+    activity:
+      title: "我的活动"
     aspects:
-      title: "Your Aspects"
+      title: "我的视窗"
+    aspects_stream: "分组"
+    comment_stream:
+      contacts_title: "您评论过的内容作者"
+      title: "有评论的内容"
+    community_spotlight_stream: "社区热点"
+    followed_tag:
+      add_a_tag: "新增标签"
+      contacts_title: "这个标签的粉丝"
+      follow: "关注"
+      title: "#关注的标签"
+    followed_tags_stream: "#关注的标签"
+    like_stream:
+      contacts_title: "您赞的帖文作者"
+      title: "赞的动态"
+    mentioned_stream: "@提到的"
     mentions:
-      title: "Your Mentions"
+      contacts_title: "提到您的人"
+      title: "@提到的"
+    multi:
+      contacts_title: "出现在动态中的人"
+      title: "动态"
+    public:
+      contacts_title: "最新发布者"
+      title: "公开活动"
     tags:
-      contacts_title: "People who dig these tags"
+      contacts_title: "这个标签的粉丝"
+      tag_prefill_text: "关于 %{tag_name} 的事情是… "
+      title: "有以下标签的内容：%{tags}"
   tag_followings:
     create:
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "无法关注 #%{name}"
+      none: "不能关注空白标签！"
+      success: "已关注 #%{name}"
     destroy:
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "无法取消对 #%{name} 的关注"
+      success: "已经取消对 #%{name} 的关注"
   tags:
     show:
-      nobody_talking: "尚还没有人在讨论 %{tag}。"
+      follow: "关注 #%{tag}"
+      followed_by: "关注者："
+      following: "正在关注 #%{tag}"
+      nobody_talking: "还没有人在讨论 %{tag}。"
+      none: "不存在空白标签！"
       people_tagged_with: "标记为 %{tag} 的人"
       posts_tagged_with: "标记为 #%{tag} 的内容"
+      stop_following: "停止关注 #%{tag}"
+  terms_and_conditions: "服务条款与细则"
   tokens:
     show:
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
+      connect_to_cubbies: "与 Cubbi.es 连接"
+      connecting_is_simple: "与 Diaspora 帐号连接很简单，您只需要在 (<b>%{diaspora_id}</b>) Cubbi.es <a href='%{href_link}'>帐号页面</a>填写两个信息。"
+      daniels_account: "Daniel 的 Diaspora 帐号"
+      love_to_try: "希望您能一试。"
+      making_the_connection: "建立连接"
+      screenshot_explanation: "%{link1}。这个cubby页面链接至%{link2}。"
+      sign_up_today: "现在就注册！"
+      typical_userpage: "典型的 Cubbi.es 个人页面"
+      via: "（通过 %{link}）"
+      what_is_cubbies: "Cubbi.es 是 Diaspora 的第一个应用，它是收集在线照片的最佳方式。"
   undo: "撤消？"
   username: "帐号"
   users:
     confirm_email:
-      email_confirmed: "E-Mail %{email} activated"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
+      email_confirmed: "电子邮箱地址 %{email} 已激活"
+      email_not_confirmed: "电子邮箱地址无法激活。链接错误？"
+    destroy:
+      no_password: "请输入您目前的密码关闭帐号。"
+      success: "您的帐号已经锁定。完成关闭大约需要 20 分钟的时间。感谢您使用 Diaspora。"
+      wrong_password: "输入的密码与您的密码不符。"
     edit:
-      also_commented: "……当有人也对您的好友的内容发表评论时？"
-      auto_follow_back: "Automatically follow back if a someone follows you"
+      also_commented: "…当有人对您的好友的内容发表评论时？"
+      auto_follow_aspect: "自动关注的用户的分组："
+      auto_follow_back: "自动关注关注您的人"
       change: "更改"
-      change_email: "Change E-Mail"
+      change_email: "修改电子邮箱地址"
       change_language: "更改语言"
       change_password: "更改密码"
+      character_minimum_expl: "至少需要六个字符。"
       close_account:
-        what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
-      comment_on_post: "……当有人对您的内容发表评论时？"
+        dont_go: "请不要离开！"
+        if_you_want_this: "如果您真的希望如此，在下面输入您的密码，然后按“关闭帐号”"
+        lock_username: "您的用户名会被锁定，不能重新注册。"
+        locked_out: "接下来您会被退出，帐号将关闭。"
+        make_diaspora_better: "希望您能帮助我们让 Diaspora 更好，而不是选择离开。如果您坚持，我们也希望让您知道未来的发展。"
+        mr_wiggles: "Mr Wiggles 会对于您的离开很难过。"
+        no_turning_back: "现在已经不能后悔了。"
+        what_we_delete: "我们会尽快删除您发布的内容和个人资料。您的评论会保留，但没有您的个人信息。"
+      close_account_text: "关闭帐号"
+      comment_on_post: "…当有人对您的内容发表评论时？"
       current_password: "当前密码"
+      current_password_expl: "登入的那个…"
       download_photos: "下载我的照片"
       download_xml: "下载我的 xml"
       edit_account: "编辑帐号"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      email_awaiting_confirmation: "我们将向 %{unconfirmed_email} 发送一个确认邮件。在确认之前，我们将沿用 %{email} 这个联系方式。"
       export_data: "资料导出"
-      liked: "…有人喜欢您发布的内容？"
-      mentioned: "……当贴文中提到您时？"
+      following: "关注设置"
+      getting_started: "新用户设置"
+      liked: "…当有人赞您发布的内容？"
+      mentioned: "…当贴文中提到您时？"
       new_password: "新密码"
-      private_message: "……当收到私人信息时？"
+      photo_export_unavailable: "相片目前无法导出"
+      private_message: "…当收到私人信息时？"
       receive_email_notifications: "是否要在以下情况收到电子邮件通知……"
-      started_sharing: "…有人开始与您分享？"
+      reshared: "…有人转发您的内容时？"
+      show_community_spotlight: "在动态中显示社区热点？"
+      show_getting_started: "显示新手指南"
+      started_sharing: "…当有人开始与您分享内容？"
+      stream_preferences: "动态设置"
       your_email: "您的电子邮箱"
-      your_handle: "您的 diaspora 帐号"
+      your_handle: "您的 Diaspora 帐号"
     getting_started:
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      awesome_take_me_to_diaspora: "棒极了！带我去 Diaspora*"
+      community_welcome: "Diaspora 社区欢迎您的到来"
+      hashtag_explanation: "标签让您可以讨论关注您的兴趣。并且也是在 Diaspora 找到新朋友的好办法。"
+      hashtag_suggestions: "试试看关注如 #艺术，#电影, #gif 之类的标签。"
+      hooking_up_fb: "连接您的 Facebook 帐号"
+      saved: "已保存"
+      we_can_speed_things_up: "我们可以通过"
+      well_hello_there: "嗨，您好！"
+      what_are_you_in_to: "您对什么有兴趣？"
+      what_facebook_does: "让您尽快使用 Diaspora。这个步骤会获取您的姓名和照片，并开启内容分享。"
+      who_are_you: "您是哪位？"
+    privacy_settings:
+      ignored_users: "忽略的用户"
+      stop_ignoring: "停止忽略"
+      title: "隐私设置"
     public:
       does_not_exist: "不存在 %{username} 这个用户！"
     update:
       email_notifications_changed: "邮件通知更改成功"
+      follow_settings_changed: "关注设置已更新"
+      follow_settings_not_changed: "关注设置更新失败"
       language_changed: "语言更改成功"
       language_not_changed: "语言更改失败"
       password_changed: "密码更改成功"
       password_not_changed: "密码更改失败"
-      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
-      unconfirmed_email_not_changed: "E-Mail Change Failed"
+      settings_not_updated: "设置更新失败"
+      settings_updated: "设置已更新"
+      unconfirmed_email_changed: "电子邮箱地址已修改，需要激活。"
+      unconfirmed_email_not_changed: "电子邮箱地址修改失败"
   webfinger:
     fetch_failed: "获取 %{profile_url} 的 webfinger 个人档案失败"
     hcard_fetch_failed: "获取 %{account} 的 hcard 资料时发生错误"
     no_person_constructed: "从这份 hcard 资料无法组建出联络人。"
-    not_enabled: "%{account} 的主机似乎没有启用 webfinger"
+    not_enabled: "%{account} 的主机似乎暂未启用 webfinger"
     xrd_fetch_failed: "从 %{account} 这个帐号取得 xrd 时发生错误"
-  welcome: "欢迎！"
\ No newline at end of file
+  welcome: "欢迎！"
+  will_paginate:
+    next_label: "后面 &raquo;"
+    previous_label: "&laquo; 前面"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 262cbe6c09..c0db552fe0 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -83,7 +83,7 @@ nl:
       more_comments:
         few: "Toon nog <%= count %> reacties"
         many: "Toon nog <%= count %> reacties"
-        one: "Toon nog <%= count %> reacties"
+        one: "Toon nog <%= count %> reactie"
         other: "Toon nog <%= count %> reacties"
         two: "Toon nog <%= count %> reacties"
         zero: "Toon nog <%= count %> reacties"
@@ -91,9 +91,9 @@ nl:
       public: "Openbaar"
       reshare: "Doorgeven"
       reshares:
-        one: "<%= count %>x gedeeld"
-        other: "<%= count %>x gedeeld"
-        zero: "<%= count %>x gedeeld"
+        one: "<%= count %>keer opnieuw gedeeld"
+        other: "<%= count %>keer opnieuw gedeeld"
+        zero: "<%= count %>keer opnieuw gedeeld"
       show_nsfw_post: "Toon bericht"
       show_nsfw_posts: "Toon alles"
       unfollow: "Niet meer volgen"
diff --git a/config/locales/javascript/javascript.si.yml b/config/locales/javascript/javascript.si.yml
index 3b632ddfca..aa9dc9617b 100644
--- a/config/locales/javascript/javascript.si.yml
+++ b/config/locales/javascript/javascript.si.yml
@@ -63,4 +63,6 @@ si:
       unknown: "දන්නේ නැති විඩියෝ type එකක්"
       watch: "මෙම විඩියෝ එක <%= provider %> එකෙන් බලන්න"
     viewer:
-      home: "නිවස"
\ No newline at end of file
+      home: "නිවස"
+      like: "කැමතියි"
+      unlike: "අකැමතියි"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index 1d6f66f2ea..47c84a28de 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -7,76 +7,130 @@
 zh-CN:
   javascripts:
     aspect_dropdown:
-      add_to_aspect: "添加到视图"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
-      started_sharing_with: "You have started sharing with {{name}}!"
-      stopped_sharing_with: "You have stopped sharing with {{name}}."
+      add_to_aspect: "添加到分组"
+      all_aspects: "所有分组"
+      error: "无法与 <%= name %> 共享内容。您是否忽略了他们？"
+      select_aspects: "选择分组"
+      started_sharing_with: "您已开始与 <%= name %> 共享内容。"
+      stopped_sharing_with: "您已停止与 <%= name %> 共享内容。"
       toggle:
         few: "在{{count}}个视图中"
         many: "在{{count}}个视图中"
         one: "在{{count}}个视图中"
-        other: "在{{count}}个视图中"
+        other: "在 <%= count %> 个分组中"
         two: "In <%= count %> aspects"
-        zero: "添加到视图"
+        zero: "添加到分组"
+    aspect_navigation:
+      deselect_all: "清空选择"
+      no_aspects: "尚未选择任何一个分组"
+      select_all: "全选"
     comments:
       hide: "隐藏评论"
       show: "显示所有评论"
-    confirm_dialog: "你确定吗？"
-    failed_to_like: "表示喜欢失败！"
+    confirm_dialog: "您确定吗？"
+    delete: "删除"
+    failed_to_like: "赞失败"
     failed_to_post_message: "发布消息失败！"
     getting_started:
-      hey: "Hey, {{name}}!"
-      preparing_your_stream: "Preparing your personialized stream..."
+      alright_ill_wait: "以后再说"
+      hey: "您好，<%= name %>！"
+      no_tags: "嘿，您尚未关注任何标签！要下一步吗？"
+      preparing_your_stream: "正在准备您的个人消息流。"
     header:
-      search: "Find people or #tags"
+      admin: "管理"
+      close: "关闭"
+      contacts: "好友"
+      home: "首页"
+      log_out: "退出"
+      mark_all_as_read: "全部标记已读"
+      messages: "信息"
+      notifications: "提示"
+      profile: "个人资料"
+      recent_notifications: "新提示"
+      search: "搜索"
+      settings: "设置"
+      view_all: "查看所有"
+    ignore: "忽略"
     infinite_scroll:
-      no_more: "没有更多的内容了。"
+      no_more: "暂无更多的内容。"
+    my_activity: "我的活动"
+    my_stream: "动态"
+    people:
+      not_found: "找不到任何人…"
+    photo_uploader:
+      looking_good: "天啊，您太棒了！"
     publisher:
       at_least_one_aspect: "发布时请选择至少一个情景"
+      limited: "限制 - 只有您想分享的人才看得到您的内容"
+      public: "公开 - 所有人都能看到您的内容，包括搜索引擎"
     reshares:
-      duplicate: "You've already reshared that post!"
+      duplicate: "您已经转发过了。"
+      post: "要转发 <%= name %> 的内容吗？"
+      successful: "转发成功"
     search_for: "搜索 {{name}}"
     show_more: "查看更多"
     stream:
+      comment: "评论"
+      follow: "关注"
+      hide: "隐藏"
+      hide_nsfw_posts: "隐藏 #nsfw (工作不宜)的内容"
+      like: "赞"
       likes:
         few: "<%= count %> Likes"
         many: "<%= count %> Likes"
         one: "<%= count %> Like"
-        other: "<%= count %> Likes"
+        other: "<%= count %> 个赞"
         two: "<%= count %> Likes"
-        zero: "<%= count %> Likes"
+        zero: "<%= count %> 个赞"
+      limited: "限制"
       more_comments:
         few: "Show <%= count %> more comments"
         many: "Show <%= count %> more comments"
         one: "Show <%= count %> more comment"
-        other: "Show <%= count %> more comments"
+        other: "显示剩余的 <%= count %> 个评论"
         two: "Show <%= count %> more comments"
-        zero: "Show <%= count %> more comments"
+        zero: "显示剩余的 <%= count %> 个评论"
+      original_post_deleted: "原内容已被作者删除。"
+      public: "公开"
+      reshare: "转发"
       reshares:
         few: "<%= count %> Reshares"
         many: "<%= count %> Reshares"
         one: "<%= count %> Reshare"
-        other: "<%= count %> Reshares"
+        other: "<%= count %> 次转发"
         two: "<%= count %> Reshares"
-        zero: "<%= count %> Reshares"
+        zero: "<%= count %> 次转发"
+      show_nsfw_post: "显示内容"
+      show_nsfw_posts: "全部显示"
+      unfollow: "取消关注"
+      unlike: "取消赞"
     tags:
-      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+      wasnt_that_interesting: "我想 #<%= tagName %> 并不全那么有趣。"
     timeago:
-      day: "1天"
-      days: "%d天"
-      hour: "约1小时"
-      hours: "约%d小时"
-      minute: "约1分钟"
-      minutes: "%d分钟"
-      month: "约1个月"
-      months: "%d个月"
-      prefixAgo: ""
-      prefixFromNow: ""
-      seconds: "少于1分钟"
+      day: "1 天"
+      days: "%d 天"
+      hour: "约 1 小时"
+      hours: "约 %d 小时"
+      minute: "约 1 分钟"
+      minutes: "%d 分钟"
+      month: "约 1 个月"
+      months: "%d 个月"
+      prefixAgo: "在"
+      prefixFromNow: "距今"
+      seconds: "少于 1 分钟"
       suffixAgo: "前"
       suffixFromNow: "后"
-      year: "约1年"
-      years: "%då¹´"
+      year: "约 1 年"
+      years: "%d å¹´"
     videos:
       unknown: "未知视频格式"
-      watch: "在 {{provider}} 上看观看视频"
\ No newline at end of file
+      watch: "在 {{provider}} 上看观看视频"
+    viewer:
+      comment: "评论"
+      follow_post: "关注内容"
+      home: "主页"
+      like: "赞"
+      reshare: "转发"
+      reshared: "转发的"
+      stop_following_post: "停止关注内容"
+      unlike: "取消赞"
\ No newline at end of file
-- 
GitLab