diff --git a/.sass-cache/45e4e9f67747727a1d5f5f5a66df9ff84e1a8282/_mixins.sassc b/.sass-cache/45e4e9f67747727a1d5f5f5a66df9ff84e1a8282/_mixins.sassc
deleted file mode 100644
index 2e7ac1635abf83d9c7d3c5c3399e6159398aad3d..0000000000000000000000000000000000000000
Binary files a/.sass-cache/45e4e9f67747727a1d5f5f5a66df9ff84e1a8282/_mixins.sassc and /dev/null differ
diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index a2eff9207b45648da2beebdf139366f746312e4d..e301d75b9e097267c9897a70c114f3e1758c33b9 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -48,7 +48,7 @@
%br
%br
- %b your aspects
+ %b= t('.your_aspects')
%br
- for aspect in @all_aspects
= link_to aspect, aspects_path('a_ids[]' => aspect.id)
@@ -56,7 +56,7 @@
%br
%br
- = link_to 'logout', destroy_user_session_path
+ = link_to t('layouts.header.logout'), destroy_user_session_path
-if current_user
@@ -79,7 +79,7 @@
= @notification_count
%h4
- your aspects
+ = t('.your_aspects')
%ul{:data => {:role => 'listview', :inset => 'true'}}
%li
@@ -90,12 +90,11 @@
#footer
- logged in as
- = link_to current_user.name, current_user.person
+ = link_to t('.logged_in_as' :name => current_user.name), current_user.person
%br
%br
- %b your aspects
+ %b= t('.your_aspects')
%br
- for aspect in @all_aspects
= link_to aspect, aspects_path('a_ids[]' => aspect.id)
@@ -103,4 +102,4 @@
%br
%br
- = link_to 'logout', destroy_user_session_path
+ = link_to t('layouts.header.logout'), destroy_user_session_path
diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml
index 22e596aa5a61d8e29c6e9d529383ede977d72c87..3b5d52bada4c5976697f845e26e63ab76b717ded 100644
--- a/app/views/notifications/index.html.haml
+++ b/app/views/notifications/index.html.haml
@@ -38,7 +38,7 @@
= t('.notifications')
.span-13.last.left
.button.mark_all_read
- = link_to "Mark All as Read", "#"
+ = link_to t('.mark_all_as_read'), "#"
.span-24.last
%ul.stream.notifications
diff --git a/app/views/people/index.mobile.haml b/app/views/people/index.mobile.haml
index 1cd619625c1f6ead7920d1bfc60803103392f8a7..e847ee485485933547020bebb480cf1c2e4b9373 100644
--- a/app/views/people/index.mobile.haml
+++ b/app/views/people/index.mobile.haml
@@ -10,7 +10,7 @@
= form_tag(people_path, :method => 'get') do
%div{:data => {:role => 'fieldcontain', :inline => 'true'}}
= search_field_tag :q
- = submit_tag :search, 'data-inline' => 'true'
+ = submit_tag t('search'), 'data-inline' => 'true'
- if params[:q].blank?
diff --git a/app/views/shared/_publisher.mobile.haml b/app/views/shared/_publisher.mobile.haml
index f807bf96930500912118f79aa2340dd271d79f89..380c4500cb814f20f382ba0b6bce1f8ad2914bf7 100644
--- a/app/views/shared/_publisher.mobile.haml
+++ b/app/views/shared/_publisher.mobile.haml
@@ -25,6 +25,6 @@
- unless params[:a_ids]
%input{:type => 'checkbox', :name => 'status_message[public]', :id => 'public', :class => 'custom', :value => 'true'}
%label{:for => 'public'}
- make public?
+ = t('.make_public')
= status.submit t('.share'), 'data-inline' => 'true', 'data-theme' => 'b'
diff --git a/config/environment.rb b/config/environment.rb
index 90e8193e702488d7dc57e90baec1861d135fe1c3..d44c652f7575749412747a3bfda8cb9d132e9e0d 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -14,7 +14,7 @@ if File.exists?(File.expand_path("./config/languages.yml"))
AVAILABLE_LANGUAGE_CODES = languages['available'].keys.map { |v| v.to_s }
else
AVAILABLE_LANGUAGES = { :en => 'English' }
- DEFAULT_LANGUAGES = 'en'
+ DEFAULT_LANGUAGE = 'en'
AVAILABLE_LANGUAGE_CODES = ['en']
end
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 191bce8faf33297650379d7660ea3320d816ac4b..542446cf97312f45f9f8b86ab3ea15e3c737d5ec 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -71,7 +71,7 @@ cs:
modern_browsers: "podporuje pouze modernà prohlÞeÄe."
password: "Heslo"
remember_me: "Zapamatovat si mÄ›"
- sign_in: "Přihlásit se"
+ sign_in: "Přihlásit"
username: "Uživatelské jméno"
signed_in: "Přihlášenà proběhlo úspěšně."
signed_out: "Odhlášenà proběhlo úspěšně."
@@ -80,7 +80,7 @@ cs:
forgot_your_password: "Zapomněli jste heslo?"
receive_confirmation: "Neobdrželi jste instrukce na potvrzen�"
receive_unlock: "Neobdrželi jste instrukce na odblokován�"
- sign_in: "Přihlásit se"
+ sign_in: "PÅ™ihlášenÃ"
sign_up: "Zapsat se"
sign_up_closed: "Momentálně jsou dalšà registrace pozastavené."
mail_signup_form:
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index e4545539eb3467a3b701ac8253cc3c0d1169600e..c319528aa04d8615a18d32acf45f95012ab51294 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -54,7 +54,7 @@ da:
change_password: "skift adgangskode"
new:
forgot_password: "Glemt din adgangskode?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "Ingen konto med den email adresse eksisterer. Hvis du venter på invitation, vi åbner op så snart som muligt"
send_password_instructions: "Send mig instruktioner til nulstilning af kodeord"
send_instructions: "Du vil modtage en e-mail med instruktioner om hvordan du kan nulstille din adgangskode om et par minutter."
updated: "Dit adgangskode er nu ændret. Du er nu logget ind."
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index bdb2a9a7ec389303746703720cf7293e0d939fb2..a201089d0bedb6ab73b3d724b42cf34e355d02e7 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -54,7 +54,7 @@ el:
change_password: "Αλλαγή του ÎºÏ‰Î´Î¹ÎºÎ¿Ï Î¼Î¿Ï…"
new:
forgot_password: "Ξεχάσατε τον κωδικό σας;"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "Δεν υπάÏχει λογαÏιασμός με αυτό το email. Αν πεÏιμÎνετε για Ï€Ïόσκληση, θα γίνουν αποστολÎÏ‚ το συντομότεÏο δυνατόν"
send_password_instructions: "Στείλτε μου οδηγίες επαναφοÏάς κωδικοÏ"
send_instructions: "Θα λάβετε Îνα email με οδηγίες για το πως να επαναφÎÏετε τον κωδικό Ï€Ïόσβασης σας σε λίγα λεπτά."
updated: "Ο κωδικός σας άλλαξε με επιτυχία. Έχετε πλÎον συνδεθεί."
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index c952692f5325722a47c288824998b4e102b668da..6c6f48f96b6342b1e3aae3e99e09d0103cdfc34a 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -54,7 +54,7 @@ fi:
change_password: "Vaihda salasanani"
new:
forgot_password: "Unohditko salasanasi?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "Tunnusta tälle sähköpostille ei ole olemassa. Mikäli odotat vielä kutsua, pyrimme lähettämänää sen niin pian kuin mahdollista."
send_password_instructions: "Lähetä minulle salasanan uudelleenasettamisohjeet"
send_instructions: "Saat hetken päästä sähköpostiisi ohjeet siitä, miten voit asettaa salasanasi uudelleen."
updated: "Salasanasi on vaihdettu onnistuneesti. Olet nyt kirjautunut sisään."
diff --git a/config/locales/devise/devise.gl-ES.yml b/config/locales/devise/devise.gl-ES.yml
index fcdbc7d62a7914c4228dfe04ea859aa68fc85422..1ed57e382473348c5c88b568d6d49b778b3fe0d2 100644
--- a/config/locales/devise/devise.gl-ES.yml
+++ b/config/locales/devise/devise.gl-ES.yml
@@ -6,92 +6,92 @@
gl-ES:
devise:
confirmations:
- confirmed: "Your account was successfully confirmed. You are now signed in."
+ confirmed: "A túa conta foi confirmada. Xa estás en Diaspora"
new:
- resend_confirmation: "Resend confirmation instructions"
- send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+ resend_confirmation: "Volver a enviar instruccións de confirmación."
+ send_instructions: "Recibiraás un correo con instrucción para confirmar a túa conta nuns minutos."
failure:
- inactive: "Your account was not activated yet."
- invalid: "Invalid email or password."
- invalid_token: "Invalid authentication token."
- locked: "Your account is locked."
- timeout: "Your session expired, please sign in again to continue."
- unauthenticated: "You need to sign in or sign up before continuing."
- unconfirmed: "You have to confirm your account before continuing."
+ inactive: "A túa conta aÃnda non foi activada."
+ invalid: "Correo ou contrasinal incorrecta."
+ invalid_token: "Invitación inválida."
+ locked: "A túa conta está bloqueada."
+ timeout: "A túa sesión rematou, entra de novo para continuar."
+ unauthenticated: "Tes que entrar ou rexistrarte antes de seguir."
+ unconfirmed: "Tes que confirmar a túa conta antes de seguir."
invitations:
- invitation_token_invalid: "The invitation token provided is not valid!"
- send_instructions: "Your invitation has been sent."
- updated: "Your password was set successfully. You are now signed in."
+ invitation_token_invalid: "Está invitación non é valida!"
+ send_instructions: "A túa invitación foi enviada."
+ updated: "O teu contrasinal estableceuse correctamente."
mailer:
confirmation_instructions:
- confirm: "Confirm my account"
- subject: "Confirmation instructions"
- you_can_confirm: "You can confirm your account through the link below:"
- hello: "Hello %{email}!"
+ confirm: "Confirmar conta"
+ subject: "Instruccións de confirmación"
+ you_can_confirm: "Podes confirmar a túa conta a través do enlace de abaixo:"
+ hello: "Ola %{email}!"
invitation:
- accept: "Accept invitation"
- ignore: "If you don't want to accept the invitation, please ignore this email."
- no_account_till: "Your account won't be created until you access the link above and sign up."
- subject: "You've been invited to join Diaspora!"
+ accept: "Aceptar convite"
+ ignore: "Se non queres aceptar a invitación, por favor ignora este correo."
+ no_account_till: "A túa conta non se creará ata que premas o link de arriba e te rexistres."
+ subject: "Fuches invitado a formar parte de Diaspora!"
inviters:
- accept_at: ", at %{url}, you can accept it through the link below."
- has_invited_you: "%{name} has invited you to join Diaspora"
- have_invited_you: "%{names} have invited you to join Diaspora"
+ accept_at: ", %{url}, podes aceptar mediante o link de abaixo."
+ has_invited_you: "%{name} invitoute a Diaspora"
+ have_invited_you: "%{names} invitáronte a Diaspora"
reset_password_instructions:
- change: "Change my password"
- ignore: "If you didn't request this, please ignore this email."
- someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
- subject: "Reset password instructions"
- wont_change: "Your password won't change until you access the link above and create a new one."
+ change: "Cambiar contrasinal"
+ ignore: "Se non pediches isto, por favor ignora este correo."
+ someone_requested: "Alguén pediu un enlace para cambiar o teu contrasinal, podes facelo no enlace de abaixo."
+ subject: "Instruccións para reestablecer contrasinal"
+ wont_change: "O teu contrasinal non cambiará ata que premas o enlace de arriba e crees unha nova."
unlock_instructions:
- account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
- click_to_unlock: "Click the link below to unlock your account:"
- subject: "Unlock Instructions"
- unlock: "Unlock my account"
- welcome: "Welcome %{email}!"
+ account_locked: "A túa conta foi bloqueada debido ás excesivas tentativas de entrar."
+ click_to_unlock: "Preme no link de abaixo para desbloquear a conta"
+ subject: "Instrucción de desbloqueo"
+ unlock: "Desbloquear conta"
+ welcome: "Benvido %{email}!"
passwords:
edit:
- change_password: "Change my password"
+ change_password: "Cambiar contrasinal"
new:
- forgot_password: "Forgot your password?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
- send_password_instructions: "Send me reset password instructions"
- send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
- updated: "Your password was changed successfully. You are now signed in."
+ forgot_password: "Olvidaches o contrasinal?"
+ no_account: "Non existe ningunha conta con esta dirección. Se estás esperando unha invitación temos que dicirche que as estamos tratando de repartir o máis cedo posible."
+ send_password_instructions: "EnvÃame instruccións para restablecer contrasinal"
+ send_instructions: "Nuns minutos recibirás un correo con instruccións de como reestablecer o teu contrasinal"
+ updated: "O teu contrasinal foi cambiado."
registrations:
- destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
- signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
- updated: "You updated your account successfully."
+ destroyed: "Adeus! A túa conta foi cancelada satisfactoriamente. Esperamos que nos volvamos ver."
+ signed_up: "Rexistrouse satisfactoriamente. Envióuseche unha confirmación."
+ updated: "Actualizou a súa conta satisfactoriamente."
sessions:
new:
- alpha_software: "You are about to use alpha software."
- bugs_and_feedback: "Be advised, you will experience bugs. We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups! We will work as fast as we can to resolve any issues you report."
- bugs_and_feedback_mobile: "Be advised, you will experience bugs. We encourage you to report any hiccups! We will work as fast as we can to resolve any issues you report."
- login: "Login"
- modern_browsers: "only supports modern browsers."
- password: "Password"
- remember_me: "Remember me"
- sign_in: "Sign in"
- username: "Username"
- signed_in: "Signed in successfully."
- signed_out: "Signed out successfully."
+ alpha_software: "Estás apunto de usar software en fase Alfa."
+ bugs_and_feedback: "Avisámosche de que experimentarás erros. Animámosche a usar o botón de Feedback na parte dereita para reportar calquera fallo. Trataremos de resolver o máis cedo posible os erros que reportes."
+ bugs_and_feedback_mobile: "Avisámoste de que percibirás erros. Animámoste a que os reportes para que podamos traballar para resolvelos o máis cedo posible."
+ login: "Nome de usuario"
+ modern_browsers: "só acepta navegadores actuais."
+ password: "Contrasinal"
+ remember_me: "Lémbrame"
+ sign_in: "Entrar"
+ username: "Nome de usuario"
+ signed_in: "Entrou satisfactoriamente."
+ signed_out: "Saiu satisfactoriamente."
shared:
links:
- forgot_your_password: "Forgot your password?"
- receive_confirmation: "Didn't receive confirmation instructions?"
- receive_unlock: "Didn't receive unlock instructions?"
- sign_in: "Sign in"
- sign_up: "Sign up"
- sign_up_closed: "Open signups are closed at this time."
+ forgot_your_password: "Esqueceu o contrasinal?"
+ receive_confirmation: "Non recibiches instruccións de confirmación?"
+ receive_unlock: "Non recibiches instrucción de desbloqueo?"
+ sign_in: "Entrar"
+ sign_up: "Rexistrarse"
+ sign_up_closed: "Os rexistros están pechados neste intre."
mail_signup_form:
- sign_up_for_an_invite: "Sign up for an invite!"
+ sign_up_for_an_invite: "RexÃstrate para unha invitación!"
unlocks:
new:
- resend_unlock: "Resend unlock instructions"
- send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
- unlocked: "Your account was successfully unlocked. You are now signed in."
+ resend_unlock: "Reenviar instruccións de desbloqueo"
+ send_instructions: "Nuns minutos recibirás un correo con instruccións sobre como desbloquear a túa conta."
+ unlocked: "A túa conta foi desbloqueada."
errors:
messages:
already_confirmed: "xa foi confirmado"
not_found: "non se atopou"
- not_locked: "was not locked"
+ not_locked: "non foi bloqueado"
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index 06816eccdcd21b5f40a33c0ce9c666f894c13518..8766a2d59d00d66ef2d4d4a95f0ea605e7f04d07 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -54,7 +54,7 @@ hu:
change_password: "Megváltoztatom a jelszavamat"
new:
forgot_password: "Elfelejtetted a jelszavad?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "Ehhez az emailhez nincs fiók regisztrálva. Ha meghÃvóra vársz, akkor légy türelmes. Hamarosan osztogatunk."
send_password_instructions: "Küldd el nekem jelszó alaphelyzetbe állÃtásához szükséges utasÃtások"
send_instructions: "Néhány perc múlva kapni fog egy e-mailt arról, hogy miként állÃtsa alaphelyzetbe a jelszavát."
updated: "A jelszavad megváltozott. Be vagy jelentkezve vele."
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index c92f6a4f679066246c384732cc33a79ac71aa780..e12bd126e94605d9719b719615c22b75c50fdbf8 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -54,7 +54,7 @@ it:
change_password: "Cambia la mia password"
new:
forgot_password: "Hai dimenticato la password?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "Non esiste un account per questo indirizzo email. Se sei in attesa di un invito, sappi che li stiamo spedendo il più velocemente possibile."
send_password_instructions: "Inviami le istruzioni per reimpostare la password."
send_instructions: "Tra pochi minuti riceverai una email con le istruzioni su come cambiare la tua password."
updated: "La tua password è stata modificata. Hai appena effettuato l'accesso."
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index c08017d15e067a2efbedd05d5c97901196550aaf..eb571cb5cd2150a6234aea3f7640f161c5c1bd88 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -54,7 +54,7 @@ nl:
change_password: "Wijzig mijn wachtwoord"
new:
forgot_password: "Wachtwoord vergeten?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "Er bestaat geen account met dit e-mailadres. Mocht je op een uitnodiging wachten; deze komen zo snel mogelijk beschikbaar."
send_password_instructions: "Stuur mij instructies om mijn wachtwoord te resetten"
send_instructions: "Je ontvangt een e-mail met instructies om je wachtwoord opnieuw in te stellen."
updated: "Je wachtwoord is veranderd. Je bent nu ingelogd."
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index 3ba0840f7873814409df62fd2387b03dd9bce4be..358db9b68ed0e4e5fe6acb8ad0032b7c55c5fed9 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -54,7 +54,7 @@ ro:
change_password: "Schimbă-mi parola"
new:
forgot_password: "AÅ£i uitat parola?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "Nici un cont cu acest e-mail există. Dacă sunteţi ȋn aşteptare pentru o invitaţie, cât mai curând posibil vor fi disponibile\n"
send_password_instructions: "Trimite-mi instrucţiunile pentru a reseta parola"
send_instructions: "În scurt timp veți primi un email cu instrucțiuni pentru resetarea parolei."
updated: "Parolă schimbată cu success. Sunteți acum autentificat(ă)."
@@ -65,7 +65,7 @@ ro:
sessions:
new:
alpha_software: "Sunteţi pe cale de a utiliza software alfa."
- bugs_and_feedback: "Aveţi grijă, veţi experimenta probeleme. Vă încurajăm să utilizaţi butonul Feedback pe partea dreaptă a browser-ului pentru a raporta orice problemă! Vom lucra cât de repede putem pentru a rezolva orice dificultaţi veţi întâmpina."
+ bugs_and_feedback: "Aveţi grijă, puteţi experimenta probleme. Vă încurajăm să utilizaţi butonul Feedback pe partea dreaptă a browser-ului pentru a raporta orice problemă! Vom lucra cât de repede putem pentru a rezolva orice dificultaţi veţi întâmpina."
bugs_and_feedback_mobile: "Aveţi grijă, veţi experimenta probeleme. Vă încurajăm să raportaţi orice problemă! Vom lucra cât de repede putem pentru a rezolva orice dificultaţi veţi întâmpina."
login: "Autentificare"
modern_browsers: "suportă doar browser-ele moderne."
diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml
index a520a0c524da63702db8d0d81b0f0e6654b6bcde..5f6e86f8f139277d9e5cffec85293d3d42f0a379 100644
--- a/config/locales/devise/devise.sl.yml
+++ b/config/locales/devise/devise.sl.yml
@@ -54,7 +54,7 @@ sl:
change_password: "Spremeni geslo"
new:
forgot_password: "Ste pozabili geslo?"
- no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible"
+ no_account: "UporabniÅ¡ki raÄun s tem e-naslovom ne obstaja. V kolikor Äakate na povabilo, ga lahko v kratkem priÄakujete."
send_password_instructions: "Pošlji navodila za ponastavitev gesla"
send_instructions: "V nekaj minutah boste po e-pošti prejeli navodila za ponastavitev vašega gesla."
updated: "Vaše geslo je bilo uspešno spremenjeno. Zdaj ste prijavljeni."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 3e17b06757ff058c3fc0ae6736845fb3ee72ab24..f60fb37316a8a0c2960eeef79822aa06ca2e02d2 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -6,10 +6,12 @@
ar:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comments"
_contact: "Contact"
_contacts: "Contacts"
_home: "Home"
+ _more: "More"
_photos: "fotos"
_services: "Servicios"
account: "Cuenta"
@@ -171,6 +173,7 @@ ar:
login: "login"
logout: "logout"
view_profile: "view profile"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ ar:
success: "Successfully destroyed authentication."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connect to facebook"
connect_to_twitter: "Connect to twitter"
@@ -358,6 +365,9 @@ ar:
edit_services: "Edit services"
logged_in_as: "logged in as"
really_disconnect: "disconnect %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Settings"
shared:
add_contact:
@@ -370,9 +380,12 @@ ar:
all_contacts: "All contacts"
cannot_remove: "Cannot remove person from last aspect."
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} left)"
invite_someone: "Invite someone"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ ar:
posting: "Posting..."
share: "مشاركة"
share_with: "Share with %{aspect}"
- share_with_all: "Share with all aspects"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Reshare"
status_messages:
@@ -415,6 +428,7 @@ ar:
change_language: "Change Language"
change_password: "Cambiar Contraseña"
close_account: "Cerrar Cuenta"
+ current_password: "Current password"
download_photos: "descargar mis fotos"
download_xml: "download my xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index a7190da6fbb53fe0922de7dee8829d41b1721360..332bdac14beaee51965ed174ca112151e47bd22b 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -6,10 +6,12 @@
ca:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comentaris"
_contact: "Contact"
_contacts: "Contacts"
_home: "Inici"
+ _more: "More"
_photos: "fotografies"
_services: "Serveis"
account: "Compte"
@@ -171,6 +173,7 @@ ca:
login: "Entrar"
logout: "desconectar-se"
view_profile: "veure perfil"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} noves peticions!"
@@ -351,6 +354,10 @@ ca:
success: "Autenticación destruida con éxito."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Conectar a facebook"
connect_to_twitter: "Conectar a twitter"
@@ -358,6 +365,9 @@ ca:
edit_services: "Edit services"
logged_in_as: "registrado como"
really_disconnect: "¿desconectar %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Configuración"
shared:
add_contact:
@@ -370,9 +380,12 @@ ca:
all_contacts: "Todos los contactos"
cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectar a esta persona debes removerla de tus contactos.)"
invitations:
+ by_email: "by Email"
dont_have_now: "No tienes ninguna ahora mismo, pero pronto llegarán más invitaciones!"
+ from_facebook: "From Facebook"
invitations_left: "(quedan %{count})"
invite_someone: "Invita a alguien"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Las invitaciones en este servidor Diaspora están actualmente cerradas"
notification:
@@ -391,7 +404,7 @@ ca:
posting: "Posteando..."
share: "Compartir"
share_with: "Compartir con %{aspect}"
- share_with_all: "Compartir con todos los aspectos"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Compartir de nuevo"
status_messages:
@@ -415,6 +428,7 @@ ca:
change_language: "Cambiar idioma"
change_password: "Cambiar contraseña"
close_account: "Cerrar cuenta"
+ current_password: "Current password"
download_photos: "Descargar mis fotos"
download_xml: "Descargar mi xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 5b5bb1a443ae43043d5afe61fef815c16218a686..58e49cddca602f263268151ab77d5753b3ef3457 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -6,10 +6,12 @@
cs:
_aspect: "Aspekt"
_aspects: "Aspekty"
+ _comment: "Komentář"
_comments: "Komentáře"
_contact: "Kontakt"
_contacts: "Kontakty"
_home: "Doma"
+ _more: "VÃce"
_photos: "fotky"
_services: "Služby"
account: "ÚÄet"
@@ -171,6 +173,7 @@ cs:
login: "pÅ™ihlášenÃ"
logout: "odhlásit"
view_profile: "zobrazit profil"
+ more: "VÃce"
new_notifications: "%{count} nových oznámenÃ"
new_requests:
few: "%{count} nových žádostÃ!"
@@ -269,7 +272,7 @@ cs:
recent_public_posts: "Poslednà veÅ™ejné pÅ™ÃspÄ›vky"
return_to_aspects: "Návrat na vaši stránku s aspekty"
similar_contacts: "podobné kontakty"
- start_sharing: "start sharing"
+ start_sharing: "zaÄÃt sdÃlet"
to_accept_or_ignore: "přijmout nebo ignorovat."
update:
failed: "Aktualizace profilu selhala"
@@ -351,6 +354,10 @@ cs:
success: "Autorizace úspěšně odstraněna."
failure:
error: "nastala chyba při připojenà ke službě"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Připojit na facebook"
connect_to_twitter: "Připojit na twitter"
@@ -358,6 +365,9 @@ cs:
edit_services: "Upravit služby"
logged_in_as: "přihlášen jako"
really_disconnect: "odpojit %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "NastavenÃ"
shared:
add_contact:
@@ -370,9 +380,12 @@ cs:
all_contacts: "VÅ¡echny kontakty"
cannot_remove: "Nelze odstranit osobu z poslednÃho aspektu. (Pokud se chcete odpojit od této osoby, musÃte odstranit jejà kontakt.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Již nemáte žádné, ale dalšà brzy přibudou!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} zbývá)"
invite_someone: "Pozvěte někoho"
+ invite_your_friends: "Invite your friends"
invites: "Pozvánky"
invites_closed: "Pozvánky jsou aktuálně uzavřeny na tomto Diaspora podu"
notification:
@@ -390,8 +403,8 @@ cs:
post_a_message_to: "Poslat zprávu do %{aspect}"
posting: "PosÃlánÃ..."
share: "Sdělit"
- share_with: "SdÃlet s %{aspect}"
- share_with_all: "SdÃlet ve vÅ¡ech aspektech"
+ share_with: "sdÃlet s"
+ whats_on_your_mind: "co máte na mysli?"
reshare:
reshare: "PÅ™esdÃlet"
status_messages:
@@ -415,6 +428,7 @@ cs:
change_language: "Změnit jazyk"
change_password: "Změnit heslo"
close_account: "UzavÅ™Ãt úÄet"
+ current_password: "SouÄasné heslo"
download_photos: "stáhnout moje fotky"
download_xml: "stáhnout moje xml"
edit_account: "Upravit úÄet"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 9c300ef984abd3cf391b3064b44b52a0035d64d9..00e5a313aa9ca2aea987fe010ea6ec4a29b48cdf 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -6,10 +6,12 @@
cy:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comments"
_contact: "Contact"
_contacts: "Contacts"
_home: "Home"
+ _more: "More"
_photos: "Photos"
_services: "Services"
account: "Account"
@@ -171,6 +173,7 @@ cy:
login: "login"
logout: "logout"
view_profile: "view profile"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ cy:
success: "Successfully destroyed authentication."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connect to facebook"
connect_to_twitter: "Connect to twitter"
@@ -358,6 +365,9 @@ cy:
edit_services: "Edit services"
logged_in_as: "logged in as"
really_disconnect: "disconnect %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Settings"
shared:
add_contact:
@@ -370,9 +380,12 @@ cy:
all_contacts: "All contacts"
cannot_remove: "Cannot remove person from last aspect."
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} left)"
invite_someone: "Invite someone"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ cy:
posting: "Posting..."
share: "Share"
share_with: "Share with %{aspect}"
- share_with_all: "Share with all aspects"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Reshare"
status_messages:
@@ -415,6 +428,7 @@ cy:
change_language: "Change Language"
change_password: "Change Password"
close_account: "Close Account"
+ current_password: "Current password"
download_photos: "download my photos"
download_xml: "download my xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index be65d7a02bc869e7c4a969d675f11616834d15b3..3bf8b2113507bd2c6e4e36ec654335c6bb25dcf2 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -6,10 +6,12 @@
da:
_aspect: "Aspekt"
_aspects: "Aspekter"
+ _comment: "Comment"
_comments: "Kommentarer"
_contact: "Kontakt"
_contacts: "Kontakter"
_home: "Hjem"
+ _more: "More"
_photos: "Billeder"
_services: "Tjenester"
account: "Konto"
@@ -160,7 +162,7 @@ da:
to: "Til"
layouts:
application:
- have_a_problem: "Have a problem? Find an answer here"
+ have_a_problem: "Har du et problem? Find svaret her"
powered_by: "POWERED BY DIASPORA*"
whats_new: "Hvad er nyt?"
header:
@@ -171,6 +173,7 @@ da:
login: "Log ind"
logout: "Log ud"
view_profile: "Vis profil"
+ more: "More"
new_notifications: "%{count} nye notifikationer"
new_requests:
few: "%{count} nye anmodninger!"
@@ -269,7 +272,7 @@ da:
recent_public_posts: "Seneste offentlige indlæg"
return_to_aspects: "Tilbage til aspektsoversigt"
similar_contacts: "lignende kontakter"
- start_sharing: "start sharing"
+ start_sharing: "begynd at dele"
to_accept_or_ignore: "at godkende eller ignorere det."
update:
failed: "Kunne ikke opdatere profil"
@@ -351,6 +354,10 @@ da:
success: "Godkendelsen er nu blevet slettet."
failure:
error: "der opstod en fejl i at forbinde til den service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Tilslut til Facebook"
connect_to_twitter: "Tilslut til twitter"
@@ -358,6 +365,9 @@ da:
edit_services: "Redigér tjenester"
logged_in_as: "log ind som"
really_disconnect: "afbryd %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Indstillinger"
shared:
add_contact:
@@ -370,9 +380,12 @@ da:
all_contacts: "Alle kontaktpersoner"
cannot_remove: "Kan ikke fjerne person fra sidste aspekt."
invitations:
+ by_email: "by Email"
dont_have_now: "Du har ikke nogen lige nu, men der kommer snart flere invitationer!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} tilbage)"
invite_someone: "Invitér en person"
+ invite_your_friends: "Invite your friends"
invites: "Invitationer"
invites_closed: "Invitationer er i øjeblikket lukkede på denne Diaspora seed"
notification:
@@ -391,7 +404,7 @@ da:
posting: "Sender..."
share: "Del"
share_with: "Del med %{aspect}"
- share_with_all: "Del med alle dine aspekter"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Del igen"
status_messages:
@@ -415,6 +428,7 @@ da:
change_language: "Skift sprog"
change_password: "Skift adgangskode"
close_account: "Luk konto"
+ current_password: "Current password"
download_photos: "Download mine billeder"
download_xml: "Download min XML"
edit_account: "Rediger konto"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index d5542e8ce8e63c97a429a9aff88460bb0fb459b7..9c43f2c2d5a17c8bc74cc819eae8329b159a00a7 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -6,10 +6,12 @@
de:
_aspect: "Aspekt"
_aspects: "Aspekte"
+ _comment: "Kommentar"
_comments: "Kommentare"
_contact: "Kontakt"
_contacts: "Kontakte"
_home: "Start"
+ _more: "Mehr"
_photos: "Fotos"
_services: "Dienste"
account: "Konto"
@@ -171,6 +173,7 @@ de:
login: "Anmelden"
logout: "Abmelden"
view_profile: "Profil ansehen"
+ more: "Mehr"
new_notifications: "%{count} neue Benachrichtigungen"
new_requests:
few: "%{count} neue Anfragen!"
@@ -180,7 +183,7 @@ de:
next: "Nächste"
no_new_notifications: "keine neuen Benachrichtigungen"
notifications:
- also_commented: "hinterließ einen Kommentar zu"
+ also_commented: "kommentierte ebenfalls"
comment_on_post: "kommentierte deinen"
deleted: "gelöschten"
index:
@@ -269,7 +272,7 @@ de:
recent_public_posts: "Neueste öffentliche Beiträge"
return_to_aspects: "Kehre zur Aspekt-Übersicht zurück."
similar_contacts: "ähnliche Kontakte"
- start_sharing: "start sharing"
+ start_sharing: "Fang an zu teilen!"
to_accept_or_ignore: "um zu akzeptieren oder zu ignorieren."
update:
failed: "Ändern des Profils fehlgeschlagen"
@@ -351,6 +354,10 @@ de:
success: "Authentifizierung erfolgreich gelöscht."
failure:
error: "es gab einen Fehler beim Verbinden mit diesem Dienst"
+ finder:
+ invite_your_friends_from: "Lade deine Freunde von %{service} ein"
+ not_connected: "nicht verbunden"
+ resend: "Erneut senden"
index:
connect_to_facebook: "Mit Facebook verbinden"
connect_to_twitter: "Mit Twitter verbinden"
@@ -358,21 +365,27 @@ de:
edit_services: "Dienste bearbeiten"
logged_in_as: "angemeldet als"
really_disconnect: "Verbindung mit %{service} entfernen?"
+ inviter:
+ click_link_to_accept_invitation: "Öffne diesen Link um die Einladung zu akzeptieren"
+ join_me_on_diaspora: "Folge mir auf DIASPORA*"
settings: "Einstellungen"
shared:
add_contact:
create_request: "Ãœber die Diaspora-Adresse finden"
diaspora_handle: "diaspora@beispiel.org"
enter_a_diaspora_username: "Gib einen Diaspora-Benutzernamen ein:"
- know_email: "Du kennst die E-Mail-Adresse? Du solltest sie einladen"
+ know_email: "Du kennst die E-Mail-Adresse? Sende eine Einladung!"
your_diaspora_username_is: "Deine Diaspora-Adresse ist: %{diaspora_handle}"
contact_list:
all_contacts: "Alle Kontakte"
cannot_remove: "Kontakt kann nicht aus dem letzten Aspekt entfernt werden. Wenn du nicht länger verbunden sein willst, lösche den Kontakt."
invitations:
+ by_email: "Per E-Mail"
dont_have_now: "Du hast im Moment keine, aber es wird bald wieder neue Einladungen geben!"
+ from_facebook: "Von Facebook"
invitations_left: "(%{count} übrig)"
invite_someone: "Jemanden einladen"
+ invite_your_friends: "Lade deine Freunde ein"
invites: "Einladungen"
invites_closed: "Einladungen sind auf diesem Diaspora-Pod derzeit nicht verfügbar."
notification:
@@ -390,15 +403,15 @@ de:
post_a_message_to: "Sende eine Nachricht an %{aspect}"
posting: "Senden …"
share: "Teilen"
- share_with: "Mit %{aspect} teilen"
- share_with_all: "Mit allen Aspekten teilen"
+ share_with: "Teile mit"
+ whats_on_your_mind: "Woran denkst du?"
reshare:
reshare: "Erneut senden an"
status_messages:
helper:
no_message_to_display: "Keine Nachricht zum Anzeigen."
new_status_message:
- oh_yeah: "oh yeah!"
+ oh_yeah: "Ja!"
tell_me_something_good: "Was gibt’s Neues?"
show:
destroy: "Entfernen"
@@ -415,6 +428,7 @@ de:
change_language: "Sprache ändern"
change_password: "Passwort ändern"
close_account: "Konto schließen"
+ current_password: "Derzeitiges Passwort"
download_photos: "Meine Fotos herunterladen"
download_xml: "Mein XML herunterladen"
edit_account: "Konto bearbeiten"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 036d925ece0f8728940a7621ea4ca2e29420b61c..a957ad4631e0521c268094069988af2973ef9c3a 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -6,11 +6,13 @@
el:
_aspect: "Πτυχή"
_aspects: "ΠτυχÎÏ‚"
+ _comment: "Comment"
_comments: "Σχόλια"
_contact: "Επαφή"
_contacts: "ΕπαφÎÏ‚"
_home: "ΑÏχική"
- _photos: "φωτογÏαφίες"
+ _more: "ΠεÏισσότεÏα"
+ _photos: "ΦωτογÏαφίες"
_services: "ΥπηÏεσίες"
account: "ΛογαÏιασμός"
activemodel:
@@ -160,7 +162,7 @@ el:
to: "Στον"
layouts:
application:
- have_a_problem: "Have a problem? Find an answer here"
+ have_a_problem: "Έχετε κάποιο Ï€Ïόβλημα; Î’Ïείτε την απάντηση εδώ"
powered_by: "POWERED BY DIASPORA*"
whats_new: "Τι νÎα?"
header:
@@ -171,6 +173,7 @@ el:
login: "Είσοδος"
logout: "αποσÏνδεση"
view_profile: "Ï€Ïοβολή Ï€Ïοφίλ"
+ more: "ΠεÏισσότεÏα"
new_notifications: "%{count} νÎες ειδοποιήσεις"
new_requests:
few: "%{count} νÎα αιτήματα!"
@@ -269,7 +272,7 @@ el:
recent_public_posts: "Î Ïόσφατες Δημόσιες ΔημοσιεÏσεις"
return_to_aspects: "ΕπιστÏοφή στη σελίδα με τις πτυχÎÏ‚ σας"
similar_contacts: "παÏόμοιες επαφÎÏ‚"
- start_sharing: "start sharing"
+ start_sharing: "ξεκινήσετε την κοινή χÏήση"
to_accept_or_ignore: "να το αποδεχθεί ή να το αγνοήσει."
update:
failed: "Αποτυχία ενημÎÏωσης Ï€Ïοφίλ"
@@ -351,6 +354,10 @@ el:
success: "Επιτυχής καταστÏοφή ταυτότητας."
failure:
error: "εμφανίστηκε Îνα σφάλμα κατά τη σÏνδεση με αυτή την υπηÏεσία"
+ finder:
+ invite_your_friends_from: "Î ÏοσκαλÎστε τους φίλους σας απο %{service}"
+ not_connected: "not connected"
+ resend: "ξαναστείλτε"
index:
connect_to_facebook: "ΣÏνδεση με το facebook"
connect_to_twitter: "ΣÏνδεση με το twitter"
@@ -358,6 +365,9 @@ el:
edit_services: "ΕπεξεÏγασία υπηÏεσιών"
logged_in_as: "συνδεδεμÎνος ως"
really_disconnect: "αποσÏνδεση %{service};"
+ inviter:
+ click_link_to_accept_invitation: "Κάντε κλικ αυτό το σÏνδεσμο για να αποδεχθείτε την Ï€Ïόσκλησή σας"
+ join_me_on_diaspora: "Συνδεθείτε μαζί μου στο DIASPORA*"
settings: "Ρυθμίσεις"
shared:
add_contact:
@@ -370,9 +380,12 @@ el:
all_contacts: "Όλες οι επαφÎÏ‚"
cannot_remove: "Δεν είναι δυνατή η αφαίÏεση του ατόμου από την τελευταία πτυχή. (Αν θÎλετε να αποσυνδεθείτε από το Ï€Ïόσωπο αυτό Ï€ÏÎπει να καταÏγήσετε την αντίστοιχη επαφή.)"
invitations:
+ by_email: "με ηλεκτÏονικό ταχυδÏομείο"
dont_have_now: "Δεν Îχετε κάποιο δικαίωμα Ï„ÏŽÏα, αλλά πεÏισσότεÏες Ï€Ïοσκλήσεις ÎÏχονται σÏντομα!"
+ from_facebook: "Από το Facebook"
invitations_left: "(απομÎνουν %{count})"
invite_someone: "Î ÏοσκαλÎστε κάποιον/α"
+ invite_your_friends: "Î ÏοσκαλÎστε τους φίλους σας"
invites: "Î Ïοσκλήσεις"
invites_closed: "Οι Ï€Ïοσκλήσεις είναι κλειστÎÏ‚ αυτή την πεÏίοδο στο Diaspora pod"
notification:
@@ -391,7 +404,7 @@ el:
posting: "ΑνάÏτηση..."
share: "ΜοιÏάσου"
share_with: "ΜοιÏάσου με %{aspect}"
- share_with_all: "ΜοιÏάσου με όλους στις πτυχÎÏ‚"
+ whats_on_your_mind: "τι Îχετε στο μυαλό σας;"
reshare:
reshare: "ΜοιÏάσου και πάλι"
status_messages:
@@ -415,6 +428,7 @@ el:
change_language: "Αλλαγή Γλώσσας"
change_password: "Αλλαγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
close_account: "Κλείσιμο ΛογαÏιασμοÏ"
+ current_password: "ΤÏÎχων κωδικός Ï€Ïόσβασης"
download_photos: "κατÎβασε τις φωτογÏαφίες μου"
download_xml: "κατÎβασε το xml μου"
edit_account: "ΕπεξεÏγασία λογαÏιασμοÏ"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 2526317e8444e8f3aad16fa7397cf79366c66d87..50ba870484942418b6ee192e098b4a88ade2f3ed 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -97,6 +97,8 @@ en:
powered_by: "POWERED BY DIASPORA*"
whats_new: "what's new?"
have_a_problem: "Have a problem? Find an answer here"
+ your_aspects: "your aspects"
+ logged_in_as: "logged in as %{name}"
shared:
publisher:
posting: "Posting..."
@@ -201,6 +203,7 @@ en:
deleted: 'deleted'
index:
notifications: "Notifications"
+ mark_all_as_read: "Mark All as Read"
users:
edit:
export_data: "Export Data"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 7b7d0a54af4c404d2d666a000f5b120c24c76ba6..a8d7293033ce7373c1b726f0da6fbaf6f16c619d 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -6,10 +6,12 @@
en_shaw:
_aspect: "ð‘¨ð‘•ð‘ð‘§ð‘’ð‘‘"
_aspects: "ð‘¨ð‘•ð‘ð‘§ð‘’ð‘‘ð‘•"
+ _comment: "Comment"
_comments: "ð‘’ð‘ªð‘¥ð‘©ð‘¯ð‘‘ð‘•"
_contact: "ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘"
_contacts: "ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘ð‘•"
_home: "Home"
+ _more: "More"
_photos: "ð‘“ð‘´ð‘‘ð‘´ð‘Ÿ"
_services: "Services"
account: "ð‘©ð‘’ð‘¬ð‘¯ð‘‘"
@@ -171,6 +173,7 @@ en_shaw:
login: "ð‘¤ð‘ªð‘œð‘¦ð‘¯"
logout: "ð‘¤ð‘ªð‘œð‘¬ð‘‘"
view_profile: "ð‘ð‘¿ ð‘ð‘®ð‘´ð‘“ð‘²ð‘¤"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} ð‘¯ð‘¿ ð‘®ð‘¦ð‘’ð‘¢ð‘§ð‘•ð‘‘ð‘•!"
@@ -269,7 +272,7 @@ en_shaw:
recent_public_posts: "ð‘®ð‘°ð‘•ð‘©ð‘¯ð‘‘ ð‘ð‘³ð‘šð‘¤ð‘¦ð‘’ ð‘ð‘´ð‘•ð‘‘ð‘•"
return_to_aspects: "ð‘®ð‘¦ð‘‘ð‘»ð‘¯ ð‘‘ ð‘¿ð‘¼ ð‘¨ð‘•ð‘ð‘§ð‘’ð‘‘ð‘• ð‘ð‘±ð‘¡"
similar_contacts: "ð‘•ð‘¦ð‘¥ð‘¦ð‘¤ð‘¼ ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘ð‘•"
- start_sharing: "start sharing"
+ start_sharing: "ð‘•ð‘‘ð‘¸ð‘‘ ð‘–ð‘ºð‘¦ð‘™"
to_accept_or_ignore: "ð‘‘ ð‘©ð‘’ð‘•ð‘§ð‘𑑠𑹠ð‘¦ð‘œð‘¯ð‘¹ ð‘¦ð‘‘."
update:
failed: "ð‘“ð‘±ð‘¤ð‘› ð‘‘ ð‘³ð‘ð‘›ð‘±ð‘‘ ð‘ð‘®ð‘´ð‘“ð‘²ð‘¤"
@@ -351,6 +354,10 @@ en_shaw:
success: "ð‘•ð‘©ð‘’ð‘•ð‘§ð‘•ð‘“ð‘«ð‘¤ð‘¦ ð‘›ð‘¦ð‘¤ð‘°ð‘‘ð‘©ð‘› ð‘·ð‘”ð‘§ð‘¯ð‘‘ð‘¦ð‘’ð‘±ð‘–ð‘©ð‘¯."
failure:
error: "ð‘žð‘º ð‘¢ð‘ªð‘Ÿ ð‘©ð‘¯ ð‘ºð‘¼ ð‘’ð‘©ð‘¯ð‘§ð‘’ð‘‘ð‘¦ð‘™ ð‘žð‘¨ð‘‘ ð‘•ð‘»ð‘ð‘©ð‘•"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "ð‘’ð‘©ð‘¯ð‘§ð‘’ð‘‘ ð‘‘ ð‘“ð‘±ð‘•ð‘šð‘«ð‘’"
connect_to_twitter: "ð‘’ð‘©ð‘¯ð‘§ð‘’ð‘‘ ð‘‘ ð‘‘ð‘¢ð‘¦ð‘‘ð‘¼"
@@ -358,6 +365,9 @@ en_shaw:
edit_services: "ð‘§ð‘›ð‘¦ð‘‘ ð‘•ð‘»ð‘ð‘¦ð‘•ð‘©ð‘Ÿ"
logged_in_as: "ð‘¤ð‘ªð‘œð‘› ð‘¦ð‘¯ ð‘¨ð‘Ÿ"
really_disconnect: "ð‘›ð‘¦ð‘•ð‘’ð‘©ð‘¯ð‘§ð‘’ð‘‘ %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "ð‘•ð‘§ð‘‘ð‘¦ð‘™ð‘Ÿ"
shared:
add_contact:
@@ -370,9 +380,12 @@ en_shaw:
all_contacts: "ð‘·ð‘¤ ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘ð‘•"
cannot_remove: "ð‘’ð‘¨ð‘¯ð‘ªð‘‘ ð‘®ð‘¦ð‘¥ð‘µð‘ ð‘ð‘»ð‘•ð‘©ð‘¯ ð‘“ð‘®ð‘ªð‘¥ ð‘¨ð‘•ð‘ð‘§ð‘’ð‘‘. (ð‘¦ð‘“ ð‘¿ ð‘¢ð‘³ð‘¯ð‘‘ ð‘‘ ð‘›ð‘¦ð‘•ð‘’ð‘©ð‘¯ð‘§ð‘’ð‘‘ ð‘“ð‘®ð‘ªð‘¥ ð‘žð‘¦ð‘• ð‘ð‘»ð‘•ð‘©ð‘¯ ð‘¿ ð‘¥ð‘³ð‘•ð‘‘ ð‘®ð‘¦ð‘¥ð‘µð‘ ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘.)"
invitations:
+ by_email: "by Email"
dont_have_now: "ð‘¿ ð‘›ð‘´ð‘¯ð‘‘ ð‘£ð‘¨ð‘ ð‘¨ð‘¯ð‘¦ ð‘®ð‘²ð‘‘ ð‘¯ð‘¬, ð‘šð‘³ð‘‘ ð‘¥ð‘¹ ð‘¦ð‘¥ð‘ð‘²ð‘‘𑕠𑸠ð‘’ð‘³ð‘¥ð‘¦ð‘™ ð‘•ð‘µð‘¯!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} ð‘¤ð‘§ð‘“ð‘‘)"
invite_someone: "ð‘¦ð‘¯ð‘ð‘²ð‘‘ ð‘•ð‘³ð‘¥ð‘¢ð‘©ð‘¯"
+ invite_your_friends: "Invite your friends"
invites: "ð‘¦ð‘¯ð‘ð‘²ð‘‘ð‘•"
invites_closed: "ð‘¦ð‘¯ð‘ð‘²ð‘‘𑕠𑸠ð‘’ð‘»ð‘©ð‘¯ð‘‘ð‘¤ð‘¦ ð‘’ð‘¤ð‘´ð‘Ÿð‘› ð‘ªð‘¯ ð‘žð‘¦ð‘• ·ð‘›ð‘¦ð‘¨ð‘•ð‘ð‘¹ð‘© ð‘ð‘ªð‘›"
notification:
@@ -391,7 +404,7 @@ en_shaw:
posting: "ð‘ð‘´ð‘•ð‘‘ð‘¦ð‘™..."
share: "ð‘–ð‘º"
share_with: "ð‘–𑺠ð‘¢ð‘¦ð‘ž %{aspect}"
- share_with_all: "ð‘–𑺠ð‘©ð‘’ð‘®ð‘ªð‘• ð‘·ð‘¤ ð‘ ð‘¿ð‘¼ ð‘¨ð‘•ð‘ð‘§ð‘’ð‘‘ð‘•"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "ð‘®ð‘¦ð‘–ð‘º"
status_messages:
@@ -415,6 +428,7 @@ en_shaw:
change_language: "ð‘—ð‘±ð‘¯ð‘¡ ð‘¤ð‘±ð‘™ð‘œð‘¢ð‘©ð‘¡"
change_password: "ð‘—ð‘±ð‘¯ð‘¡ ð‘ð‘¨ð‘•ð‘¢ð‘¼ð‘›"
close_account: "ð‘’ð‘¤ð‘´ð‘Ÿ ð‘©ð‘’ð‘¬ð‘¯ð‘‘"
+ current_password: "Current password"
download_photos: "ð‘›ð‘¬ð‘¯ð‘¤ð‘´ð‘› ð‘¥ð‘² ð‘“ð‘´ð‘‘ð‘´ð‘Ÿ"
download_xml: "ð‘›ð‘¬ð‘¯ð‘¤ð‘´ð‘› ð‘¥ð‘² ð‘§.ð‘¥.ð‘¤."
edit_account: "ð‘§ð‘›ð‘¦ð‘‘ ð‘©ð‘’ð‘¬ð‘¯ð‘‘"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 119f70ef7ea685baa3498ea478f7b53e267e5f9c..c64764f1962dd3bd7386906111524a974e833d69 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -6,10 +6,12 @@
eo:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comments"
_contact: "Contact"
_contacts: "Contacts"
_home: "Hejmo"
+ _more: "More"
_photos: "bildoj"
_services: "Services"
account: "Account"
@@ -171,6 +173,7 @@ eo:
login: "login"
logout: "logout"
view_profile: "view profile"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ eo:
success: "Successfully destroyed authentication."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connect to facebook"
connect_to_twitter: "Connect to twitter"
@@ -358,6 +365,9 @@ eo:
edit_services: "Edit services"
logged_in_as: "logged in as"
really_disconnect: "disconnect %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Settings"
shared:
add_contact:
@@ -370,9 +380,12 @@ eo:
all_contacts: "All contacts"
cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} left)"
invite_someone: "Invite someone"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ eo:
posting: "Posting..."
share: "Share"
share_with: "Share with %{aspect}"
- share_with_all: "share across all of your aspects"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Reshare"
status_messages:
@@ -415,6 +428,7 @@ eo:
change_language: "Change Language"
change_password: "Change Password"
close_account: "Close Account"
+ current_password: "Current password"
download_photos: "download my photos"
download_xml: "download my xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 66df8f25dd505aa1b70bdba0f10866392f86470d..f1bf74f11aec836197526321fe93f8e87bdd2eb8 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -6,10 +6,12 @@
es-CL:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comentarios"
_contact: "Contact"
_contacts: "Contacts"
_home: "Inicio"
+ _more: "More"
_photos: "fotos"
_services: "Servicios"
account: "Cuenta"
@@ -171,6 +173,7 @@ es-CL:
login: "entrar"
logout: "salir"
view_profile: "ver perfil"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "¡%{count} nuevas solicitudes!"
@@ -351,6 +354,10 @@ es-CL:
success: "Autenticación destruida correctamente."
failure:
error: "ocurrió un error al conectarse con ese servicio"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Conectar a facebook"
connect_to_twitter: "Conectar a twitter"
@@ -358,6 +365,9 @@ es-CL:
edit_services: "Editar servicios"
logged_in_as: "has entrado como"
really_disconnect: "¿desconectar %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Configuración"
shared:
add_contact:
@@ -370,9 +380,12 @@ es-CL:
all_contacts: "Todos los contactos"
cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectarte de esta persona primero debes eliminar al contacto.)"
invitations:
+ by_email: "by Email"
dont_have_now: "No tienes ninguna ahora, ¡pero pronto vendrán mas invitaciones!"
+ from_facebook: "From Facebook"
invitations_left: "(quedan %{count})"
invite_someone: "Invita a alguien"
+ invite_your_friends: "Invite your friends"
invites: "Invitaciones"
invites_closed: "Las invitaciones están temporalmente cerradas en este servidor de Diaspora"
notification:
@@ -391,7 +404,7 @@ es-CL:
posting: "Posteando..."
share: "Compartir"
share_with: "Compartir con %{aspect}"
- share_with_all: "compartir con todos tus aspectos"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Compartir de nuevo"
status_messages:
@@ -415,6 +428,7 @@ es-CL:
change_language: "Cambiar Idioma"
change_password: "Cambiar Contraseña"
close_account: "Cerrar Cuenta"
+ current_password: "Current password"
download_photos: "descargar mis fotos"
download_xml: "descargar mi xml"
edit_account: "Editar cuenta"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index a48d19ece998cd427d5a24cbd31d6958c516d3a2..af384383f07623d6d8ac7586dff66c7bae276944 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -6,10 +6,12 @@
es:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comentarios"
_contact: "Contact"
_contacts: "Contacts"
_home: "Inicio"
+ _more: "More"
_photos: "fotos"
_services: "Servicios"
account: "Cuenta"
@@ -171,6 +173,7 @@ es:
login: "Ingresar"
logout: "desconectarse"
view_profile: "ver perfil"
+ more: "More"
new_notifications: "%{count} nuevas notificaciones"
new_requests:
few: "%{count} nuevas peticiones!"
@@ -351,6 +354,10 @@ es:
success: "Autenticación destruida con éxito."
failure:
error: "hubo un error conectando ese servicio"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Conectar a facebook"
connect_to_twitter: "Conectar a twitter"
@@ -358,6 +365,9 @@ es:
edit_services: "Editar servicios"
logged_in_as: "registrado como"
really_disconnect: "¿desconectar %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Configuración"
shared:
add_contact:
@@ -370,9 +380,12 @@ es:
all_contacts: "Todos los contactos"
cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectar a esta persona debes removerla de tus contactos.)"
invitations:
+ by_email: "by Email"
dont_have_now: "No tienes ninguna ahora mismo, pero pronto llegarán más invitaciones!"
+ from_facebook: "From Facebook"
invitations_left: "(quedan %{count})"
invite_someone: "Invita a alguien"
+ invite_your_friends: "Invite your friends"
invites: "Invita"
invites_closed: "Las invitaciones en este servidor Diaspora están actualmente cerradas"
notification:
@@ -391,7 +404,7 @@ es:
posting: "Posteando..."
share: "Compartir"
share_with: "Compartir con %{aspect}"
- share_with_all: "Compartir con todos los aspectos"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Compartir de nuevo"
status_messages:
@@ -415,6 +428,7 @@ es:
change_language: "Cambiar idioma"
change_password: "Cambiar contraseña"
close_account: "Cerrar cuenta"
+ current_password: "Current password"
download_photos: "Descargar mis fotos"
download_xml: "Descargar mi xml"
edit_account: "Editar cuenta"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 7b203857c0d106c7c3e3c6734a420efc42a40b41..43366845d61bf8077d448fde72ef81a8ea3f739e 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -6,10 +6,12 @@
fi:
_aspect: "Näkymä"
_aspects: "Näkymää"
+ _comment: "Kommentoi"
_comments: "Kommentit"
_contact: "Kontakti"
_contacts: "Kontaktit"
_home: "Etusivu"
+ _more: "Lisää"
_photos: "kuvat"
_services: "Ulkoiset palvelut"
account: "Käyttäjätili"
@@ -171,6 +173,7 @@ fi:
login: "kirjaudu sisään"
logout: "kirjaudu ulos"
view_profile: "profiili"
+ more: "Lisää"
new_notifications: "%{count} uutta ilmoitusta"
new_requests:
few: "%{count} uutta pyyntöä!"
@@ -269,7 +272,7 @@ fi:
recent_public_posts: "Viimeisimmät julkiset tapahtumat"
return_to_aspects: "Palaa näkymiin"
similar_contacts: "Yhteiset kontaktit"
- start_sharing: "start sharing"
+ start_sharing: "aloita jakamaan"
to_accept_or_ignore: "hyväksyäksesi, tai hylätäksesi sen."
update:
failed: "Profiilin päivittäminen epäonnistui"
@@ -351,6 +354,10 @@ fi:
success: "Tunnistuksen poisto onnistui."
failure:
error: "palvelun yhdistämisessä tapahtui virhe"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Yhdistä palveluun facebook"
connect_to_twitter: "Yhdistä palveluun twitter"
@@ -358,6 +365,9 @@ fi:
edit_services: "Muokkaa palveluita"
logged_in_as: "kirjautunut käyttäjänä"
really_disconnect: "katkaise %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Asetukset"
shared:
add_contact:
@@ -370,9 +380,12 @@ fi:
all_contacts: "Kaikki kontaktit"
cannot_remove: "Henkilöä ei voitu poistaa viimeisestä näkymästä. (Jos haluat katkaista yhteyden tähän henkilöön, tulee sinun poistaa kontakti.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Sinulla ei ole yhtään kutsua jäljellä, mutta lisää tulee pian!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} jäljellä)"
invite_someone: "Kutsu joku"
+ invite_your_friends: "Invite your friends"
invites: "Kutsut"
invites_closed: "Kutsut on toistaiseksi suljettu tällä Diaspora-palvelimella"
notification:
@@ -390,8 +403,8 @@ fi:
post_a_message_to: "Lähetä viesti näkymään %{aspect}"
posting: "Lähetetään..."
share: "Jaa"
- share_with: "Jaa näkymän, %{aspect}, kanssa"
- share_with_all: "Jaa viesti kaikkiin näkymiin"
+ share_with: "Jaa"
+ whats_on_your_mind: "Mitä mielessä?"
reshare:
reshare: "Jaa uudelleen"
status_messages:
@@ -415,6 +428,7 @@ fi:
change_language: "Vaihda kieli"
change_password: "Vaihda salasana"
close_account: "Sulje käyttäjätili"
+ current_password: "Nykyinen salasana"
download_photos: "lataa kaikki kuvat"
download_xml: "lataa tiedot XML-muodossa"
edit_account: "Muokkaa käyttäjätiliä"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index bd74580e93cc3243a3c93bd056e18ca5a2521991..9ede032f645ae1347b044ee2006e85d33a22f18c 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -6,10 +6,12 @@
fr:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Commentaire"
_comments: "Commentaires"
_contact: "Contact"
_contacts: "Contacts"
_home: "Accueil"
+ _more: "Plus"
_photos: "photos"
_services: "Services"
account: "Compte"
@@ -36,7 +38,7 @@ fr:
invalid: "est invalide."
username:
taken: "est déjà pris."
- ago: "%{time} plus tôt"
+ ago: "Il y a %{time}"
application:
helper:
aspect_badge:
@@ -171,7 +173,8 @@ fr:
login: "connexion"
logout: "se déconnecter"
view_profile: "voir le profil"
- new_notifications: "%{count} nouvelles notifications"
+ more: "Plus"
+ new_notifications: "%{count} nouvelle(s) notification(s)"
new_requests:
few: "%{count} nouvelles requêtes !"
one: "nouvelle requête !"
@@ -269,7 +272,7 @@ fr:
recent_public_posts: "Messages publics récents"
return_to_aspects: "Retourner à votre page des aspects"
similar_contacts: "Contacts similaires"
- start_sharing: "start sharing"
+ start_sharing: "commencer à partager"
to_accept_or_ignore: "pour l'accepter ou l'ignorer."
update:
failed: "La mise à jour du profil a échoué"
@@ -351,6 +354,10 @@ fr:
success: "Authentification supprimée."
failure:
error: "une erreur s'est produite lors de la connexion avec ce service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connecter à facebook"
connect_to_twitter: "Connecter à twitter"
@@ -358,6 +365,9 @@ fr:
edit_services: "Modifier les services"
logged_in_as: "connecté(e) en tant que"
really_disconnect: "déconnecter %{service} ?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Options"
shared:
add_contact:
@@ -370,9 +380,12 @@ fr:
all_contacts: "Tous les contacts"
cannot_remove: "Impossible de supprimer la personne du dernier aspect. (Si vous voulez supprimer toute connexion avec cette personne vous devez la supprimer en tant que contact.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Vous n'en avez aucune pour l'instant, mais d'autres invitations arriveront bientôt !"
+ from_facebook: "From Facebook"
invitations_left: "(il vous en reste %{count})"
invite_someone: "Inviter quelqu'un"
+ invite_your_friends: "Invite your friends"
invites: "Invitations"
invites_closed: "Les invitations sont actuellement fermées sur ce pod Diaspora"
notification:
@@ -390,8 +403,8 @@ fr:
post_a_message_to: "Publier un message dans %{aspect}"
posting: "Publication…"
share: "Partager"
- share_with: "Partager avec %{aspect}"
- share_with_all: "partager avec tous les aspects"
+ share_with: "Partager avec"
+ whats_on_your_mind: "exprimez-vous"
reshare:
reshare: "Repartager"
status_messages:
@@ -415,6 +428,7 @@ fr:
change_language: "Changer la langue"
change_password: "Changer le mot de passe"
close_account: "Clôturer le compte"
+ current_password: "Mot de passe actuel"
download_photos: "télécharger mes photos"
download_xml: "télécharger mon XML"
edit_account: "Modifier le compte"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index f8d5efdd64e06f00a15c3a2fb22c7cb32cb44ff9..489c0df5acecf44fd52350cb3f2d2a7e9c93a099 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -6,10 +6,12 @@
ga:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Nótaà tráchta"
_contact: "Contact"
_contacts: "Contacts"
_home: "Abhaile"
+ _more: "More"
_photos: "pictÃurÃ"
_services: "SeirbhÃsÃ"
account: "Cúntas"
@@ -171,6 +173,7 @@ ga:
login: "logáil isteach"
logout: "logáil amach"
view_profile: "brathnaigh air próifÃl"
+ more: "More"
new_notifications: "%{count} fógraà nua"
new_requests:
few: "%{count} iarratas nua!"
@@ -351,6 +354,10 @@ ga:
success: "D'éirigh le scriose and fÃordheimhniú"
failure:
error: "bhà earráid ag nasc leis an seirbhÃs sin"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Nasc le facebook"
connect_to_twitter: "Nasc let twitter"
@@ -358,6 +365,9 @@ ga:
edit_services: "Athraigh seirbhÃsÃ"
logged_in_as: "logáilte isteach mar"
really_disconnect: "disconnect %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Socraithe"
shared:
add_contact:
@@ -370,9 +380,12 @@ ga:
all_contacts: "All contacts"
cannot_remove: "Nà féidir leat fháil ré leis an duine seo ón gné déarnach. (Má tá tú ag iarradh dÃnascadh ón duine seo, tá ort fháil ré le teagmháil.)"
invitations:
+ by_email: "by Email"
dont_have_now: "NÃl aon cinn agat fós, ach tá nÃos mó le teacht!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} fágtha)"
invite_someone: "Seol cuireadh chuig duine"
+ invite_your_friends: "Invite your friends"
invites: "Cuireadh"
invites_closed: "Tá na cuireadh dúnta ar an phod Diaspora seo"
notification:
@@ -391,7 +404,7 @@ ga:
posting: "Póstáil..."
share: "Roinn"
share_with: "Roinn le %{aspect}"
- share_with_all: "roinn le gach cheann de do gné"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Roinn arÃs"
status_messages:
@@ -415,6 +428,7 @@ ga:
change_language: "Athraigh Teanga"
change_password: "Athraigh Pasfhocal"
close_account: "Dún Cúntas"
+ current_password: "Current password"
download_photos: "Ãoslódáil mo phictiúrÃ"
download_xml: "Ãoslódáil mo xml"
edit_account: "Athraigh cúntas"
diff --git a/config/locales/diaspora/gl-ES.yml b/config/locales/diaspora/gl-ES.yml
index 81fbef02cac7e470a07501650a533b9b17c4066c..dd9060f29195ebd3ff08cc209e559753d36ff444 100644
--- a/config/locales/diaspora/gl-ES.yml
+++ b/config/locales/diaspora/gl-ES.yml
@@ -6,10 +6,12 @@
gl-ES:
_aspect: "Aspecto"
_aspects: "Aspectos"
+ _comment: "Comentar"
_comments: "Comentarios"
_contact: "Contacto"
- _contacts: "Contacts"
+ _contacts: "Contactos"
_home: "Inicio"
+ _more: "Máis"
_photos: "fotos"
_services: "Servizos"
account: "Conta"
@@ -19,7 +21,7 @@ gl-ES:
contact:
attributes:
person_id:
- taken: "must be unique among this user's contacts."
+ taken: "debe ser único entre os contactos deste usuario."
person:
attributes:
diaspora_handle:
@@ -27,7 +29,7 @@ gl-ES:
request:
attributes:
from_id:
- taken: "is a duplicate of a pre-existing request."
+ taken: "duplicado dunha petición xa existente."
user:
attributes:
email:
@@ -36,50 +38,50 @@ gl-ES:
invalid: "é incorrecto"
username:
taken: "xa está sendo usado"
- ago: "%{time} atrás"
+ ago: "hai %{time}"
application:
helper:
aspect_badge:
- all_aspects: "All aspects"
+ all_aspects: "Todos os aspectos"
unknown_person: "persoa descoñecida"
video_title:
- unknown: "Unknown Video Title"
- are_you_sure: "Are you sure?"
+ unknown: "TÃtulo de vÃdeo descoñecido"
+ are_you_sure: "Estás seguro?"
aspects:
add_to_aspect:
- failure: "Non se puido engadir o contacto á aparencia."
- success: "Engadiuse correctamente o contacto coa aparencia."
+ failure: "Non se puido engadir o contacto ao aspecto."
+ success: "Engadiuse correctamente o contacto ao aspecto."
aspect_contacts:
- done_editing: "done editing"
+ done_editing: "edición rematada"
create:
- failure: "Fallou a creación da aparencia."
- success: "A súa nova aparencia %{name} foi creada"
+ failure: "Fallou a creación do aspecto."
+ success: "O seu novo aspecto %{name} foi creado"
destroy:
success: "%{name} foi eliminado correctamente."
edit:
- add_existing: "Add an existing contact"
- confirm_remove_aspect: "Are you sure you want to delete this aspect?"
- remove_aspect: "Delete this aspect"
- rename: "rename"
- rename_aspect: "Rename aspect"
+ add_existing: "Engadir un contacto existente"
+ confirm_remove_aspect: "Estás seguro de querer eliminar este aspecto?"
+ remove_aspect: "Borrar este aspecto"
+ rename: "renomear"
+ rename_aspect: "Renomear aspecto"
helper:
- are_you_sure: "Are you sure you want to delete this aspect?"
- aspect_not_empty: "A aparencia non está baleira"
+ are_you_sure: "Estás seguro de querer borrar este aspecto?"
+ aspect_not_empty: "O aspecto non esta baleiro"
remove: "eliminar"
index:
handle_explanation: "Esta é a súa tarxeta de diaspora. Coma un enderezo electrónico, podes darllo ás persoas para que te localicen."
- no_contacts: "No contacts"
+ no_contacts: "sen contactos"
manage:
- add_a_new_aspect: "Engadir unha nova aparencia"
+ add_a_new_aspect: "Engadir un novo aspecto"
add_a_new_contact: "Engadir un novo contacto"
drag_to_add: "Arrastre para engadir xente"
- manage_aspects: "Xestionar aparencias"
+ manage_aspects: "Xestionar aspectos"
no_requests: "Non hai solicitudes novas"
requests: "Solicitudes"
move_contact:
error: "Erro movendo ao contacto: %{inspect}"
failure: "non funcionou %{inspect}"
- success: "A persoa mudou a unha nova aparencia"
+ success: "A persoa mudou a un novo aspecto"
new_aspect:
create: "Crear"
name: "Nome"
@@ -88,34 +90,34 @@ gl-ES:
add_contact_to: "Engadir a alguén a %{aspect_name}"
invite: "Convida a alguén a participar en Diaspora!"
nobody: "Traia ás persoas que lle importan a Diaspora!"
- nobody_in_aspect: "A túa aparencia '%{aspect_name}' está baleira."
+ nobody_in_aspect: "O seu aspecto '%{aspect_name}' está baleiro."
no_posts_message:
start_talking: "Ninguén dixo nada. Comeza unha conversa!"
remove_from_aspect:
- failure: "Non se puido eliminar a persoa da aparencia"
- success: "Persoa eliminada correctamente da aparencia"
+ failure: "Sen éxito ao borrar persoa do aspecto"
+ success: "Persoa eliminada correctamente do aspecto"
seed:
family: "Familia"
work: "Traballo"
show:
- edit_aspect: "editar aparencia"
+ edit_aspect: "editar aspecto"
update:
- failure: "Your aspect, %{name}, had too long name to be saved."
- success: "A súa aparencia, %{name}, foi editada con éxito."
+ failure: "O seu aspecto, %{name}, ten un nome demasiado longo para ser gardado."
+ success: "O seu aspecto, %{name}, foi editado con éxito."
back: "Volver"
cancel: "Cancelar"
comments:
new_comment:
comment: "Comentario"
commenting: "Comentando..."
- enter: "enter"
- press: "press"
- to_comment: "to comment"
+ enter: "entrar"
+ press: "premer"
+ to_comment: "para comentar"
contacts:
- few: "%{count} contacts"
- one: "1 contact"
- other: "%{count} contacts"
- zero: "no contacts"
+ few: "%{count} contactos"
+ one: "1 contacto"
+ other: "%{count} contactos"
+ zero: "non hai contactos"
delete: "Borrar"
email: "Correo-e"
error_messages:
@@ -127,7 +129,7 @@ gl-ES:
show:
already_account: "xa tes unha conta?"
choice: "Escolla"
- choice_explanation: "Diaspora permÃtelle clasificar as súas conexións en grupos chamados aparencias. Exclusivo de Diaspora, as aparencias garanten que as súas fotos, historias e chistes son compartidos só coas persoas que quere."
+ choice_explanation: "Diaspora permÃtelle clasificar as súas conexións en grupos chamados aspectos. Exclusivo de Diaspora, os aspectos garanten que as súas fotos, historias e chistes son compartidos só coas persoas que quere."
learn_about_host: "Aprenda como aloxar o seu propio servidor de Diaspora."
login_here: "inicie sesión aquÃ"
ownership: "Propiedade"
@@ -135,99 +137,100 @@ gl-ES:
share_what_you_want: "Comparte o que desexes, con quen desexes."
simplicity: "Simplicidade"
simplicity_explanation: "Diaspora fai de compartir algo claro e sinxelo - e isto vale tamén coa privacidade. Coa mesma, Diaspora non lle fará percorrer páxinas de axustes e opcións para manter o seu perfil seguro."
- tagline_first_half: "Share what you want,"
- tagline_second_half: "with whom you want."
+ tagline_first_half: "Comparte o que queras,"
+ tagline_second_half: "con quen queras."
invitations:
check_token:
not_found: "Bono de convite non atopado"
create:
- already_contacts: "You are already connected with this person"
- already_sent: "You already invited this person."
+ already_contacts: "Xa estás conectado a esta persoa"
+ already_sent: "Xa invitaches a esta persoa."
no_more: "Non tes máis convites."
rejected: "Os seguintes enderezos de correo deron problemas:"
sent: "Os convites foron enviados a:"
edit:
sign_up: "rexistrarse"
new:
- already_invited: "Already invited"
- aspect: "Aspect"
- comma_seperated_plz: "Podes engadir varios enderezos de correo separándoos por vÃrgulas."
- if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
+ already_invited: "Xa convidado"
+ aspect: "Aspecto"
+ comma_seperated_plz: "Podes engadir varios enderezos de correo separándoos por comas."
+ if_they_accept_info: "se aceptan, serán engadidos ao aspecto ao que os convidaches."
invite_someone_to_join: "Convida a alguén a participar en Diaspora!"
- personal_message: "Personal message"
- send_an_invitation: "Enviar un convite"
- send_invitation: "Enviar convite"
- to: "A"
+ personal_message: "Mensaxe persoal"
+ send_an_invitation: "Mensaxe persoal"
+ send_invitation: "Enviar un convite"
+ to: "Mensaxe persoal"
layouts:
application:
- have_a_problem: "Have a problem? Find an answer here"
+ have_a_problem: "Tes problemas? Atopa aquà a resposta"
powered_by: "FORNECIDO POR DIASPORA*"
- whats_new: "what's new?"
+ whats_new: "que hai de novo?"
header:
account_settings: "Configuración da conta"
blog: "Bitácora"
- code: "code"
+ code: "código"
edit_profile: "Modificar o perfil"
login: "Identificarse"
logout: "SaÃr"
view_profile: "Ver o perfil"
- new_notifications: "%{count} new notifications"
+ more: "Máis"
+ new_notifications: "%{count} novas notificacións"
new_requests:
- few: "%{count} new requests!"
- one: "new request!"
- other: "%{count} new requests!"
- zero: "no new requests"
- next: "next"
- no_new_notifications: "no new notifications"
+ few: "%{count} novas peticións!"
+ one: "nova petición!"
+ other: "%{count} novas peticións!"
+ zero: "non hai novas peticións"
+ next: "seguinte"
+ no_new_notifications: "non hai novas peticións"
notifications:
- also_commented: "also commented on"
- comment_on_post: "commented on your"
- deleted: "deleted"
+ also_commented: "tamén comentado nos do teu contacto"
+ comment_on_post: "comentado no teu"
+ deleted: "borrado"
index:
- notifications: "Notifications"
- new_request: "offered to share with you."
- post: "post"
- request_accepted: "accepted your share request."
+ notifications: "Notificacións"
+ new_request: "ofrecido para compartir contigo."
+ post: "publicar"
+ request_accepted: "aceptada a túa petición para compartir."
notifier:
also_commented:
- commented: "has also commented on %{post_author}'s post:"
- sign_in: "Sign in to view it."
- subject: "%{name} has also commented."
+ commented: "tamén comentou na publicación de %{post_author}:"
+ sign_in: "Identificarse para velo."
+ subject: "%{name} tamén comentou."
comment_on_post:
- commented: "has commented on your post!"
- sign_in: "Sign in to view it."
- subject: "%{name} has commented on your post."
+ commented: "comentou na túa publicación!"
+ sign_in: "Entrar para velo."
+ subject: "%{name} comentou na túa publicación."
diaspora: "o robot do correo electrónico de Diaspora"
hello: "Ola %{name}!"
love: "amor,"
new_request:
just_sent_you: "acaba de mandarche unha petición de contacto en Diaspora*."
- sign_in: "Rexistrarse"
+ sign_in: "entra aquÃ"
subject: "Ten unha nova petición de contacto en Diaspora* de %{from}."
try_it_out: "DeberÃa pensar seriamente en botarlle unha ollada."
request_accepted:
- accepted: "has accepted your contact request. They are now in your"
+ accepted: "aceptou a túa petición de contacto."
subject: "%{name} aceptouno como contacto en Diaspora*."
single_admin:
- admin: "Your Diaspora administrator"
- subject: "A message from your Diaspora administrator:"
- thanks: "Thanks,"
+ admin: "O teu administrador Diaspora"
+ subject: "Un mensaxe da túa conta Diaspora:"
+ thanks: "Grazas,"
ok: "Aceptar"
or: "ou"
pagination:
- next: "Next"
- previous: "Previous"
+ next: "Seguinte"
+ previous: "Anterior"
password: "Contrasinal"
password_confirmation: "Confirmación do contrasinal"
people:
aspect_list:
- edit_membership: "edit aspect membership"
+ edit_membership: "editar membresÃa de aparencia"
edit:
- allow_search: "Permitir á xente pescudarche dentro de Diaspora"
- edit_profile: "Edit profile"
+ allow_search: "Permitir á xente buscarte dentro de Diaspora"
+ edit_profile: "Editar perfil"
first_name: "Nome"
info_available_to: "Esta información estará dispoñÃbel a quen te conectes en Diaspora."
- last_name: "Apelido"
+ last_name: "Apelidos"
update_profile: "Actualizar perfil"
your_bio: "Sobre min"
your_birthday: "O teu aniversario"
@@ -236,12 +239,12 @@ gl-ES:
your_photo: "A túa foto"
your_profile: "O teu perfil"
helper:
- people_on_pod_are_aware_of: " people on pod are aware of"
+ people_on_pod_are_aware_of: "xente na vaÃña están ao tanto de"
results_for: "resultados para %{params}"
index:
- couldnt_find_them_send_invite: "Couldn't find them? Send an invite!"
- no_one_found: "...and no one was found."
- no_results: "Hey! You need to search for something."
+ couldnt_find_them_send_invite: "Non os atopas? EnvÃalles unha invitación"
+ no_one_found: "...non se atopou ningún"
+ no_results: "Ei! Precisas buscar algo."
results_for: "resultados da procura para"
person:
add_contact: "engadir contacto"
@@ -250,37 +253,37 @@ gl-ES:
thats_you: "es ti!"
profile_sidebar:
bio: "bio"
- born: "nado"
- cannot_remove: "Non se pode eliminar %{name} da última aparencia. (Se te queres desvincular desta persoa tes que eliminar o contacto.)"
+ born: "aniversario"
+ cannot_remove: "Non se pode eliminar %{name} do último aspecto. (Se te queres desvincular desta persoa tes que eliminar o contacto.)"
edit_my_profile: "Editar o meu perfil"
gender: "xénero"
- in_aspects: "en aparencias"
+ in_aspects: "en aspectos"
remove_contact: "borrar contacto"
- remove_from: "Eliminar %{name} da %{aspect}?"
+ remove_from: "Eliminar %{name} de %{aspect}?"
share_with:
- accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
- share_with: "Start sharing with %{name}"
+ accepts: "Cando %{name} acepte, comezaredes a ver as publicacións do outro en Diaspora"
+ share_with: "Comeza a compartir con %{name}"
show:
does_not_exist: "A persoa non existe!"
- incoming_request: "You have an incoming request from this person."
+ incoming_request: "Tes invitacións pendentes desta persoa."
no_posts: "non hai mensaxes que amosar!"
- not_connected: "You are not connected with this person"
- recent_posts: "Recent Posts"
- recent_public_posts: "Recent Public Posts"
- return_to_aspects: "Return to your aspects page"
- similar_contacts: "similar contacts"
- start_sharing: "start sharing"
- to_accept_or_ignore: "to accept or ignore it."
+ not_connected: "Non estás conectado a %{name}"
+ recent_posts: "Publicacións recentes"
+ recent_public_posts: "Publicacións Públicas Recentes"
+ return_to_aspects: "Voltar á paxina dos teus aspectos"
+ similar_contacts: "contactos semellantes"
+ start_sharing: "comezar a compartir"
+ to_accept_or_ignore: "aceptalo ou ignoralo"
update:
failed: "Non se puido actualizar o perfil"
updated: "Perfil actualizado"
webfinger:
- fail: "Sorry, we couldn't find %{handle}."
+ fail: "SentÃmolo, non poidemos atopar %{handle}."
photos:
create:
- integrity_error: "Photo upload failed. Are you sure that was an image?"
- runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
- type_error: "Photo upload failed. Are you sure an image was added?"
+ integrity_error: "Fallou a carga da foto. Seguro que o ficheiro era unha imaxe?"
+ runtime_error: "Fallou a carga da foto. Seguro que tiñas o cinto de seguridade ben apretado?"
+ type_error: "Fallou a carga da foto. Seguro que engadiches a imaxe?"
destroy:
notice: "Foto eliminada."
edit:
@@ -288,14 +291,14 @@ gl-ES:
new:
back_to_list: "Volta á lista"
new_photo: "Foto nova"
- post_it: "anótao!"
+ post_it: "publÃcao!"
new_photo:
empty: "{file} está baleiro, elixa de novo os arquivos."
invalid_ext: "{file} ten unha extensión incorrecta. Só se permiten estas {extensions}."
size_error: "{file} é moi grande, o peso máximo de arquivo é {sizeLimit}."
new_profile_photo:
- or_select_one: "or select one from your already existing"
- upload: "Upload a new profile photo!"
+ or_select_one: "ou escolle un xa existente"
+ upload: "Sube unha nova foto de perfil!"
photo:
view_all: "ver todas as fotos de %{name}"
show:
@@ -306,163 +309,174 @@ gl-ES:
permalink: "permalink"
update_photo: "Actualizar foto"
view: "ver"
- view_original_post: "view original post"
+ view_original_post: "ver publicación orixinal"
update:
error: "Erro ao editar a foto."
notice: "Foto actualizada correctamente."
- previous: "previous"
+ previous: "anterior"
profile: "Perfil"
registrations:
- closed: "Signups are closed on this Diaspora pod."
+ closed: "Rexistros pechados nesta vaÃña de Diaspora."
create:
- success: "Engadiuse a Diaspora!"
+ success: "Xa estás en Diaspora!"
edit:
cancel_my_account: "Cancelar a miña conta"
- edit: "Edit %{name}"
- leave_blank: "(leave blank if you don't want to change it)"
- password_to_confirm: "(we need your current password to confirm your changes)"
- unhappy: "Unhappy?"
- update: "Update"
+ edit: "Editar %{name}"
+ leave_blank: "(deixao baleiro se non queres cambialo)"
+ password_to_confirm: "(precisamos o teu contrasinal actual para confirmar os cambios)"
+ unhappy: "Non estas contento?"
+ update: "Actualizar"
new:
- enter_email: "Enter an e-mail"
- enter_password: "Enter a password"
- enter_password_again: "Enter the same password as before"
- enter_username: "Pick a username (only letters, numbers, and underscores)"
- sign_up: "Sign up"
- sign_up_for_diaspora: "Sign up for Diaspora"
+ enter_email: "Introduce un correo-e"
+ enter_password: "Introduce un contrasinal"
+ enter_password_again: "Introduce o mesmo contrasinal que antes"
+ enter_username: "Escolle un nome de usuario (só letras, números e guions baixos)"
+ sign_up: "Rexistrarse"
+ sign_up_for_diaspora: "Rexistrarse en Diaspora"
requests:
create:
- sending: "Sending"
- sent: "You've asked to share with %{name}. They should see it next time they log in to Diaspora."
+ sending: "Enviando"
+ sent: "Pediches compartir con %{name}. Verano a próxima vez que entren en Diaspora."
destroy:
- error: "Please select an aspect!"
- ignore: "Ignored contact request."
- success: "You are now friends."
+ error: "Por favor, seleccione un aspecto"
+ ignore: "Petición de contacto ignorada."
+ success: "Agora sodes amigos"
manage_aspect_contacts:
- existing: "Existing contacts"
- manage_within: "Manage contacts within"
+ existing: "Contactos existentes"
+ manage_within: "Administrar contactos"
new_request_to_person:
- sent: "sent!"
- search: "Search"
+ sent: "enviado!"
+ search: "Procurar"
services:
create:
success: "Identificado con éxito."
destroy:
- success: "Successfully destroyed authentication."
+ success: "Autentificación destruÃda satisfactoriamente."
failure:
- error: "there was an error connecting that service"
+ error: "houbo un erro conectando co servizo"
+ finder:
+ invite_your_friends_from: "Invita aos teus amigos de %{service}"
+ not_connected: "sen conexión"
+ resend: "reenviar"
index:
connect_to_facebook: "Conectar ao Facebook"
connect_to_twitter: "Conectar ao Twitter"
disconnect: "desconectar"
- edit_services: "Edit services"
- logged_in_as: "conectado coma"
+ edit_services: "Editar servizos"
+ logged_in_as: "conectado como"
really_disconnect: "desconectar %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Preme este enlace para aceptar a invitación"
+ join_me_on_diaspora: "Unirse a DIASPORA*"
settings: "Axustes"
shared:
add_contact:
create_request: "Pescudar por tarxeta Diaspora"
- diaspora_handle: "Tarxeta Diaspora"
+ diaspora_handle: "diaspora@handle.org"
enter_a_diaspora_username: "Introduza un nome de usuario de Diaspora:"
- know_email: "Know their email address? You should invite them"
+ know_email: "Sabes os seus enderezos electrónicos? DeberÃas invitalos"
your_diaspora_username_is: "O teu nome de usuario de Diaspora é: %{diaspora_handle}"
contact_list:
- all_contacts: "All contacts"
- cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+ all_contacts: "Tódolos contactos"
+ cannot_remove: "Non se pode borrar esta persoa do último aspecto. (Se te queres desconectar desta persoa debes borrar o contacto)"
invitations:
- dont_have_now: "You don't have any right now, but more invites are coming soon!"
- invitations_left: "(%{count} left)"
- invite_someone: "Invite someone"
- invites: "Invites"
- invites_closed: "Invites are currently closed on this Diaspora seed"
+ by_email: "por correo"
+ dont_have_now: "Non tes ningunha agora mesmo, pero xa terás máis!"
+ from_facebook: "De Facebook"
+ invitations_left: "(quedan %{count} )"
+ invite_someone: "Invitar alguén"
+ invite_your_friends: "Invita os teus amigos"
+ invites: "Convites"
+ invites_closed: "As invitacións están actualmente pechadas nesta vaÃña Diaspora"
notification:
- new: "New %{type} from %{from}"
+ new: "Novo %{type} de %{from}"
public_explain:
- logged_in: "logged in to %{service}"
- manage: "manage connected services"
- outside: "Public messages will be available for others outside of Diaspora to see."
- title: "You are about to post a public message!"
+ logged_in: "conectado a %{service}"
+ manage: "administrar servizos conectados"
+ outside: "As mensaxes públicas poderán ser vistas por xente de fóra de Diaspora."
+ title: "Estás a piques de publicar unha mensaxe pública!"
publisher:
- add_photos: "add photos"
- all: "all"
- all_contacts: "all contacts"
- make_public: "make public"
- post_a_message_to: "Post a message to %{aspect}"
- posting: "Posting..."
- share: "Share"
- share_with: "Share with %{aspect}"
- share_with_all: "share across all of your aspects"
+ add_photos: "engadir fotos"
+ all: "todos"
+ all_contacts: "todos os contactos"
+ make_public: "facer público"
+ post_a_message_to: "Deixar un mensaxe en %{aspect}"
+ posting: "Publicando..."
+ share: "Compartir"
+ share_with: "Compartir con %{aspect}"
+ whats_on_your_mind: "que tes en mente?"
reshare:
- reshare: "Reshare"
+ reshare: "Recompartir "
status_messages:
helper:
- no_message_to_display: "No message to display."
+ no_message_to_display: "Non hai mensaxes para amosar"
new_status_message:
- oh_yeah: "oh yeah!"
- tell_me_something_good: "tell me something good"
+ oh_yeah: "e logo!!"
+ tell_me_something_good: "cóntame algo bo"
show:
- destroy: "Destroy"
+ destroy: "Borrar"
permalink: "permalink"
stream_helper:
- hide_comments: "hide comments"
- show_comments: "show comments"
- the_world: "the world"
- username: "Username"
+ hide_comments: "esconder comentarios"
+ show_comments: "Amosar todos os comentarios"
+ the_world: "o mundo"
+ username: "Nome de usuario"
users:
- destroy: "Account successfully closed."
+ destroy: "Conta pechada satisfactoriamente."
edit:
- change: "Change"
- change_language: "Change Language"
- change_password: "Change Password"
- close_account: "Close Account"
- download_photos: "download my photos"
- download_xml: "download my xml"
- edit_account: "Edit account"
- email_notifications: "Email notificaions"
- export_data: "Export Data"
- new_password: "New Password"
- receive_email_notifications: "Receive email notificaions?"
- your_email: "Your email"
+ change: "Cambiar"
+ change_language: "Cambiar lingua"
+ change_password: "Cambiar contrasinal"
+ close_account: "Pechar conta"
+ current_password: "Contrasinal actual"
+ download_photos: "Descargar as miñas imaxes"
+ download_xml: "descargar o meu xml"
+ edit_account: "Editar conta"
+ email_notifications: "Notificacións de correo-e"
+ export_data: "Exportar datos"
+ new_password: "Novo contrasinal"
+ receive_email_notifications: "Receibir notificacións por correo?"
+ your_email: "O teu correo"
your_handle: "Your diaspora handle"
getting_started:
- connect_services: "Connect your other services"
- define_aspects: "Define your aspects"
- edit_profile: "Edit your profile"
- finished: "Finished!"
- save_and_continue: "Save and continue"
- signup_steps: "Finish your sign up by completing these three steps:"
- skip: "skip getting started"
+ connect_services: "Conectar a outros servizos"
+ define_aspects: "Define os teus aspectos"
+ edit_profile: "Edita o teu perfil"
+ finished: "Xa está!"
+ save_and_continue: "Gardar e continuar"
+ signup_steps: "Remata de rexistrarte completando estes tres pasos"
+ skip: "saltar guÃa de comezo"
step_2:
- add: "Add"
- aspect_name: "Aspect name"
- description: "Tell Diaspora what different aspects of you are seen by different contacts. You can manage these later through your account menu at the top right. Your aspects are unique to you and not visible by others."
- drag_to_add: "Drag them to the aspect of yourself they know"
- no_requests: "You have no requests"
- your_aspects: "Your aspects"
- your_inviter: "Here are the people who are waiting for you:"
+ add: "Engadir"
+ aspect_name: "Nome do aspecto"
+ description: "Dille a Diaspora que diferentes aspectos teus son vistos por diferentes contactos. Podes administralos máis tarde no teu menú de conta arriba á dereita. Os teu aspectos son únicos e so visibles por ti."
+ drag_to_add: "Arrástraos ao aspecto teu que coñecen"
+ no_requests: "Non tes peticións"
+ your_aspects: "Os teus aspectos"
+ your_inviter: "Aquà tes á xente que espera por ti:"
step_3:
- description: "You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public\""
- your_services: "Your services"
+ description: "Podes conectar ás túas redes sociais á túa conta en Diaspora. Poderás publicar a través da túa páxina de inicio cando selecciones facer público."
+ your_services: "Os teus servizos"
step_4:
- change_profile: "You can edit your profile and manage your connected services at any time through "
- continue: "Continue on to your Home page, an overview of all of your aspects."
- finish: "Finish"
- manage_aspects: "You can also add contacts while on any aspect page."
- ready_to_share: "You're now ready to start sharing with "
- set_up: "You're all set up, %{name}!"
- user_menu: "the user menu located at the top right."
- welcome: "Welcome to Diaspora!"
+ change_profile: "Podes editar o teu perfil e administrar os teus servizos conectados en calquera momento."
+ continue: "Continuar á páxina de inicio para ver todos os teus aspectos"
+ finish: "Finalizado"
+ manage_aspects: "Tamén podes engadir contactos mentres estás nunha páxina de aspecto."
+ ready_to_share: "Xa estás listo para comezar a compartir con"
+ set_up: "Todo listo, %{name}!"
+ user_menu: "o menú de usuario localizado arriba á dereita."
+ welcome: "Benvido a Diaspora!"
public:
- does_not_exist: "User %{username} does not exist!"
+ does_not_exist: "O usuario %{username} non existe!"
update:
- email_notifications_changed: "Language Change Failed"
- language_changed: "Language Changed"
- language_not_changed: "Language Change Failed"
- password_changed: "Password Changed"
- password_not_changed: "Password Change Failed"
+ email_notifications_changed: "Notificacións de correo-e cambiadas"
+ language_changed: "Lingua cambiada"
+ language_not_changed: "Fallo ao cambiar de lingua"
+ password_changed: "Contrasinal Cambiado"
+ password_not_changed: "Fallo ao cambiar de contrasinal"
webfinger:
- fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
- hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
- no_person_constructed: "No person could be constructed from this hcard."
- not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
- xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+ fetch_failed: "fallo ao buscar perfil webfinger para %{profile_url}"
+ hcard_fetch_failed: "Houbo un problema na buca da hcard para #{@account}"
+ no_person_constructed: "Non se puido contruir persoa a partir desta hcard."
+ not_enabled: "o webfinger non parece estar activado para %{account}"
+ xrd_fetch_failed: "houbo un erro conseguindo o xrd da conta %{account}"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 78396641a9a8172cbc8a6227a13cf28341e2909b..56e4be4be39283defa1e0c879ae35ac3afcb5252 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -6,10 +6,12 @@
he:
_aspect: "היבט"
_aspects: "היבטי×"
+ _comment: "Comment"
_comments: "תגובות"
_contact: "×יש קשר"
_contacts: "×× ×©×™ קשר"
_home: "בית"
+ _more: "More"
_photos: "×ª×ž×•× ×•×ª"
_services: "שירותי×"
account: "חשבון"
@@ -171,6 +173,7 @@ he:
login: "×›× ×™×¡×”"
logout: "יצי××”"
view_profile: "צפייה בפרופיל"
+ more: "More"
new_notifications: "%{count} התרעות חדשות"
new_requests:
few: "%{count} בקשות חדשות!"
@@ -351,6 +354,10 @@ he:
success: "×”×ימות × ×ž×—×§ בהצלחה."
failure:
error: "×ירעה שגי××” בעת ההתחברות לשירות ×–×”"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "התחברות לפייסבוק"
connect_to_twitter: "התחברות לטוויטר"
@@ -358,6 +365,9 @@ he:
edit_services: "עריכת שירותי×"
logged_in_as: "× ×›× ×¡×ª בש×"
really_disconnect: "×”×× ×œ× ×ª×§ ×ת %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "הגדרות"
shared:
add_contact:
@@ -370,9 +380,12 @@ he:
all_contacts: "כל ×× ×©×™ הקשר"
cannot_remove: "×œ× × ×™×ª×Ÿ להסיר ×ת ×יש הקשר מההיבט ×”×חרון. (×× ×‘×¨×¦×•× ×š ×œ×”×ª× ×ª×§ מ×יש הקשר עליך להסירו מרשימת ×× ×©×™ הקשר)."
invitations:
+ by_email: "by Email"
dont_have_now: "×ין לך כרגע, ×ך יתווספו לך ×”×–×ž× ×•×ª בקרוב!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} × ×•×ª×¨×•)"
invite_someone: "שליחת ×”×–×ž× ×”"
+ invite_your_friends: "Invite your friends"
invites: "×”×–×ž× ×•×ª"
invites_closed: "× ×›×•×Ÿ לעכשיו ×”×”×–×ž× ×•×ª לפוד ×–×” של די×ספורה סגורות"
notification:
@@ -391,7 +404,7 @@ he:
posting: "פרסו×..."
share: "שיתוף"
share_with: "שיתוף ×¢× %{aspect}"
- share_with_all: "שיתוף בין כל ×”×”×™×‘×˜×™× ×©×œ×š"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "שיתוף מחדש"
status_messages:
@@ -415,6 +428,7 @@ he:
change_language: "החלפת השפה"
change_password: "החלפת הססמה"
close_account: "סגירת החשבון"
+ current_password: "Current password"
download_photos: "הורדת ×”×ª×ž×•× ×•×ª שלי"
download_xml: "הורדת ה־xml שלי"
edit_account: "עריכת החשבון"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 4db699811f26d8e9ee8e5135bf44367760720445..381fe7d35477fd8689dc00712238d51433682562 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -6,10 +6,12 @@
hu:
_aspect: "Csoport"
_aspects: "Csoportok"
+ _comment: "Hozzászólás"
_comments: "Hozzászólások"
_contact: "Kapcsolat"
_contacts: "Ismerősök"
_home: "Kezdőlap"
+ _more: "BÅ‘vebben"
_photos: "Képek"
_services: "Szolgáltatások"
account: "Felhasználói fiók"
@@ -160,7 +162,7 @@ hu:
to: "CÃmzett"
layouts:
application:
- have_a_problem: "Have a problem? Find an answer here"
+ have_a_problem: "Problémád van?"
powered_by: "DIASPORA* fordÃtotta ADAMEX"
whats_new: "Újdonságok"
header:
@@ -171,6 +173,7 @@ hu:
login: "belépés"
logout: "kilépés"
view_profile: "profil megtekintése"
+ more: "BÅ‘vebben"
new_notifications: "%{count} új értesÃtés"
new_requests:
few: "%{count} új felkérés!"
@@ -269,7 +272,7 @@ hu:
recent_public_posts: "Legutóbbi nyilvános hozzászólások"
return_to_aspects: "Menj vissza a csoportokhoz"
similar_contacts: "hasonló kapcsolatok"
- start_sharing: "start sharing"
+ start_sharing: "Megosztás indÃtása"
to_accept_or_ignore: "hogy elfogadd vagy elutasÃtsd."
update:
failed: "Profil frissÃtése sikertelen"
@@ -351,6 +354,10 @@ hu:
success: "Sikeresen megsemmisÃtetted hitelesÃtést."
failure:
error: "Hiba történt a szolgáltatáshoz kapcsolódás közben"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Csatlakozás Facebook-hoz"
connect_to_twitter: "Csatlakozás Twitter-hez"
@@ -358,6 +365,9 @@ hu:
edit_services: "Szolgáltatások szerkesztése"
logged_in_as: "bejelentkezett, mint"
really_disconnect: "Lecsatlakozik: %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "BeállÃtások"
shared:
add_contact:
@@ -370,9 +380,12 @@ hu:
all_contacts: "Összes kapcsolat"
cannot_remove: "Nem törölheted az utolsó csoportot. (Ha nem akarsz a személy ismerőse lenni, töröld a kapcsolatot.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Nincs több meghÃvód, de hamarosan kapsz még!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} maradt)"
invite_someone: "HÃvj meg valakit"
+ invite_your_friends: "Invite your friends"
invites: "MeghÃvók"
invites_closed: "A meghÃvás jelenleg szünetel erre a Diaspora* kiszolgálóra."
notification:
@@ -390,8 +403,8 @@ hu:
post_a_message_to: "Üzenet küldése ennek a csoportnak: %{aspect}"
posting: "Küldés..."
share: "Megosztás"
- share_with: "Megosztás ezzel a csoporttal: %{aspect}"
- share_with_all: "megosztás az összes csoportommal"
+ share_with: "Megosztás vele: %{aspect}"
+ whats_on_your_mind: "Mi jár a fejedben?"
reshare:
reshare: "Újraosztás"
status_messages:
@@ -415,6 +428,7 @@ hu:
change_language: "Nyelv megváltoztatása"
change_password: "Jelszó módosÃtása"
close_account: "Fiók bezárása"
+ current_password: "Jelenlegi jelszó"
download_photos: "Képeim letöltése"
download_xml: "Saját XML letöltése"
edit_account: "Fiók szerkesztése"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 4f76b95e565ce8a85b97b4d624479488e6634525..ebc14e9ca47c01dc73edaa21b8917b200e1aa85e 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -6,10 +6,12 @@
id:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comments"
_contact: "Contact"
_contacts: "Contacts"
_home: "Home"
+ _more: "More"
_photos: "photos"
_services: "Services"
account: "Account"
@@ -171,6 +173,7 @@ id:
login: "login"
logout: "logout"
view_profile: "view profile"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ id:
success: "Successfully destroyed authentication."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connect to facebook"
connect_to_twitter: "Connect to twitter"
@@ -358,6 +365,9 @@ id:
edit_services: "Edit services"
logged_in_as: "logged in as"
really_disconnect: "disconnect %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Settings"
shared:
add_contact:
@@ -370,9 +380,12 @@ id:
all_contacts: "All contacts"
cannot_remove: "Cannot remove person from last aspect."
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} left)"
invite_someone: "Invite someone"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ id:
posting: "Posting..."
share: "Bagikan"
share_with: "Share with %{aspect}"
- share_with_all: "Share with all aspects"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Reshare"
status_messages:
@@ -415,6 +428,7 @@ id:
change_language: "Change Language"
change_password: "Change Password"
close_account: "Close Account"
+ current_password: "Current password"
download_photos: "download my photos"
download_xml: "download my xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index ebf4163e9edc77df58dcf1c1a9aea67bbd75903e..29cf77f7dc6164a58eed389bc1b1a6fd91e1c7b1 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -6,10 +6,12 @@
it:
_aspect: "Aspetto"
_aspects: "Aspetti"
+ _comment: "Commento"
_comments: "Commenti"
_contact: "Contatto"
_contacts: "Contatti"
_home: "Home"
+ _more: "Altro"
_photos: "foto"
_services: "Servizi"
account: "Account"
@@ -60,7 +62,7 @@ it:
add_existing: "Aggiungi un contatto esistente"
confirm_remove_aspect: "Sei sicuro di voler eliminare questo aspetto?"
remove_aspect: "Elimina questo aspetto"
- rename: "rename"
+ rename: "rinomina"
rename_aspect: "Rinomina aspetto"
helper:
are_you_sure: "Sei sicuro di voler eliminare questo aspetto?"
@@ -160,7 +162,7 @@ it:
to: "A"
layouts:
application:
- have_a_problem: "Have a problem? Find an answer here"
+ have_a_problem: "Hai un problema? Trova qui la soluzione"
powered_by: "CREATO CON DIASPORA*"
whats_new: "novità "
header:
@@ -171,6 +173,7 @@ it:
login: "accedi"
logout: "esci"
view_profile: "visualizza profilo"
+ more: "Altro"
new_notifications: "%{count} nuove notifiche"
new_requests:
few: "%{count} nuove richieste!"
@@ -269,7 +272,7 @@ it:
recent_public_posts: "Post pubblici recenti"
return_to_aspects: "Torna alla pagina dei tuoi aspetti"
similar_contacts: "contatti simili"
- start_sharing: "start sharing"
+ start_sharing: "inizia a condividere"
to_accept_or_ignore: "per accettarla o ignorarla."
update:
failed: "Impossibile aggiornare il profilo"
@@ -351,6 +354,10 @@ it:
success: "Autenticazione cancellata con successo."
failure:
error: "si è verificato un errore durante la connessione a quel servizio"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connettiti a facebook"
connect_to_twitter: "Connettiti a twitter"
@@ -358,6 +365,9 @@ it:
edit_services: "Modifica servizi"
logged_in_as: "connesso come"
really_disconnect: "disconnettere %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Impostazioni"
shared:
add_contact:
@@ -370,9 +380,12 @@ it:
all_contacts: "Tutti i contatti"
cannot_remove: "Impossibile rimuovere la persona dall'ultimo aspetto."
invitations:
+ by_email: "by Email"
dont_have_now: "Non ne hai alcuno per il momento, ma altri arriveranno presto!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} rimanenti)"
invite_someone: "Invita qualcuno"
+ invite_your_friends: "Invite your friends"
invites: "Inviti"
invites_closed: "Al momento gli inviti sono chiusi su questo pod Diaspora."
notification:
@@ -390,8 +403,8 @@ it:
post_a_message_to: "Invia un messaggio a %{aspect}"
posting: "Invio in corso..."
share: "Condividi"
- share_with: "Condividi con %{aspect}"
- share_with_all: "Condividi con tutti gli aspetti"
+ share_with: "Condividi con"
+ whats_on_your_mind: "cosa stai pensando?"
reshare:
reshare: "Ricondividi"
status_messages:
@@ -415,6 +428,7 @@ it:
change_language: "Cambia Lingua"
change_password: "Cambia Password"
close_account: "Chiudi Account"
+ current_password: "Password attuale"
download_photos: "scarica le mie"
download_xml: "scarica il mio xml"
edit_account: "Modifica account"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 0dd4785d38eccfb7248a908ab2d2106a0e500a4d..3d9d419d141179855e5471710b3f57003edf5685 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -6,10 +6,12 @@
lt:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Komentarai"
_contact: "Contact"
_contacts: "Contacts"
_home: "Pradžia"
+ _more: "More"
_photos: "Nuotraukos"
_services: "Paslaugos"
account: "Paskyra"
@@ -171,6 +173,7 @@ lt:
login: "prisijungti"
logout: "atsijungti"
view_profile: "peržiūrėti profilį"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} nuove richieste!"
@@ -351,6 +354,10 @@ lt:
success: "Atjungimas sÄ—kmingas."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Prijungti facebook"
connect_to_twitter: "Prijungti twitter"
@@ -358,6 +365,9 @@ lt:
edit_services: "Edit services"
logged_in_as: "sujungta su"
really_disconnect: "atjungti %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Nustatymai"
shared:
add_contact:
@@ -370,9 +380,12 @@ lt:
all_contacts: "Visi kontaktai"
cannot_remove: "Iš paskutinio aspekto asmens pašalinti negalima."
invitations:
+ by_email: "by Email"
dont_have_now: "Tu neturi jokių pakvietimų dabar, taÄiau netrukus gausi daugiau!"
+ from_facebook: "From Facebook"
invitations_left: "(liko %{count})"
invite_someone: "Pakviesk kÄ… nors"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ lt:
posting: "Rašoma..."
share: "Skelbti"
share_with: "Skelbti aspekte \"%{aspect}\""
- share_with_all: "Skelbti visuose aspektuose"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Skelbti papildomai"
status_messages:
@@ -415,6 +428,7 @@ lt:
change_language: "Keisti kalbÄ…"
change_password: "Keisti slaptažodį"
close_account: "Uždaryti paskyrą"
+ current_password: "Current password"
download_photos: "atsisiųsti mano nuotraukas"
download_xml: "atsisiųsti mano duomenis xml formatu"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 06d217c7f36c40ff3ac902923b12bffecc4770c8..7be7dcedb1231b9a5a212a79156cc19ea8a58512 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -6,10 +6,12 @@
mk:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Коментари"
_contact: "Contact"
_contacts: "Contacts"
_home: "Дома"
+ _more: "More"
_photos: "фотографии"
_services: "СервиÑи"
account: "КориÑничка Ñметка"
@@ -171,6 +173,7 @@ mk:
login: "најави Ñе"
logout: "одјави Ñе"
view_profile: "погледни профил"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ mk:
success: "УÑпешно уништена автентификација."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Конектирај Ñе Ñо facebook"
connect_to_twitter: "Конектирај Ñе Ñо twitter"
@@ -358,6 +365,9 @@ mk:
edit_services: "Edit services"
logged_in_as: "најавен како"
really_disconnect: "прекини %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "ПодеÑувања"
shared:
add_contact:
@@ -370,9 +380,12 @@ mk:
all_contacts: "All contacts"
cannot_remove: "Ðеможе да Ñе одÑтрани личноÑта од поÑледниот аÑпект. (Ðко Ñакате да Ñе раздвоите од оваа личноÑÑ‚ мора да ја одÑтраните од лиÑтата на контакти.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Моментално немате права, но повеќе покани ќе дојдат наÑкоро!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} лево)"
invite_someone: "Покани некој"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ mk:
posting: "Објавување..."
share: "Сподели"
share_with: "Сподели Ñо %{aspect}"
- share_with_all: "Ñподели на Ñите ваши аÑпекти"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Сподели повторно"
status_messages:
@@ -415,6 +428,7 @@ mk:
change_language: "Промени јазик"
change_password: "Промени лозинка"
close_account: "Затвори кориÑничка Ñметка"
+ current_password: "Current password"
download_photos: "Ñимни ги моите Ñлики"
download_xml: "Ñимни го мојот xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index ace94057b4e3e098a3b6807c9291c79257269f10..0a91c646e380967f9a67903825490f327058fbb7 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -6,10 +6,12 @@
nb:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comments"
_contact: "Contact"
_contacts: "Contacts"
_home: "Home"
+ _more: "More"
_photos: "photos"
_services: "Services"
account: "Account"
@@ -171,6 +173,7 @@ nb:
login: "login"
logout: "logout"
view_profile: "view profile"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ nb:
success: "Successfully destroyed authentication."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connect to facebook"
connect_to_twitter: "Connect to twitter"
@@ -358,6 +365,9 @@ nb:
edit_services: "Edit services"
logged_in_as: "logged in as"
really_disconnect: "disconnect %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Settings"
shared:
add_contact:
@@ -370,9 +380,12 @@ nb:
all_contacts: "All contacts"
cannot_remove: "Cannot remove person from last aspect."
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} left)"
invite_someone: "Invite someone"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ nb:
posting: "Posting..."
share: "Del"
share_with: "Share with %{aspect}"
- share_with_all: "Share with all aspects"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Reshare"
status_messages:
@@ -415,6 +428,7 @@ nb:
change_language: "Change Language"
change_password: "Change Password"
close_account: "Close Account"
+ current_password: "Current password"
download_photos: "download my photos"
download_xml: "download my xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 6d99749136ce5388ed34139b5a48410957234ba4..4e472129b0873c80c8bb7d42712f437d55a9cf2f 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -6,10 +6,12 @@
nl:
_aspect: "Aspect"
_aspects: "Aspecten"
+ _comment: "Reageer"
_comments: "Reacties"
_contact: "Contact"
_contacts: "Contacten"
_home: "Home"
+ _more: "Meer"
_photos: "foto's"
_services: "Services"
account: "Account"
@@ -171,6 +173,7 @@ nl:
login: "inloggen"
logout: "log uit"
view_profile: "bekijk profiel"
+ more: "Meer"
new_notifications: "%{count} nieuwe notificaties"
new_requests:
few: "%{count} nieuwe verzoeken!"
@@ -269,7 +272,7 @@ nl:
recent_public_posts: "Recente Openbare Berichten"
return_to_aspects: "Ga terug naar je aspecten pagina"
similar_contacts: "vergelijkbare contacten"
- start_sharing: "start sharing"
+ start_sharing: "start met delen"
to_accept_or_ignore: "om te accepteren of te negeren."
update:
failed: "Updaten van profiel mislukt"
@@ -351,6 +354,10 @@ nl:
success: "Authenticatie succesvol vernietigd."
failure:
error: "er ging iets mis bij het verbinden met die service"
+ finder:
+ invite_your_friends_from: "Nodig je %{service} contacten uit"
+ not_connected: "niet verbonden"
+ resend: "herstuur"
index:
connect_to_facebook: "Verbind met Facebook"
connect_to_twitter: "Verbind met Twitter"
@@ -358,6 +365,9 @@ nl:
edit_services: "Bewerk services"
logged_in_as: "ingelogd als"
really_disconnect: "verbreek verbinding met %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Klik op deze link om de uitnodiging te accepteren"
+ join_me_on_diaspora: "Volg me op DIASPORA*"
settings: "Instellingen"
shared:
add_contact:
@@ -370,9 +380,12 @@ nl:
all_contacts: "Alle contacten"
cannot_remove: "Kan persoon niet van laatste aspect verwijderen. (Als je met deze persoon wilt breken moet je dit contact verwijderen)"
invitations:
+ by_email: "via E-mail"
dont_have_now: "Momenteel heb je er geen, maar meer uitnodigingen volgen spoedig!"
+ from_facebook: "Van Facebook"
invitations_left: "(%{count} over)"
invite_someone: "Nodig iemand uit"
+ invite_your_friends: "Nodig je vrienden uit"
invites: "Uitnodigingen"
invites_closed: "Uitnodigingen zijn momenteel gesloten voor deze Diaspora pod"
notification:
@@ -390,8 +403,8 @@ nl:
post_a_message_to: "Plaats een bericht aan %{aspect}"
posting: "Plaatsen..."
share: "Delen"
- share_with: "Deel met %{aspect}"
- share_with_all: "Deel met al je aspecten"
+ share_with: "deel met"
+ whats_on_your_mind: "waar denk je aan?"
reshare:
reshare: "Herdeel"
status_messages:
@@ -415,6 +428,7 @@ nl:
change_language: "Taal wijzigen"
change_password: "Verander wachtwoord"
close_account: "Verwijder account"
+ current_password: "Huidig wachtwoord"
download_photos: "download mijn foto's"
download_xml: "download mijn xml"
edit_account: "Bewerk account"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 0fe17c6abb4e9de93ac0716ad870b02dd6a577e9..928d6d3be8e83c68a6b6c31c6af7431ef5226e6a 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -6,10 +6,12 @@
pl:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Komentarze"
_contact: "Contact"
_contacts: "Contacts"
_home: "Wszyscy"
+ _more: "More"
_photos: "zdjęcia"
_services: "Usługi"
account: "Konto"
@@ -171,6 +173,7 @@ pl:
login: "logowanie"
logout: "wyloguj"
view_profile: "podglÄ…d profilu"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "Masz %{count} nowe zaproszenia!"
@@ -351,6 +354,10 @@ pl:
success: "Pomyślnie zniszczono hasło i login."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Połącz z Facebookiem"
connect_to_twitter: "Połącz z Twitterem"
@@ -358,6 +365,9 @@ pl:
edit_services: "Edit services"
logged_in_as: "zalogowano jako"
really_disconnect: "rozłączyć %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Ustawienia"
shared:
add_contact:
@@ -370,9 +380,12 @@ pl:
all_contacts: "Wszystkie kontakty"
cannot_remove: "Nie można usunąć osoby z jedynego pozostałego aspektu. (Jeśli chcesz się rozłączyć z tą osobą musisz ją usunąć ze znajomych.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Nie masz wolnych zaproszeń, ale niebawem się pojawią!"
+ from_facebook: "From Facebook"
invitations_left: "(pozostało %{count} zaproszeń)"
invite_someone: "ZaproÅ› kogoÅ›"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Wysyłanie zaproszeń jest obecnie wyłączony na tym podzie Diaspora"
notification:
@@ -391,7 +404,7 @@ pl:
posting: "Wysyłanie…"
share: "Podziel siÄ™"
share_with: "Podziel siÄ™ z aspektem %{aspect}"
- share_with_all: "Podziel siÄ™ ze wszystkimi aspektami"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Podziel siÄ™ ponownie"
status_messages:
@@ -415,6 +428,7 @@ pl:
change_language: "Zmień język"
change_password: "Zmiana hasła"
close_account: "Zamknij konto"
+ current_password: "Current password"
download_photos: "pobierz moje zdjęcia"
download_xml: "pobierz mój xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 143f898438c8f5bead5cb9446f98b8409792ac1d..49d008d1e146227481478543ca84088b5cea9354 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -6,10 +6,12 @@
pt-BR:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comentários"
_contact: "Contact"
_contacts: "Contacts"
_home: "Home"
+ _more: "More"
_photos: "fotos"
_services: "Serviços"
account: "Conta"
@@ -171,6 +173,7 @@ pt-BR:
login: "entrar"
logout: "sair"
view_profile: "ver perfil"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} novos pedidos!"
@@ -351,6 +354,10 @@ pt-BR:
success: "Autenticação removida com sucesso."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Conectar com o facebook"
connect_to_twitter: "Conectar com o twitter"
@@ -358,6 +365,9 @@ pt-BR:
edit_services: "Edit services"
logged_in_as: "logado como"
really_disconnect: "remover %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Configurações"
shared:
add_contact:
@@ -370,9 +380,12 @@ pt-BR:
all_contacts: "Todos contatos"
cannot_remove: "Cannot remove person from last aspect."
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} restantes)"
invite_someone: "Convidar"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ pt-BR:
posting: "Postando..."
share: "Compartilhar"
share_with: "Compartilhar com %{aspect}"
- share_with_all: "Compartilhar com todos os seus aspectos"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Re-compartilhar"
status_messages:
@@ -415,6 +428,7 @@ pt-BR:
change_language: "Trocar idioma"
change_password: "Trocar senha"
close_account: "Encerrar minha conta"
+ current_password: "Current password"
download_photos: "baixar minhas fotos"
download_xml: "baixar meu xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index c84a1e7ab7583e2aacb7a26ac01cdc23e2d82de9..5c12472717a1d6e4294d66f2f16d1e47f73a9a8a 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -6,10 +6,12 @@
pt-PT:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comentários"
_contact: "Contact"
_contacts: "Contacts"
_home: "InÃcio"
+ _more: "More"
_photos: "Fotografias"
_services: "Serviços"
account: "Conta"
@@ -171,6 +173,7 @@ pt-PT:
login: "entrar"
logout: "sair"
view_profile: "ver perfil"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ pt-PT:
success: "A autenticação foi destruÃda com sucesso."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Ligar ao Facebook"
connect_to_twitter: "Ligar ao Twitter"
@@ -358,6 +365,9 @@ pt-PT:
edit_services: "Edit services"
logged_in_as: "registado como"
really_disconnect: "desligar do %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Definições "
shared:
add_contact:
@@ -370,9 +380,12 @@ pt-PT:
all_contacts: "All contacts"
cannot_remove: "ImpossÃvel remover esta pessoa do último Grupo. (Se quiseres desligar-te desta pessoa terás que remover o contacto.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Não tens nenhum agora, mas terás mais convites brevemente!"
+ from_facebook: "From Facebook"
invitations_left: "(faltam %{count})"
invite_someone: "Convida alguém"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ pt-PT:
posting: "A publicar..."
share: "Partilhar"
share_with: "Partilhar com %{aspect}"
- share_with_all: "Partilhar com todos os grupos"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Partilhar Novamente"
status_messages:
@@ -415,6 +428,7 @@ pt-PT:
change_language: "Modificar Idioma"
change_password: "Modificar Palavra-chave"
close_account: "Encerrar Conta"
+ current_password: "Current password"
download_photos: "descarregar as minhas fotos"
download_xml: "descarregar o meu xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 89e3f9c4e9194087dfb22d735a3bc8957dcac6f4..197239edccaf46eec655451120759c4230f1b4c7 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -6,10 +6,12 @@
ro:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comments"
_contact: "Contact"
_contacts: "Contacts"
- _home: "Home"
+ _home: "Acasă"
+ _more: "More"
_photos: "poze"
_services: "Servicii"
account: "Cont"
@@ -72,7 +74,7 @@ ro:
manage:
add_a_new_aspect: "Adaugă aspect"
add_a_new_contact: "Add a new contact"
- drag_to_add: "Drag to add people"
+ drag_to_add: "Glisaţi pentru a adăuga persoane"
manage_aspects: "Gestionează aspectele"
no_requests: "Nici o cerere nouă"
requests: "Cereri"
@@ -90,12 +92,12 @@ ro:
nobody: "We know you know people — bring them to Diaspora!"
nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
no_posts_message:
- start_talking: "Nimeni nu a spus nimic încă. Începe conversaţia!"
+ start_talking: "Nimeni nu a spus nimic deocamdată. Începe tu conversaţia!"
remove_from_aspect:
failure: "Failed to remove person from aspect"
success: "Successfully removed person from aspect"
seed:
- family: "Family"
+ family: "Familie"
work: "Work"
show:
edit_aspect: "edit aspect"
@@ -121,7 +123,7 @@ ro:
error_messages:
helper:
correct_the_following_errors_and_try_again: "Corectaţi următoarele erori şi încercaţi din nou."
- invalid_fields: "Invalid Fields"
+ invalid_fields: "Câmpuri invalide"
fill_me_out: "Fill me out"
home:
show:
@@ -143,7 +145,7 @@ ro:
create:
already_contacts: "You are already connected with this person"
already_sent: "You already invited this person."
- no_more: "You have no more invitations."
+ no_more: "Nu mai dispui de invitaţii."
rejected: "The following email addresses had problems: "
sent: "Invitaţia dvs. a fost trimisă."
edit:
@@ -153,7 +155,7 @@ ro:
aspect: "Aspect"
comma_seperated_plz: "You can enter multiple email addresses separated by commas."
if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
- invite_someone_to_join: "Invite someone to join Diaspora!"
+ invite_someone_to_join: "Invită pe cineva pe Diaspora!"
personal_message: "Personal message"
send_an_invitation: "Trimite o invitaţie"
send_invitation: "Trimite invitaţie"
@@ -171,6 +173,7 @@ ro:
login: "login"
logout: "logout"
view_profile: "view profile"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -226,10 +229,10 @@ ro:
allow_search: "Allow for people to search for you"
edit_profile: "Edit profile"
first_name: "Nume"
- info_available_to: "This info will be available to whomever you connect with on Diaspora."
+ info_available_to: "Această informaţie va fi disponibilă pentru toţi cei cu care sunteţi conectaţi pe Diaspora."
last_name: "Prenume"
update_profile: "Actualizeaza Profilul"
- your_bio: "Your bio"
+ your_bio: "Biografia ta"
your_birthday: "Ziua ta de naÅŸtere"
your_gender: "Sexul"
your_name: "Numele tău"
@@ -242,17 +245,17 @@ ro:
couldnt_find_them_send_invite: "Couldn't find them? Send an invite!"
no_one_found: "...and no one was found."
no_results: "Hey! You need to search for something."
- results_for: "search results for"
+ results_for: "caută rezultate pentru"
person:
add_contact: "add contact"
already_connected: "Already connected"
- pending_request: "pending request"
- thats_you: "thats you!"
+ pending_request: "cerere în aşteptare"
+ thats_you: "eÅŸti tu!"
profile_sidebar:
bio: "bio"
born: "born"
cannot_remove: "Cannot remove %{name} from last aspect."
- edit_my_profile: "Edit my profile"
+ edit_my_profile: "Editează profilul meu"
gender: "gender"
in_aspects: "in aspects"
remove_contact: "remove contact"
@@ -261,9 +264,9 @@ ro:
accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
share_with: "Start sharing with %{name}"
show:
- does_not_exist: "Person does not exist!"
+ does_not_exist: "Persoana nu există!"
incoming_request: "You have an incoming request from this person."
- no_posts: "no posts to display!"
+ no_posts: "nici un post disponibil!"
not_connected: "You are not connected with this person"
recent_posts: "Recent Posts"
recent_public_posts: "Recent Public Posts"
@@ -272,8 +275,8 @@ ro:
start_sharing: "start sharing"
to_accept_or_ignore: "to accept or ignore it."
update:
- failed: "Failed to update profile"
- updated: "Profile updated"
+ failed: "Nu s-a reuÅŸit actualizarea profilului"
+ updated: "Profil actualizat"
webfinger:
fail: "Sorry, we couldn't find %{handle}."
photos:
@@ -282,7 +285,7 @@ ro:
runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
type_error: "Photo upload failed. Are you sure an image was added?"
destroy:
- notice: "Photo deleted."
+ notice: "Poză ştearsă."
edit:
editing: "Modificare"
new:
@@ -302,16 +305,16 @@ ro:
delete_photo: "Șterge Poză"
edit: "edit"
edit_delete_photo: "Edit photo description / delete photo"
- make_profile_photo: "make profile photo"
+ make_profile_photo: "Setează ca fotografie de profil"
permalink: "permalink"
update_photo: "Actualizează fotografia"
view: "view"
view_original_post: "view original post"
update:
error: "Failed to edit photo."
- notice: "Photo successfully updated."
+ notice: "Poza a fost actualizată cu succes."
previous: "previous"
- profile: "Profile"
+ profile: "Profil"
registrations:
closed: "Signups are closed on this Diaspora pod."
create:
@@ -329,15 +332,15 @@ ro:
enter_password_again: "Enter the same password as before"
enter_username: "Pick a username (only letters, numbers, and underscores)"
sign_up: "ÃŽnregistrare"
- sign_up_for_diaspora: "Sign up for Diaspora"
+ sign_up_for_diaspora: "ÃŽnscrie-te pe Diaspora"
requests:
create:
sending: "Sending..."
sent: "You've asked to share with %{name}. They should see it next time they log in to Diaspora."
destroy:
- error: "Please select an aspect!"
+ error: "Vă rugăm să selectaţi un aspect!"
ignore: "Ignored friend request."
- success: "You are now friends."
+ success: "Sunteţi acum prieteni."
manage_aspect_contacts:
existing: "Existing contacts"
manage_within: "Manage contacts within"
@@ -346,11 +349,15 @@ ro:
search: "Search"
services:
create:
- success: "Authentication successful."
+ success: "Autentificare cu succes."
destroy:
success: "Successfully destroyed authentication."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Connect to facebook"
connect_to_twitter: "Connect to twitter"
@@ -358,7 +365,10 @@ ro:
edit_services: "Edit services"
logged_in_as: "logged in as"
really_disconnect: "disconnect %{service}?"
- settings: "Settings"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
+ settings: "Setări"
shared:
add_contact:
create_request: "Find by Diaspora handle"
@@ -370,28 +380,31 @@ ro:
all_contacts: "All contacts"
cannot_remove: "Cannot remove person from last aspect."
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
- invitations_left: "(%{count} left)"
+ from_facebook: "From Facebook"
+ invitations_left: "(%{count} rămase)"
invite_someone: "Invite someone"
+ invite_your_friends: "Invita-Å£i prietenii"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
new: "New %{type} from %{from}"
public_explain:
logged_in: "logged in to %{service}"
- manage: "manage connected services"
- outside: "Public messages will be available for others outside of Diaspora to see."
- title: "You are about to post a public message!"
+ manage: "gestionează serviciile la care eşti conectat"
+ outside: "Mesajele publice vor fi disponibile pentru cei ce nu fac parte din Diaspora."
+ title: "Sunteţi pe cale de a publica un mesaj public!"
publisher:
add_photos: "add photos"
- all: "all"
+ all: "toate"
all_contacts: "all contacts"
make_public: "make public"
post_a_message_to: "Post a message to %{aspect}"
posting: "Posting..."
share: "Distribuie"
share_with: "Share with %{aspect}"
- share_with_all: "Share with all aspects"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Reshare"
status_messages:
@@ -407,14 +420,15 @@ ro:
hide_comments: "hide comments"
show_comments: "show comments"
the_world: "the world"
- username: "Username"
+ username: "Nume de utilizator"
users:
- destroy: "Account successfully closed."
+ destroy: "Contul a fost închis cu succes."
edit:
change: "Change"
- change_language: "Change Language"
- change_password: "Change Password"
- close_account: "Close Account"
+ change_language: "Modificare limbă"
+ change_password: "Modificare parolă"
+ close_account: "ÃŽnchide cont"
+ current_password: "Current password"
download_photos: "download my photos"
download_xml: "download my xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index baaeef88937018fba4a5e0471e54facd69ecb425..4f32a8198b7d1c756dce4a6366a264f38e2079ce 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -6,10 +6,12 @@
ru:
_aspect: "ÐÑпект"
_aspects: "ÐÑпекты"
+ _comment: "Comment"
_comments: "Коментарии"
_contact: "Контакт"
_contacts: "Контакты"
_home: "Домашний"
+ _more: "More"
_photos: "Фотографии"
_services: "СервиÑÑ‹"
account: "Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ"
@@ -171,6 +173,7 @@ ru:
login: "логин"
logout: "выйти"
view_profile: "проÑмотр профилÑ"
+ more: "More"
new_notifications: "%{count} новых уведомлений"
new_requests:
few: "%{count} новых запроÑов!"
@@ -351,6 +354,10 @@ ru:
success: "ÐÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ ÑƒÑпешно уничтожена."
failure:
error: "Произошла ошибка при подключении Ñтого ÑервиÑа"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Подключение к Facebook"
connect_to_twitter: "Подключение к Twitter"
@@ -358,6 +365,9 @@ ru:
edit_services: "Редактировать ÑервиÑÑ‹"
logged_in_as: "Вы вошли как"
really_disconnect: "отключить %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "ÐаÑтройки"
shared:
add_contact:
@@ -370,9 +380,12 @@ ru:
all_contacts: "Ð’Ñе контакты"
cannot_remove: "Ðе может удалить человека Ñ Ð¿Ð¾Ñледнего аÑпекта.(ЕÑли вы хотите, отключить Ñтого человека необходимо удалить контакт)"
invitations:
+ by_email: "by Email"
dont_have_now: "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ñƒ Ð²Ð°Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ нет приглашений, но новые уже не за горами!"
+ from_facebook: "From Facebook"
invitations_left: "(оÑталоÑÑŒ %{count})"
invite_someone: "ПриглаÑить кого-нибудь"
+ invite_your_friends: "Invite your friends"
invites: "ПриглашениÑ"
invites_closed: "Ð’ данный момент возможноÑÑ‚ÑŒ приглашений закрыта в Ñтой чаÑти ДиаÑпоры"
notification:
@@ -391,7 +404,7 @@ ru:
posting: "Отправка ..."
share: "ПоделитьÑÑ"
share_with: "ПоделитьÑÑ Ñ %{aspect}"
- share_with_all: "ПоделитьÑÑ Ð²Ð¾ вÑе аÑпекты"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "ПоделитьÑÑ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾"
status_messages:
@@ -415,6 +428,7 @@ ru:
change_language: "Сменить Ñзык"
change_password: "Сменить пароль"
close_account: "Закрыть учётную запиÑÑŒ"
+ current_password: "Current password"
download_photos: "Скачать мои изображениÑ"
download_xml: "Скачать мою информацию в xml"
edit_account: "Редактировать аккаунт"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index fc3e80d58a303eee4ac5c96a19d78627a30f3efd..7ca2fef5fc1943c3fcbca624a4a4b528d216674f 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -6,10 +6,12 @@
sk:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Komentáre"
_contact: "Contact"
_contacts: "Contacts"
_home: "Domov"
+ _more: "More"
_photos: "Fotky"
_services: "Služby"
account: "ÚÄet"
@@ -171,6 +173,7 @@ sk:
login: "prihlásenie"
logout: "odhlásiť sa"
view_profile: "pozrieť profil"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "nové žiadosti (%{count})"
@@ -351,6 +354,10 @@ sk:
success: "Autentifikácia úspešne zrušená."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Pripojiť k Facebooku"
connect_to_twitter: "Pripojiť k Twitteru"
@@ -358,6 +365,9 @@ sk:
edit_services: "Edit services"
logged_in_as: "prihlásený ako"
really_disconnect: "odpojiť %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Nastavenia"
shared:
add_contact:
@@ -370,9 +380,12 @@ sk:
all_contacts: "VÅ¡etky kontakty"
cannot_remove: "Nie je možné osobu odstrániÅ¥ z posledného aspektu. (Ak s ňou chcete nadobro preruÅ¡iÅ¥ kontakt, odstráňte ju prosÃm z Vášho zoznamu osôb.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Momentálne už nemáte žiadnu pozvánku. ÄŽalÅ¡ie pribudnú Äoskoro."
+ from_facebook: "From Facebook"
invitations_left: "(%{count} ostáva)"
invite_someone: "Pozvať niekoho"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Pozvánky sú na tomto seede momentálne uzavreté"
notification:
@@ -391,7 +404,7 @@ sk:
posting: "Posielam..."
share: "Zdieľať"
share_with: "Zdieľať s aspektom %{aspect}"
- share_with_all: "zdieľať so všetkými aspektami"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Znovu zdieľať"
status_messages:
@@ -415,6 +428,7 @@ sk:
change_language: "Zmeniť jazyk"
change_password: "Zmeniť heslo"
close_account: "ZruÅ¡iÅ¥ úÄet"
+ current_password: "Current password"
download_photos: "Stiahnuť moje fotky"
download_xml: "stiahnuť moje xml"
edit_account: "Edit account"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 269ed61a8bb125a339b5bc2e6d8f49a9b5394c8d..66ecacc563d346286abefbae220ffa47ee27fb03 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -6,10 +6,12 @@
sl:
_aspect: "Vidik"
_aspects: "Vidiki"
+ _comment: "Comment"
_comments: "Komentarji"
_contact: "Kontakt"
_contacts: "Kontakti"
_home: "Domov"
+ _more: "More"
_photos: "slike"
_services: "Servisi"
account: "UporabniÅ¡ki raÄun"
@@ -160,7 +162,7 @@ sl:
to: "Za"
layouts:
application:
- have_a_problem: "Have a problem? Find an answer here"
+ have_a_problem: "Ste naleteli na težavo? Tukaj poiÅ¡Äite odgovor"
powered_by: "STRAN POGANJA DIASPORA*"
whats_new: "kaj je novega?"
header:
@@ -171,6 +173,7 @@ sl:
login: "prijava"
logout: "odjavi me"
view_profile: "ogled profila"
+ more: "More"
new_notifications: "Å¡tevilo novih sporoÄil %{count}"
new_requests:
few: "število novih prošenj %{count}!"
@@ -269,7 +272,7 @@ sl:
recent_public_posts: "Zadnje javne objave"
return_to_aspects: "Vrnite se na vašo stran s skupinami"
similar_contacts: "podobni stiki"
- start_sharing: "start sharing"
+ start_sharing: "zaÄni deliti"
to_accept_or_ignore: "sprejmite ali zavrnite."
update:
failed: "Posodobitev profila ni uspelo"
@@ -351,6 +354,10 @@ sl:
success: "Preverjanje istovetnosti je uspešno izbrisano."
failure:
error: "pri povezovanju s servisom je prišlo do napake"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Poveži se s facebook"
connect_to_twitter: "Poveži se s twitter"
@@ -358,6 +365,9 @@ sl:
edit_services: "Uredi servise"
logged_in_as: "prijavljeni ste kot"
really_disconnect: "prekinem povezavo s servisom %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Nastavitve"
shared:
add_contact:
@@ -370,9 +380,12 @@ sl:
all_contacts: "Vsi stiki"
cannot_remove: "Osebe ni mogoÄe odstraniti iz skupine. (V kolikor želite prekiniti stik z osebo, jo je potrebno odstraniti iz vaÅ¡ega seznama stikov.)"
invitations:
+ by_email: "by Email"
dont_have_now: "Trenutno nimate povabil, vendar jih lahko v kratkem priÄakujete!"
+ from_facebook: "From Facebook"
invitations_left: "(Å¡e %{count})"
invite_someone: "Povabi osebo"
+ invite_your_friends: "Invite your friends"
invites: "Povabila"
invites_closed: "Za ta 'Diaspora pod' so povabila trenutno onemogoÄena."
notification:
@@ -390,8 +403,8 @@ sl:
post_a_message_to: "Objavi sporoÄilo v %{aspect}"
posting: "Objavljam..."
share: "Deli"
- share_with: "Deli s skupino %{aspect}"
- share_with_all: "deli z vsemi skupinami"
+ share_with: "deli s/z"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Deli znova"
status_messages:
@@ -415,6 +428,7 @@ sl:
change_language: "Spremeni jezik"
change_password: "Spremeni geslo"
close_account: "Zapri uporabniÅ¡ki raÄun"
+ current_password: "Current password"
download_photos: "prenesi slike"
download_xml: "prenesi v xml"
edit_account: "Uredi uporabniÅ¡ki raÄun"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index efe6ef452ea005e24f558d359af9ca69176ce930..1f1ef788fdb062cbb782100032562171418b7055 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -6,10 +6,12 @@
sv:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Kommentarer"
_contact: "Contact"
_contacts: "Contacts"
_home: "Hem"
+ _more: "More"
_photos: "foton"
_services: "Tjänster"
account: "Konto"
@@ -171,6 +173,7 @@ sv:
login: "logga in"
logout: "logga ut"
view_profile: "visa profil"
+ more: "More"
new_notifications: "%{count} nya notifieringar"
new_requests:
few: "%{count} nya förfrågningar!"
@@ -351,6 +354,10 @@ sv:
success: "Du har nu kopplat bort tjänsten."
failure:
error: "Det blev ett fel vid anslutning till tjänsten"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "Anslut till facebook"
connect_to_twitter: "Anslut till twitter"
@@ -358,6 +365,9 @@ sv:
edit_services: "Anslutna tjänster"
logged_in_as: "inloggad som"
really_disconnect: "koppla från %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Inställningar"
shared:
add_contact:
@@ -370,9 +380,12 @@ sv:
all_contacts: "Alla kontakter"
cannot_remove: "Kan inte ta bort personen från fler sidor, ta bort kontakten om du inte längre vill vara ansluten till denne."
invitations:
+ by_email: "by Email"
dont_have_now: "Du har inga inbjudningar just nu, men fler kommer delas ut inom kort!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} kvar)"
invite_someone: "Bjud in en kontakt"
+ invite_your_friends: "Invite your friends"
invites: "Inbjudningar"
invites_closed: "Inbjudningar är för närvarande stängd på denna Diaspora server"
notification:
@@ -391,7 +404,7 @@ sv:
posting: "Skickar..."
share: "Dela"
share_with: "Dela med %{aspect}"
- share_with_all: "Dela på alla dina sidor"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Ã…terdela"
status_messages:
@@ -415,6 +428,7 @@ sv:
change_language: "Ändra språk"
change_password: "Ändra lösenord"
close_account: "Stäng kontot"
+ current_password: "Current password"
download_photos: "Ladda ner mina foton"
download_xml: "Ladda ner min xml"
edit_account: "Ändra konto"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 9929e7a544009f5bda0b678f84aad27190a253fd..89fe7772e937075bba1e875d835940a5f2515d9f 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -6,10 +6,12 @@
tr:
_aspect: "Aspect"
_aspects: "Aspects"
+ _comment: "Comment"
_comments: "Comments"
_contact: "Contact"
_contacts: "Contacts"
_home: "Home"
+ _more: "More"
_photos: "fotoÄŸraflar"
_services: "Servisler"
account: "Hesap"
@@ -171,6 +173,7 @@ tr:
login: "login"
logout: "logout"
view_profile: "view profile"
+ more: "More"
new_notifications: "%{count} new notifications"
new_requests:
few: "%{count} new requests!"
@@ -351,6 +354,10 @@ tr:
success: "Başarılı bir şekilde doğrulama yokedildi."
failure:
error: "there was an error connecting that service"
+ finder:
+ invite_your_friends_from: "Invite your friends from %{service}"
+ not_connected: "not connected"
+ resend: "resend"
index:
connect_to_facebook: "facebook baÄŸlan"
connect_to_twitter: "twitter baÄŸlan"
@@ -358,6 +365,9 @@ tr:
edit_services: "Edit services"
logged_in_as: "olarak bağlandınız"
really_disconnect: "disconnect %{service}?"
+ inviter:
+ click_link_to_accept_invitation: "Click this link to accept your invitation"
+ join_me_on_diaspora: "Join me on DIASPORA*"
settings: "Ayarlar"
shared:
add_contact:
@@ -370,9 +380,12 @@ tr:
all_contacts: "All contacts"
cannot_remove: "Cannot remove person from last aspect."
invitations:
+ by_email: "by Email"
dont_have_now: "You don't have any right now, but more invites are coming soon!"
+ from_facebook: "From Facebook"
invitations_left: "(%{count} davet kaldı)"
invite_someone: "Birisini davet edin"
+ invite_your_friends: "Invite your friends"
invites: "Invites"
invites_closed: "Invites are currently closed on this Diaspora seed"
notification:
@@ -391,7 +404,7 @@ tr:
posting: "Posting..."
share: "PaylaÅŸ"
share_with: "Share with %{aspect}"
- share_with_all: "Share with all aspects"
+ whats_on_your_mind: "what's on your mind?"
reshare:
reshare: "Reshare"
status_messages:
@@ -415,6 +428,7 @@ tr:
change_language: "Dili DeÄŸiÅŸtir"
change_password: "Åžifremi DeÄŸiÅŸtir"
close_account: "Hesabımı kapat"
+ current_password: "Current password"
download_photos: "fotoğraflarımı kaydet"
download_xml: "xml dosyamı kaydet"
edit_account: "Edit account"
diff --git a/config/locales/rails-i18n/nl.yml b/config/locales/rails-i18n/nl.yml
index f4a64034d1a0bbd4b194129336c75a867ac5013b..307f1653fcd1b5f507d6201edc84b4827797984d 100644
--- a/config/locales/rails-i18n/nl.yml
+++ b/config/locales/rails-i18n/nl.yml
@@ -1,179 +1,186 @@
-# Dutch translation in YML by Ariejan de Vroom <ariejan@ariejan.net>
+# Dutch translations for Ruby on Rails, based on US English template
+# Original version by Ariejan de Vroom <ariejan@ariejan.net>
# - Sponsored by Kabisa ICT - http://kabisa.nl
-#
-# Fully compatible with Translate (the Rails translation plugin)
-# - http://developer.newsdesk.se/2009/01/21/translate-new-rails-i18n-plugin-with-a-nice-web-ui/
----
-nl:
- number:
- format:
- separator: ","
- precision: 2
- delimiter: .
- human:
- storage_units:
- format: "%n %u"
- units:
- kb: KB
- tb: TB
- gb: GB
- byte:
- one: Byte
- other: Bytes
- mb: MB
- currency:
- format:
- format: "%u %n"
- unit: !binary |
- 4oKs
+# Rails 3 update by Floris Huetink <floris@avocado.nl> (github: florish)
+
+nl:
+ date:
+ formats:
+ default: "%d/%m/%Y"
+ short: "%e %b"
+ long: "%e %B %Y"
+ only_day: "%e"
+
+ day_names: [zondag, maandag, dinsdag, woensdag, donderdag, vrijdag, zaterdag]
+ abbr_day_names: [zon, maa, din, woe, don, vri, zat]
+
+ month_names: [~, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november, december]
+ abbr_month_names: [~, jan, feb, mar, apr, mei, jun, jul, aug, sep, okt, nov, dec]
+ order:
+ - :day
+ - :month
+ - :year
- separator: ","
- precision: 2
- delimiter: .
- attributes:
- created_at: "Aangemaakt op"
- updated_at: "Aangepast op"
- helpers:
- submit:
- create: "Maak %{model}"
- update: "Bewaar %{model}"
- errors:
- messages:
- greater_than_or_equal_to: moet groter of gelijk zijn aan %{count}
- less_than_or_equal_to: moet minder of gelijk zijn aan %{count}
- confirmation: komt niet met de bevestiging overeen
- blank: moet opgegeven zijn
- exclusion: is niet beschikbaar
- invalid: is ongeldig
- record_invalid: is ongeldig
- odd: moet oneven zijn
- too_short: is te kort (niet minder dan %{count} tekens)
- wrong_length: heeft niet de juiste lengte (moet %{count} tekens lang zijn)
- empty: moet opgegeven zijn
- even: moet even zijn
- less_than: moet minder zijn dan %{count}
- equal_to: moet gelijk zijn aan %{count}
- greater_than: moet groter zijn dan %{count}
- accepted: moet worden geaccepteerd
- too_long: is te lang (niet meer dan %{count} tekens)
- taken: is niet beschikbaar
- inclusion: is niet in de lijst opgenomen
- not_a_number: is geen getal
- template:
- body: "Controleer alstublieft de volgende velden:"
- header:
- one: "Kon dit %{model} object niet opslaan: 1 fout."
- other: "Kon dit %{model} niet opslaan: %{count} fouten."
time:
- am: "'s ochtends"
formats:
default: "%a %d %b %Y %H:%M:%S %Z"
- time: "%H:%M"
short: "%d %b %H:%M"
+ long: "%d %B %Y %H:%M"
+ time: "%H:%M"
only_second: "%S"
- datetime:
- formats:
- default: "%d-%m-%YT%H:%M:%S%Z"
- long: "%d %B %Y %H:%M"
+ am: "'s ochtends"
pm: "'s middags"
- date:
- month_names:
- -
- - januari
- - februari
- - maart
- - april
- - mei
- - juni
- - juli
- - augustus
- - september
- - oktober
- - november
- - december
- abbr_day_names:
- - zon
- - maa
- - din
- - woe
- - don
- - vri
- - zat
- order:
- - :day
- - :month
- - :year
- formats:
- only_day: "%e"
- default: "%d/%m/%Y"
- short: "%e %b"
- long: "%e %B %Y"
- day_names:
- - zondag
- - maandag
- - dinsdag
- - woensdag
- - donderdag
- - vrijdag
- - zaterdag
- abbr_month_names:
- -
- - jan
- - feb
- - mar
- - apr
- - mei
- - jun
- - jul
- - aug
- - sep
- - okt
- - nov
- - dec
+
support:
array:
words_connector: ", "
two_words_connector: " en "
last_word_connector: " en "
- datetime:
- format:
- default: "%Y-%m-%dT%H:%M:%S%Z"
- prompts:
- minute: minuut
- second: seconden
- month: maand
- hour: uur
- day: dag
- year: jaar
- distance_in_words:
- less_than_x_minutes:
- one: "minder dan \xC3\xA9\xC3\xA9n minuut"
- other: minder dan %{count} minuten
- x_days:
- one: 1 dag
- other: "%{count} dagen"
- x_seconds:
- one: 1 seconde
+
+ select:
+ prompt: "Selecteer"
+
+ number:
+ format:
+ separator: ","
+ delimiter: "."
+ precision: 2
+ significant: false
+ strip_insignificant_zeros: false
+
+ currency:
+ format:
+ format: "%u%n"
+ unit: "€"
+ separator: ","
+ delimiter: "."
+ precision: 2
+ significant: false
+ strip_insignificant_zeros: false
+
+ percentage:
+ format:
+ delimiter: ""
+
+ precision:
+ format:
+ delimiter: ""
+
+ human:
+ format:
+ delimiter: ""
+ precision: 3
+ significant: true
+ strip_insignificant_zeros: true
+ storage_units:
+ format: "%n %u"
+ units:
+ byte:
+ one: "Byte"
+ other: "Bytes"
+ kb: "KB"
+ mb: "MB"
+ gb: "GB"
+ tb: "TB"
+ decimal_units:
+ format: "%n %u"
+ units:
+ unit: ""
+ thousand: "duizend"
+ million: "miljoen"
+ billion: "miljard"
+ trillion: "biljoen"
+ quadrillion: "biljard"
+
+ datetime:
+ distance_in_words:
+ half_a_minute: "een halve minuut"
+ less_than_x_seconds:
+ one: "minder dan \xC3\xA9\xC3\xA9n seconde"
+ other: "minder dan %{count} seconden"
+ x_seconds:
+ one: "1 seconde"
other: "%{count} seconden"
- about_x_hours:
- one: "ongeveer \xC3\xA9\xC3\xA9n uur"
- other: ongeveer %{count} uur
- less_than_x_seconds:
- one: "minder dan \xC3\xA9\xC3\xA9n seconde"
- other: minder dan %{count} seconden
- x_months:
- one: 1 maand
- other: "%{count} maanden"
- x_minutes:
- one: 1 minuut
+ less_than_x_minutes:
+ one: "minder dan \xC3\xA9\xC3\xA9n minuut"
+ other: "minder dan %{count} minuten"
+ x_minutes:
+ one: "1 minuut"
other: "%{count} minuten"
- about_x_years:
- one: "ongeveer \xC3\xA9\xC3\xA9n jaar"
- other: ongeveer %{count} jaren
+ about_x_hours:
+ one: "ongeveer \xC3\xA9\xC3\xA9n uur"
+ other: "ongeveer %{count} uur"
+ x_days:
+ one: "1 dag"
+ other: "%{count} dagen"
about_x_months:
one: "ongeveer \xC3\xA9\xC3\xA9n maand"
- other: ongeveer %{count} maanden
+ other: "ongeveer %{count} maanden"
+ x_months:
+ one: "1 maand"
+ other: "%{count} maanden"
+ about_x_years:
+ one: "ongeveer \xC3\xA9\xC3\xA9n jaar"
+ other: "ongeveer %{count} jaar"
over_x_years:
- one: "langer dan \xC3\xA9\xC3\xA9n jaar"
- other: langer %{count} jaar
- half_a_minute: halve minuut
\ No newline at end of file
+ one: "meer dan \xC3\xA9\xC3\xA9n jaar"
+ other: "meer dan %{count} jaar"
+ almost_x_years:
+ one: "bijna \xC3\xA9\xC3\xA9n jaar"
+ other: "bijna %{count} jaar"
+ prompts:
+ year: "jaar"
+ month: "maand"
+ day: "dag"
+ hour: "uur"
+ minute: "minuut"
+ second: "seconde"
+
+ helpers:
+ select:
+ prompt: "Selecteer"
+
+ submit:
+ create: '%{model} toevoegen'
+ update: '%{model} bewaren'
+ submit: '%{model} opslaan'
+
+ errors:
+ format: "%{attribute} %{message}"
+
+ messages: &errors_messages
+ inclusion: "is niet in de lijst opgenomen"
+ exclusion: "is niet beschikbaar"
+ invalid: "is ongeldig"
+ confirmation: "komt niet met de bevestiging overeen"
+ accepted: "moet worden geaccepteerd"
+ empty: "moet opgegeven zijn"
+ blank: "moet opgegeven zijn"
+ too_long: "is te lang (maximaal %{count} tekens)"
+ too_short: "is te kort (minimaal %{count} tekens)"
+ wrong_length: "heeft onjuiste lengte (moet %{count} tekens lang zijn)"
+ not_a_number: "is geen getal"
+ not_an_integer: "moet een geheel getal zijn"
+ greater_than: "moet groter zijn dan %{count}"
+ greater_than_or_equal_to: "moet groter dan of gelijk zijn aan %{count}"
+ equal_to: "moet gelijk zijn aan %{count}"
+ less_than: "moet minder zijn dan %{count}"
+ less_than_or_equal_to: "moet minder dan of gelijk zijn aan %{count}"
+ odd: "moet oneven zijn"
+ even: "moet even zijn"
+
+ activerecord:
+ errors:
+ template:
+ header:
+ one: "%{model} niet opgeslagen: 1 fout gevonden"
+ other: "%{model} niet opgeslagen: %{count} fouten gevonden"
+ body: "Controleer de volgende velden:"
+
+ messages:
+ taken: "is al in gebruik"
+ record_invalid: "Validatie mislukt: %{errors}"
+ <<: *errors_messages
+
+ full_messages:
+ format: "%{attribute}%{message}"
diff --git a/config/routes.rb b/config/routes.rb
index 35204b7e53970b33777a0dc6c8b091cd43ba9879..27c4ae00cdad262cc5f90306910afd13374be9f7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,7 +40,7 @@ Diaspora::Application.routes.draw do
match 'getting_started_completed', :to => 'users#getting_started_completed'
match 'users/export', :to => 'users#export'
match 'users/export_photos', :to => 'users#export_photos'
- match 'login', :to => 'users#sign_up'
+ match 'login' => redirect('/users/sign_in')
resources :users, :except => [:create, :new, :show]
match 'aspects/move_contact', :to => 'aspects#move_contact', :as => 'move_contact'
diff --git a/features/change_password.feature b/features/change_password.feature
index f5f0f6f0909fa642064be84fd32a66d06ecb39d3..8c1709b98a489b19c9d4ba0315b4185d7e355b99 100644
--- a/features/change_password.feature
+++ b/features/change_password.feature
@@ -15,5 +15,4 @@ Feature: Change password
And I follow "logout"
Then I should be on the home page
And I sign in with password "newsecret"
- Then I should be on the aspects page
-
+ Then I should be on the aspects page
\ No newline at end of file
diff --git a/features/close_account.feature b/features/close_account.feature
new file mode 100644
index 0000000000000000000000000000000000000000..da9fc0e1ec4c08ee36e4c2f1745170637718ccd7
--- /dev/null
+++ b/features/close_account.feature
@@ -0,0 +1,17 @@
+@javascript
+Feature: close_account
+In order to remove my diaspora account
+As a User
+I want to close my account
+
+
+
+
+Scenario: close my account
+ Given I am signed in
+ And I click on my name in the header
+ And I follow "account settings"
+ And I preemptively confirm the alert
+ And I follow "Close Account"
+ Then I should be on the home page
+
diff --git a/features/edits_profile.feature b/features/edits_profile.feature
index 11148d9a4c919a4c6a83c6f0b7ac558eae75959d..af353794edbacaebbda1aab78006542e243eb557 100644
--- a/features/edits_profile.feature
+++ b/features/edits_profile.feature
@@ -1,13 +1,42 @@
@javascript
Feature: editing your profile
- Scenario: editing gender with a textbox
+ Background:
Given I am signed in
And I click on my name in the header
And I follow "edit profile"
Then I should be on my edit profile page
+
+ Scenario: editing gender with a textbox
When I fill in "profile_gender" with "F"
And I press "Update Profile"
Then I should be on my edit profile page
And I should see "Profile updated"
And the "profile_gender" field should contain "F"
+
+ Scenario: editing name
+ When I fill in "profile_first_name" with "Boba"
+ And I fill in "profile_last_name" with "Fett"
+ And I press "Update Profile"
+ Then I should be on my edit profile page
+ And I should see "Profile updated"
+ And the "profile_first_name" field should contain "Boba"
+ And the "profile_last_name" field should contain "Fett"
+
+ Scenario: edit bio
+ When I fill in "profile_bio" with "This is a bio"
+ And I press "Update Profile"
+ Then I should be on my edit profile page
+ And I should see "Profile updated"
+ And the "profile_bio" field should contain "This is a bio"
+
+ Scenario: change birthday
+ When I select "1986" from "profile_date_year"
+ And I select "November" from "profile_date_month"
+ And I select "30" from "profile_date_day"
+ And I press "Update Profile"
+ Then I should be on my edit profile page
+ And I should see "Profile updated"
+ And I click on my name in the header
+ And I follow "view profile"
+ Then I should see "November 30 1986"
\ No newline at end of file
diff --git a/features/manages_aspects.feature b/features/manages_aspects.feature
index 5715a77a5cd56bff8aab18aab2c76ef1530c5b51..f248bf02766a1f7efb800c211ff9894c6188c401 100644
--- a/features/manages_aspects.feature
+++ b/features/manages_aspects.feature
@@ -4,7 +4,7 @@ Feature: User manages aspects
As a User
I want to create new aspects
- Scenario: creating an aspect
+ Scenario: creating an aspect from manage aspects page
Given I am signed in
When I follow "Home" in the header
And I follow "Manage aspects"
@@ -12,3 +12,11 @@ Feature: User manages aspects
And I fill in "Name" with "Dorm Mates" in the modal window
And I press "Create" in the modal window
Then I should see "Dorm Mates" in the header
+
+ Scenario: creating an aspect from homepage
+ Given I am signed in
+ When I follow "Home" in the header
+ And I follow "+" in the header
+ And I fill in "Name" with "losers" in the modal window
+ And I press "Create" in the modal window
+ Then I should see "losers" in the header
diff --git a/features/signs_up.feature b/features/signs_up.feature
index dab53f96bfcf496a8653b15f22f32524ad5209ac..7ace4790d2d19f4bc4884aefc0c143472824876e 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -18,6 +18,7 @@ Feature: new user registration
And I press "Save and continue"
Then I should see "Profile updated"
And I should see "Your aspects"
+
# Not working with selenium - it thinks the aspect name field is hidden
# When I fill in "Aspect name" with "cheez friends"
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 0c6ee052ca7b9157ce401c2a893c59b577fdd307..5d4ba21f2c8baea5d62c36c26ee2efcf5ee3741b 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2355,10 +2355,10 @@ ul.show_comments
:color #888
&.submit
- :width 100px
+ :width auto
input
- :width 100px
+ :width auto
:position relative
:height 40px
:top 0px
diff --git a/script/server b/script/server
index 04359d4203e32d89d0d11162cc102ed973d3dc08..6d71e3a4683a8e4b96b36decef0bcf4db55a4d24 100755
--- a/script/server
+++ b/script/server
@@ -67,6 +67,10 @@ function redis_config
elif [ -r "/opt/local/etc/redis.conf" ]; then
# MacPorts location
redis_conf="/opt/local/etc/redis.conf"
+ elif [ -r "/usr/local/etc/redis.conf" ]; then
+ redis_conf="/usr/local/etc/redis.conf"
+ elif [ -r "/usr/local/etc/redis/redis.conf" ]; then
+ redis_conf="/usr/local/etc/redis/redis.conf"
else
echo "Don't know how to configure redis for this platform. Copy the configuration file redis.conf to the config directory and patch it manually. In particular, don't daemonize." >&2
return