From 2027655316cd1272082b33351cae235308d0771a Mon Sep 17 00:00:00 2001 From: MrZYX Date: Tue, 29 Mar 2011 21:53:29 +0200 Subject: [PATCH 1/3] updated locales --- config/locales/devise/devise.es.yml | 24 +++++------ config/locales/diaspora/ar.yml | 7 +++- config/locales/diaspora/cs.yml | 7 +++- config/locales/diaspora/cy.yml | 7 +++- config/locales/diaspora/da.yml | 7 +++- config/locales/diaspora/de.yml | 7 +++- config/locales/diaspora/el.yml | 7 +++- config/locales/diaspora/en_shaw.yml | 7 +++- config/locales/diaspora/eo.yml | 7 +++- config/locales/diaspora/es-CL.yml | 7 +++- config/locales/diaspora/es.yml | 65 +++++++++++++++-------------- config/locales/diaspora/eu.yml | 7 +++- config/locales/diaspora/fi.yml | 7 +++- config/locales/diaspora/fr.yml | 7 +++- config/locales/diaspora/ga.yml | 7 +++- config/locales/diaspora/gl.yml | 7 +++- config/locales/diaspora/he.yml | 7 +++- config/locales/diaspora/hu.yml | 65 +++++++++++++++-------------- config/locales/diaspora/id.yml | 7 +++- config/locales/diaspora/is.yml | 7 +++- config/locales/diaspora/it.yml | 7 +++- config/locales/diaspora/lt.yml | 7 +++- config/locales/diaspora/mk.yml | 7 +++- config/locales/diaspora/ml.yml | 7 +++- config/locales/diaspora/nb.yml | 15 ++++--- config/locales/diaspora/nl.yml | 7 +++- config/locales/diaspora/pa.yml | 7 +++- config/locales/diaspora/pl.yml | 7 +++- config/locales/diaspora/pt-BR.yml | 7 +++- config/locales/diaspora/pt-PT.yml | 7 +++- config/locales/diaspora/ro.yml | 7 +++- config/locales/diaspora/ru.yml | 7 +++- config/locales/diaspora/sk.yml | 7 +++- config/locales/diaspora/sl.yml | 7 +++- config/locales/diaspora/sv.yml | 7 +++- config/locales/diaspora/tr.yml | 7 +++- config/locales/diaspora/zh-TW.yml | 7 +++- config/locales/diaspora/zh.yml | 7 +++- 38 files changed, 259 insertions(+), 148 deletions(-) diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml index 38d56a27e..c807f4ce3 100644 --- a/config/locales/devise/devise.es.yml +++ b/config/locales/devise/devise.es.yml @@ -9,17 +9,17 @@ es: confirmed: "Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta." new: resend_confirmation: "Volver a enviar instrucciones de confirmación" - send_instructions: "Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos." + send_instructions: "Recibirás un correo con instrucciones para confirmar tu cuenta en pocos minutos." failure: inactive: "Tu cuenta aún no ha sido activada." - invalid: "Contraseña o email incorrecto." + invalid: "Contraseña o correo incorrecto." invalid_token: "Identificador de autenticación incorrecto." locked: "Tu cuenta está bloqueada." timeout: "Tu sesión ha expirado, por favor accede de nuevo para continuar." unauthenticated: "Necesitas acceder a tu cuenta o registrarte antes de continuar." unconfirmed: "Necesitas confirmar tu cuenta antes de continuar." invitations: - invitation_token_invalid: "El identificador de la invitación no es valido!" + invitation_token_invalid: "¡El identificador de la invitación no es valido!" send_instructions: "Tu invitación se ha enviado." updated: "Tu contraseña ha sido configurada correctamente. Ahora estás conectado." mailer: @@ -45,7 +45,7 @@ es: wont_change: "Tu contraseña no cambiará hasta que accedas al enlace anterior y crees una nueva." unlock_instructions: account_locked: "Tu cuenta ha sido bloqueada debido a una excesiva cantidad de intentos de ingreso fallidos." - click_to_unlock: "Haz clic en el enlace de abajo para desbloquear tu cuenta:" + click_to_unlock: "Pulsa en el enlace de abajo para desbloquear tu cuenta:" subject: "Instrucciones para desbloquear tu cuenta" unlock: "Desbloquear mi cuenta" welcome: "¡Bienvenido %{email}!" @@ -54,19 +54,19 @@ es: change_password: "Cambiar mi contraseña" new: forgot_password: "¿Olvidaste tu contraseña?" - no_account: "No existe una cuenta con ese email. Si estás esperando una invitación, las haremos llegar tan pronto como nos sea posible." + no_account: "No existe una cuenta con ese correo. Si estás esperando una invitación, las haremos llegar tan pronto como nos sea posible." send_password_instructions: "Envíame instrucciones para restablecer la contraseña" - send_instructions: "Recibirás un email con instrucciones para cambiar tu contraseña en pocos minutos." + send_instructions: "Recibirás un correo con instrucciones para cambiar tu contraseña en pocos minutos." updated: "Tu contraseña ha sido modificada. Ya has accedido a tu cuenta." registrations: destroyed: "!Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto." - signed_up: "Te has registrado correctamente. Ya puedes consultar en tu correo el email de confirmación." + signed_up: "Te has registrado correctamente. Consulta el mensaje de confirmación que te hemos enviado a tu correo." updated: "Has actualizado tu cuenta correctamente." sessions: new: alpha_software: "Estás a punto de utilizar software en versión alpha." - bugs_and_feedback: "Ten en cuenta que puedes experimentar errores. ¡Te animamos a que utilices el botón de Feedback situado a la derecha de tu navegador para informar cualquier fallo! Trabajaremos tan rápido como nos sea posible para resolver cualquier problema del que tú nos informes." - bugs_and_feedback_mobile: "Ten en cuenta, experimentarás errores. ¡Te animamos a informar de cualquier fallo! Vamos a trabajar tan rápido como nos sea posible para resolver cualquier problema que informes." + bugs_and_feedback: "Ten en cuenta que puedes sufrir errores. ¡Te animamos a que utilices el botón de Feedback situado a la derecha de tu navegador para informar cualquier fallo! Trabajaremos tan rápido como nos sea posible para resolver cualquier problema que nos remitas." + bugs_and_feedback_mobile: "Ten en cuenta que puedes sufrir errores. ¡Te animamos a informar de cualquier fallo! Trabajaremos tan rápido como nos sea posible para resolver cualquier problema que nos remitas." login: "Iniciar sesión" modern_browsers: "Sólo es compatible con navegadores modernos." password: "Contraseña" @@ -78,8 +78,8 @@ es: shared: links: forgot_your_password: "¿Olvidaste tu contraseña?" - receive_confirmation: "No has recibido instrucciones de confirmación?" - receive_unlock: "No has recibido las instrucciones de desbloqueo?" + receive_confirmation: "¿No has recibido instrucciones de confirmación?" + receive_unlock: "¿No has recibido las instrucciones de desbloqueo?" sign_in: "Acceder" sign_up: "Regístrate" sign_up_closed: "Los registros están cerrados temporalmente." @@ -88,7 +88,7 @@ es: unlocks: new: resend_unlock: "Volver a enviar las instrucciones de desbloqueo." - send_instructions: "Recibirás un email con instrucciones para desbloquear tu cuenta en pocos minutos." + send_instructions: "Recibirás un correo con instrucciones para desbloquear tu cuenta en pocos minutos." unlocked: "Tu cuenta ha sido desbloqueada. Ya has accedido a tu cuenta." errors: messages: diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml index ddd61b8ed..883ec451e 100644 --- a/config/locales/diaspora/ar.yml +++ b/config/locales/diaspora/ar.yml @@ -36,8 +36,6 @@ ar: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "شخص غير معروف" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ ar: success: ".بنجاح %{name} تم تعديل" zero: "no aspects" back: "Back" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancelar" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml index e56f0000e..ccbfc6465 100644 --- a/config/locales/diaspora/cs.yml +++ b/config/locales/diaspora/cs.yml @@ -36,8 +36,6 @@ cs: all_aspects: "Všechny aspekty" application: helper: - aspect_badge: - all_aspects: "Všechny aspekty" unknown_person: "neznámá osoba" video_title: unknown: "Neznámý název videa" @@ -113,6 +111,11 @@ cs: success: "Váš aspekt, %{name}, byl úspěšně upraven." zero: "žádné aspekty" back: "Zpět" + bookmarklet: + explanation: "%{link} odkudkoliv pomocí tohoto odkazu." + explanation_link_text: "Příspěvek do Diaspory" + post_something: "Poslat něco na Diasporu" + post_success: "Odesláno! Zavírám!" cancel: "Zrušit" comments: few: "%{count} komentáře" diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml index cdde03d4a..d4ee73f75 100644 --- a/config/locales/diaspora/cy.yml +++ b/config/locales/diaspora/cy.yml @@ -36,8 +36,6 @@ cy: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "unknown person" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ cy: success: "Your aspect, %{name}, has been successfully edited." zero: "no aspects" back: "Back" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancel" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml index 1814699f9..2d86c1c33 100644 --- a/config/locales/diaspora/da.yml +++ b/config/locales/diaspora/da.yml @@ -36,8 +36,6 @@ da: all_aspects: "Alle aspekter" application: helper: - aspect_badge: - all_aspects: "Alle aspekter" unknown_person: "Ukendt person" video_title: unknown: "Ukendt videotitel" @@ -113,6 +111,11 @@ da: success: "Dit aspekt, %{name}, er nu blevet redigeret." zero: "ingen aspekter" back: "Tilbage" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Annullér" comments: few: "%{count} kommentarer" diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index 41be70d30..87d4ac295 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -36,8 +36,6 @@ de: all_aspects: "Alle Aspekte" application: helper: - aspect_badge: - all_aspects: "Alle Aspekte" unknown_person: "unbekannte Person" video_title: unknown: "Unbekannter Video-Titel" @@ -113,6 +111,11 @@ de: success: "Aspekt %{name} erfolgreich bearbeitet." zero: "keine Aspekte" back: "Zurück" + bookmarklet: + explanation: "%{link} von überall in dem du diesen Link als Lesezeichen speicherst." + explanation_link_text: "Erstelle einen Beitrag in Diaspora" + post_something: "Erstelle einen Beitrag in Diaspora" + post_success: "Erstellt! Schließen…" cancel: "Abbrechen" comments: few: "%{count} Kommentare" diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml index 534b90e0c..b374f10e3 100644 --- a/config/locales/diaspora/el.yml +++ b/config/locales/diaspora/el.yml @@ -36,8 +36,6 @@ el: all_aspects: "Όλες οι πτυχές" application: helper: - aspect_badge: - all_aspects: "Όλες οι πτυχές" unknown_person: "άγνωστο άτομο" video_title: unknown: "Άγνωστος τίτλος video" @@ -113,6 +111,11 @@ el: success: "Έγινε επιτυχώς η επεξεργασία της πτυχής σας,% {name}." zero: "καμία πτυχή" back: "Πίσω" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Ακύρωση" comments: few: "%{count} σχόλια" diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml index b0fa7f93a..ba5452272 100644 --- a/config/locales/diaspora/en_shaw.yml +++ b/config/locales/diaspora/en_shaw.yml @@ -36,8 +36,6 @@ en_shaw: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "𐑷𐑤 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" unknown_person: "𐑩𐑯𐑯𐑴𐑯 𐑐𐑻𐑕𐑩𐑯" video_title: unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑑𐑩𐑤" @@ -113,6 +111,11 @@ en_shaw: success: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑, %{name}, 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑧𐑛𐑦𐑑𐑩𐑛." zero: "𐑯𐑴 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" back: "𐑚𐑨𐑒" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "𐑒𐑨𐑯𐑕𐑩𐑤" comments: few: "%{count} 𐑒𐑪𐑥𐑩𐑯𐑑𐑕" diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml index 7c4b44178..1e639c786 100644 --- a/config/locales/diaspora/eo.yml +++ b/config/locales/diaspora/eo.yml @@ -36,8 +36,6 @@ eo: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "nekonata persono" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ eo: success: "Your aspect, %{name}, has been successfully edited." zero: "no aspects" back: "Antaŭen" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancel" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml index 2ef849e54..5b24a11a1 100644 --- a/config/locales/diaspora/es-CL.yml +++ b/config/locales/diaspora/es-CL.yml @@ -36,8 +36,6 @@ es-CL: all_aspects: "Todos los Aspectos" application: helper: - aspect_badge: - all_aspects: "Todos los Aspectos" unknown_person: "persona desconocida" video_title: unknown: "Titulo de vídeo desconocido" @@ -113,6 +111,11 @@ es-CL: success: "Tu aspecto, %{name}, ha sido correctamente editado." zero: "ningún aspecto" back: "Atrás" + bookmarklet: + explanation: "%{link} donde sea agregando a marcadores este link." + explanation_link_text: "Postea en Diaspora" + post_something: "Postea algo en Diaspora" + post_success: "Posteado! Cerrando!" cancel: "Cancelar" comments: few: "%{count} comentarios" diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml index 363721d21..2ee1a60db 100644 --- a/config/locales/diaspora/es.yml +++ b/config/locales/diaspora/es.yml @@ -33,11 +33,9 @@ es: username: taken: "ya está ocupado." ago: "hace %{time} " - all_aspects: "Todos" + all_aspects: "Todos los contactos" application: helper: - aspect_badge: - all_aspects: "Todos los Aspectos" unknown_person: "persona desconocida" video_title: unknown: "Título de vídeo desconocido" @@ -55,7 +53,7 @@ es: done_editing: "Aceptar" aspect_stream: activity: "actividad" - post_time: "inicio" + post_time: "fecha de publicación" sort_by: "ordenar por:" contacts_not_visible: "Los contactos de este Aspecto no podrán verse." contacts_visible: "Los contactos de este Aspecto podrán verse." @@ -71,7 +69,7 @@ es: aspect_list_is_visible: "Lista de contactos visible para los demás en el Aspecto" confirm_remove_aspect: "¿Seguro que quieres eliminar este Aspecto?" done: "Listo" - make_aspect_list_visible: "hacer visible el aspecto?" + make_aspect_list_visible: "¿hacer visible el aspecto?" remove_aspect: "Eliminar este Aspecto" rename: "renombrar" update: "Actualizar" @@ -82,7 +80,7 @@ es: aspect_not_empty: "El Aspecto no está vacío" remove: "eliminar" index: - handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de email, puedes dársela a la gente para que te encuentren." + handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de correo, puedes dársela a la gente para que te encuentren." no_contacts: "No hay contactos" manage: add_a_new_aspect: "Añadir nuevo Aspecto" @@ -113,6 +111,11 @@ es: success: "Tu Aspecto, %{name}, fue editado correctamente." zero: "no hay aspectos" back: "Atrás" + bookmarklet: + explanation: "%{link} donde sea agregando a tus marcadores este enlace." + explanation_link_text: "Publicar en Diaspora" + post_something: "Publica algo en Diaspora" + post_success: "Publicado! Cerrando!" cancel: "Cancelar" comments: few: "%{count} comentarios" @@ -167,7 +170,7 @@ es: birthday_with_year: "%B %d %Y" fullmonth_day: "%B %d" delete: "Eliminar" - email: "Email" + email: "Correo electrónico" error_messages: helper: correct_the_following_errors_and_try_again: "Corrija los siguentes errores e inténtelo de nuevo." @@ -194,14 +197,14 @@ es: already_contacts: "Ya estás conectado con esa persona" already_sent: "Ya has invitado a esa persona." no_more: "No tienes más invitaciones." - rejected: "Las siguientes direcciones de email han tendido problemas:" + rejected: "Las siguientes direcciones de correo han tendido problemas:" sent: "Invitaciones enviadas a:" edit: sign_up: "registrarse" new: already_invited: "Ya invitado" aspect: "Aspecto" - comma_seperated_plz: "Puedes escribir múltiples direcciones de email separadas por comas." + comma_seperated_plz: "Puedes escribir múltiples direcciones de correo separadas por comas." if_they_accept_info: "Si aceptan, serán añadidos al Aspecto que selecciones." invite_someone_to_join: "¡Invita a alguien a unirse a Diaspora*!" personal_message: "Mensaje Personal" @@ -214,7 +217,7 @@ es: have_a_problem: "¿Algún problema? Encuentra una solución aquí" logged_in_as: "Registrado como %{name}" powered_by: "IMPULSADO POR DIASPORA*" - public_feed: "Canal publico de %{name} " + public_feed: "Canal público de %{name} " toggle: "cambiar sitio movil" whats_new: "¿Qué hay de nuevo?" your_aspects: "Tus Aspectos" @@ -232,13 +235,13 @@ es: many: "%{count} personas no les gusta esto" one: "1 persona no le gusta esto" other: "%{count} personas no les gusta esto" - zero: "a ninguna persona le disgusta esto" + zero: "a nadie le disgusta esto" people_like_this: few: "%{count} personas les gusta eso" many: "%{count} personas les gusta esto" one: "1 persona le gusta esto" other: "%{count} personas les gusta esto" - zero: "a ninguna persona le gusta esto" + zero: "a nadie le gusta esto" more: "Más" next: "Siguiente" notifications: @@ -329,7 +332,7 @@ es: born: "Fecha de Nacimiento" cannot_remove: "%{name} no puede eliminarse del último Aspecto. (Si quieres dejar de compartir con él, debes elimínarlo.)" edit_my_profile: "Editar mi Perfil" - gender: "genero / sexo" + gender: "género / sexo" in_aspects: "en Aspectos" location: "Ubicación " remove_contact: "eliminar contacto" @@ -344,12 +347,12 @@ es: no_posts: "¡No hay publicaciones que mostrar!" not_connected: "No estás conectado con esta persona." recent_posts: "Últimas Publicaciones" - recent_public_posts: "Últimas Publicaciones (el mundo)" + recent_public_posts: "Últimas Publicaciones (El mundo)" return_to_aspects: "Volver a tu página de Aspectos." similar_contacts: "Contactos similares" start_sharing: "Empezar a compartir" to_accept_or_ignore: "Aceptar o ignorar" - you_have_no_tags: "No tienes etiquetas!" + you_have_no_tags: "¡No tienes etiquetas!" webfinger: fail: "Perdona, no pudimos encontrar %{handle}" zero: "sin personas" @@ -402,12 +405,12 @@ es: your_bio: "Tu Biografía" your_birthday: "Tu Cumpleaños" your_gender: "Tu Género / Sexo" - your_location: "Tú ubicación" + your_location: "Tu ubicación" your_name: "Tu Nombre" your_photo: "Tu Foto" your_private_profile: "Tu perfil privado" your_public_profile: "Tu perfil publico" - your_tags: "Tu: en 5 #etiquetas" + your_tags: "Tú: en 5 #etiquetas" your_tags_placeholder: "p.ej. #diaspora #panqueque #gatitos #musica" update: failed: "No se pudo actualizar el Perfil" @@ -424,7 +427,7 @@ es: unhappy: "¿Triste?" update: "Actualizar" new: - enter_email: "Escribe una dirección de email" + enter_email: "Escribe una dirección de correo" enter_password: "Escribe una contraseña" enter_password_again: "Introduce la misma contraseña" enter_username: "Elije un nombre de usuario (sólo letras, números y guiones bajos)" @@ -440,10 +443,10 @@ es: success: "Ahora está conectado." helper: new_requests: - few: "%{count} nuevas solicitudes!" - many: "%{count} nuevas solicitudes!" - one: "nueva solicitud!" - other: "%{count} nuevas solicitudes!" + few: "¡%{count} nuevas solicitudes!" + many: "¡%{count} nuevas solicitudes!" + one: "¡nueva solicitud!" + other: "¡%{count} nuevas solicitudes!" zero: "no hay nuevas solicitudes" manage_aspect_contacts: existing: "Contactos existentes" @@ -486,13 +489,13 @@ es: create_request: "Buscar por la dirección Diaspora*" diaspora_handle: "diaspora@handle.org" enter_a_diaspora_username: "Introduce su nombre de usuario Diaspora*:" - know_email: "¿Conoces sus direciones de email? ¡Puedes invitarlos!" + know_email: "¿Conoces sus direcciones de correo? ¡Puedes invitarlos!" your_diaspora_username_is: "Su nombre de usuario Diaspora* es: %{diaspora_handle}" contact_list: all_contacts: "Todos los contactos" cannot_remove: "No se puede eliminar a la persona del último Aspecto. (Si quieres desconectar a esta persona debes elminarla de tus contactos.)" invitations: - by_email: "Por email" + by_email: "Por correo" dont_have_now: "No tienes invitaciones ahora mismo pero, ¡pronto llegarán más!" from_facebook: "Desde Facebook" invitations_left: "(%{count} restantes)" @@ -511,15 +514,15 @@ es: add_photos: "Añadir fotos" all: "todo" all_contacts: "Todos los contactos" - click_to_share_with: "" - make_public: "Publicar" + click_to_share_with: "Pulsa para compartir con:" + make_public: "Compartir públicamente" post_a_message_to: "Enviar un mensaje a %{aspect}" posting: "Publicando..." public: "El mundo" publishing_to: "publicar en: " share: "Compartir" share_with: "compartir con" - whats_on_your_mind: "¿Qué tal? ¡Qué pasa!" + whats_on_your_mind: "¿Qué tienes en mente?" reshare: reshare: "Publicar en..." stream_element: @@ -546,7 +549,7 @@ es: nobody_talking: "Nadie esta hablando de %{tag} todavía." people_tagged_with: "Personas etiquetadas en %{tag}" posts_tagged_with: "Publicaciones etiquetadas con #%{tag}" - the_world: "el mundo" + the_world: "El mundo" username: "Nombre de usuario" users: destroy: "Cuenta cerrada con éxito." @@ -565,10 +568,10 @@ es: mentioned: "...eres mencionado en una publicación?" new_password: "Nueva contraseña" private_message: "...recibes un mensaje privado?" - receive_email_notifications: "Recibir notificaciones por email cuando..." + receive_email_notifications: "Recibir notificaciones por correo cuando..." request_acceptence: "...tu solicitud de contacto es aceptada?" request_received: "...recibes una nueva solicitud de contacto?" - your_email: "Tu dirección de email" + your_email: "Tu dirección de correo" your_handle: "Tu dirección Diaspora*" getting_started: connect_on_diaspora: "Conectar en Diaspora*" @@ -589,7 +592,7 @@ es: public: does_not_exist: "¡El usuario %{username} no existe!" update: - email_notifications_changed: "Notificaciones por email cambiadas" + email_notifications_changed: "Notificaciones por correo cambiadas" language_changed: "Idioma cambiado" language_not_changed: "Cambio de idioma fallido" password_changed: "Contraseña cambiada" diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml index a994b9b25..a51719640 100644 --- a/config/locales/diaspora/eu.yml +++ b/config/locales/diaspora/eu.yml @@ -36,8 +36,6 @@ eu: all_aspects: "Alderdi guztiak" application: helper: - aspect_badge: - all_aspects: "Alderdi guztiak" unknown_person: "pertsona ezezaguna" video_title: unknown: "Bideo izen ezezaguna" @@ -113,6 +111,11 @@ eu: success: "Zure alderdia, %{name}, eraldatua izan da." zero: "alderdirik ez" back: "Atzera" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Ezeztatu" comments: few: "%{count} iruzkin" diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml index 594d1b856..3dc5983b9 100644 --- a/config/locales/diaspora/fi.yml +++ b/config/locales/diaspora/fi.yml @@ -36,8 +36,6 @@ fi: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Kaikki näkymät" unknown_person: "tuntematon henkilö" video_title: unknown: "Videon Otsikko Tuntematon" @@ -113,6 +111,11 @@ fi: success: "Näkymäsi, %{name}, muokkaus onnistui." zero: "ei näkymiä" back: "Takaisin" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Peruuta" comments: few: "%{count} kommentia" diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml index 9ca9b19a7..cfedfe1b0 100644 --- a/config/locales/diaspora/fr.yml +++ b/config/locales/diaspora/fr.yml @@ -36,8 +36,6 @@ fr: all_aspects: "Tous les aspects" application: helper: - aspect_badge: - all_aspects: "Tous les aspects" unknown_person: "personne inconnue" video_title: unknown: "Titre de vidéo inconnu" @@ -113,6 +111,11 @@ fr: success: "Votre aspect « %{aspect_name} » a été modifié." zero: "aucun aspect" back: "Retour" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Annuler" comments: few: "%{count} commentaires" diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml index 6f0c94357..8df10a904 100644 --- a/config/locales/diaspora/ga.yml +++ b/config/locales/diaspora/ga.yml @@ -36,8 +36,6 @@ ga: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Gach gné" unknown_person: "duine anaithnid" video_title: unknown: "Teideal Físeán Anaithnid" @@ -113,6 +111,11 @@ ga: success: "D'eirigh le athrú do gné %{name}." zero: "no aspects" back: "Ar ais" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cealaigh" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml index 274666856..d62b8acdb 100644 --- a/config/locales/diaspora/gl.yml +++ b/config/locales/diaspora/gl.yml @@ -36,8 +36,6 @@ gl: all_aspects: "Todos os aspectos" application: helper: - aspect_badge: - all_aspects: "Todos os aspectos" unknown_person: "persoa descoñecida" video_title: unknown: "Título de vídeo descoñecido" @@ -113,6 +111,11 @@ gl: success: "O seu aspecto, %{name}, foi editado con éxito." zero: "non hai aspectos" back: "Volver" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancelar" comments: few: "%{count} comentarios" diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml index e0c7abee4..dc13f04f4 100644 --- a/config/locales/diaspora/he.yml +++ b/config/locales/diaspora/he.yml @@ -36,8 +36,6 @@ he: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "כל ההיבטים" unknown_person: "אדם לא ידוע" video_title: unknown: "כותרת הווידאו אינה ידועה" @@ -113,6 +111,11 @@ he: success: "ההיבט שלך, %{name}, נערך בהצלחה." zero: "no aspects" back: "חזרה" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "ביטול" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml index 16d2e1a83..f3200efba 100644 --- a/config/locales/diaspora/hu.yml +++ b/config/locales/diaspora/hu.yml @@ -33,11 +33,9 @@ hu: username: taken: "már foglalt." ago: "ezelőtt" - all_aspects: "All aspects" + all_aspects: "Összes csoport" application: helper: - aspect_badge: - all_aspects: "Összes csoport" unknown_person: "ismeretlen személy" video_title: unknown: "Ismeretlen videó cím" @@ -75,7 +73,7 @@ hu: remove_aspect: "Csoport törlése" rename: "átnevezés" update: "frissítés" - updating: "updating" + updating: "Frissítés" few: "%{count} csoport" helper: are_you_sure: "Biztos, hogy törlöd a csoportot?" @@ -113,12 +111,17 @@ hu: success: "%{name} csoport szerkesztve." zero: "nincs csoport" back: "Vissza" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Mégsem" comments: few: "%{count} hozzászólás" many: "%{count} hozzászólás" new_comment: - comment: "Hozzászólás" + comment: "hozzászólás" commenting: "Hozzászólok.." one: "1 hozzászólás" other: "%{count} hozzászólás" @@ -148,7 +151,7 @@ hu: zero: "nincs új üzenet" index: create_a_new_message: "új üzenet írása" - inbox: "Inbox" + inbox: "Bejövő" message_inbox: "Bejövő üzenetek" new_message: "Új üzenet" no_conversation_selected: "nincs beszélgetés kiválasztva" @@ -228,17 +231,17 @@ hu: likes: likes: people_dislike_this: - few: "%{count} people disliked this" - many: "%{count} people disliked this" - one: "1 person disliked this" - other: "%{count} people disliked this" - zero: "no people disliked this" + few: "%{count} személy nem kedveli" + many: "%{count} személy nem kedveli" + one: "1 személy nem kedveli" + other: "%{count} személy nem kedveli" + zero: "senkinek nem ellenszenves" people_like_this: - few: "%{count} people liked this" - many: "%{count} people liked this" - one: "1 person liked this" - other: "%{count} people liked this" - zero: "no people liked this" + few: "%{count} személy kedveli" + many: "%{count} személy kedveli" + one: "1 személy kedveli" + other: "%{count} személy kedveli" + zero: "senki nem kedveli" more: "Bővebben" next: "következő" notifications: @@ -261,7 +264,7 @@ hu: mentioned: "megemlítettek téged a" new_request: "megosztást ajánlott neked." post: "bejegyzés" - private_message: "sent you a message." + private_message: "üzenetet küldött neked." request_accepted: "elfogadta a megosztási kérésed." notifier: also_commented: @@ -275,7 +278,7 @@ hu: diaspora: "A diaspora email robot" hello: "Szia %{name}!" love: "Szeretettel," - manage_your_email_settings: "manage your email settings" + manage_your_email_settings: "Kezeld az email beállításaidat" mentioned: mentioned: "megemlített téged egy bejegyzésében:" sign_in: "Jelentkezz be, hogy megnézhesd." @@ -304,7 +307,7 @@ hu: password_confirmation: "Jelszó megerősítése" people: add_contact_small: - add_contact_from_tag: "add contact from tag" + add_contact_from_tag: "ismerős hozzáadása címkéből" aspect_list: edit_membership: "csoport tagság szerkesztése" few: "%{count} személy" @@ -322,7 +325,7 @@ hu: person: add_contact: "Kapcsolat hozzáadása" already_connected: "Már csatlakozott" - pending_request: "folyamatban lévő kérelem" + pending_request: "Folyamatban lévő kérelem" thats_you: "Ez vagy Te!" profile_sidebar: bio: "Személyes" @@ -331,7 +334,7 @@ hu: edit_my_profile: "Profilom szerkesztése" gender: "nem" in_aspects: "csoportokban" - location: "location" + location: "hely" remove_contact: "kapcsolat törlése" remove_from: "Törlöd %{name}-t a %{aspect} csoportból?" show: @@ -402,7 +405,7 @@ hu: your_bio: "Rólam" your_birthday: "Szülinapom" your_gender: "Nem" - your_location: "Your location" + your_location: "Helység" your_name: "Nevem" your_photo: "Fényképem" your_private_profile: "Személyes profilod" @@ -511,11 +514,11 @@ hu: add_photos: "Képek hozzáadása" all: "összes" all_contacts: "összes kapcsolat" - click_to_share_with: "Click to share with: " + click_to_share_with: "Kattints, hogy megoszd vele:" make_public: "nyilvánossá tesz" post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}" posting: "Küldés..." - public: "Public" + public: "Nyilvános" publishing_to: "Publikálás:" share: "Megosztás" share_with: "Megosztás vele: %{aspect}" @@ -523,8 +526,8 @@ hu: reshare: reshare: "Újraosztás" stream_element: - dislike: "I dislike this" - like: "I like this" + dislike: "Nem tetszik" + like: "Tetszik" status_messages: create: success: "Megemlítetted: %{names}" @@ -536,16 +539,16 @@ hu: mentioning: "Megemlít: %{person}" show: destroy: "Töröl" - not_found: "Sorry, we couldn't find that post." + not_found: "Bocsánat, nem találjuk a bejegyzést." permalink: "permalink" stream_helper: hide_comments: "hozzászólások elrejtése" show_comments: "hozzászólások megtekintése" tags: show: - nobody_talking: "Nobody is talking about %{tag} yet." - people_tagged_with: "People tagged with %{tag}" - posts_tagged_with: "Posts tagged with #%{tag}" + nobody_talking: "Senki nem beszélt még erről: %{tag}." + people_tagged_with: "Személy felcímkézve: %{tag}" + posts_tagged_with: "Bejegyzések felcímkézve: #%{tag}" the_world: "a világ" username: "Felhasználónév" users: @@ -573,7 +576,7 @@ hu: getting_started: connect_on_diaspora: "Kapcsolat a Diaspora-n" connect_services: "Csatold a többi szolgáltatásod is ide" - could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them." + could_not_find_anyone: "Nem található egy barátod sem Diaspora-n. Használd a barát-keresőt, hogy meghívd őket." edit_profile: "Profil szerkesztése" finished: "Kész!" save_and_continue: "Mentés és folytatás" diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml index 93ad378dc..d756f867e 100644 --- a/config/locales/diaspora/id.yml +++ b/config/locales/diaspora/id.yml @@ -36,8 +36,6 @@ id: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "orang tak dikenal" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ id: success: "Aspek anda, %{name}, telah berhasil diubah." zero: "no aspects" back: "Back" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancel" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml index a675753c1..37206ab5e 100644 --- a/config/locales/diaspora/is.yml +++ b/config/locales/diaspora/is.yml @@ -36,8 +36,6 @@ is: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Allar ásýndir" unknown_person: "óþekkt manneskja" video_title: unknown: "Óþekktur vídeótitill" @@ -113,6 +111,11 @@ is: success: "Ásýnd þinni,% {nafn}, hefur verið breytt." zero: "no aspects" back: "Til baka" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Hætta við" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index e16c91f49..e9cbff292 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -36,8 +36,6 @@ it: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Tutti gli aspetti" unknown_person: "persona sconosciuta" video_title: unknown: "Video Senza Nome" @@ -113,6 +111,11 @@ it: success: "Il tuo aspetto, %{name}, è stato modificato con successo." zero: "no aspects" back: "Indietro" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Annulla" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml index 3f00ab125..634dc6bf7 100644 --- a/config/locales/diaspora/lt.yml +++ b/config/locales/diaspora/lt.yml @@ -36,8 +36,6 @@ lt: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "nežinomas asmuo" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ lt: success: "Aspektas \"%{name}\" pakeistas sėkmingai." zero: "no aspects" back: "Atgal" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Atšaukti" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml index 39aa30570..e5e61cd88 100644 --- a/config/locales/diaspora/mk.yml +++ b/config/locales/diaspora/mk.yml @@ -36,8 +36,6 @@ mk: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "непозната личност" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ mk: success: "Вашиот аспект, %{name}, беше успешно уреден." zero: "no aspects" back: "Назад" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Откажи" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml index 161679bff..80fe281e6 100644 --- a/config/locales/diaspora/ml.yml +++ b/config/locales/diaspora/ml.yml @@ -36,8 +36,6 @@ ml: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "എല്ലാ പരിചയങ്ങളും" unknown_person: "അറിയാത്ത വ്യക്തി" video_title: unknown: "ചലചിത്രത്തിന്റെ തലക്കെട്ട് അറിയില്ല" @@ -113,6 +111,11 @@ ml: success: "നിങ്ങളുടെ പരിചയം, %{name}, വിജയകരമായി ചിട്ടപ്പെടുത്തി." zero: "പരിചയങ്ങള്‍ ഇല്ല" back: "പിന്നോട്ട്" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "റദ്ദാക്കുക" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml index 0d9f21ae6..aff11a24b 100644 --- a/config/locales/diaspora/nb.yml +++ b/config/locales/diaspora/nb.yml @@ -36,8 +36,6 @@ nb: all_aspects: "Alle aspekter" application: helper: - aspect_badge: - all_aspects: "Alle aspekt" unknown_person: "ukjent person" video_title: unknown: "Ukjent Videotittel" @@ -52,7 +50,7 @@ nb: failure: "Kunne ikke legge kontakt til aspektet." success: "Kontakt lagt til aspekt." aspect_contacts: - done_editing: "ferdig med å redigere" + done_editing: "fullfør" aspect_stream: activity: "aktivitet" post_time: "tidspunkt" @@ -113,6 +111,11 @@ nb: success: "Aspektet ditt, %{name}, har blitt endra." zero: "ingen aspekter" back: "Tilbake" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Avbryt" comments: few: "%{count} kommentarer" @@ -127,8 +130,8 @@ nb: create: failure: "Kunne ikke opprette kontakt" destroy: - failure: "Kunne ikke koble fra % {name}" - success: "Vellykket koblet fra % {name}" + failure: "Kunne ikke koble fra %{name}" + success: "Vellykket koblet fra %{name}" few: "%{count} kontakter" many: "%{count} kontakter" one: "1 kontakt" @@ -136,7 +139,7 @@ nb: share_with_pane: accepts: "Straks %{name} aksepterer, vil dere se hverandres innlegg på Diaspora" add_new_aspect: "legg til i nytt aspekt" - share_with: "Begynn å dele med % {name}" + share_with: "Begynn å dele med %{name}" zero: "ingen kontakter" conversations: helper: diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml index 657c26af7..b880146de 100644 --- a/config/locales/diaspora/nl.yml +++ b/config/locales/diaspora/nl.yml @@ -36,8 +36,6 @@ nl: all_aspects: "Alle aspecten" application: helper: - aspect_badge: - all_aspects: "Alle aspecten" unknown_person: "onbekend persoon" video_title: unknown: "Onbekende Videotitel" @@ -113,6 +111,11 @@ nl: success: "Je aspect, %{name}, is succesvol aangepast." zero: "geen aspecten" back: "Terug" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Annuleren" comments: few: "%{count} reacties" diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml index a614bea6f..5349aa93d 100644 --- a/config/locales/diaspora/pa.yml +++ b/config/locales/diaspora/pa.yml @@ -36,8 +36,6 @@ pa: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "unknown person" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ pa: success: "Your aspect, %{name}, has been successfully edited." zero: "no aspects" back: "ਪਿੱਛੇ" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancel" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml index f502cafdf..2ad8807d0 100644 --- a/config/locales/diaspora/pl.yml +++ b/config/locales/diaspora/pl.yml @@ -36,8 +36,6 @@ pl: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "nieznana osoba" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ pl: success: "Twój aspekt '%{name}' został pomyślnie zmieniony." zero: "no aspects" back: "Wróć" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Anuluj" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml index b23ce9287..35fa3e3d3 100644 --- a/config/locales/diaspora/pt-BR.yml +++ b/config/locales/diaspora/pt-BR.yml @@ -36,8 +36,6 @@ pt-BR: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Todos os aspectos" unknown_person: "pessoa desconhecida" video_title: unknown: "Vídeo sem título" @@ -113,6 +111,11 @@ pt-BR: success: "Seu aspecto %{name} foi editado com sucesso." zero: "no aspects" back: "Voltar" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancelar" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index 6aefb6f53..3404d6ae7 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -36,8 +36,6 @@ pt-PT: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Todos os aspectos" unknown_person: "utilizador(a) desconhecido(a)" video_title: unknown: "Video sem título " @@ -113,6 +111,11 @@ pt-PT: success: "O teu grupo, %{name}, foi editado com sucesso." zero: "nenhum aspecto" back: "Voltar" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Cancelar" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml index c889635d5..0f037b917 100644 --- a/config/locales/diaspora/ro.yml +++ b/config/locales/diaspora/ro.yml @@ -36,8 +36,6 @@ ro: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Toate aspectele" unknown_person: "persoană necunoscută" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ ro: success: "Aspectul, %{name}, a fost editat cu succes." zero: "no aspects" back: "Înapoi" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Anulează" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index c614f386d..9b2c1e4d4 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -36,8 +36,6 @@ ru: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Все аспекты" unknown_person: "неизвестная персона" video_title: unknown: "Неизвестное название видеозаписи" @@ -113,6 +111,11 @@ ru: success: "Аспект, %{name}, отредактирован." zero: "no aspects" back: "Назад" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Отмена" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml index 74039b299..bbc7d1b5e 100644 --- a/config/locales/diaspora/sk.yml +++ b/config/locales/diaspora/sk.yml @@ -36,8 +36,6 @@ sk: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Všetky aspekty" unknown_person: "neznáma osoba" video_title: unknown: "Neznámy názov videa" @@ -113,6 +111,11 @@ sk: success: "Váš aspekt, %{name}, bol úspešne upravený." zero: "no aspects" back: "Späť" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Zrušiť" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml index 530fb8307..6916256e6 100644 --- a/config/locales/diaspora/sl.yml +++ b/config/locales/diaspora/sl.yml @@ -36,8 +36,6 @@ sl: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "Vse skupine" unknown_person: "neznana oseba" video_title: unknown: "Neznani video naslov" @@ -113,6 +111,11 @@ sl: success: "Vaša skupina %{name} je bila uspešno posodobljena." zero: "no aspects" back: "Nazaj" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Prekliči" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index 3e2a2b953..cc4049929 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -36,8 +36,6 @@ sv: all_aspects: "Alla aspekter" application: helper: - aspect_badge: - all_aspects: "Alla aspekter" unknown_person: "okänd person" video_title: unknown: "Okänd videotitel" @@ -113,6 +111,11 @@ sv: success: "Din aspekt %{name} är nu ändrad." zero: "inga aspekter" back: "Tillbaka" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "Avbryt" comments: few: "%{count} kommentarer" diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml index 5c4f8bece..70c722108 100644 --- a/config/locales/diaspora/tr.yml +++ b/config/locales/diaspora/tr.yml @@ -36,8 +36,6 @@ tr: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "All aspects" unknown_person: "bilinmiyen kişiler" video_title: unknown: "Unknown Video Title" @@ -113,6 +111,11 @@ tr: success: "Sizin yanınız, %{name}, başariyla düzeltildi." zero: "no aspects" back: "Geri" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "İptal Et" comments: few: "%{count} comments" diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml index 00c0576fa..fe63405ba 100644 --- a/config/locales/diaspora/zh-TW.yml +++ b/config/locales/diaspora/zh-TW.yml @@ -36,8 +36,6 @@ zh-TW: all_aspects: "所有面向" application: helper: - aspect_badge: - all_aspects: "全部面向" unknown_person: "不明聯絡人" video_title: unknown: "影片標題不明" @@ -113,6 +111,11 @@ zh-TW: success: "你的面向 %{name} 已編輯完成." zero: "沒有面向" back: "後退" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "取消" comments: few: "%{count}則回應" diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml index 16de3d9bd..b96141338 100644 --- a/config/locales/diaspora/zh.yml +++ b/config/locales/diaspora/zh.yml @@ -36,8 +36,6 @@ zh: all_aspects: "All aspects" application: helper: - aspect_badge: - all_aspects: "所有分组" unknown_person: "陌生人" video_title: unknown: "未知的视频标题" @@ -113,6 +111,11 @@ zh: success: "您的%{name}分组编辑完成。" zero: "no aspects" back: "后退" + bookmarklet: + explanation: "%{link} from anywhere by bookmarking this link." + explanation_link_text: "Post to Diaspora" + post_something: "Post something to Diaspora" + post_success: "Posted! Closing!" cancel: "取消" comments: few: "%{count} comments" From 98820c0866b0742124efb4669eb4d79d66128792 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Tue, 29 Mar 2011 22:25:03 +0200 Subject: [PATCH 2/3] do not display tags on the public profile --- app/views/people/show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 9acbd7e6f..7ff399398 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -60,7 +60,7 @@ %span.diaspora_handle = @person.diaspora_handle .description - - if !@person.profile.tag_string.blank? + - if !@person.profile.tag_string.blank? && user_signed_in? && ((@contact.persisted? && !@contact.pending?) || @person == current_user.person || @incoming_request) = @person.profile.format_tags(@person.profile.tag_string) - if user_signed_in? && @person == current_user.person %span.hover_edit From bbe5f56292f2da2af5a7e7bd0e1a21a5775739e9 Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 29 Mar 2011 13:55:14 -0700 Subject: [PATCH 3/3] you can now mention in the bookmarklet --- app/controllers/status_messages_controller.rb | 1 + app/views/status_messages/bookmarklet.html.haml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index 8b0ad56c7..59c0e87b9 100644 --- a/app/controllers/status_messages_controller.rb +++ b/app/controllers/status_messages_controller.rb @@ -27,6 +27,7 @@ class StatusMessagesController < ApplicationController def bookmarklet @aspects = current_user.aspects + @selected_contacts = @aspects.map { |aspect| aspect.contacts }.flatten.uniq @aspect_ids = @aspects.map{|x| x.id} render :layout => nil end diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index e25248aa4..6df5ed922 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -31,6 +31,7 @@ }); #new_status_message_pane + = hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json .span-15.last #facebox_header %h4