updated locales

config/locales/devise/devise.nb.yml

@@ -13,30 +13,30 @@ nb:
     failure: 
       inactive: "Brukeren din er ikke aktivert ennå."
       invalid: "Ugyldig e-postadresse eller passord."
-      invalid_token: "Ugyldig authentication token."
+      invalid_token: "Ugyldig aktiveringskode."
       locked: "Brukeren din er låst."
       timeout: "Økta har løpt ut, logg inn igjen for å fortsette."
       unauthenticated: "Du må logge inn eller lage en bruker før du kan fortsette."
       unconfirmed: "Du må bekrefte brukeren din før du kan fortsette."
     invitations: 
-      invitation_token_invalid: "The invitation token provided is not valid!"
+      invitation_token_invalid: "Den oppgitte aktiveringskoden er ugyldig!"
       send_instructions: "Invitasjonen er sendt."
       updated: "Passordet ble satt vellykket. Du er nå logget inn"
     mailer: 
       confirmation_instructions: 
         confirm: "Bekreft kontoen min"
-        subject: "Confirmation instructions"
+        subject: "Bekreftelsesinstrukser"
         you_can_confirm: "Du kan bekrefte kontoen via linken nedenfor:"
       hello: "Hei %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
+        accept: "Takk ja til invitasjonen"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
+        ignore: "Hvis du ikke ønsker å godta invitasjonen, kan du se bort fra denne e-posten."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
+        no_account_till: "Brukeren din vil ikke opprettes før du besøker lenken over og registrerer deg."
-        subject: "You've been invited to join Diaspora!"
+        subject: "Du har blitt invitert til 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"
+        have_invited_you: "%{names} har invitert deg til Diaspora"
       reset_password_instructions: 
         change: "Endre passordet mitt"
         ignore: "Hvis du ikke har bedt om det, kan du overse denne e-posten."
@@ -46,7 +46,7 @@ nb:
       unlock_instructions: 
         account_locked: "Kontoen din er låst på grunn av for mange mislykkede påloggingsforsøk"
         click_to_unlock: "Klikk på linken nedenfor for å låse opp kontoen:"
-        subject: "Unlock Instructions"
+        subject: "Instrukser for å låse opp"
         unlock: "Lås opp kontoen min"
       welcome: "Velkommen %{email}!"
     passwords: 
@@ -54,7 +54,7 @@ nb:
         change_password: "Endre passordet mitt"
       new: 
         forgot_password: "Glemt passordet?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
+        no_account: "Det finnes ingen bruker med denne e-postadressen. Hvis du venter på en invitasjon, sender vi dem ut så snart vi kan."
         send_password_instructions: "Send meg instruksjoner for å tilbakestille passordet"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du tilbakestiller passordet ditt om kort tid."
       updated: "Passordet ditt er nå endra, og du har logga inn."
@@ -78,8 +78,8 @@ nb:
     shared: 
       links: 
         forgot_your_password: "Glemt passordet?"
-        receive_confirmation: "Didn't receive confirmation instructions?"
+        receive_confirmation: "Fikk du ingen bekreftelsesinstrukser?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_unlock: "Fikk du ingen instrukser for å låse opp?"
         sign_in: "Logg inn"
         sign_up: "Registrer deg"
         sign_up_closed: "Åpen påmelding er stengt."
@@ -87,7 +87,7 @@ nb:
         sign_up_for_an_invite: "Registrer deg for en invitasjon!"
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
+        resend_unlock: "Send instruksene for å låse opp på nytt"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du låser opp brukeren din om kort tid."
       unlocked: "Brukeren din er nå låst opp, og du er logga in."
   errors: 

config/locales/diaspora/bg.yml

@@ -771,7 +771,7 @@ bg:
       connect_to: "Свържете профила си с"
       connect_to_your_other_social_networks: "Свържете профила си с други социални мрежи"
       connect_with_people: "Свържете се с интересни хора"
-      connect_with_people_explanation_pt1: "Свържете се с хора поставяйки ги в един или няколко от вашите %{bold}"
+      connect_with_people_explanation_pt1: "Свържете се с хора поставяйки ги в един или няколко от вашите %{bold}."
       connect_with_people_explanation_pt2: "Групирането на контактите в аспекти ще ви позволи да споделяте/филрирате информация само с/от определена подгрупа от контактите ви."
       featured_tags: "Отличени тагове"
       featured_users: "Отличени потребители"

config/locales/diaspora/es.yml

@@ -771,7 +771,7 @@ es:
       connect_to: "Conectar a"
       connect_to_your_other_social_networks: "Conéctate a tus otras redes sociales"
       connect_with_people: "Conectate con gente interesante"
-      connect_with_people_explanation_pt1: "Comparte con gente añadiéndola en uno o más de tus %{bold}"
+      connect_with_people_explanation_pt1: "Conecta con gente colocándola en uno o más de tus %{bold}"
       connect_with_people_explanation_pt2: "Los Aspectos son una manera intuitiva de agrupar contactos nuevos o caras familiares, de forma privada, permitiéndote el filtrado o compartir cosas con subgrupos de entre tus contactos muy fácilmente."
       featured_tags: "Etiquetas ofrecidas"
       featured_users: "Usuarios ofrecidos"

config/locales/diaspora/it.yml

@@ -771,7 +771,7 @@ it:
       connect_to: "Connettiti a"
       connect_to_your_other_social_networks: "Connetti altri social network"
       connect_with_people: "Connettiti con gente speciale"
-      connect_with_people_explanation_pt1: "Stai in contatto con le persone mettendole in uno o più dei tuoi %{bold}"
+      connect_with_people_explanation_pt1: "Stai in contatto con le persone mettendole in uno o più dei tuoi %{bold}."
       connect_with_people_explanation_pt2: "Gli aspetti sono un sistema intuitivo per raggruppare vecchie e nuove conoscenze in modo riservato, così potrai filtrare o condividere i contenuti con chi vuoi e con facilità."
       featured_tags: "Tag consigliati"
       featured_users: "Utenti consigliati"

config/locales/diaspora/nb.yml

@@ -104,8 +104,8 @@ nb:
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Ingen kontakter"
       no_tags: "No tags"
-      people_sharing_with_you: "People sharing with you"
+      people_sharing_with_you: "Folk som deler med deg"
-      post_a_message: "post a message >>"
+      post_a_message: "legg ut en melding >>"
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
@@ -118,8 +118,8 @@ nb:
       failure: "fungerte ikke % {inspisere}"
       success: "Person flyttet til nytt aspekt"
     new: 
-      create: "Create"
+      create: "Opprett"
-      name: "Name"
+      name: "Navn"
     no_contacts_message: 
       featured_users: "featured users"
       or_featured: "Or you can share with %{link}"
@@ -186,7 +186,7 @@ nb:
     one: "1 kontakt"
     other: "%{count} kontakter"
     sharing: 
-      people_sharing: "People sharing with you:"
+      people_sharing: "Folk som deler med deg:"
     zero: "ingen kontakter"
   conversations: 
     create: 
@@ -256,7 +256,7 @@ nb:
       already_contacts: "Du er allerede tilknyttet denne personen"
       already_sent: "Du har allerede invitert denne personen."
       no_more: "Du har ikke flere invitasjoner."
-      own_address: "You can't send an invitation to your own address."
+      own_address: "Du kan ikke sende invitasjoner til din egen adresse."
       rejected: "Følgende e-postadresser hadde problemer:"
       sent: "Invitasjoner har blitt sendt til:"
     edit: 
@@ -281,7 +281,7 @@ nb:
       whats_new: "hva er nytt?"
       your_aspects: "dine aspekt"
     header: 
-      admin: "admin"
+      admin: "administrator"
       blog: "blogg"
       code: "kode"
       login: "logg inn"
@@ -364,7 +364,7 @@ nb:
       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}."
+      many: "%{actors} har nevnt deg i et %{post_link}."
       one: "%{actors} has mentioned you in a %{post_link}."
       other: "%{actors} has mentioned you in a %{post_link}."
       zero: "%{actors} has mentioned you in a %{post_link}."
@@ -424,7 +424,7 @@ nb:
       admin: "Din Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
-      sharing: "has started sharing with you!"
+      sharing: "har begynt å dele med deg!"
       subject: "%{name} has started sharing with you on Diaspora*"
       view_profile: "View %{name}'s profile"
     thanks: "Takk,"
@@ -440,7 +440,7 @@ nb:
       edit_membership: "endre aspektmedlemskap"
     few: "%{count} personer"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
+      people_on_pod_are_aware_of: "folk på poden snakker om"
       results_for: " resultater for %{params}"
     index: 
       couldnt_find_them_send_invite: "Finner du dem ikke? Send en invitasjon!"
@@ -474,7 +474,7 @@ nb:
       recent_posts: "Nylige Innlegg"
       recent_public_posts: "Nylige Offentlige Innlegg"
       return_to_aspects: "Tilbake til aspektene"
-      see_all: "See all"
+      see_all: "Vis alle"
       start_sharing: "begynn å dele"
       to_accept_or_ignore: "for å akseptere eller ignorere."
     sub_header: 
@@ -687,7 +687,7 @@ nb:
       dislike: "Liker ikke"
       like: "Liker"
       shared_with: "Shared with: %{aspect_names}"
-      unlike: "Unlike"
+      unlike: "Liker ikke"
       via: "via %{link}"
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
@@ -700,11 +700,11 @@ nb:
     new: 
       mentioning: "Nevner: %{person}"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
+      few: "du bør begrense statusmeldingene dine til %{count} tegn"
-      many: "please make your status messages less than %{count} characters"
+      many: "Du bør begrense statusmeldingene dine til %{count} characters"
-      one: "please make your status messages less than %{count} character"
+      one: "du bør begrense statusmeldingene dine til %{count} tegn"
-      other: "please make your status messages less than %{count} characters"
+      other: "du må gjøre statusmeldingene dine kortere enn %{count} tegn"
-      zero: "please make your status messages less than %{count} characters"
+      zero: "Statusmeldinger må være lengre enn ingenting."
   stream_helper: 
     hide_comments: "skjul kommentarer"
     show_more_comments: "Show %{number} more comments"
@@ -725,17 +725,17 @@ nb:
       stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
+      connect_to_cubbies: "Koble til Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
+      daniels_account: "Daniels Diasporabruker"
       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."
+      love_to_try: "Vi vil veldig gjerne at du skal prøve det."
       making_the_connection: "Making the Connection"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
+      screenshot_explanation: "%{link1}.  Denne cubby-en er lenket til %{link2}."
-      sign_up_today: "Sign up today!"
+      sign_up_today: "Registrer deg nå!"
-      typical_userpage: "A typical cubbi.es userpage"
+      typical_userpage: "En typisk cubbi.es brukerside"
       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."
+      what_is_cubbies: "Cubbi.es er verdens første Diasporaapplikasjon. Det er også den beste måten å samle bilder på nettet."
   undo: "Angre?"
   username: "Brukernavn"
   users: 
@@ -757,13 +757,13 @@ nb:
       edit_account: "Endre konto"
       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}."
       export_data: "Eksporter Data"
-      liked: "...someone likes your post?"
+      liked: "... noen liker innlegget ditt?"
       mentioned: " du nevnes i et innlegg?"
       new_password: "Nytt Passord"
       private_message: " du mottar en privat melding?"
       receive_email_notifications: "Motta varsler på epost når:"
       reshared: "...someone reshares your post?"
-      started_sharing: "...someone starts sharing with you?"
+      started_sharing: "... noen begynner å dele med deg?"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora brukernavn"
     getting_started: 

config/locales/diaspora/zh-TW.yml

@@ -17,7 +17,7 @@ zh-TW:
         contact: 
           attributes: 
             person_id: 
-              taken: "對此使用者必須為不重複的聯繫."
+              taken: "對此使用者必須為不重複的聯絡人."
         person: 
           attributes: 
             diaspora_handle: 
@@ -55,8 +55,8 @@ zh-TW:
       success: "從面向中移除聯絡人成功"
   aspects: 
     add_to_aspect: 
-      failure: "將聯繫加入至面向失敗."
+      failure: "將聯絡人加入至面向失敗."
-      success: "將聯繫加入至面向成功."
+      success: "將聯絡人加入至面向成功."
     aspect_contacts: 
       done_editing: "編輯完成"
     aspect_listings: 
@@ -66,21 +66,21 @@ zh-TW:
       posted: "發表的"
       recently: "最近:"
       stream: "事件流"
-    contacts_not_visible: "此面向中的聯繫無法看見彼此."
+    contacts_not_visible: "此面向中的聯絡人無法看見彼此."
-    contacts_visible: "此面向中的聯繫可以看見彼此."
+    contacts_visible: "此面向中的聯絡人可以看見彼此."
     create: 
       failure: "創造面向失敗."
-      success: "新的面向 %{name} 已造出來了"
+      success: "新的面向 %{name} 已經造出來了"
     destroy: 
       failure: "無法刪除 %{name} 因為它不是空的."
       success: "成功刪除 %{name} 了."
     edit: 
-      add_existing: "加入既有聯繫"
+      add_existing: "加入既有聯絡人"
-      aspect_list_is_not_visible: "面向中的其他人無法看見聯繫列表"
+      aspect_list_is_not_visible: "面向中的其他人無法看見聯絡人列表"
-      aspect_list_is_visible: "面向中的其他人可以看見聯繫列表"
+      aspect_list_is_visible: "面向中的其他人可以看見聯絡人列表"
       confirm_remove_aspect: "你確定要刪除這個面向?"
       done: "完成"
-      make_aspect_list_visible: "是否讓其他人可以看見面向裡的聯繫列表?"
+      make_aspect_list_visible: "是否讓其他人可以看見面向的聯絡人列表?"
       remove_aspect: "刪除這個面向"
       rename: "改名"
       update: "更新"
@@ -102,7 +102,7 @@ zh-TW:
       donate: "捐獻"
       handle_explanation: "這是你的 diaspora 識別碼. 就像電子信箱一樣, 你可以把它給想聯絡你的人."
       keep_us_running: "為了讓 %{pod} 高速奔馳, 提供些咖啡存量給我們的伺服器吧!"
-      no_contacts: "沒有任何聯繫"
+      no_contacts: "沒有任何聯絡人"
       no_tags: "+ 找個標籤來追蹤"
       people_sharing_with_you: "跟你分享的人"
       post_a_message: "貼訊息 >>"
@@ -114,8 +114,8 @@ zh-TW:
       your_aspects: "你的面向"
     many: "%{count}個面向"
     move_contact: 
-      error: "聯繫移動錯誤: %{inspect}"
+      error: "聯絡人移動錯誤: %{inspect}"
-      failure: "因%{inspect}沒有作用"
+      failure: "因%{inspect}而沒有作用"
       success: "聯絡人已移至新的面向"
     new: 
       create: "建立"
@@ -169,12 +169,12 @@ zh-TW:
       failure: "建立聯繫失敗"
     featured: 
       featured_users: "特色使用者"
-    few: "%{count}個聯繫"
+    few: "%{count}個聯絡人"
     index: 
       add_a_new_aspect: "加入新面向"
       all_contacts: "全部聯絡人"
       edit_aspect: "編輯%{name}"
-      many_people_are_you_sure: "你確定要進行跟%{suggested_limit}個聯絡人的私人對話? 貼文到該面向可能是比較好跟他們聯絡的方式."
+      many_people_are_you_sure: "你確定要進行跟%{suggested_limit}個聯絡人的私人對話? 貼文到該面向可能是跟他們聯絡比較好的方式."
       my_contacts: "我的聯絡人"
       no_contacts: "沒有聯絡人."
       only_sharing_with_me: "和我分享的人"
@@ -182,12 +182,12 @@ zh-TW:
       start_a_conversation: "開始對話"
       title: "聯絡人"
       your_contacts: "你的聯絡人"
-    many: "%{count}個聯繫"
+    many: "%{count}個聯絡人"
-    one: "1個聯繫"
+    one: "1個聯絡人"
-    other: "%{count}個聯繫"
+    other: "%{count}個聯絡人"
     sharing: 
       people_sharing: "跟你分享的人:"
-    zero: "沒有任何聯繫"
+    zero: "沒有任何聯絡人"
   conversations: 
     create: 
       fail: "無效的訊息"
@@ -435,12 +435,12 @@ zh-TW:
   password_confirmation: "密碼確認"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "從標籤新增聯繫"
+      add_contact_from_tag: "從標籤新增聯絡人"
     aspect_list: 
       edit_membership: "編輯所屬面向"
     few: "%{count}個聯絡人"
     helper: 
-      people_on_pod_are_aware_of: "Pod 上已知的人"
+      people_on_pod_are_aware_of: "Pod上已知的人"
       results_for: "%{params}的搜尋結果"
     index: 
       couldnt_find_them_send_invite: "找不到他們? 寄一封邀請函吧!"
@@ -451,7 +451,7 @@ zh-TW:
     one: "1個聯絡人"
     other: "%{count}個聯絡人"
     person: 
-      add_contact: "加入聯繫"
+      add_contact: "加入聯絡人"
       already_connected: "已建立連結"
       pending_request: "請求等候中"
       thats_you: "那是你耶!"
@@ -462,7 +462,7 @@ zh-TW:
       gender: "性別"
       in_aspects: "所屬面向"
       location: "位置"
-      remove_contact: "刪除聯繫"
+      remove_contact: "刪除聯絡人"
       remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
       does_not_exist: "聯絡人不存在!"
@@ -565,7 +565,7 @@ zh-TW:
       enter_email: "輸入電子信箱"
       enter_password: "輸入密碼"
       enter_password_again: "輸入與前面相同的密碼"
-      enter_username: "選個用戶名稱(名稱只能包含拉丁字母,數字,以及底線字元)"
+      enter_username: "選個使用者名稱(名稱只能包含拉丁字母,數字,以及底線字元)"
       join_the_movement: "參加這個行動!"
       sign_up_today: "今天就來註冊"
   requests: 
@@ -584,8 +584,8 @@ zh-TW:
         other: "%{count}個新請求!"
         zero: "沒有新請求"
     manage_aspect_contacts: 
-      existing: "聯繫編輯"
+      existing: "既有聯絡人"
-      manage_within: "管理聯繫:"
+      manage_within: "管理聯絡人於"
     new_request_to_person: 
       sent: "已送出!"
   reshares: 
@@ -633,12 +633,12 @@ zh-TW:
   settings: "設定"
   shared: 
     add_contact: 
-      add_new_contact: "加入新聯繫"
+      add_new_contact: "加入新聯絡人"
       create_request: "以 Diaspora 識別碼搜尋"
       diaspora_handle: "diaspora@pod.org"
-      enter_a_diaspora_username: "輸入 Diaspora 用戶名稱:"
+      enter_a_diaspora_username: "輸入 Diaspora 使用者名稱:"
       know_email: "知道他們的電子信箱嗎? 你應該邀請他們來"
-      your_diaspora_username_is: "你的 Diaspora 用戶名稱是: %{diaspora_handle}"
+      your_diaspora_username_is: "你的 Diaspora 使用者名稱是: %{diaspora_handle}"
     aspect_dropdown: 
       add_to_aspect: "加入至面向"
       toggle: 
@@ -648,7 +648,7 @@ zh-TW:
         other: "在%{count}個面向中"
         zero: "加入至面向"
     contact_list: 
-      all_contacts: "全部聯繫"
+      all_contacts: "全部聯絡人"
     footer: 
       logged_in_as: "已用 %{name} 登入"
       your_aspects: "你的面向"
@@ -670,7 +670,7 @@ zh-TW:
       title: "設定連線服務"
     publisher: 
       all: "全部"
-      all_contacts: "全部的聯繫"
+      all_contacts: "全部聯絡人"
       click_to_share_with: "點一下以一起分享: "
       discard_post: "捨棄貼文"
       make_public: "公開"
@@ -737,14 +737,14 @@ zh-TW:
       via: "(經由%{link})"
       what_is_cubbies: "Cubbi.es 是世界上第一個 Diaspora 應用程式. 它也是收集線上照片的最佳方式."
   undo: "復原?"
-  username: "用戶名稱"
+  username: "使用者名稱"
   users: 
     confirm_email: 
       email_confirmed: "已啟用E-Mail %{email}"
       email_not_confirmed: "無法啟用E-Mail. 連結有誤嗎?"
     destroy: "帳號已鎖定. 關閉帳號可能需要20分鐘才能完成. 感謝你試用 Diaspora."
     edit: 
-      also_commented: "...當有人也對你的聯繫的貼文發表意見時?"
+      also_commented: "...當有人也對你的聯絡人的貼文發表意見時?"
       change: "更改"
       change_email: "更改E-Mail"
       change_language: "更改語言"
@@ -771,7 +771,7 @@ zh-TW:
       connect_to: "連結至"
       connect_to_your_other_social_networks: "與其他社交網站連結"
       connect_with_people: "與酷咖連結"
-      connect_with_people_explanation_pt1: "為了和別人聯繫, 將他們放入你的任何一個或多個%{bold}"
+      connect_with_people_explanation_pt1: "將別人放進你的任何一個或多個%{bold}中來與他們建立聯繫."
       connect_with_people_explanation_pt2: "面向是區分新人或熟人的直覺方式, 並且只有你自己知道, 讓你可以輕易過濾他們, 或只和部份聯絡人分享."
       featured_tags: "特色標籤"
       featured_users: "特色使用者"
@@ -794,7 +794,7 @@ zh-TW:
       welcome: "歡迎光臨!"
       welcome_with_name: "歡迎光臨, %{name}!"
     public: 
-      does_not_exist: "不存在 %{username} 這個用戶!"
+      does_not_exist: "不存在 %{username} 這個使用者!"
     update: 
       email_notifications_changed: "已更改電郵通知"
       language_changed: "已更改語言"