diff options
author | Dennis Schubert <mail@dennis-schubert.de> | 2016-02-22 13:27:45 +0300 |
---|---|---|
committer | Dennis Schubert <mail@dennis-schubert.de> | 2016-02-22 13:27:45 +0300 |
commit | 4cb0d18a633add02712d062acd5b0c32f22a8533 (patch) | |
tree | 2e1ac225aba26529cf50fe2d72d11278e19a1d69 /config/locales/javascript | |
parent | 11420c20e3ab9f0ef1b57b9283660ddd05cbfcfa (diff) | |
parent | fbabc541ae19331a85b6529caad887f58c0b95f1 (diff) |
Merge branch 'stable' into develop
Diffstat (limited to 'config/locales/javascript')
-rw-r--r-- | config/locales/javascript/javascript.de.yml | 2 | ||||
-rw-r--r-- | config/locales/javascript/javascript.en_valspeak.yml | 4 | ||||
-rw-r--r-- | config/locales/javascript/javascript.ia.yml | 1 | ||||
-rw-r--r-- | config/locales/javascript/javascript.nds.yml | 1 | ||||
-rw-r--r-- | config/locales/javascript/javascript.nl.yml | 2 | ||||
-rw-r--r-- | config/locales/javascript/javascript.pt-BR.yml | 6 | ||||
-rw-r--r-- | config/locales/javascript/javascript.sv.yml | 6 |
7 files changed, 13 insertions, 9 deletions
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml index e320aef80..6aa063189 100644 --- a/config/locales/javascript/javascript.de.yml +++ b/config/locales/javascript/javascript.de.yml @@ -64,7 +64,7 @@ de: create: "Erstellen" delete: "Löschen" edit: "Bearbeiten" - failed_to_like: "Gefällt mir fehlgeschlagen!" + failed_to_like: "Gefällt mir fehlgeschlagen. Vielleicht ignoriert dich der Autor?" failed_to_post_message: "Konnte Beitrag nicht senden!" failed_to_remove: "Fehler beim Entfernen des Beitrags!" failed_to_reshare: "Fehler beim Weitersagen!" diff --git a/config/locales/javascript/javascript.en_valspeak.yml b/config/locales/javascript/javascript.en_valspeak.yml index 3cbd5e81d..d8d270067 100644 --- a/config/locales/javascript/javascript.en_valspeak.yml +++ b/config/locales/javascript/javascript.en_valspeak.yml @@ -62,6 +62,7 @@ en_valspeak: home: "Homee" log_out: "Bounce" mark_all_as_read: "Read them all" + moderator: "MODS MODS" notifications: "Noties" profile: "Profilee" recent_notifications: "Recent Noties" @@ -114,6 +115,7 @@ en_valspeak: gender: "So Im like..." location: "My crib" photos: "Pics and selfies <3" + posts: "Posties!!" you_have_no_tags: "u like... have no tagz!" publisher: add_option: "Like, add an ansah!" @@ -187,7 +189,7 @@ en_valspeak: seconds: "less than a min" suffixAgo: "like... ago" suffixFromNow: "from nao" - wordSeparator: "" + wordSeparator: " " year: "bout like... a yr" years: "like %d yrs" unblock_failed: "Unblockin this h8ter didnt work :(" diff --git a/config/locales/javascript/javascript.ia.yml b/config/locales/javascript/javascript.ia.yml index 4abfac733..1947eba28 100644 --- a/config/locales/javascript/javascript.ia.yml +++ b/config/locales/javascript/javascript.ia.yml @@ -75,6 +75,7 @@ ia: home: "Initio" log_out: "Clauder session" mark_all_as_read: "Marcar totes como legite" + moderator: "Moderator" notifications: "Notificationes" profile: "Profilo" recent_notifications: "Notificationes recente" diff --git a/config/locales/javascript/javascript.nds.yml b/config/locales/javascript/javascript.nds.yml index a149624b4..e4ae0d212 100644 --- a/config/locales/javascript/javascript.nds.yml +++ b/config/locales/javascript/javascript.nds.yml @@ -105,6 +105,7 @@ nds: contacts: "Kontakte" edit: "Ännern" gender: "Geschlecht" + ignoring: "Du ignorierst alle Bidräg von <%= name %>." location: "Ort" photos: "Bilder" posts: "Bidräg" diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml index 599ea1e3d..52fe842c8 100644 --- a/config/locales/javascript/javascript.nl.yml +++ b/config/locales/javascript/javascript.nl.yml @@ -64,7 +64,7 @@ nl: create: "Creëren" delete: "Verwijder" edit: "Bewerken" - failed_to_like: "Leuk vinden mislukt!" + failed_to_like: "Leuk vinden mislukt! Misschien negeert de schrijver jou?" failed_to_post_message: "Bericht plaatsen mislukt!" failed_to_remove: "Kon het bericht niet verwijderen!" failed_to_reshare: "Doorgeven mislukt!" diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml index e82504ce6..d4d995828 100644 --- a/config/locales/javascript/javascript.pt-BR.yml +++ b/config/locales/javascript/javascript.pt-BR.yml @@ -141,16 +141,16 @@ pt-BR: publisher: add_option: "Adicionar uma resposta" at_least_one_aspect: "Você deve publicar em pelo menos um aspecto" - limited: "Limitada - a sua publicação será visível apenas para as pessoas com quem você compartilha." + limited: "Limitada: a sua publicação será visível apenas para as pessoas com quem você compartilha." near_from: "Publicado de: <%= location %>" option: "Resposta" - public: "Pública - a sua publicação será totalmente visível na web e poderá ser encontrada por mecanismos de buscas, como Google, Bing e etc..." + public: "Pública: a sua publicação será totalmente visível na Web e poderá ser encontrada por meio de mecanismos de buscas" question: "Pergunta" remove_post: "Remover esta publicação?" report: name: "Relatar" prompt: "Por favor entre um motivo:" - prompt_default: "conteúdo ofensivo" + prompt_default: "p. ex. conteúdo ofensivo" status: created: "O relato foi criado com sucesso" exists: "O relato já existe" diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml index bd9816342..4d2d753b9 100644 --- a/config/locales/javascript/javascript.sv.yml +++ b/config/locales/javascript/javascript.sv.yml @@ -64,7 +64,7 @@ sv: create: "Skapa" delete: "Radera" edit: "Ändra" - failed_to_like: "Misslyckades med att gilla!" + failed_to_like: "Misslyckades med att gilla. Ignorerar författaren dig?" failed_to_post_message: "Misslyckades att posta meddelande!" failed_to_remove: "Misslyckades med att borttaga inlägget!" failed_to_reshare: "Kunde inte dela vidare!" @@ -125,8 +125,8 @@ sv: count: one: "<%=count%> röst lagd" other: "<%=count%> röster lagda" - go_to_original_post: "Du kan rösta på <%= original_post_link %>" - original_post: "ursprungligt inlägg" + go_to_original_post: "Du kan rösta hos <%= original_post_link %>" + original_post: "det ursprungliga inlägget" result: "Resultat" show_result: "Visa resultat" vote: "Rösta" |