From 80e41f1ebb729489ab29d7bc3fdbacce5bca81be Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Sat, 5 Nov 2011 23:13:27 +0100 Subject: [PATCH 1/2] decode the cookie through rails in the websocket server. Hopefully this is more stable --- script/websocket_server.rb | 46 ++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/script/websocket_server.rb b/script/websocket_server.rb index 866c9cc82..f38a8c24a 100644 --- a/script/websocket_server.rb +++ b/script/websocket_server.rb @@ -40,6 +40,25 @@ def process_message end end +$cookie_parser = Rack::Builder.new do + use ActionDispatch::Cookies + use ActionDispatch::Session::CookieStore, :key => "_diaspora_session" + use Warden::Manager do |warden| + warden.default_scope = :user + end + + run Proc.new {|env| [0, {}, env['warden'].user]} +end + +def get_user_from_request(request) + user = $cookie_parser.call(request.merge( + {"HTTP_COOKIE" => request['cookie'], + "action_dispatch.secret_token" => Rails.application.config.secret_token} + ))[2] + raise ArgumentError, "user not authenticated" unless user + user +end + begin EM.run { Diaspora::WebSocket.initialize_channels @@ -61,38 +80,27 @@ begin ws.onopen { begin debug_pp ws.request + + user = get_user_from_request(ws.request) + user_id = user.id - cookies = ws.request["cookie"].split(';') - session_key = "_diaspora_session=" - enc_diaspora_cookie = cookies.detect{|c| c.include?(session_key)} - raise IndexError, "No session cookie available" unless enc_diaspora_cookie - enc_diaspora_cookie.gsub(session_key,'') - cookie = Marshal.load(enc_diaspora_cookie.strip.unpack("m*").first) - - debug_pp cookie - - user_id = cookie["warden.user.user.key"][1].first - - debug_pp "In WSS, suscribing user: #{User.find(user_id).name} with id: #{user_id}" + debug_pp "In WSS, suscribing user: #{user.name} with id: #{user_id}" sid = Diaspora::WebSocket.subscribe(user_id, ws) ws.onmessage { |msg| SocketsController.new.incoming(msg) } ws.onclose { begin - debug_pp "In WSS, unsuscribing user: #{User.find(user_id).name} with id: #{user_id}" + debug_pp "In WSS, unsuscribing user: #{user.name} with id: #{user_id}" Diaspora::WebSocket.unsubscribe(user_id, sid) rescue debug_pp "Could not unsubscribe socket for #{user_id}" end } - rescue RuntimeError, ArgumentError, TypeError => e + rescue ArgumentError => e + raise e unless e.message.include?("not authenticated") debug_pp "Could not open socket for request with cookie: #{ws.request["cookie"]}" - debug_pp "Error was: " - debug_pp e - rescue IndexError => e - debug_pp e - debug_pp "Cookie was: #{ws.request["cookie"]}" + debug_pp "Looks like the cookie is invalid or the user isn't signed in" end } end From 2b5963437f4e45fda13ee5db0aea8e53e8f1f872 Mon Sep 17 00:00:00 2001 From: Jonne Hass Date: Sat, 5 Nov 2011 23:44:12 +0100 Subject: [PATCH 2/2] updated 54 locale files [ci skip] --- config/locales/diaspora/ar.yml | 6 +- config/locales/diaspora/bg.yml | 10 +- config/locales/diaspora/br.yml | 6 +- config/locales/diaspora/cs.yml | 6 +- config/locales/diaspora/cy.yml | 52 ++--- config/locales/diaspora/da.yml | 6 +- config/locales/diaspora/de.yml | 18 +- config/locales/diaspora/de_formal.yml | 42 ++-- config/locales/diaspora/el.yml | 6 +- config/locales/diaspora/en_1337.yml | 6 +- config/locales/diaspora/en_pirate.yml | 6 +- config/locales/diaspora/en_shaw.yml | 6 +- config/locales/diaspora/eo.yml | 106 +++++----- config/locales/diaspora/es-AR.yml | 6 +- config/locales/diaspora/es-CL.yml | 6 +- config/locales/diaspora/es.yml | 54 ++--- config/locales/diaspora/eu.yml | 6 +- config/locales/diaspora/fi.yml | 192 +++++++++--------- config/locales/diaspora/fr.yml | 6 +- config/locales/diaspora/ga.yml | 6 +- config/locales/diaspora/he.yml | 6 +- config/locales/diaspora/hu.yml | 6 +- config/locales/diaspora/id.yml | 6 +- config/locales/diaspora/is.yml | 6 +- config/locales/diaspora/it.yml | 32 +-- config/locales/diaspora/ja.yml | 6 +- config/locales/diaspora/ko.yml | 38 ++-- config/locales/diaspora/lt.yml | 6 +- config/locales/diaspora/mk.yml | 6 +- config/locales/diaspora/nb.yml | 6 +- config/locales/diaspora/nl.yml | 6 +- config/locales/diaspora/nn.yml | 6 +- config/locales/diaspora/pa.yml | 6 +- config/locales/diaspora/pl.yml | 74 +++---- config/locales/diaspora/pt-BR.yml | 6 +- config/locales/diaspora/pt-PT.yml | 6 +- config/locales/diaspora/ro.yml | 6 +- config/locales/diaspora/ru.yml | 42 ++-- config/locales/diaspora/sk.yml | 6 +- config/locales/diaspora/sl.yml | 7 +- config/locales/diaspora/sq.yml | 6 +- config/locales/diaspora/sv.yml | 6 +- config/locales/diaspora/tr.yml | 6 +- config/locales/diaspora/uk.yml | 6 +- config/locales/diaspora/ur-PK.yml | 6 +- config/locales/diaspora/vi.yml | 6 +- config/locales/diaspora/zh-CN.yml | 6 +- config/locales/diaspora/zh-TW.yml | 22 +- config/locales/javascript/javascript.cy.yml | 2 +- config/locales/javascript/javascript.de.yml | 2 +- config/locales/javascript/javascript.es.yml | 2 +- config/locales/javascript/javascript.it.yml | 2 +- config/locales/javascript/javascript.pl.yml | 2 +- .../locales/javascript/javascript.zh-TW.yml | 4 +- 54 files changed, 555 insertions(+), 358 deletions(-) diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml index bf16e5779..7ac42ed1a 100644 --- a/config/locales/diaspora/ar.yml +++ b/config/locales/diaspora/ar.yml @@ -671,6 +671,7 @@ ar: failure: error: "خطأ خلال محاولة الإتصال بالخدمة" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "لم يُعثَر على أصدقاء فايسبوك." service_friends: "%{service} الأصدقاء" index: @@ -847,7 +848,10 @@ ar: confirm_email: email_confirmed: "فُعِّل البريد الإلكتروني %{email} بنجاح" email_not_confirmed: "لا يمكن تفعيل البريد الإلكتروني، أهو رابط خاطئ؟" - destroy: "أُغلِق حسابك بنجاح. قد يستغرق إغلاق الحساب تمامًا 20 دقيقة. شكرًا لتجريبك ديسبورا." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...علق أحدهم على منشور مراسلك" change: "تغيير" diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml index 82edcd488..e9a8c6d4a 100644 --- a/config/locales/diaspora/bg.yml +++ b/config/locales/diaspora/bg.yml @@ -671,6 +671,7 @@ bg: failure: error: "възникна грешка при свързването с услугата" finder: + fetching_contacts: "Diaspora копира приятелите ви от %{service}. Моля, пробвайте отново след няколко минути." no_friends: "Няма намерени приятели от Facebook." service_friends: "Приятели от %{service}" index: @@ -678,7 +679,7 @@ bg: connect_to_tumblr: "Свързване с tumblr" connect_to_twitter: "Свързване с twitter" disconnect: "изключване" - edit_services: "Редактиране на услуги" + edit_services: "Редактиране на услугите" logged_in_as: "вписани сте като" no_services: "Все още не сте свързали нито една услуга." really_disconnect: "Наистина ли желаете свързаността с %{service} да бъде изключена?" @@ -847,7 +848,10 @@ bg: confirm_email: email_confirmed: "Ел. поща %{email} е активирана" email_not_confirmed: "Ел. поща не може да бъде активирана. Грешна връзка?" - destroy: "Акаунтът ви в Diaspora е заключен. Затварянето може да отнеме до 20 минути. Благодарим ви, че пробвахте Diaspora." + destroy: + no_password: "Моля, въведете паролата си, за да бъде затворен акаунта." + success: "Акаунтът ви е заключен. Затварянето на акаунт изисква около 20 минути. Благодарим ви, че пробвахте Diaspora." + wrong_password: "Въведената парола не съвпада с текущата парола на акаунта." edit: also_commented: "...някой коментира публикация на ваш контакт?" change: "Промяна" @@ -895,7 +899,7 @@ bg: simply_visit: "Просто посетете" works_on_modern: "Съвместима е с всеки съвременен смартфон" privacy_settings: - ignored_users: "Игнорирани поотребители" + ignored_users: "Игнорирани потребители" stop_ignoring: "Прекратяване на игнорирането" title: "Privacy Settings" public: diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml index 50c1f2be9..4c1ae8576 100644 --- a/config/locales/diaspora/br.yml +++ b/config/locales/diaspora/br.yml @@ -671,6 +671,7 @@ br: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ br: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Ar c'hont zo bet klozet mat." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Cheñch" diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml index 696e72289..fe718fa2d 100644 --- a/config/locales/diaspora/cs.yml +++ b/config/locales/diaspora/cs.yml @@ -671,6 +671,7 @@ cs: failure: error: "nastala chyba při připojení ke službě" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Žádní přátelé z Facebooku nenalezeni." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ cs: confirm_email: email_confirmed: "E-mail %{email} aktivován" email_not_confirmed: "E-mail nemohl být aktivován. Špatný odkaz?" - destroy: "Váš účet byl uzamčen. Dokončení uzavření vašeho účtu může trvat 20 minut. Děkujeme vám za vyzkoušení Diaspory." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...někdo komentoval váš příspěvek?" change: "Změnit" diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml index fa01316d2..7e018a2e6 100644 --- a/config/locales/diaspora/cy.yml +++ b/config/locales/diaspora/cy.yml @@ -154,7 +154,7 @@ cy: manage_your_aspects: "Manage your aspects." no_contacts: "You don't have any contacts here yet." view_all_community_spotlight: "See all community spotlight" - view_all_contacts: "View all contacts" + view_all_contacts: "Gweld cysylltiadau i gŷd" show: edit_aspect: "edit aspect" two: "%{count} agweddau" @@ -320,7 +320,7 @@ cy: profile: "profile" recent_notifications: "Recent notifications" settings: "settings" - view_all: "View all" + view_all: "Gweld popeth" likes: likes: people_dislike_this: @@ -350,26 +350,26 @@ cy: no_results: "No Results Found" notifications: also_commented: - few: "%{actors} also commented on %{post_author}'s %{post_link}." - many: "%{actors} also commented on %{post_author}'s %{post_link}." - one: "%{actors} also commented on %{post_author}'s %{post_link}." - other: "%{actors} also commented on %{post_author}'s %{post_link}." - two: "%{actors} also commented on %{post_author}'s %{post_link}." - zero: "%{actors} also commented on %{post_author}'s %{post_link}." + few: "Mae %{actors} hefyd wedi sylwi ar %{post_link} %{post_author}." + many: "Mae %{actors} hefyd wedi sylwi ar %{post_link} %{post_author}." + one: "Mae %{actors} hefyd wedi sylwi ar %{post_link} %{post_author}." + other: "Mae %{actors} hefyd wedi sylwi ar %{post_link} %{post_author}." + two: "Mae %{actors} hefyd wedi sylwi ar %{post_link} %{post_author}." + zero: "Mae %{actors} hefyd wedi sylwi ar %{post_link} %{post_author}." also_commented_deleted: - few: "%{actors} commented on a deleted post." - many: "%{actors} commented on a deleted post." - one: "%{actors} commented on a deleted post." - other: "%{actors} commented on a deleted post." - two: "%{actors} commented on a deleted post." - zero: "%{actors} commented on a deleted post." + few: "Mae %{actors} wedi sylwad ar bost dileuwyd" + many: "Mae %{actors} wedi sylwad ar bost dileuwyd" + one: "Mae %{actors} wedi sylwad ar bost dileuwyd" + other: "Mae %{actors} wedi sylwad ar bost dileuwyd" + two: "Mae %{actors} wedi sylwad ar bost dileuwyd" + zero: "Mae %{actors} wedi sylwad ar bost dileuwyd" comment_on_post: - few: "%{actors} commented on your %{post_link}." - many: "%{actors} commented on your %{post_link}." - one: "%{actors} commented on your %{post_link}." - other: "%{actors} commented on your %{post_link}." - two: "%{actors} commented on your %{post_link}." - zero: "%{actors} commented on your %{post_link}." + few: "%{actors} sylwadau ar eich %{post_link}." + many: "%{actors} sylwadau ar eich %{post_link}." + one: "%{actors} sylwadau ar eich %{post_link}." + other: "%{actors} sylwadau ar eich %{post_link}." + two: "%{actors} sylwadau ar eich %{post_link}." + zero: "%{actors} sylwadau ar eich %{post_link}." helper: new_notifications: few: "%{count} hysbysiadau newydd" @@ -527,7 +527,7 @@ cy: to_accept_or_ignore: "to accept or ignore it." sub_header: add_some: "add some" - edit: "edit" + edit: "golygu" you_have_no_tags: "you have no tags!" two: "%{count} people" webfinger: @@ -671,6 +671,7 @@ cy: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Dim ffrindiau Facebook wedi darganfod." service_friends: "Ffrindiau %{service}" index: @@ -789,7 +790,7 @@ cy: aspects: title: "Eich Agweddau" aspects_stream: "Aspects" - commented_on: "commented on" + commented_on: "wedi sylwad ar" community_spotlight_stream: "Community Spotlight" followed_tag: add_a_tag: "Add a tag" @@ -824,7 +825,7 @@ cy: follow: "Follow #%{tag}" followed_by: "followed by" following: "Following #%{tag}" - nobody_talking: "Nobody is talking about %{tag} yet." + nobody_talking: "Does neb yn siarad am %{tag} eto." people_tagged_with: "People tagged with %{tag}" posts_tagged_with: "Posts tagged with #%{tag}" stop_following: "Stop Following #%{tag}" @@ -847,7 +848,10 @@ cy: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Mae eich cyfrif wedi'i gloi. Gall gymryd 20 munud er mwyn i ni orffen gau eich cyfrif. Diolch i chi am ddefnyddio Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml index 055bae2cd..238a4102e 100644 --- a/config/locales/diaspora/da.yml +++ b/config/locales/diaspora/da.yml @@ -671,6 +671,7 @@ da: failure: error: "der opstod en fejl i at forbinde til den service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Ingen Facebook-venner fundet." service_friends: "%{service} Venner" index: @@ -847,7 +848,10 @@ da: confirm_email: email_confirmed: "E-mail %{email} aktiveret" email_not_confirmed: "E-mail kunne ikke aktiveres. Forkert link?" - destroy: "Kontoen er nu lukket. Det kan tage 20 minutter for os at lukke din konto helt. Tak fordi du prøvede Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...nogen har kommenteret på en af dine kontakters indlæg?" change: "Skift" diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index dc759c945..aeab2bef6 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -113,7 +113,7 @@ de: satisfaction: "%{link}: Unterstützung durch die Gemeinschaft" tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Von der Gemeinschaft erstellte Tutorials, Anleitungen und Nachrichten" introduce_yourself: "Das ist dein Stream. Leg' los und stell dich vor." - keep_us_running: "Hilf %{pod} schnell zu arbeiten und kaufe unseren Servern ihren monatlichen Schuss Kaffee!" + keep_us_running: "Hilf %{pod}, schnell zu arbeiten und spendiere unseren Servern ihre Tasse Kaffee mit einer monatlichen Spende!" new_here: follow: "Folge %{link} und begrüße neue Benutzer bei Diaspora*!" learn_more: "mehr erfahren" @@ -532,7 +532,7 @@ de: two: "%{count} Personen" webfinger: fail: "Entschuldigung, wir konnten %{handle} nicht finden." - zero: "keiner Person" + zero: "niemand" photos: comment_email_subject: "%{name}s Foto" create: @@ -552,8 +552,8 @@ de: invalid_ext: "{file} hat keine gültige Erweiterung. Nur {extensions} sind erlaubt." size_error: "{file} ist zu groß. Die maximale Dateigröße beträgt {sizeLimit}." new_profile_photo: - or_select_one: "oder wähle eins aus deinen bereits bestehenden" - upload: "Lade ein neues Profilfoto hoch!" + or_select_one: "oder eins deiner bereits verfügbaren Fotos auswählen" + upload: "Ein neues Profilfoto hochladen" photo: view_all: "zeige alle Fotos von %{name}" show: @@ -671,6 +671,7 @@ de: failure: error: "Es gab einen Fehler der Verbindung mit dem Dienst." finder: + fetching_contacts: "Deine %{service}-Freunde werden momentan eingeladen. Schau bitte in ein paar Minuten noch mal vorbei!" no_friends: "Keine Facebook-Freunde gefunden." service_friends: "%{service}-Freunde" index: @@ -818,7 +819,7 @@ de: success: "Hurra! Du folgst nun: #%{name}" destroy: failure: "Fehler beim Beenden des Folgens von: #%{name}. Vielleicht hast du schon aufgehört zu folgen?" - success: "Du folgst #%{name} nicht mehr" + success: "Schade! Du folgst #%{name} nun nicht mehr." tags: show: follow: "#%{tag} folgen" @@ -847,7 +848,10 @@ de: confirm_email: email_confirmed: "E-Mail %{email} wurde aktiviert" email_not_confirmed: "Die E-Mail-Adresse konnte nicht aktiviert werden. Falscher Link?" - destroy: "Dein Konto wurde gesperrt. Es kann 20 Minuten dauern, bis wir die Schließung deines Kontos abgeschlossen haben. Vielen Dank, dass du Diaspora ausprobiert hast." + destroy: + no_password: "Bitte gib dein Kennwort ein, um deinen Account zu schließen." + success: "Dein Account wurde gesperrt. Es kann 20 Minuten dauern, bis dein Account geschlossen ist. Danke, dass du Diaspora ausprobiert hast." + wrong_password: "Das eingegebene Kennwort stimmt nicht mit deinem aktuellen Kennwort überein." edit: also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert?" change: "Ändern" @@ -890,7 +894,7 @@ de: who_are_you: "Wer bist Du?" logged_out: go_mobile: "Jetzt mobil werden." - on_your_mobile_device: "auf deinem mobilem Gerät, um die mobile Seite von Diaspora* zu benutzen." + on_your_mobile_device: "auf deinem mobilen Gerät, um die mobile Seite von Diaspora* aufzurufen." signed_out: "Du hast dich aus Diaspora* ausgeloggt" simply_visit: "Besuche einfach" works_on_modern: "Funktioniert auf allen modernen Smartphones" diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml index 9ccb3f044..bcfd0576e 100644 --- a/config/locales/diaspora/de_formal.yml +++ b/config/locales/diaspora/de_formal.yml @@ -115,9 +115,9 @@ de_formal: introduce_yourself: "Das ist ihr Stream. Legen Sie los und stellen Sie sich vor." keep_us_running: "Helfen Sie, %{pod} schnell zu arbeiten und kaufen Sie unseren Servern ihren monatlichen Schuss Kaffee!" new_here: - follow: "Follow %{link} and welcome new users to Diaspora*!" - learn_more: "Learn more" - title: "Welcome New Users" + follow: "Folgen Sie %{link} und heißen Sie neue Benutzer auf Diaspora* willkommen!" + learn_more: "Mehr erfahren" + title: "Willkommen, neuer Benutzer" no_contacts: "Keine Kontakte" no_tags: "+ Finden Sie einen #Tag zum folgen" people_sharing_with_you: "Leute, die mit Ihnen teilen" @@ -169,11 +169,11 @@ de_formal: back: "Zurück" blocks: create: - failure: "I couldn't ignore that user. #evasion" - success: "Alright, you won't see that user in your stream again. #silencio!" + failure: "Konnte diesen Benutzer nicht ignorieren. #evasion" + success: "Alles klar, Sie werden diesen Benutzer nicht mehr in ihrem Stream sehen. #silencio!" destroy: - failure: "I couldn't stop ignoring that user. #evasion" - success: "Let's see what they have to say! #sayhello" + failure: "Konnte das Ignorieren dieses Benutzers nicht aufheben. #evasion" + success: "Sehen Sie, was diese zu sagen haben! #sayhello" bookmarklet: explanation: "Erstellen Sie einen Beitrag in Diaspora von überall, in dem Sie %{link} als Lesezeichen speichern." explanation_link_text: "diesen Link" @@ -298,7 +298,7 @@ de_formal: comma_seperated_plz: "Sie können mehrere E-Mail-Adressen durch Trennen mit Kommata eintragen." if_they_accept_info: "Wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den Sie sie eingeladen haben." invite_someone_to_join: "Laden Sie jemanden zu Diaspora ein!" - language: "Language" + language: "Sprache" personal_message: "Persönliche Nachricht" resend: "Erneut senden" send_an_invitation: "Eine Einladung senden" @@ -514,7 +514,7 @@ de_formal: show: does_not_exist: "Diese Person existiert nicht!" has_not_shared_with_you_yet: "%{name} hat bisher noch keine Beiträge mit Ihnen geteilt!" - ignoring: "You are ignoring all posts from %{name}." + ignoring: "Sie ignorieren sämtliche Beiträge von %{name}." incoming_request: "Sie haben eine eingehende Anfrage von %{name}." mention: "Erwähnen" message: "Nachricht" @@ -573,7 +573,7 @@ de_formal: not_found: "Entschuldigen Sie, wir konnten den Beitrag leider nicht finden." permalink: "Permanentlink" previous: "Vorherige" - privacy: "Privacy" + privacy: "Privatsphäre" profile: "Profil" profiles: edit: @@ -671,6 +671,7 @@ de_formal: failure: error: "Es gab einen Fehler der Verbindung mit dem Dienst." finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Keine Facebook-Freunde gefunden." service_friends: "%{service}-Freunde" index: @@ -692,8 +693,8 @@ de_formal: settings: "Einstellungen" share_visibilites: update: - post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted." - see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page." + post_hidden_and_muted: "%{name}s Beitrag wurde versteckt und Benachrichtigungen stumm geschaltet." + see_it_on_their_profile: "Wenn Sie Aktualisierungen dieses Beitrags sehen wollen, besuchen Sie %{name}s Profil." shared: add_contact: add_new_contact: "Einen neuen Kontakt hinzufügen" @@ -744,7 +745,7 @@ de_formal: new_user_prefill: hello: "Hallo zusammen, ich bin #%{new_user_tag}. " i_like: "Ich interessiere mich für %{tags}." - invited_by: "Thanks for the invite, " + invited_by: "Danke für die Einladung, " post_a_message_to: "Senden Sie eine Nachricht an %{aspect}" posting: "Senden …" publishing_to: "Veröffentlichen an: " @@ -759,8 +760,8 @@ de_formal: currently_unavailable: "Kommentieren derzeit nicht verfügbar" dislike: "Gefällt mir nicht" hide_and_mute: "Verbergen und stummschalten" - ignore_user: "Ignore %{name}" - ignore_user_description: "Ignore and remove user from all aspects?" + ignore_user: "%{name} ignorieren" + ignore_user_description: "Benutzer ignorieren und aus allen Aspekten entfernen?" like: "Gefällt mir" shared_with: "Geteilt mit: %{aspect_names}" unlike: "Gefällt mir nicht mehr" @@ -847,7 +848,10 @@ de_formal: confirm_email: email_confirmed: "E-Mail %{email} wurde aktiviert" email_not_confirmed: "Die E-Mail-Adresse konnte nicht aktiviert werden. Falscher Link?" - destroy: "Ihr Konto wurde gesperrt. Es kann 20 Minuten dauern, bis wir die Schließung Ihres Kontos abgeschlossen haben. Vielen Dank, dass Sie Diaspora ausprobiert haben." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert?" change: "Ändern" @@ -895,9 +899,9 @@ de_formal: simply_visit: "Besuchen Sie einfach" works_on_modern: "Funktioniert auf allen modernen Smartphones" privacy_settings: - ignored_users: "Ignored Users" - stop_ignoring: "Stop ignoring" - title: "Privacy Settings" + ignored_users: "Ignorierte Benutzer" + stop_ignoring: "Ignorieren beenden" + title: Privatsphären-Einstellungen public: does_not_exist: "Benutzer %{username} existiert nicht!" update: diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml index e66df8f2c..b6dc76491 100644 --- a/config/locales/diaspora/el.yml +++ b/config/locales/diaspora/el.yml @@ -671,6 +671,7 @@ el: failure: error: "εμφανίστηκε ένα σφάλμα κατά τη σύνδεση με αυτή την υπηρεσία" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Δεν βρέθηκαν φίλοι στο Facebook. " service_friends: "%{service} Φίλοι" index: @@ -847,7 +848,10 @@ el: confirm_email: email_confirmed: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου %{email} ενεργοποιήθηκε" email_not_confirmed: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν ενεργοποιήθηκε. Μήπως ήταν λάθος ο σύνδεσμος;" - destroy: "Ο λογαριασμός σας έχει κλειδωθεί. Μπορεί να διαρκέσει μέχρι και 20 λεπτά για να τελειώσουμε το κλείσιμο του λογαριασμού. Σας ευχαριστούμε που δοκιμάσατε το Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...κάποιος επίσης σχολίασε σε δημοσίευση επαφής σας;" change: "Αλλαγή" diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml index 69638a342..a9428fa5a 100644 --- a/config/locales/diaspora/en_1337.yml +++ b/config/locales/diaspora/en_1337.yml @@ -671,6 +671,7 @@ en_1337: failure: error: "3RR0R C0NN3C71NG 7H47 53RV1C3!" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "N0 FB N00B5 F0UND!" service_friends: "%{service} N00B5" index: @@ -847,7 +848,10 @@ en_1337: confirm_email: email_confirmed: "M41L %{email} 4C71V473D!" email_not_confirmed: "M41L C0ULD N07 B3 4C71V473D, WR0NG L1NK?" - destroy: "Y0UR 4CC0N7 G07 PWND. 17 M4Y 74K3 U5 20 M1NU735 70 D3L373 17. 7HX F0R 7RY1NG D*!" + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...50M30N3 4L50 5P4M5 0N 4 N00B5 5P4M?" change: "CH4NG3" diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml index 0a62773df..1cb07dd48 100644 --- a/config/locales/diaspora/en_pirate.yml +++ b/config/locales/diaspora/en_pirate.yml @@ -671,6 +671,7 @@ en_pirate: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ en_pirate: confirm_email: email_confirmed: "Email %{email} activated" email_not_confirmed: "Email could not be activated. Wrong link?" - destroy: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml index cec3c3198..15548bbfa 100644 --- a/config/locales/diaspora/en_shaw.yml +++ b/config/locales/diaspora/en_shaw.yml @@ -671,6 +671,7 @@ en_shaw: failure: error: "𐑞𐑺 𐑢𐑪𐑟 𐑩𐑯 𐑺𐑼 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑞𐑨𐑑 𐑕𐑻𐑝𐑩𐑕" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ en_shaw: confirm_email: email_confirmed: "𐑦-𐑥𐑱𐑤 %{email} 𐑨𐑒𐑑𐑦𐑝𐑱𐑑𐑩𐑛" email_not_confirmed: "𐑦-𐑥𐑱𐑤 𐑒𐑫𐑛 𐑯𐑪𐑑 𐑚𐑰 𐑨𐑒𐑑𐑦𐑝𐑱𐑑𐑩𐑛. 𐑮𐑪𐑙 𐑤𐑦𐑙𐑒?" - destroy: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑤𐑪𐑒𐑑. 𐑦𐑑 𐑥𐑱 𐑑𐑱𐑒 20 𐑥𐑦𐑯𐑩𐑑𐑕 𐑓𐑹 𐑳𐑕 𐑑 𐑓𐑦𐑯𐑦𐑖 𐑒𐑤𐑴𐑟𐑦𐑙 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑. 𐑔𐑱𐑙𐑒 𐑿 𐑓𐑹 𐑑𐑮𐑲𐑦𐑙 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑐𐑴𐑕𐑑?" change: "𐑗𐑱𐑯𐑡" diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml index 8cc6414d7..29cd0df29 100644 --- a/config/locales/diaspora/eo.yml +++ b/config/locales/diaspora/eo.yml @@ -29,7 +29,7 @@ eo: reshare: attributes: root_guid: - taken: "Vi jam repartoprenis tiun afiŝon!" + taken: "Ho, ĉu tiom bone? Vi jam rekonigis tiun afiŝon!" user: attributes: email: @@ -65,8 +65,8 @@ eo: edit_aspect: "Redakti %{name}-n" select_all: "Selektu ĉion" aspect_stream: - stay_updated: "Stay Updated" - stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community." + stay_updated: "Restu ĝisdatigata" + stay_updated_explanation: "Via precipa torento enhavas ĉiujn viajn kontaktojn, sekvatajn etikedojn kaj afiŝoj de kelkaj kreemaj anoj de la komunumo." contacts_not_visible: "Kontaktoj en tiu aspekto ne povos vidi unu la aliajn." contacts_visible: "Kontaktoj en tiu aspekto povos vidi unu la alian." create: @@ -109,10 +109,10 @@ eo: find_a_bug: "... trovas %{link}?" have_a_question: "... havas %{link}?" here_to_help: "Jen la DIASPORA* komunumo!" - need_help: "Ĉu Devas Helpon?" + need_help: "Ĉu Vi Bezonas Helpon?" satisfaction: "%{link}: Komunuma helpo" - tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news" - introduce_yourself: "This is your stream. Jump in and introduce yourself." + tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Instruiloj, lerniloj kaj novaĵoj funkciigitaj de la komunumo" + introduce_yourself: "Tio estas via torento. Ensaltu kaj prezentu vin mem." keep_us_running: "Helpu %{pod} rapide funkcii kaj aĉetu por niaj servkomputiloj ilian kaforiparon per ĉiumonata donatado!" new_here: follow: "Sekvu %{link} kaj bonvenu novajn uzantojn al Diaspora*!" @@ -126,7 +126,7 @@ eo: content: "Vi povas konekti la postajn servojn kun DIASPORA*:" heading: "Konekti Servojn" unfollow_tag: "Ne plu abonas #%{tag}." - welcome_to_diaspora: "Welcome to Diaspora, %{name}!" + welcome_to_diaspora: "Bonvenon al Diaspora, %{name}!" your_aspects: "Viaj Aspektoj" many: "%{count} aspektoj" move_contact: @@ -139,7 +139,7 @@ eo: no_contacts_message: community_spotlight: "komunuma reflektoro" or_spotlight: "Aŭ vi povas dividi kun %{link}" - try_adding_some_more_contacts: "Vi povas serĉi (supre) aŭ inviti (dekstre) pli kontaktojn." + try_adding_some_more_contacts: "Vi povas serĉi aŭ inviti pli kontaktojn." you_should_add_some_more_contacts: "Vi devus aldoni pli kontaktojn!" no_posts_message: start_talking: "Ankoraŭ neniu diris iun ajn!" @@ -169,11 +169,11 @@ eo: back: "Antaŭen" blocks: create: - failure: "I couldn't ignore that user. #evasion" - success: "Alright, you won't see that user in your stream again. #silencio!" + failure: "Mi ne povis ignori tiun uzanton. #evasion" + success: "Bone, vi ne revidos tiun uzanton en via torento. #silencio!" destroy: - failure: "I couldn't stop ignoring that user. #evasion" - success: "Let's see what they have to say! #sayhello" + failure: "Mi ne povis ĉesi ignori tiun uzanton. #evasion" + success: "Ni vidu kion ili emas diri! #sayhello" bookmarklet: explanation: "Vi povas afiŝi al DIASPORA* el ĉie per paĝosigno montranta al %{link}." explanation_link_text: "ĉi tiu ligilo" @@ -197,7 +197,7 @@ eo: few: "%{count} kontaktoj" index: add_a_new_aspect: "Aldoni novan aspekton" - add_to_aspect: "Aldoni kontaktojn al %{name}" + add_to_aspect: "aldoni kontaktojn al %{name}" all_contacts: "Ĉiuj kontaktoj" check_out: "Vidu" many_people_are_you_sure: "Ĉu vi certas, ke vi volas mesaĝi pli ol {suggested_limit} homojn? Afiŝi al tiu ĉi aspekto eble estas pli bona metodo kontakti ilin." @@ -308,7 +308,7 @@ eo: application: powered_by: "FUNKCIAS PER DIASPORA*" public_feed: "Publika DIASPORA* Afiŝostrio de %{name}" - toggle: "baskuligu poŝtelefona versio" + toggle: "baskuligi poŝtelefona versio" whats_new: "kio estas nova?" your_aspects: "viaj aspektoj" header: @@ -316,7 +316,7 @@ eo: blog: "blogo" code: "kodo" login: "ensaluti" - logout: "elsaluti" + logout: "Elsaluti" profile: "Profilo" recent_notifications: "Freŝaj sciigoj" settings: "Agordoj" @@ -430,8 +430,8 @@ eo: many: "%{actors} rekonigis vian %{post_link}." one: "%{actors} repartoprenis vian %{post_link}." other: "%{actors} rekonigis vian %{post_link}." - two: "%{actors} repartoprenis vian %{post_link}." - zero: "%{actors} repartoprenis vian %{post_link}." + two: "%{actors} rekonigis vian %{post_link}." + zero: "%{actors} rekonigis vian %{post_link}." reshared_post_deleted: few: "%{actors} repartoprenis vian foritan afiŝon." many: "%{actors} repartoprenis vian foritan afiŝon." @@ -514,7 +514,7 @@ eo: show: does_not_exist: "Persono ne ekzistas!" has_not_shared_with_you_yet: "%{name} ne jam partoprenis iuj ajn afiŝojn kun vi!" - ignoring: "You are ignoring all posts from %{name}." + ignoring: "Vi estas ignoranta ĉiujn afiŝojn de %{name}." incoming_request: "%{name} volas konigi kun vi" mention: "Mencii" message: "Mesaĝo" @@ -573,7 +573,7 @@ eo: not_found: "Ni bedaŭras, sed ni ne povis trovi tiun afiŝon." permalink: "malŝanĝantligilo" previous: "antaŭa" - privacy: "Privacy" + privacy: "Privateco" profile: "Profilo" profiles: edit: @@ -615,13 +615,13 @@ eo: unhappy: "ĉu malfeliĉas?" update: "Ĝisdatigi" new: - create_my_account: "Krei mian konton" + create_my_account: "Krei mian konton!" enter_email: "Enskribu retpoŝtadreson" enter_password: "Enskribu pasvorton" enter_password_again: "Enskribu la saman pasvorton, kiel antaŭe" enter_username: "Elektu uzantnomon (nur literojn, nombrojn, kaj substrekojn)" join_the_movement: "Aniĝu je la movado!" - sign_up_message: "Interkona retkonektadi kun <3" + sign_up_message: "Interkona retkonektado kun ♥" requests: create: sending: "Sendanta" @@ -663,7 +663,7 @@ eo: search: "Serĉi" services: create: - already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account." + already_authorized: "Uzanto kun Diaspora nomo %{diaspora_id} jam sankciis tiun %{service_name} konton." failure: "Aŭtentigo malsukcesis." success: "Aŭtentokontrolo sukcesis." destroy: @@ -671,6 +671,7 @@ eo: failure: error: "estis eraro, kiam ni provis konekti tiun servon" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Neniuj Facebook amikoj trovitaj." service_friends: "%{service} Amikoj" index: @@ -692,8 +693,8 @@ eo: settings: "Agordoj" share_visibilites: update: - post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted." - see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page." + post_hidden_and_muted: "La afiŝo de %{name} kaŝiĝis kaj sciigoj mutiĝis." + see_it_on_their_profile: "Se vi volas vidi ĝisdatigoj pri tiu afiŝo, vizitu la profilon de %{name}." shared: add_contact: add_new_contact: "Aldoni novan kontakton" @@ -728,22 +729,22 @@ eo: notification: new: "Nova %{type} de %{from}" public_explain: - control_your_audience: "Control your Audience" + control_your_audience: "Kontrolu vian spektantaron" logged_in: "ensalutinta al %{service}" manage: "administri ligitajn servojn" - new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions" + new_user_welcome_message: "Uzu #kradoetikedon por klasifiki viajn afiŝojn kaj por trovi homojn kiuj havas kun vi komunajn interesojn. Alvoku iun malaĉan per @mencio." outside: "Publikaj afiŝoj estos videblaj al aliaj, kiuj estas ekster DIASPORA*." - share: "Share" + share: "Dividi" title: "Agordi ligitajn servojn" - visibility_dropdown: "Use this dropdown to change visibility of your post. (We suggest you make this first one public.)" + visibility_dropdown: "Uzu tiun falliston por ŝanĝi videblecon de via afiŝo. (Ni sugestas, ke vi faru publika tiun unuan afiŝon.)" publisher: all: "ĉiuj" all_contacts: "ĉiuj kontaktoj" discard_post: "Forviŝi afiŝon" make_public: "publikigi" new_user_prefill: - hello: "Hey everyone, I'm #%{new_user_tag}. " - i_like: "I'm interested in %{tags}." + hello: "Saluton al ĉiu, mi estas #%{new_user_tag}. " + i_like: "Mi interesiĝas pri %{tags}." invited_by: "Dankon pro la invito," post_a_message_to: "Afiŝi al %{aspect}" posting: Afiŝanta... @@ -758,9 +759,9 @@ eo: connect_to_comment: "konektu al tiu uzanto por komenti al lia afiŝo" currently_unavailable: "komentado intertempe ne eblas" dislike: "Malŝati" - hide_and_mute: "Malvidebligi kaj malsciiĝi" - ignore_user: "Ignore %{name}" - ignore_user_description: "Ignore and remove user from all aspects?" + hide_and_mute: "Kaŝi kaj muti afiŝon" + ignore_user: "Ignori %{name}" + ignore_user_description: "Ignori kaj forigi uzanton de ĉiuj aspektoj?" like: "Ŝati" shared_with: "Partoprenita kun: %{aspect_names}" unlike: "Ne plu ŝati" @@ -790,10 +791,10 @@ eo: title: "Viaj Aspektoj" aspects_stream: "Aspektoj" commented_on: "komentis pri" - community_spotlight_stream: "Community Spotlight" + community_spotlight_stream: "Komunuma Reflektoro" followed_tag: add_a_tag: "Aldoni etikedon" - contacts_title: "People who dig these tags" + contacts_title: "homoj kiuj frandas tiujn etikedojn" follow: "Sekvi" title: "#Sekvataj etikedoj" followed_tags_stream: "#Sekvataj etikedoj" @@ -814,11 +815,11 @@ eo: title: "Afiŝoj etikeditaj: %{tags}" tag_followings: create: - failure: "Ne povis aboni: #%{name}" - success: "Sukcese abonis: #%{name}" + failure: "Malsukcesis aboni je #%{name}. Ĉu vi jam sekvas ĝin?" + success: "Hura! Vi nun sekvas je #%{name}." destroy: - failure: "Ne povis malaboni: #%{name}" - success: "Sukcese malabonis: #%{name}" + failure: "Ne povis malaboni je #%{name}. Ĉu eble vi jam malabonis?" + success: "Nu! Vi ne plu sekvas je #%{name}." tags: show: follow: "Aboni al #%{tag}" @@ -847,7 +848,10 @@ eo: confirm_email: email_confirmed: "Retpoŝtadreso %{email} aktiviĝis" email_not_confirmed: "Retpoŝtadreso ne povis aktiviĝi. Ĉu malĝusta ligilo?" - destroy: "Via konto ŝlosiĝis. Povas daŭri 20 minutoj antaŭ ni forigado de via konto finiĝos. Dankon por via provado de DIASPORA*." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?" change: "Ŝanĝi" @@ -862,7 +866,7 @@ eo: edit_account: "Redakti konton" email_awaiting_confirmation: "Ni poŝtis al vin aktivigadan ligilon ĉe %{unconfirmed_email}. Ĝis vi klikos tiun ĉi ligilo kaj aktivigos la novan repoŝtadreson, ni uzados vian malŝanĝitan retpoŝtadreson %{email}." export_data: "Eksporti datumojn" - getting_started: "New User Prefrences" + getting_started: "Novaj uzanto-agordoj" liked: "...iu ŝatis vian afiŝon?" mentioned: "...vi estas menciita en afiŝo?" new_password: "Nova pasvorto" @@ -877,17 +881,17 @@ eo: your_email: "Via retpoŝtadreso" your_handle: "Via DIASPORA* uzantnomo" getting_started: - awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*" + awesome_take_me_to_diaspora: "Malaĉe! Gvidu min al Diaspora*" community_welcome: "La komunumo de DIASPORA* feliĉas, ke vi aniĝis!" hashtag_explanation: "Etikedoj lasu vin pridiri kaj aboni viajn interesigojn. Ili ankaŭ estas bona metodo trovi novajn homojn ĉe DIASPORA*." hashtag_suggestions: "Provu sekvi etikedojn kiel #arto, #filmoj, #gif, ktp." - hooking_up_fb: "hooking up your Facebook account" - saved: Saved! + hooking_up_fb: "alkroĉi vian Facebook konton" + saved: Konservita! we_can_speed_things_up: "Ni povas iomete rapidigi ĝin per" - well_hello_there: "Well, hello there!" - what_are_you_in_to: "What are you into?" - what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng." - who_are_you: "Who are you?" + well_hello_there: "Bone, saluton tie!" + what_are_you_in_to: "Pri kio vi ŝatokupiĝas?" + what_facebook_does: "al Diaspora. Tio tiros vian nomon kaj foton, kaj ebligos krucreferencadon." + who_are_you: "Kiu vi estas?" logged_out: go_mobile: "Nun uzu poŝtelefonan!" on_your_mobile_device: "per via poŝtelefono uzi DIASPORA* poŝtelefonan." @@ -895,9 +899,9 @@ eo: simply_visit: "Nur iru al" works_on_modern: "Funkcias per ĉiuj modernaj poŝtelefonoj" privacy_settings: - ignored_users: "Ignored Users" - stop_ignoring: "Stop ignoring" - title: "Privacy Settings" + ignored_users: "Ignoritaj Uzantoj" + stop_ignoring: "Ĉesi ignori" + title: "Privatecaj Agordoj" public: does_not_exist: "Uzanto %{username} ne ekzistas!" update: diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml index 37d4d26b9..7628e9d40 100644 --- a/config/locales/diaspora/es-AR.yml +++ b/config/locales/diaspora/es-AR.yml @@ -671,6 +671,7 @@ es-AR: failure: error: "hubo un error al conectar al servicio" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No se han encontrado amigos de Facebook." service_friends: "%{service} Amigos" index: @@ -847,7 +848,10 @@ es-AR: confirm_email: email_confirmed: "E-Mail %{email} activado" email_not_confirmed: "El E-Mail no pudo ser activado. Link equivocado?" - destroy: "Cuenta cerrada satisfactoriamente." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...alguien también comenta en una publicación en la que comentaste?" change: "Cambiar" diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml index 7407d28a3..821fd56c1 100644 --- a/config/locales/diaspora/es-CL.yml +++ b/config/locales/diaspora/es-CL.yml @@ -671,6 +671,7 @@ es-CL: failure: error: "ocurrió un error al conectarse con ese servicio" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Ningún amigo de Facebook encontrado." service_friends: "Los %{service} de tus amigos" index: @@ -847,7 +848,10 @@ es-CL: confirm_email: email_confirmed: "E-Mail %{email} activado" email_not_confirmed: "El email no se pudo activar. Es la dirección correcta?" - destroy: "Tu cuenta ha sido bloqueada. Nos puede tomar hasta 20 minutos cerrar tu cuenta. Gracias por probar Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...alguien comenta en el post de tu amigo?" change: "Modificar" diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml index e9d05c8ff..37c983a48 100644 --- a/config/locales/diaspora/es.yml +++ b/config/locales/diaspora/es.yml @@ -17,7 +17,7 @@ es: contact: attributes: person_id: - taken: "debe ser único entre los contactos del usuario." + taken: "debe ser único entre los contactos de la persona." person: attributes: diaspora_handle: @@ -66,7 +66,7 @@ es: select_all: "Marcar todos" aspect_stream: stay_updated: "Mantente Actualizad@" - stay_updated_explanation: "Tu entrada de Novedades la forman todos tus contactos, las etiquetas que sigues, y si lo deseas, las publicaciones de diferentes miembros creativos de la comunidad." + stay_updated_explanation: "Tu entrada de novedades la forman todos tus contactos, las etiquetas que sigues, y si lo deseas, las publicaciones de diferentes miembros creativos de la comunidad." contacts_not_visible: "Los contactos de este aspecto no podrán verse." contacts_visible: "Los contactos de este aspecto podrán verse." create: @@ -115,9 +115,9 @@ es: introduce_yourself: "Esta es tu entrada de novedades. Adelante, preséntate..." keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores sus dosis de café mensual!" new_here: - follow: "¡Sigue %{link} y da la bienvenida a Diaspora* a los nuevos usuarios!" + follow: "¡Sigue %{link} y da la bienvenida a Diaspora* a la gente nueva!" learn_more: "Más información" - title: "Bienvenida de nuevos usuarios" + title: "Bienvenida" no_contacts: "No hay contactos" no_tags: "+ Encuentra una etiqueta a seguir" people_sharing_with_you: "Comparten contigo" @@ -169,10 +169,10 @@ es: back: "Atrás" blocks: create: - failure: "No podría ignorar a ese usuario. #evasion" - success: "Bien, tú no verás a ese usuario en tus novedades otra vez. #silencio!" + failure: "No podría ignorar a esa persona. #evasion" + success: "Bien, tú no verás a esa persona en tus novedades otra vez. #silencio!" destroy: - failure: "No podría dejar de ignorar a ese usuario. #evasion" + failure: "No podría dejar de ignorar a esa persona. #evasion" success: "¡Vamos a ver qué tiene que decir! #sayhello" bookmarklet: explanation: "Publica en Diaspora* desde donde quieras agregando a tus marcadores %{link}." @@ -440,12 +440,12 @@ es: two: "%{actors} compartió tu publicación eliminada." zero: "%{actors} compartió tu publicación eliminada." started_sharing: - few: "%{actors} empezaron a compartir contigo." - many: "%{actors} empezaron a compartir contigo." - one: "%{actors} empezó a compartir contigo." - other: "%{actors} empezaron a compartir contigo." + few: "%{actors} ahora siguen tus mensajes públicos." + many: "%{actors} ahora siguen tus mensajes públicos." + one: "%{actors} ahora sigue tus mensajes públicos." + other: "%{actors} ahora siguen tus mensajes públicos." two: "%{actors} empezó a compatir contigo." - zero: "%{actors} empezó compartir contigo." + zero: "%{actors} ahora sigue tus mensajes públicos." notifier: a_post_you_shared: "una publicación." click_here: "pulsa aquí" @@ -512,7 +512,7 @@ es: remove_contact: "quitar contacto" remove_from: "¿Eliminar a %{name} de %{aspect}?" show: - does_not_exist: "¡El usuario no existe!" + does_not_exist: "¡La persona no existe!" has_not_shared_with_you_yet: "¡%{name} todavía no ha compartido ninguna publicación contigo!" ignoring: "Estás ignorando todas las publicaciones de %{name}." incoming_request: "%{name} quisiera compartir contigo" @@ -619,7 +619,7 @@ es: enter_email: "Escribe un email" enter_password: "Escribe una contraseña" enter_password_again: "Escribe la misma contraseña como antes" - enter_username: "Elije un nombre de usuario (solo letras, números y guiones bajos)" + enter_username: "Elige un nombre de usuario (letras, números o guiones bajos)" join_the_movement: "¡Únete al movimiento!" sign_up_message: "Redes Sociales con un ♥" requests: @@ -663,7 +663,7 @@ es: search: "Buscar" services: create: - already_authorized: "Un usuario con la identidad Diaspora %{diaspora_id} ya registró esa cuenta de %{service_name}." + already_authorized: "Una persona con la identidad Diaspora %{diaspora_id} ya registró esa cuenta de %{service_name}." failure: "Error de acceso." success: "Autenticación correcta." destroy: @@ -671,6 +671,7 @@ es: failure: error: "hubo un error conectando ese servicio" finder: + fetching_contacts: "Diaspora está trasladando a tus amigos de %{service}, por favor compruébalo de nuevo en unos minutos." no_friends: "No se han encontrados amig@s de Facebook." service_friends: "%{service} Amigos" index: @@ -701,7 +702,7 @@ es: diaspora_handle: diaspora@pod.org enter_a_diaspora_username: "Introduce un nombre de usuario Diaspora*:" know_email: "¿Conoces sus direcciones de email? Podrías invitarles" - your_diaspora_username_is: "Su nombre de usuario Diaspora* es: %{diaspora_handle}" + your_diaspora_username_is: "Tu nombre de usuario Diaspora* es: %{diaspora_handle}" aspect_dropdown: add_to_aspect: "Añadir contacto" toggle: @@ -742,7 +743,7 @@ es: discard_post: "Descartar publicación" make_public: "hacer público" new_user_prefill: - hello: "Hola a todos, soy nuevo aquí. I'm #%{new_user_tag}." + hello: "Hola a tod@s, I'm #%{new_user_tag}." i_like: "Tengo interés en %{tags}." invited_by: "Gracias por la invitación, " post_a_message_to: "Publicar un mensaje en %{aspect}" @@ -755,12 +756,12 @@ es: reshare: reshare: "Publicar en..." stream_element: - connect_to_comment: "Conecta con este usuario para comentar en su publicación" + connect_to_comment: "Conecta con esta persona para comentar en su publicación" currently_unavailable: "comentarios actualmente no disponibles" dislike: "No me gusta" - hide_and_mute: "Ocultar y silenciar publicación" + hide_and_mute: "Ocultar publicación y desactivar notificaciones" ignore_user: "Ignorar a %{name}" - ignore_user_description: "¿Ignorar y quitar al usuario de todos los aspectos?" + ignore_user_description: "¿Ignorar y quitar a esa persona de todos los aspectos?" like: "Me gusta" shared_with: "Compartir con: %{aspect_names}" unlike: "No me gusta" @@ -838,7 +839,7 @@ es: making_the_connection: "Creando la conexión" screenshot_explanation: "%{link1}. Este cubby en particular está conectado con %{link2}." sign_up_today: "Regístrate hoy mismo!" - typical_userpage: "Una típica pagina de usuario de cubbi.es" + typical_userpage: "Una página de un usuario de cubbi.es" via: "(vía %{link})" what_is_cubbies: "Cubbi.es es la primera aplicación de Diaspora en el mundo. Es también la mejor forma de coleccionar fotos en línea." undo: ¿Deshacer? @@ -847,7 +848,10 @@ es: confirm_email: email_confirmed: "Email %{email} activado" email_not_confirmed: "El email no pudo ser activado. ¿Enlace erróneo?" - destroy: "Tu cuenta ha sido bloqueada. En unos 20 minutos se cerrará totalmente. Gracias por probar Diaspora*. " + destroy: + no_password: "Por favor, introduce tu contraseña actual para cerrar tu cuenta." + success: "Tu cuenta ha sido bloqueda. Tomará unos 20 minutos cerrarla y destruirla. Gracias por probar Diaspora." + wrong_password: "La contraseña introducida no coincide con la contraseña actual." edit: also_commented: "...alguien comenta en la publicación de tu contacto?" change: "Cambiar" @@ -864,7 +868,7 @@ es: export_data: "Exportar datos" getting_started: "Preferencias del Nuevo Usuario" liked: "...a alguien le gusta tu publicación?" - mentioned: "...eres mencionadx en una publicación?" + mentioned: "...eres mencionad@ en una publicación?" new_password: "Nueva contraseña" photo_export_unavailable: "Exportar fotos no está disponible actualmente" private_message: "...recibes un mensaje privado?" @@ -872,7 +876,7 @@ es: reshared: "...alguien compartió tu publicación?" show_community_spotlight: "¿Mostrar \"Comunidad Creativa\" en tus Novedades?" show_getting_started: "Reiniciar la Introducción de Ayuda" - started_sharing: "...alquien empieza a compartir contigo?" + started_sharing: "...alquien empieza a seguir tus mensajes públicos?" stream_preferences: "Preferencias de las Novedades" your_email: "Tu email" your_handle: "Tu dirección Diaspora*" @@ -899,7 +903,7 @@ es: stop_ignoring: "Dejar de ignorar" title: "Configuración de Privacidad" public: - does_not_exist: "¡El usuario %{username} no existe!" + does_not_exist: "¡La persona %{username} no existe!" update: email_notifications_changed: "Notificaciones por email cambiadas" language_changed: "Idioma cambiado" diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml index 8cee9faed..749c0cd00 100644 --- a/config/locales/diaspora/eu.yml +++ b/config/locales/diaspora/eu.yml @@ -671,6 +671,7 @@ eu: failure: error: "huts zerbitzu hori konektatzean" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Ez dira Facebookeko lagunak aurkitu." service_friends: "%{service}(e)ko Lagunak" index: @@ -847,7 +848,10 @@ eu: confirm_email: email_confirmed: "E-MPosta %{email} gaitua" email_not_confirmed: "E-MPosta ezin izan da gaitu. Esteka baliogabea agian?" - destroy: "Zure kontua giltzapetuta dago. 20 minutu eraman dezake kontua ezabatzeak. Eskerrik asko Diaspora erabiltzeagatik." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...beste norbaitek zure adiskide baten mezua iruzkintzen duenean?" change: "Aldatu" diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml index 7b2e459f7..427d2daad 100644 --- a/config/locales/diaspora/fi.yml +++ b/config/locales/diaspora/fi.yml @@ -61,12 +61,12 @@ fi: done_editing: "muokkaus valmis" aspect_listings: add_an_aspect: "+ Lisää näkymä" - deselect_all: "Deselect all" - edit_aspect: "Edit %{name}" - select_all: "Select all" + deselect_all: "Poista valinta kaikista" + edit_aspect: "Muokkaa näkymää %{name}" + select_all: "Valitse kaikki" aspect_stream: - stay_updated: "Stay Updated" - stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community." + stay_updated: "Pysy ajan tasalla" + stay_updated_explanation: "Sinun päävirrassasi näkyvät kaikki kontaktisi, seuraamasi tagit ja eräiden yhteisön luovien jäsenten viestit." contacts_not_visible: "Kontaktit tässä näkymässä eivät voi nähdä toisiaan." contacts_visible: "Kontaktit tässä näkymässä voivat nähdä toisensa." create: @@ -112,7 +112,7 @@ fi: need_help: "Need Help?" satisfaction: "%{link}: Community-powered support" tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news" - introduce_yourself: "This is your stream. Jump in and introduce yourself." + introduce_yourself: "Tämä on virtasi. Hyppää sekaan ja esittele itsesi." keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!" new_here: follow: "Follow %{link} and welcome new users to Diaspora*!" @@ -125,8 +125,8 @@ fi: services: content: "Voit yhdistää Diasporaan seuraavat palvelut:" heading: "Yhdistä palveluihin" - unfollow_tag: "Stop following #%{tag}" - welcome_to_diaspora: "Welcome to Diaspora, %{name}!" + unfollow_tag: "Lopeta tagin #%{tag} seuraaminen" + welcome_to_diaspora: "Tervetuloa Diasporaan, %{name}!" your_aspects: "Näkymäsi" many: "%{count} näkymää" move_contact: @@ -135,14 +135,14 @@ fi: success: "Henkilö siirretty uuteen näkymään" new: create: "Luo" - name: "Nimi" + name: "Nimi (näkyy vain sinulle)" no_contacts_message: - community_spotlight: "community spotlight" + community_spotlight: "yhteisön valokeila" or_spotlight: "Or you can share with %{link}" - try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts." + try_adding_some_more_contacts: "Voit etsiä (ylhäällä) tai kutsua (oikealla) lisää kontakteja." you_should_add_some_more_contacts: "You should add some more contacts!" no_posts_message: - start_talking: "Kukaan ei ole sanonut vielä mitään. Aloita keskustelu!" + start_talking: "Kukaan ei ole sanonut vielä mitään!" one: "1 näkymä" other: "%{count} näkymää" seed: @@ -164,7 +164,7 @@ fi: zero: "ei näkymiä" authorizations: index: - no_applications: "You haven't registered any applications yet." + no_applications: "Et ole rekisteröinyt vielä yhtäkään sovellusta." revoke_access: "Estä pääsy" back: "Takaisin" blocks: @@ -177,7 +177,7 @@ fi: bookmarklet: explanation: "%{link} from anywhere by bookmarking this link." explanation_link_text: "Post to Diaspora" - heading: "Diaspora Bookmarklet" + heading: "Sovelluskirjanmerkki" post_something: "Kirjoita jotain Diasporaan" post_success: "Lähetetty! Suljetaan!" cancel: "Peruuta" @@ -189,7 +189,7 @@ fi: commenting: Kommentoidaan... one: "1 kommentti" other: "%{count} kommenttia" - two: "%{count} comments" + two: "%{count} kommenttia" zero: "ei kommentteja" contacts: create: @@ -197,7 +197,7 @@ fi: few: "%{count} kontaktia" index: add_a_new_aspect: "Lisää näkymä" - add_to_aspect: "Add contacts to %{name}" + add_to_aspect: "lisää kontakteja näkymään %{name}" all_contacts: "Kaikki kontaktit" check_out: "Check out" many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them." @@ -214,8 +214,8 @@ fi: sharing: people_sharing: "Ihmiset jotka jakavat kanssasi:" spotlight: - community_spotlight: "Community Spotlight" - two: "%{count} contacts" + community_spotlight: "Yhteisön valokeila" + two: "%{count} kontaktia" zero: "ei kontakteja" conversations: create: @@ -229,8 +229,8 @@ fi: many: "%{count} uutta viestiä" one: "1 uusi viesti" other: "%{count} uutta viestiä" - two: "%{count} new messages" - zero: "ei uusia viestejä" + two: "%{count} uutta viestiä" + zero: "Ei uusia viestejä" index: create_a_new_message: "tee uusi viesti" inbox: "Uudet viestit" @@ -241,7 +241,7 @@ fi: new: abandon_changes: "Hylkää muutokset?" send: "Lähetä" - sending: Sending... + sending: Lähetetään... subject: "aihe" to: "vastaanottaja" new_message: @@ -249,14 +249,14 @@ fi: show: delete: "poista ja estä tämä keskustelu" reply: "vastaa" - replying: Replying... + replying: Vastataan... date: formats: birthday: "%B %d" birthday_with_year: "%B %d %Y" fullmonth_day: "%B %d" delete: "Poista" - email: "Sähköposti" + email: "Sähköpostiosoite" error_messages: helper: correct_the_following_errors_and_try_again: "Korjaa seuraavat virheet ja yritä uudelleen." @@ -279,7 +279,7 @@ fi: tagline_first_half: "Jaa mitä haluat," tagline_second_half: "kenen kanssa haluat." invitations: - a_facebook_user: "A Facebook user" + a_facebook_user: Facebook-käyttäjä check_token: not_found: "Kutsun tunnusta ei löytynyt" create: @@ -298,7 +298,7 @@ fi: comma_seperated_plz: "Voit syöttää useita sähköpostiosoitteita pilkuilla erotettuna." if_they_accept_info: "jos he hyväksyvät kutsun, heidät lisätään siihen näkymään, johon heidät kutsuit." invite_someone_to_join: "Kutsu joku Diasporan käyttäjäksi!" - language: "Language" + language: "Kieli" personal_message: "Henkilökohtainen viesti" resend: "Lähetä uudelleen" send_an_invitation: "Lähetä kutsu" @@ -335,15 +335,15 @@ fi: many: "%{count} tykkää" one: "%{count} tykkää" other: "%{count} tykkää" - two: "%{count} likes" + two: "%{count} tykkää" zero: "ei tykkäyksiä" people_like_this_comment: - few: "%{count} likes" - many: "%{count} likes" - one: "%{count} like" - other: "%{count} likes" - two: "%{count} likes" - zero: "no likes" + few: "%{count} tykkää" + many: "%{count} tykkää" + one: "%{count} tykkää" + other: "%{count} tykkää" + two: "%{count} tykkää" + zero: "ei tykkäyksiä" limited: "Rajoitettu" more: "Lisää" next: "seuraava" @@ -377,7 +377,7 @@ fi: one: "1 uusi ilmoitus" other: "%{count} uutta ilmoitusta" two: "%{count} new notifications" - zero: "ei uusia ilmoituksia" + zero: "Ei uusia ilmoituksia" index: and: "ja" and_others: @@ -450,30 +450,30 @@ fi: a_post_you_shared: "a post." click_here: "klikkaa tästä" comment_on_post: - reply: "Vastaa tai katso %{name}:n viesti >" + reply: "Vastaa tai katso käyttäjän %{name} viesti >" 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: "Aktivoi uusi sähköpostiosoitteesi %{unconfirmed_email} napsauttamalla tätä linkkiä:" + subject: "Aktivoi uusi sähköpostiosoitteesi %{unconfirmed_email}" email_sent_by_diaspora: "Diaspora lähetti tämän sähköpostin. Jos et halua saada tällaisia sähköposteja jatkossa," hello: "Hei %{name}!" liked: - liked: "%{name} tykkäsi kirjoituksestasi: " + liked: "%{name} tykkäsi kirjoituksestasi" view_post: "Katso viesti >" mentioned: mentioned: "mainitsi sinut viestissään:" - subject: "%{name} on maininnut sinut Diaspora*:ssa" + subject: "%{name} on maininnut sinut Diasporassa" private_message: reply_to_or_view: "Lue tai osallistu keskusteluun >" reshared: reshared: "%{name} just reshared your post" - view_post: "View post >" + view_post: "Näytä viesti >" single_admin: - admin: "Diasporasi ylläpitäjä" + admin: "Sinun Diaspora-ylläpitäjäsi" subject: "Viesti Diaspora-käyttäjätilistäsi:" started_sharing: - sharing: "on aloittanut jakamaan kanssasi!" - subject: "%{name} has started sharing with you on Diaspora*" - view_profile: "Näytä %{name}:n profiiili" + sharing: "on alkanut jakaa kanssasi!" + subject: "%{name} on alkanut jakaa kanssasi Diasporassa" + view_profile: "Näytä käyttäjän %{name} profiiili" thanks: "Kiitos," to_change_your_notification_settings: "vaihtaaksesi ilmoitusasetuksia" ok: "OK" @@ -513,7 +513,7 @@ fi: remove_from: "Poista %{name} näkymästä %{aspect}?" show: does_not_exist: "Henkilöä ei ole olemassa!" - has_not_shared_with_you_yet: "%{name} ei ole jakanut vielä yhtään postausta kanssasi!" + has_not_shared_with_you_yet: "%{name} ei ole jakanut vielä yhtään viestiä kanssasi!" ignoring: "You are ignoring all posts from %{name}." incoming_request: "Tämä henkilö on lähettänyt sinulle pyynnön." mention: "Mainitse" @@ -526,9 +526,9 @@ fi: start_sharing: "aloita jakamaan" to_accept_or_ignore: "hyväksyäksesi tai hylätäksesi sen." sub_header: - add_some: "add some" - edit: "edit" - you_have_no_tags: "you have no tags!" + add_some: "lisää niitä" + edit: "muokkaa" + you_have_no_tags: "sinulla ei ole tageja!" two: "%{count} people" webfinger: fail: "Valitettavasti tunnusta %{handle} ei löytynyt." @@ -573,7 +573,7 @@ fi: not_found: "Valitettavasti viestiä ei löytynyt." permalink: "pysyvä linkki" previous: "edellinen" - privacy: "Privacy" + privacy: "Yksityisyys" profile: "Profiili" profiles: edit: @@ -636,7 +636,7 @@ fi: many: "%{count} uutta pyyntöä!" one: "uusi pyyntö!" other: "%{count} uutta pyyntöä!" - two: "%{count} new requests!" + two: "%{count} uutta pyyntöä!" zero: "ei uusia pyyntöjä" manage_aspect_contacts: existing: "Olemassa olevat kontaktit" @@ -671,12 +671,13 @@ fi: failure: error: "palvelun yhdistämisessä tapahtui virhe" finder: - no_friends: "No Facebook friends found." - service_friends: "%{service} Friends" + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." + no_friends: "Facebook-kavereita ei löytynyt." + service_friends: "%{service}-kaverit" index: - connect_to_facebook: "Yhdistä palveluun facebook" - connect_to_tumblr: "Yhdistä Tumblr:iin" - connect_to_twitter: "Yhdistä palveluun twitter" + connect_to_facebook: "Yhdistä Facebookiin" + connect_to_tumblr: "Yhdistä Tumblriin" + connect_to_twitter: "Yhdistä Twitteriin" disconnect: "katkaise" edit_services: "Muokkaa palveluita" logged_in_as: "kirjautunut käyttäjänä" @@ -687,7 +688,7 @@ fi: join_me_on_diaspora: "DIASPORA* kutsuu!" remote_friend: invite: "kutsu" - not_on_diaspora: "Not yet on Diaspora" + not_on_diaspora: "Ei vielä Diasporassa" resend: "lähetä uudelleen" settings: "Asetukset" share_visibilites: @@ -698,19 +699,19 @@ fi: add_contact: add_new_contact: "Lisää uusi kontakti" create_request: "Etsi Diaspora-tunnuksella" - diaspora_handle: diaspora@handle.org + diaspora_handle: diaspora@pod.org enter_a_diaspora_username: "Anna Diaspora-käyttäjätunnus:" know_email: "Tiedätkö heidän sähköpostiosoitteitansa? Kutsu heidät!" your_diaspora_username_is: "Diaspora-käyttäjätunnuksesi on: %{diaspora_handle}" aspect_dropdown: - add_to_aspect: "Add to aspect" + add_to_aspect: "Lisää kontakti" toggle: few: "In %{count} aspects" many: "In %{count} aspects" one: "In %{count} aspect" other: "In %{count} aspects" two: "In %{count} aspects" - zero: "Add to aspect" + zero: "Lisää kontakti" contact_list: all_contacts: "Kaikki kontaktit" footer: @@ -720,7 +721,7 @@ fi: by_email: "Sähköpostilla" dont_have_now: "Sinulla ei ole yhtään kutsua jäljellä, mutta lisää tulee pian!" from_facebook: "Facebookista" - invitations_left: "(%{count} jäljellä)" + invitations_left: "%{count} jäljellä" invite_someone: "Kutsu joku" invite_your_friends: "Kutsu kavereitasi" invites: "Kutsut" @@ -728,14 +729,20 @@ fi: notification: new: "Uusi %{type} henkilöltä %{from}" public_explain: - control_your_audience: "Control your Audience" + control_your_audience: "Hallitse yleisöäsi" logged_in: "sisäänkirjautunut palveluun %{service}" manage: "hallitse yhdistettyjä palveluita" - new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions" + new_user_welcome_message: |- + Käytä #hashtageja luokitellaksesi viestisi ja löytääksesi ihmisiä, jotka jakavat kiinnostuksen kohteesi. Kutsu upeita ihmisiä paikalle @Maininnoilla. + + Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions outside: "Julkiset viestit näkyvät Diasporan ulkopuolelle." - share: "Share" + share: "Jaa" title: "Olet lähettämässä julkista viestiä!" - visibility_dropdown: "Use this dropdown to change visibility of your post. (We suggest you make this first one public.)" + visibility_dropdown: |- + Muuta tästä pudotusvalikosta viestisi näkyvyyttä. (Suosittelemme, että teet tästä ensimmäisestä viestistäsi julkisen.) + + Use this dropdown to change visibility of your post. (We suggest you make this first one public.) publisher: all: "kaikki" all_contacts: "kaikki kontaktit" @@ -762,7 +769,7 @@ fi: ignore_user: "Ignore %{name}" ignore_user_description: "Ignore and remove user from all aspects?" like: "Tykkää" - shared_with: "Jaa heidän kanssa: %{aspect_names}" + shared_with: "Jaettu heidän kanssaan: %{aspect_names}" unlike: "En tykkää" via: "%{link} kautta" viewable_to_anyone: "Kuka tahansa verkossa näkee tämän viestin" @@ -780,31 +787,31 @@ fi: many: "Ole hyvä ja kirjoita tilaasi vähemmän kuin %{count} merkkiä" one: "viestin merkkimäärä voi olla maksimissaan %{count}" other: "viestin merkkimäärä voi olla maksimissaan %{count}" - two: "please make your status messages less than %{count} characters" + two: "statusviestisi voi olla korkeintaan %{count} merkin pituinen" zero: "viestin merkkimäärä voi olla maksimissaan %{count}" stream_helper: - hide_comments: "piilota kommentit" + hide_comments: "Piilota kaikki kommentit" show_more_comments: "Näytä kaikki (%{number}) kommentit" streams: aspects: - title: "Your Aspects" - aspects_stream: "Aspects" - commented_on: "commented on" - community_spotlight_stream: "Community Spotlight" + title: "Näkymäsi" + aspects_stream: "Näkymät" + commented_on: "kommentoidut" + community_spotlight_stream: "Yhteisön valokeila" followed_tag: add_a_tag: "Lisää tagi" contacts_title: "People who dig these tags" - follow: "Follow" - title: "#Followed Tags" - followed_tags_stream: "#Followed Tags" - mentioned_stream: "@Mentions" + follow: "Seuraa" + title: "#Seuratut tagit" + followed_tags_stream: "#Seuratut tagit" + mentioned_stream: "@Maininnat" mentions: - contacts_title: "People who mentioned you" - title: "Your Mentions" + contacts_title: "Sinut maininneet ihmiset" + title: "@Maininnat" multi: - contacts_title: "People in your Stream" - title: "Stream" - posted: "posted" + contacts_title: "Ihmiset sinun virrassasi" + title: "Virta" + posted: "lähetetyt" public: contacts_title: "Recent Posters" title: "Public Activity" @@ -821,13 +828,13 @@ fi: success: "Onnistuneesti lopetettiin #%{name}:n seuraaminen" tags: show: - follow: "Seuraa #%{tag} " - followed_by: "followed by" - following: "Seurataan #%{tag}" + follow: "Seuraa tagia #%{tag} " + followed_by: "tagia seuraa" + following: "Seurataan tagia #%{tag}" nobody_talking: "Kukaan ei vielä keskustele tagista %{tag}." people_tagged_with: "Ihmiset merkitty %{tag} tagilla" posts_tagged_with: "Viestit merkitty #%{tag} tagilla" - stop_following: "Lopeta #%{tag} seuraaminen" + stop_following: "Lopeta tagin #%{tag} seuraaminen" tokens: show: connect_to_cubbies: "Yhdistä kohteeseen Cubbi.es" @@ -847,11 +854,14 @@ fi: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Käyttäjätilin sulkeminen onnistui." + destroy: + no_password: "Syötä nykyinen salasanasi sulkeaksesi tilisi." + success: "Tilisi on lukittu. Meiltä voi mennä 20 minuuttia tilisi sulkemiseen. Kiitos, kun kokeilit Diasporaa." + wrong_password: "Syötetty salasana ei vastannut nykyistä salasanaasi." edit: also_commented: "...joku myös kommentoi kontaktisi viestiin?" change: "Vaihda" - change_email: "Change E-Mail" + change_email: "Vaihda sähköpostiosoite" change_language: "Vaihda kieli" change_password: "Vaihda salasana" close_account: "Sulje käyttäjätili" @@ -870,10 +880,10 @@ fi: private_message: "...saat uuden viestin?" receive_email_notifications: "Vastaanota sähköposti-ilmoituksia, kun.." reshared: "...someone reshares your post?" - show_community_spotlight: "Show Community Spotlight in Stream?" - show_getting_started: "Re-enable Getting Started" + show_community_spotlight: "Näytetäänkö Yhteisön valokeila virrassa?" + show_getting_started: "Ota aloitusohjeet uudelleen käyttöön" started_sharing: "...aloittaa jakamaan kanssasi?" - stream_preferences: "Stream Preferences" + stream_preferences: "Virran asetukset" your_email: "Sähköpostiosoitteesi" your_handle: Diaspora-tunnuksesi getting_started: @@ -906,8 +916,8 @@ fi: language_not_changed: "Kielen vaihtaminen epäonnistui" password_changed: "Salasana vaihdettu. Voit nyt kirjautua uudella salasanallasi." password_not_changed: "Salasanan vaihto epäonnistui" - settings_not_updated: "Settings update failed" - settings_updated: "Settings updated" + settings_not_updated: "Asetusten päivittäminen epäonnistui" + settings_updated: "Asetukset päivitetty" unconfirmed_email_changed: "E-Mail Changed. Needs activation." unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: @@ -916,4 +926,4 @@ fi: no_person_constructed: "Yhtäkään henkilöä ei pystytty kokoamaan tältä hcard:ilta." not_enabled: "webfinger-palvelua ei ilmeisesti ole aktivoitu tilin, %{account}, isännälle" xrd_fetch_failed: "tapahtui virhe haettaessa xrd:tä käyttäjätilille %{account}" - welcome: Welcome! + welcome: Tervetuloa! diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml index 43de16b7c..8da73f69b 100644 --- a/config/locales/diaspora/fr.yml +++ b/config/locales/diaspora/fr.yml @@ -671,6 +671,7 @@ fr: failure: error: "une erreur s'est produite lors de la connexion avec ce service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Pas d'amis Facebook trouvés." service_friends: "Amis %{service}" index: @@ -847,7 +848,10 @@ fr: confirm_email: email_confirmed: "Email %{email} activé" email_not_confirmed: "L'email n'a pas pu être activé. Lien erroné ?" - destroy: "Votre compte a été clôturé. Il faudra peut-être 20 minutes pour terminer la fermeture de votre compte. Merci d'essayer Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "…quelqu'un d'autre commente une publication de votre contact ?" change: "Modifier" diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml index d4c019682..b7e0b60f4 100644 --- a/config/locales/diaspora/ga.yml +++ b/config/locales/diaspora/ga.yml @@ -671,6 +671,7 @@ ga: failure: error: "bhí earráid ag nasc leis an seirbhís sin" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ ga: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "D'eirigh le dúna do cúntas" + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Athraigh" diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml index 1accdbe46..a4d7fee5a 100644 --- a/config/locales/diaspora/he.yml +++ b/config/locales/diaspora/he.yml @@ -671,6 +671,7 @@ he: failure: error: "אירעה שגיאה בעת ההתחברות לשירות זה" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "לא נמצאו חברי פייסבוק." service_friends: "חברים ב־%{service}" index: @@ -847,7 +848,10 @@ he: confirm_email: email_confirmed: "כתובת הדוא״ל %{email} מופעלת" email_not_confirmed: "לא ניתן להפעיל את כתובת הדוא״ל. קישור שגוי?" - destroy: "חשבונך ננעל. סגירת חשבונך עלולה להימשך כ־20 דקות. תודה על שהתנסית בדיאספורה." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...מישהו הגיב גם על הרשומה של איש הקשר שלך?" change: "שינוי" diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml index 6bcc31636..c1a55fbf6 100644 --- a/config/locales/diaspora/hu.yml +++ b/config/locales/diaspora/hu.yml @@ -671,6 +671,7 @@ hu: failure: error: "Hiba történt a szolgáltatáshoz kapcsolódás közben" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Nincs Facebook ismerősöd" service_friends: "%{service} ismerős" index: @@ -849,7 +850,10 @@ hu: confirm_email: email_confirmed: "E-Mail (%{email}) aktiválva" email_not_confirmed: "Email cím aktiválása sikertelen. Rossz a link?" - destroy: "Fiók sikeresen lezárult. Körülbelül 20 perc míg végleg lezárjuk a fiókodat. Köszönjük, hogy kipróbáltad a Diaspora-t." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...más is hozzászólt az ismerősöd bejegyzéséhez?" change: "Módosítás" diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml index 03134a458..9977f70b3 100644 --- a/config/locales/diaspora/id.yml +++ b/config/locales/diaspora/id.yml @@ -671,6 +671,7 @@ id: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ id: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Account successfully closed." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml index 61f1add00..9197b5e91 100644 --- a/config/locales/diaspora/is.yml +++ b/config/locales/diaspora/is.yml @@ -671,6 +671,7 @@ is: failure: error: "villa kom upp við að tengjast þeirri þjónustu" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ is: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Notandastillingar voru afskráðar." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Breyting" diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index 480865c86..cf76f5f2e 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -169,11 +169,11 @@ it: back: "Indietro" blocks: create: - failure: "I couldn't ignore that user. #evasion" - success: "Alright, you won't see that user in your stream again. #silencio!" + failure: "Non posso ignorare quell'utente. #evasion" + success: "Ok, non vedrai più quell'utente nel tuo stream. #silencio!" destroy: - failure: "I couldn't stop ignoring that user. #evasion" - success: "Let's see what they have to say! #sayhello" + failure: "Non posso smettere di ignorare l'utente. #evasion" + success: "Vediamo cosa hanno da dire! #sayhello" bookmarklet: explanation: "Condividi su Diaspora in qualsiasi momento aggiungendo come segnalibro %{link}." explanation_link_text: "questo link" @@ -514,7 +514,7 @@ it: show: does_not_exist: "La persona non esiste!" has_not_shared_with_you_yet: "%{name} non ha ancora condiviso nessun post con te!" - ignoring: "You are ignoring all posts from %{name}." + ignoring: "Stai ignorando tutti i post di %{name}." incoming_request: "%{name} vuole condividere con te" mention: "Menziona" message: "Messaggio" @@ -671,6 +671,7 @@ it: failure: error: "si è verificato un errore durante la connessione a quel servizio" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Non ho trovato amici su Facebook." service_friends: "Amici su %{service}" index: @@ -692,8 +693,8 @@ it: settings: "Impostazioni" share_visibilites: update: - post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted." - see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page." + post_hidden_and_muted: "Il post di %{name} è stato nascosto e le notifiche disattivate." + see_it_on_their_profile: "Se vuoi vedere gli aggiornamenti di questi post, visita il profilo di %{name}." shared: add_contact: add_new_contact: "Aggiungi un nuovo contatto" @@ -758,9 +759,9 @@ it: connect_to_comment: "Connettiti con questo utente per commentare il post" currently_unavailable: "al momento non è possibile commentare" dislike: "Non mi piace" - hide_and_mute: "Nascondi e disattiva le notifiche" - ignore_user: "Ignore %{name}" - ignore_user_description: "Ignore and remove user from all aspects?" + hide_and_mute: "Nascondi il post e disattiva le notifiche" + ignore_user: "Ignora %{name}" + ignore_user_description: "Vuoi ignorare questo utente e rimuoverlo da tutti gli aspetti?" like: "Mi piace" shared_with: "Condiviso con: %{aspect_names}" unlike: "Annulla" @@ -847,7 +848,10 @@ it: confirm_email: email_confirmed: "Email %{email} attivata" email_not_confirmed: "L'email non è stata attivata. C'è un errore nel link?" - destroy: "Il tuo account è stato bloccato. Potrebbero occorrerci 20 minuti per terminare la chiusura del tuo account. Grazie per aver provato Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...qualcuno commenta un post dopo di te?" change: "Cambia" @@ -895,9 +899,9 @@ it: simply_visit: "Visita semplicemente" works_on_modern: "Funziona su tutti i moderni smartphone" privacy_settings: - ignored_users: "Ignored Users" - stop_ignoring: "Stop ignoring" - title: "Privacy Settings" + ignored_users: "Utenti ignorati" + stop_ignoring: "Smetti di ignorare" + title: "Impostazioni privacy" public: does_not_exist: "L'utente %{username} non esiste!" update: diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml index 702be0e88..da959a7f7 100644 --- a/config/locales/diaspora/ja.yml +++ b/config/locales/diaspora/ja.yml @@ -671,6 +671,7 @@ ja: failure: error: サービスへ接続中にエラーが発生しました。 finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ ja: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: アカウント閉鎖に成功しました。 + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "他の人も連絡先の投稿にコメントしたとき" change: "変更" diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml index 1c5273047..08354e7c9 100644 --- a/config/locales/diaspora/ko.yml +++ b/config/locales/diaspora/ko.yml @@ -93,7 +93,7 @@ ko: remove: "지우기" index: cubbies: - explanation: "Cubbi.es는 개발중인 최초의 디아스포라 어플입니다." + explanation: "Cubbi.es는 개발중인 첫 디아스포라 애플리케이션입니다." heading: "Cubbi.es에 연결하세요" learn_more: "자세히 알아보기" diaspora_id: @@ -164,15 +164,15 @@ ko: zero: "애스펙 없음" authorizations: index: - no_applications: "아직 어플을 등록하지 않았습니다." + no_applications: "아직 애플리케이션을 등록하지 않았습니다." revoke_access: "접속권한 취소" back: "돌아가기" blocks: create: - failure: "I couldn't ignore that user. #evasion" - success: "Alright, you won't see that user in your stream again. #silencio!" + failure: "그 사용자를 무시할 수 없었습니다. #evasion" + success: "이제 내 스트림에서 그 사용자를 볼 수 없습니다. #silencio!" destroy: - failure: "I couldn't stop ignoring that user. #evasion" + failure: "그 사용자를 무시하는 걸 멈출 수 없었습니다. #evasion" success: "Let's see what they have to say! #sayhello" bookmarklet: explanation: "%{link} 링크를 북마크로 추가하세요." @@ -514,7 +514,7 @@ ko: show: does_not_exist: "없는 사람입니다!" has_not_shared_with_you_yet: "%{name}님은 아직 나와 아무것도 공유하지 않았습니다!" - ignoring: "You are ignoring all posts from %{name}." + ignoring: "%{name}님의 모든 공유물을 무시하고 있습니다." incoming_request: "%{name}님이 나와 공유하길 원합니다" mention: "멘션" message: "쪽지" @@ -573,7 +573,7 @@ ko: not_found: "해당 공유물을 찾을 수 없습니다." permalink: "영구 링크" previous: "이전" - privacy: "Privacy" + privacy: "개인정보보호" profile: "프로필" profiles: edit: @@ -671,6 +671,7 @@ ko: failure: error: "서비스 연결중 에러가 발생했습니다." finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "페이스북 친구를 찾을 수 없습니다." service_friends: "%{service} 친구" index: @@ -692,8 +693,8 @@ ko: settings: "설정" share_visibilites: update: - post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted." - see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page." + post_hidden_and_muted: "%{name}님의 공유물이 감춰졌고, 알림이 되지 않습니다." + see_it_on_their_profile: "%{name}님의 프로필 페이지를 방문하면 이 공유물의 최신 상태를 볼 수 있습니다." shared: add_contact: add_new_contact: "새 컨택 추가" @@ -742,7 +743,7 @@ ko: discard_post: "공유물 삭제" make_public: "공개하기" new_user_prefill: - hello: "#%{new_user_tag} 반갑습니다! 새로 가입했습니다." + hello: "반갑습니다! 새로 가입했습니다. #%{new_user_tag}!" i_like: "제 관심사는 %{tags} 입니다." invited_by: "초대해주셔서 고맙습니다," post_a_message_to: "%{aspect}에 공유물 올리기" @@ -759,8 +760,8 @@ ko: currently_unavailable: "지금은 댓글을 달 수 없습니다" dislike: "싪어요" hide_and_mute: "숨기고 알림 끄기" - ignore_user: "Ignore %{name}" - ignore_user_description: "Ignore and remove user from all aspects?" + ignore_user: "%{name}님 무시하기" + ignore_user_description: "이 사용자를 무시한 뒤 모든 애스펙에서 지우시겠습니까?" like: "좋아요" shared_with: "공유된 애스펙: %{aspect_names}" unlike: "좋아요 취소" @@ -840,14 +841,17 @@ ko: sign_up_today: "지금 가입하세요!" typical_userpage: "전형적인 cubbi.es 사용자 페이지" via: "(via %{link})" - what_is_cubbies: "Cubbi.es 는 세계 최초의 디아스포라 어플입니다. 온라인으로 사진을 모을 수 있는 가장 좋은 방법이기도 합니다." + what_is_cubbies: "Cubbi.es 는 세계 최초의 디아스포라 애플리케이션입니다. 온라인으로 사진을 모을 수 있는 가장 좋은 방법이기도 합니다." undo: 돌이키겠습니까? username: "사용자명" users: confirm_email: email_confirmed: "%{email} 이메일이 활성화되었습니다" email_not_confirmed: "이메일을 활성화할 수 없습니다. 링크를 확인해주세요." - destroy: "계정을 성공적으로 없앴습니다." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "댓글 달았던 공유물에 내 컨택도 댓글을 달았을 때" change: "바꾸기" @@ -895,9 +899,9 @@ ko: simply_visit: "모바일 기기로" works_on_modern: "모든 최신 스마트폰에서 작동합니다" privacy_settings: - ignored_users: "Ignored Users" - stop_ignoring: "Stop ignoring" - title: "Privacy Settings" + ignored_users: "내가 무시한 사용자" + stop_ignoring: "무시하지 않기" + title: "개인정보보호 설정" public: does_not_exist: "%{username}님을 찾을 수 없습니다!" update: diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml index c2f2c9a8f..d21b5515b 100644 --- a/config/locales/diaspora/lt.yml +++ b/config/locales/diaspora/lt.yml @@ -671,6 +671,7 @@ lt: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ lt: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Paskyra uždaryta sėkmingai." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml index 531404a1f..446033630 100644 --- a/config/locales/diaspora/mk.yml +++ b/config/locales/diaspora/mk.yml @@ -671,6 +671,7 @@ mk: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ mk: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Корисничката сметка е успешно затворена." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml index ea0df5f88..9550f1572 100644 --- a/config/locales/diaspora/nb.yml +++ b/config/locales/diaspora/nb.yml @@ -671,6 +671,7 @@ nb: failure: error: "feil under tilkobling av tjenesten" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ nb: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Kontoen er stengt." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: " noen andre også kommenterte på din kontakts innlegg?" change: "Endre" diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml index 632007306..0f3b5a98b 100644 --- a/config/locales/diaspora/nl.yml +++ b/config/locales/diaspora/nl.yml @@ -671,6 +671,7 @@ nl: failure: error: "er ging iets mis bij het verbinden met die service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Geen Facebook vrienden gevonden." service_friends: "%{service} Vrienden" index: @@ -847,7 +848,10 @@ nl: confirm_email: email_confirmed: "E-mail %{email} geactiveerd" email_not_confirmed: "E-mail kon niet worden geactiveerd. Verkeerde link?" - destroy: "Je account is geblokkeerd. Het sluiten van je account kan twintig minuten in beslag nemen. Bedankt voor je interesse in Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...iemand na jou op de post van jouw contact reageert?" change: "Verander" diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml index 7a5158833..d94c0044a 100644 --- a/config/locales/diaspora/nn.yml +++ b/config/locales/diaspora/nn.yml @@ -671,6 +671,7 @@ nn: failure: error: "klarte ikkje å kopla til tenesta" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Fann ingen Facebook-vener." service_friends: "%{service}-vener" index: @@ -847,7 +848,10 @@ nn: confirm_email: email_confirmed: "E-post %{email} teken i bruk" email_not_confirmed: "Klarte ikkje å slå på bruk av e-post. Feil lenkje?" - destroy: "Kontoen din er vorten låst. Det kan ta inntil 20 minutt for oss å verta ferdig med lukka han. Takk for at du prøvde Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "… nokon òg kommenterer kontakten din sitt innlegg?" change: "Endra" diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml index 8860f4e42..1b2810d18 100644 --- a/config/locales/diaspora/pa.yml +++ b/config/locales/diaspora/pa.yml @@ -671,6 +671,7 @@ pa: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ pa: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Account successfully closed." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml index 5cd676168..8b06455ca 100644 --- a/config/locales/diaspora/pl.yml +++ b/config/locales/diaspora/pl.yml @@ -169,11 +169,11 @@ pl: back: "Powrót" blocks: create: - failure: "I couldn't ignore that user. #evasion" - success: "Alright, you won't see that user in your stream again. #silencio!" + failure: "Nie mogę zignorować tego użytkownika. #evasion" + success: "Dobra, ten użytkownik nie pojawi się ponownie w Twoim strumieniu. #silencio!" destroy: - failure: "I couldn't stop ignoring that user. #evasion" - success: "Let's see what they have to say! #sayhello" + failure: "Nie mogę przestać ignorować tego użytkownika. #evasion" + success: "Zobaczmy co mają do powiedzenia! #sayhello" bookmarklet: explanation: "Publikuj w Disporze z każdego miejsca dodając do zakładek %{link}." explanation_link_text: "te łącze" @@ -426,19 +426,19 @@ pl: two: "%{actors} wysłało ci wiadomość." zero: "%{actors} wysłał ci wiadomość." reshared: - few: "%{actors} udostępnili ponownie Twój %{post_link}." - many: "%{actors} udostępnili ponownie Twój %{post_link}." + few: "%{actors} przekazali dalej Twój %{post_link}." + many: "%{actors} przekazali dalej Twój %{post_link}." one: "%{actors} podzielił się twoim wpisem %{post_link}." - other: "%{actors} udostępnili ponownie Twój %{post_link}." - two: "%{actors} udostępnili ponownie Twój %{post_link}." - zero: "%{actors} udostępniło ponownie Twój %{post_link}." + other: "%{actors} przekazali dalej Twój %{post_link}." + two: "%{actors} przekazali dalej Twój %{post_link}." + zero: "%{actors} przekazał dalej Twój %{post_link}." reshared_post_deleted: - few: "%{actors} udostępniło ponownie Twój usunięty wpis." - many: "%{actors} udostępnili ponownie Twój usunięty wpis." - one: "%{actors} udostępnił(a) ponownie Twój usunięty wpis." - other: "%{actors} udostępnili ponownie Twój usunięty wpis." - two: "%{actors} ponownie udostępnili Twój usunięty wpis." - zero: "%{actors} udostępnili ponownie Twój usunięty wpis." + few: "%{actors} przekazali dalej Twój usunięty wpis." + many: "%{actors} przekazali dalej Twój usunięty wpis." + one: "%{actors} przekaza@{m:ł|f:ła|n:ło} dalej Twój usunięty wpis." + other: "%{actors} przekazali ponownie Twój usunięty wpis." + two: "%{actors} przekazali dalej Twój usunięty wpis." + zero: "%{actors} przekazali dalej Twój usunięty wpis." started_sharing: few: "%{actors} zaczęli Ci udostępniać." many: "%{actors} zaczęli Ci udostępniać." @@ -465,7 +465,7 @@ pl: private_message: reply_to_or_view: "Odpowiedz lub wyświetl wątek >" reshared: - reshared: "%{name} udostępni@{m:ł|f:ła|n:ł} ponownie Twój wpis" + reshared: "%{name} przekaza@{m:ł|f:ła|n:ł} ponownie Twój wpis" view_post: "Wyświetl wpis >" single_admin: admin: "Administrator Diaspory" @@ -514,7 +514,7 @@ pl: show: does_not_exist: "Osoba nie istnieje!" has_not_shared_with_you_yet: "%{name} nie udostępnia Ci jeszcze żadnych wpisów!" - ignoring: "You are ignoring all posts from %{name}." + ignoring: "Ignorujesz wszystkie wpisy od %{name}." incoming_request: "%{name} chce Ci udostępniać" mention: "Wspomnij" message: "Wiadomość" @@ -573,7 +573,7 @@ pl: not_found: "Nie można odnaleźć wskazanego wpisu." permalink: "permalink" previous: "poprzedni" - privacy: "Privacy" + privacy: "Prywatność" profile: "Profil" profiles: edit: @@ -650,14 +650,14 @@ pl: reshare: deleted: "Oryginał został usunięty przez autora." reshare: - few: "%{count} ponownych udostępnień" - many: " %{count} ponownych udostępnień" - one: "1 ponowne udostępnienie" + few: "Przekazano dalej: %{count}" + many: "Przekazano dalej: %{count}" + one: "Przekazano dalej: 1" other: "%{count} ponowne udostępnienia" - two: " %{count} ponowne udostępnienia" + two: "Przekazano dalej: %{count}" zero: "Ponownie udostępnij" - reshare_confirmation: "Udostępnić ponownie wpis użytkownika %{author}?" - reshare_original: "Udostępnij ponownie oryginał" + reshare_confirmation: "Przekazać dalej wpis użytkownika %{author}?" + reshare_original: "Przekaż dalej oryginał" reshared_via: "Ponownie udostępniony przez" show_original: "Wyświetl oryginał" search: "Znajdź" @@ -671,6 +671,7 @@ pl: failure: error: "wystąpił błąd podczas łączenia z tą usługą" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Nie znaleziono znajomych z Facebooka." service_friends: "Znajomi z %{service} " index: @@ -692,8 +693,8 @@ pl: settings: "Ustawienia" share_visibilites: update: - post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted." - see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page." + post_hidden_and_muted: "Wpisy użytkownika %{name} zostały ukryte, a powiadomienia wyciszone." + see_it_on_their_profile: "Jeśli chcesz zobaczyć aktualizacje tego wpisu, odwiedź profil użytkownika %{name}." shared: add_contact: add_new_contact: "Dodaj nowy kontakt" @@ -753,14 +754,14 @@ pl: upload_photos: "Prześlij zdjęcia" whats_on_your_mind: "O czym myślisz?" reshare: - reshare: "Podziel się ponownie" + reshare: "Przekaż dalej" stream_element: connect_to_comment: "Połącz się z tym użytkownikiem, aby komentować jego wpisy" currently_unavailable: "dodawanie komentarzy jest aktualnie niemożliwe" dislike: "Nie lubię" - hide_and_mute: "Ukryj i wycisz" - ignore_user: "Ignore %{name}" - ignore_user_description: "Ignore and remove user from all aspects?" + hide_and_mute: "Ukryj i wycisz wpis" + ignore_user: "Ignoruj - %{name}" + ignore_user_description: "Dodać użytkownika do listy ignorowanych i usunąć ze wszystkich aspektów?" like: "Lubię" shared_with: "Opublikowano w: %{aspect_names}" unlike: "Nie lubię" @@ -847,7 +848,10 @@ pl: confirm_email: email_confirmed: "Adres e-mail %{email} został aktywowany" email_not_confirmed: "Nie można aktywować adresu e-mail. Nieprawidłowe łącze?" - destroy: "Konto zostało zablokowane. Dokończenie zamykania konta może nam zająć do 20 minut. Dziękujemy za wypróbowanie Diaspory." + destroy: + no_password: "Wpisz hasło, aby zamknąć konto." + success: "Konto zostało zablokowane. Zakończenie zamykania konta może zająć do 20 minut. Dziękujemy za wypróbowanie Diaspory." + wrong_password: "Wprowadzone hasło nie jest zgodne z aktualnym hasłem." edit: also_commented: "...ktoś także skomentuje wpis jednego z z moich kontaktów" change: "Zmień" @@ -869,7 +873,7 @@ pl: photo_export_unavailable: "Eksportowanie zdjęć jest aktualnie niedostępne" private_message: "...otrzymam prywatną wiadomość" receive_email_notifications: "Wysyłaj powiadomienia e-mail jeśli..." - reshared: "...ktoś ponownie udostępnił mój post" + reshared: "...ktoś przekazał dalej mój wpis" show_community_spotlight: "Wyświetlić osoby w centrum uwagi społeczności w Strumieniu?" show_getting_started: "Ponownie włącz - Pierwsze kroki" started_sharing: "...ktoś zaczął mi coś udostępniać" @@ -895,9 +899,9 @@ pl: simply_visit: "Wystarczy odwiedzić" works_on_modern: "Działa na wszystkich nowoczesnych smartfonach" privacy_settings: - ignored_users: "Ignored Users" - stop_ignoring: "Stop ignoring" - title: "Privacy Settings" + ignored_users: "Ignorowani użytkownicy" + stop_ignoring: "Przestań ignorować" + title: "Ustawienia prywatności" public: does_not_exist: "Użytkownik %{username} nie istnieje!" update: diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml index 3734b93e4..8e8a1e4e8 100644 --- a/config/locales/diaspora/pt-BR.yml +++ b/config/locales/diaspora/pt-BR.yml @@ -671,6 +671,7 @@ pt-BR: failure: error: "Houve uma falha na conexão deste serviço" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Ninguém do Facebook foi encontrado." service_friends: "%{service} Amigos" index: @@ -847,7 +848,10 @@ pt-BR: confirm_email: email_confirmed: "Email %{email} ativado" email_not_confirmed: "O email não pode ser ativado. O endereço está correto?" - destroy: "Sua conta foi bloqueada! Pode demorar até 20 minutos para finalizarmos o encerramento da sua conta. Obrigado por utilizar Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...alguém comentar nas postagens dos teus contatos?" change: "Alterar" diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index 08d8958ff..058405db2 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -671,6 +671,7 @@ pt-PT: failure: error: "ocorreu um erro ao ligar a esse serviço" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Nenhum amigo do Facebook foi encontrado." service_friends: "Amigos do %{service}" index: @@ -847,7 +848,10 @@ pt-PT: confirm_email: email_confirmed: "Email %{email} activado" email_not_confirmed: "O email não pode ser activado. Hiperligação errada?" - destroy: "A sua conta foi encerrada. Pode demorar até 20 minutos para que terminemos o processo de encerramento da sua conta. Obrigado por experimentar o Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...alguém também comenta na publicação do seu contacto?" change: "Alterar" diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml index 57a1f47f2..16b75fd88 100644 --- a/config/locales/diaspora/ro.yml +++ b/config/locales/diaspora/ro.yml @@ -671,6 +671,7 @@ ro: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Prieteni" index: @@ -847,7 +848,10 @@ ro: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Contul a fost închis cu succes." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Modifică" diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index d6f9686c6..1395dcd70 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -169,11 +169,11 @@ ru: back: "Назад" blocks: create: - failure: "I couldn't ignore that user. #evasion" - success: "Alright, you won't see that user in your stream again. #silencio!" + failure: "Я не могу заблокировать этого пользователя. #evasion" + success: "Хорошо, вы больше не увидете этого пользователя в своем потоке. #silencio!" destroy: - failure: "I couldn't stop ignoring that user. #evasion" - success: "Let's see what they have to say! #sayhello" + failure: "Не могу прекратить блокировать этого пользователя. #evasion" + success: "Посмотрим, что они скажут! #sayhello" bookmarklet: explanation: "Пишите в Диаспору с любой страницы с помощью %{link}." explanation_link_text: "этой закладки" @@ -514,7 +514,7 @@ ru: show: does_not_exist: "Персоны не существует!" has_not_shared_with_you_yet: "%{name} еще не делился записями с вами!" - ignoring: "You are ignoring all posts from %{name}." + ignoring: "Вы блокируете все записи пользователя %{name}." incoming_request: "%{name} хочет поделиться с вами" mention: "Упоминание" message: "Сообщение" @@ -573,7 +573,7 @@ ru: not_found: "Извините, мы не смогли найти эту запись." permalink: "постоянная ссылка" previous: "предыдущая" - privacy: "Privacy" + privacy: "Приватность" profile: "Профиль" profiles: edit: @@ -628,7 +628,7 @@ ru: sent: "Вы просили поделиться с %{name}. Они должны увидеть это при следующем входе в Диаспору." destroy: error: "Выберите, пожалуйста, один аспект!" - ignore: "Игнорированые запросы на дружбу." + ignore: "Проигнорированные запросы на дружбу." success: "Теперь вы друзья." helper: new_requests: @@ -671,6 +671,7 @@ ru: failure: error: "Произошла ошибка при подключении этого сервиса" finder: + fetching_contacts: "Диаспора добавляет ваших друзей из %{service}. Пожалуйста, подождите пару минут." no_friends: "Не найдено друзей из Facebook." service_friends: "Друзья из %{service}" index: @@ -692,8 +693,8 @@ ru: settings: "Настройки" share_visibilites: update: - post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted." - see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page." + post_hidden_and_muted: "Запись пользователя %{name} была скрыта, а уведомления отключены." + see_it_on_their_profile: "Если вы хотите видеть обновления этой записи, посетите профиль пользователя %{name}." shared: add_contact: add_new_contact: "Добавить контакт" @@ -731,19 +732,19 @@ ru: control_your_audience: "Выбирайте свою аудиторию" logged_in: "вошли в %{service}" manage: "управление подключенными сервисами" - new_user_welcome_message: "Используйте #метки для классификации своих записей и поиска людей со схожими интересами. Привлекайте внимание интересных людей с помощью @упоминаний" + new_user_welcome_message: "Используйте #метки для классификации своих записей и поиска людей со схожими интересами. Привлекайте внимание интересных людей с помощью @упоминаний." outside: "Публичные сообщения доступны для чтения всем, даже за пределами Диаспоры." share: "Делитесь" title: "Настройка подключенных услуг" - visibility_dropdown: "Используйте это выпадающее меню для смены видимости вашей записи (мы предлагаем вам сделать первую запись публичной)." + visibility_dropdown: "Используйте это выпадающее меню для смены видимости вашей записи (мы предлагаем вам сделать эту первую запись публичной)." publisher: all: "все" all_contacts: "все контакты" discard_post: "Отменить запись" make_public: "сделать публичным" new_user_prefill: - hello: "Привет всем, я тут #%{new_user_tag}." - i_like: "Я интересуюсь %{tags}." + hello: "Привет всем, я тут новенький (#%{new_user_tag})." + i_like: "Мне интересны метки %{tags}." invited_by: "Спасибо за приглашение, " post_a_message_to: "Опубликовать сообщение для %{aspect}" posting: Отправка... @@ -759,8 +760,8 @@ ru: currently_unavailable: "комментирование недоступно" dislike: "Не нравится" hide_and_mute: "Скрыть и отключить уведомления" - ignore_user: "Ignore %{name}" - ignore_user_description: "Ignore and remove user from all aspects?" + ignore_user: "Блокировать пользователя %{name}" + ignore_user_description: "Блокировать и удалить пользователя из всех аспектов?" like: "Мне нравится" shared_with: "Для аспектов: %{aspect_names}" unlike: "Не нравится" @@ -847,7 +848,10 @@ ru: confirm_email: email_confirmed: "Адрес %{email} активирован" email_not_confirmed: "Адрес не может быть активирован. Неверная ссылка?" - destroy: "Ваш аккаунт заблокирован. Примерно через 20 минут аккаунт будет окончательно закрыт. Благодарим Вас за использование Диаспоры." + destroy: + no_password: "Пожалуйста, введите пароль, чтобы закрыть свою учетную запись." + success: "Ваша учетная запись заблокирована. На полное закрытие вашей учетной записи может уйти до 20 минут. Спасибо, что были вместе с нами." + wrong_password: "Введенный вами пароль не совпадает с вашим текущим паролем." edit: also_commented: "... кто-то комментировал сообщения ваших контактов?" change: "Изменить" @@ -895,9 +899,9 @@ ru: simply_visit: "Просто зайдите на" works_on_modern: "Работает на всех современных смартфонах" privacy_settings: - ignored_users: "Ignored Users" - stop_ignoring: "Stop ignoring" - title: "Privacy Settings" + ignored_users: "Заблокированные пользователи" + stop_ignoring: "Прекратить блокирование" + title: "Настройки приватности" public: does_not_exist: "Пользователя %{username} не существует!" update: diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml index 9e5e85982..ed014616f 100644 --- a/config/locales/diaspora/sk.yml +++ b/config/locales/diaspora/sk.yml @@ -671,6 +671,7 @@ sk: failure: error: "pri pripájaní k službe nastala chyba" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Žiadni priatelia z Facebooku sa nenašli." service_friends: "Priatelia zo siete %{service}" index: @@ -847,7 +848,10 @@ sk: confirm_email: email_confirmed: "E-mail %{email} aktivovaný" email_not_confirmed: "E-mail sa nepodarilo aktivovať. Zlý odkaz?" - destroy: "Váš účet bol zamknutý. Dokončenie zrušenia vášho účtu nám môže trvať 20 minút. Ďakujeme, že ste vyskúšali Diasporu." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...niekto okomentuje aj príspevok človeka vo vašich kontaktoch?" change: "Zmeniť" diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml index 78bf0da41..0118b1dc7 100644 --- a/config/locales/diaspora/sl.yml +++ b/config/locales/diaspora/sl.yml @@ -842,6 +842,7 @@ sl: cHJpIHBvdmV6b3Zhbmp1IHMgc2Vydmlzb20gamUgcHJpmmxvIGRvIG5hcGFr ZQ== finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -1042,8 +1043,10 @@ sl: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: !binary | - VXBvcmFibmmaa2kgcmHodW4gamUgdXNwZZpubyB6YXBydC4= + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Spremeni" diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml index 93b41ede2..a9d3a0c47 100644 --- a/config/locales/diaspora/sq.yml +++ b/config/locales/diaspora/sq.yml @@ -671,6 +671,7 @@ sq: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ sq: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: "Account successfully closed." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index 52f70c60a..1cea14607 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -671,6 +671,7 @@ sv: failure: error: "Det blev ett fel vid anslutning till tjänsten" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Hittade inga vänner ifrån Facebook." service_friends: "%{service}-vänner" index: @@ -847,7 +848,10 @@ sv: confirm_email: email_confirmed: "E-mail %{email} aktiverad" email_not_confirmed: "E-mail kunde inte aktiveras. Fel länk?" - destroy: "Ditt konto är nu låst. Det kan ta upp till 20 minuter att stänga kontot. Tack för att du provade Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...någon har också kommenterat på din kontakts post?" change: "Ändra" diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml index 500b60b4a..85abdf18b 100644 --- a/config/locales/diaspora/tr.yml +++ b/config/locales/diaspora/tr.yml @@ -671,6 +671,7 @@ tr: failure: error: "hizmete bağlanırken hata oluştu" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Hiç Facebook arkadaşı bulunamadı." service_friends: "%{service} Arkadaşları" index: @@ -847,7 +848,10 @@ tr: confirm_email: email_confirmed: "E-posta %{email} doğrulandı" email_not_confirmed: "E-posta doğrulanamadı. Yanlış bağlantı olabilir mi?" - destroy: "Hesap başarıyla kapatıldı." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...birisi gönderime yorum yazdığında?" change: "Değiştir" diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml index b6cc41254..41c1d99e1 100644 --- a/config/locales/diaspora/uk.yml +++ b/config/locales/diaspora/uk.yml @@ -671,6 +671,7 @@ uk: failure: error: "Сталася помилка при підключенні цього сервісу" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "Не знайдено друзів з Facebook." service_friends: "Друзі з %{service}" index: @@ -847,7 +848,10 @@ uk: confirm_email: email_confirmed: "Адреса %{email} активована" email_not_confirmed: "Адреса не може бути активована. Невірне посилання?" - destroy: "Ваш аккаунт заблокований. Приблизно через 20 хвилин аккаунт буде остаточно закритий. Дякуємо Вам за використання Діаспори." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "... хтось коментував повідомлення ваших контактів?" change: "Змінити" diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml index 02c76c9f7..71e8fc60a 100644 --- a/config/locales/diaspora/ur-PK.yml +++ b/config/locales/diaspora/ur-PK.yml @@ -671,6 +671,7 @@ ur-PK: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ ur-PK: confirm_email: email_confirmed: "Email %{email} activated" email_not_confirmed: "Email could not be activated. Wrong link?" - destroy: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml index 6d891e1c6..05a02f0d8 100644 --- a/config/locales/diaspora/vi.yml +++ b/config/locales/diaspora/vi.yml @@ -671,6 +671,7 @@ vi: failure: error: "there was an error connecting that service" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ vi: confirm_email: email_confirmed: "Email %{email} activated" email_not_confirmed: "Email could not be activated. Wrong link?" - destroy: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml index 2635a97ab..a5956c1e9 100644 --- a/config/locales/diaspora/zh-CN.yml +++ b/config/locales/diaspora/zh-CN.yml @@ -671,6 +671,7 @@ zh-CN: failure: error: "与该服务连接时有错误" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "No Facebook friends found." service_friends: "%{service} Friends" index: @@ -847,7 +848,10 @@ zh-CN: confirm_email: email_confirmed: "E-Mail %{email} activated" email_not_confirmed: "E-Mail could not be activated. Wrong link?" - destroy: 帐号关闭成功。 + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: ……当有人也对您的好友的内容发表评论时？ change: "更改" diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml index 1a23b7f3a..9db0fdc68 100644 --- a/config/locales/diaspora/zh-TW.yml +++ b/config/locales/diaspora/zh-TW.yml @@ -116,8 +116,8 @@ zh-TW: keep_us_running: "為了讓 %{pod} 高速奔馳, 用每月捐款來提供些咖啡存量給我們的伺服器吧!" new_here: follow: "Follow %{link} and welcome new users to Diaspora*!" - learn_more: "Learn more" - title: "Welcome New Users" + learn_more: "了解詳情" + title: "歡迎新使用者" no_contacts: "沒有任何聯絡人" no_tags: "+ 找個標籤來追蹤" people_sharing_with_you: "跟你分享的人" @@ -298,7 +298,7 @@ zh-TW: comma_seperated_plz: "你可以輸入多個電子信箱, 只要以逗號分隔即可." if_they_accept_info: "如果他們接受, 就會被加入至你所邀請的面向中." invite_someone_to_join: "邀請某人來加入 Diaspora!" - language: "Language" + language: "語言" personal_message: "個人訊息" resend: "重寄" send_an_invitation: "寄出邀請函" @@ -573,7 +573,7 @@ zh-TW: not_found: "抱歉,找不到該則貼文." permalink: "靜態連結" previous: "前面" - privacy: "Privacy" + privacy: "隱私" profile: "個人檔案" profiles: edit: @@ -671,6 +671,7 @@ zh-TW: failure: error: "與該服務連結時有錯誤" finder: + fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes." no_friends: "沒有 Facebook 朋友." service_friends: "%{service} 朋友" index: @@ -758,7 +759,7 @@ zh-TW: connect_to_comment: "要回應貼文請先和作者建立聯繫" currently_unavailable: "目前無法回應" dislike: "遜" - hide_and_mute: "隱藏且消音" + hide_and_mute: "將貼文隱藏且消音" ignore_user: "Ignore %{name}" ignore_user_description: "Ignore and remove user from all aspects?" like: "讚" @@ -815,10 +816,10 @@ zh-TW: tag_followings: create: failure: "追蹤 #%{name} 失敗. 是否已經在追蹤了?" - success: "喔耶! 你已經在追蹤 #%{name} 了." + success: "喔耶! 你已經開始追蹤 #%{name} 了." destroy: - failure: "停止追蹤失敗: #%{name}" - success: "停止追蹤成功: #%{name}" + failure: "停止追蹤標籤 #%{name} 失敗. 也許你已經沒在追蹤了?" + success: "唉! 你從此不再追蹤標籤 #%{name} 了." tags: show: follow: "追蹤 #%{tag}" @@ -847,7 +848,10 @@ zh-TW: confirm_email: email_confirmed: "E-Mail %{email} 已經啟用了" email_not_confirmed: "無法啟用E-Mail. 連結有誤嗎?" - destroy: "帳號已經鎖定了. 關閉帳號可能需要20分鐘才能完成. 感謝你試用 Diaspora." + destroy: + no_password: "Please enter your current password to close your account." + success: "Your account has been locked. It may take 20 minutes for us to finish closing your account. Thank you for trying Diaspora." + wrong_password: "The entered password didn't match your current password." edit: also_commented: "...當有人也對你的聯絡人的貼文發表意見時?" change: "更改" diff --git a/config/locales/javascript/javascript.cy.yml b/config/locales/javascript/javascript.cy.yml index bc2b6101b..83265a254 100644 --- a/config/locales/javascript/javascript.cy.yml +++ b/config/locales/javascript/javascript.cy.yml @@ -21,7 +21,7 @@ cy: zero: "Dewiswch agweddau" aspect_navigation: deselect_all: "Deselect all" - no_aspects: "No aspects selected" + no_aspects: "Dydych chi ddim wedi dewis unrhyw agweddau" select_all: "Dewis i gŷd" comments: hide: "cuddio sylwadau" diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml index e532661af..352e90766 100644 --- a/config/locales/javascript/javascript.de.yml +++ b/config/locales/javascript/javascript.de.yml @@ -33,7 +33,7 @@ de: alright_ill_wait: "Alles klar, ich warte." hey: "Hey, {{name}}!" no_tags: "Hey, du folgst noch keinen Tags! Trotzdem weitermachen?" - preparing_your_stream: "Dein personalisierter Stream wird zusammengestellt..." + preparing_your_stream: "Dein persönlicher Stream wird zusammengestellt …" infinite_scroll: no_more: "Keine weiteren Beiträge." photo_uploader: diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml index 2a7bc82e7..ec266b7a5 100644 --- a/config/locales/javascript/javascript.es.yml +++ b/config/locales/javascript/javascript.es.yml @@ -8,7 +8,7 @@ es: aspect_dropdown: add_to_aspect: "Añadir contacto" all_aspects: "Todos los aspectos" - error: "Couldn't start sharing with {{name}}. Are you ignoring them?" + error: "No podría empezar a compartir con {{name}}. ¿Vas a ignonarl@?" select_aspects: "Elige los aspectos" started_sharing_with: "¡Has empezado a compartir con {{name}}!" stopped_sharing_with: "Ya no compartes más con {{name}}." diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml index a0ab657ee..624454480 100644 --- a/config/locales/javascript/javascript.it.yml +++ b/config/locales/javascript/javascript.it.yml @@ -8,7 +8,7 @@ it: aspect_dropdown: add_to_aspect: "Aggiungi" all_aspects: "Tutti gli aspetti" - error: "Couldn't start sharing with {{name}}. Are you ignoring them?" + error: "Non è possibile condividere con {{name}}. E' tra gli utenti ignorati?" select_aspects: "Scegli gli aspetti" started_sharing_with: "Hai iniziato a condividere con {{name}}!" stopped_sharing_with: "Hai smesso di condividere con {{name}}." diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml index 01864f874..6cc39ec00 100644 --- a/config/locales/javascript/javascript.pl.yml +++ b/config/locales/javascript/javascript.pl.yml @@ -8,7 +8,7 @@ pl: aspect_dropdown: add_to_aspect: "Dodaj kontakt" all_aspects: "Wszystkie aspekty" - error: "Couldn't start sharing with {{name}}. Are you ignoring them?" + error: "Nie można zacząć dzielić się z {{name}}. Może ich ignorujesz?" select_aspects: "Wybierz aspekty" started_sharing_with: "Od teraz dzielisz się z {{name}}!" stopped_sharing_with: "Nie dzielisz się już z {{name}}." diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml index 9180e58ca..980d4e2ce 100644 --- a/config/locales/javascript/javascript.zh-TW.yml +++ b/config/locales/javascript/javascript.zh-TW.yml @@ -8,7 +8,7 @@ zh-TW: aspect_dropdown: add_to_aspect: "加聯絡人" all_aspects: "所有面向" - error: "Couldn't start sharing with {{name}}. Are you ignoring them?" + error: "無法開始和 {{name}} 分享. 你還在忽視他們嗎?" select_aspects: "選面向" started_sharing_with: "你開始和 {{name}} 分享了!" stopped_sharing_with: "你停止和 {{name}} 分享了." @@ -33,7 +33,7 @@ zh-TW: alright_ill_wait: "好吧, 以後再說." hey: "嘿, {{name}}!" no_tags: "嘿, 你還沒有追蹤任何標籤! 要往下一步嗎?" - preparing_your_stream: 整理你個人的流水帳... + preparing_your_stream: 整理你個人的流水帳中... infinite_scroll: no_more: 沒有貼文了. photo_uploader: