From b75f13927e742a09586f751a7ffd7ea927b5db68 Mon Sep 17 00:00:00 2001 From: spla Date: Sat, 20 May 2017 17:50:11 +0200 Subject: [PATCH] Catalan translation update (#3177) * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml --- app/javascript/mastodon/locales/ca.json | 4 ++-- config/locales/activerecord.ca.yml | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 config/locales/activerecord.ca.yml diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 61827220e66..1f3c465a876 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -148,7 +148,7 @@ "status.load_more": "Carrega més", "status.media_hidden": "Multimèdia amagat", "status.mention": "Esmentar @{name}", - "status.mute_conversation": "Mute conversation", + "status.mute_conversation": "Silenciar conversació", "status.open": "Ampliar aquest estat", "status.reblog": "Boost", "status.reblogged_by": "{name} ha retootejat", @@ -159,7 +159,7 @@ "status.sensitive_warning": "Contingut sensible", "status.show_less": "Mostra menys", "status.show_more": "Mostra més", - "status.unmute_conversation": "Unmute conversation", + "status.unmute_conversation": "Activar conversació", "tabs_bar.compose": "Compondre", "tabs_bar.federated_timeline": "Federada", "tabs_bar.home": "Inici", diff --git a/config/locales/activerecord.ca.yml b/config/locales/activerecord.ca.yml new file mode 100644 index 00000000000..d4d3d1e4015 --- /dev/null +++ b/config/locales/activerecord.ca.yml @@ -0,0 +1,12 @@ +ca: + activerecord: + errors: + models: + account: + attributes: + username: + invalid: només lletres, números i subratllats + status: + attributes: + reblog: + taken: del estat ja existeix