about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/javascript/mastodon/locales/ca.json4
-rw-r--r--config/locales/activerecord.ca.yml12
2 files changed, 14 insertions, 2 deletions
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 61827220e..1f3c465a8 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 000000000..d4d3d1e40
--- /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