diff options
author | Joan Montané <jmontane@users.noreply.github.com> | 2017-11-21 15:17:28 +0100 |
---|---|---|
committer | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-11-21 23:17:28 +0900 |
commit | 53b7b81b439e96dd594499b18d95abdeee22e97b (patch) | |
tree | 355195c5fa9ffecef2a401f7c3fd07dbbbefa6b4 /app/javascript | |
parent | 6f609dc4b4d5a25ab39bee462177a934360f4991 (diff) |
Update and fix Catalan translation (#5773)
* Update activerecord.ca.yml * Update ca.yml * Update devise.ca.yml * Update doorkeeper.ca.yml * Update simple_form.ca.yml * fix syntax error for ca translation * fix syntax errors in ca translations Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/mastodon/locales/ca.json | 5 | ||||
-rw-r--r-- | app/javascript/mastodon/locales/defaultMessages.json | 63 |
2 files changed, 52 insertions, 16 deletions
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index af732921d..c4edf3058 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -9,7 +9,9 @@ "account.follows_you": "et segueix", "account.media": "Media", "account.mention": "Esmentar @{name}", + "account.moved_to": "{name} has moved to:", "account.mute": "Silenciar @{name}", + "account.mute_notifications": "Mute notifications from @{name}", "account.posts": "Publicacions", "account.report": "Informe @{name}", "account.requested": "Esperant aprovació", @@ -18,6 +20,7 @@ "account.unblock_domain": "Mostra {domain}", "account.unfollow": "Deixar de seguir", "account.unmute": "Treure silenci de @{name}", + "account.unmute_notifications": "Unmute notifications from @{name}", "account.view_full_profile": "Veure el perfil complet", "boost_modal.combo": "Pots premer {combo} per saltar-te això el proper cop", "bundle_column_error.body": "S'ha produït un error en carregar aquest component.", @@ -104,6 +107,7 @@ "loading_indicator.label": "Carregant...", "media_gallery.toggle_visible": "Alternar visibilitat", "missing_indicator.label": "No trobat", + "mute_modal.hide_notifications": "Hide notifications from this user?", "navigation_bar.blocks": "Usuaris bloquejats", "navigation_bar.community_timeline": "Línia de temps Local", "navigation_bar.edit_profile": "Editar perfil", @@ -204,6 +208,7 @@ "tabs_bar.home": "Inici", "tabs_bar.local_timeline": "Local", "tabs_bar.notifications": "Notificacions", + "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", "upload_area.title": "Arrossega i deixa anar per carregar", "upload_button.label": "Afegir multimèdia", "upload_form.description": "Descriure els problemes visuals", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index f400b283f..571a763b6 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -29,6 +29,14 @@ { "defaultMessage": "Unmute @{name}", "id": "account.unmute" + }, + { + "defaultMessage": "Mute notifications from @{name}", + "id": "account.mute_notifications" + }, + { + "defaultMessage": "Unmute notifications from @{name}", + "id": "account.unmute_notifications" } ], "path": "app/javascript/mastodon/components/account.json" @@ -284,16 +292,8 @@ "id": "confirmations.block.confirm" }, { - "defaultMessage": "Mute", - "id": "confirmations.mute.confirm" - }, - { "defaultMessage": "Are you sure you want to block {name}?", "id": "confirmations.block.message" - }, - { - "defaultMessage": "Are you sure you want to mute {name}?", - "id": "confirmations.mute.message" } ], "path": "app/javascript/mastodon/containers/status_container.json" @@ -310,6 +310,15 @@ { "descriptors": [ { + "defaultMessage": "{name} has moved to:", + "id": "account.moved_to" + } + ], + "path": "app/javascript/mastodon/features/account_timeline/components/moved_note.json" + }, + { + "descriptors": [ + { "defaultMessage": "Unfollow", "id": "confirmations.unfollow.confirm" }, @@ -318,10 +327,6 @@ "id": "confirmations.block.confirm" }, { - "defaultMessage": "Mute", - "id": "confirmations.mute.confirm" - }, - { "defaultMessage": "Hide entire domain", "id": "confirmations.domain_block.confirm" }, @@ -334,10 +339,6 @@ "id": "confirmations.block.message" }, { - "defaultMessage": "Are you sure you want to mute {name}?", - "id": "confirmations.mute.message" - }, - { "defaultMessage": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.", "id": "confirmations.domain_block.message" } @@ -1210,6 +1211,27 @@ { "descriptors": [ { + "defaultMessage": "Are you sure you want to mute {name}?", + "id": "confirmations.mute.message" + }, + { + "defaultMessage": "Hide notifications from this user?", + "id": "mute_modal.hide_notifications" + }, + { + "defaultMessage": "Cancel", + "id": "confirmation_modal.cancel" + }, + { + "defaultMessage": "Mute", + "id": "confirmations.mute.confirm" + } + ], + "path": "app/javascript/mastodon/features/ui/components/mute_modal.json" + }, + { + "descriptors": [ + { "defaultMessage": "Home", "id": "column.home" }, @@ -1362,6 +1384,15 @@ { "descriptors": [ { + "defaultMessage": "Your draft will be lost if you leave Mastodon.", + "id": "ui.beforeunload" + } + ], + "path": "app/javascript/mastodon/features/ui/index.json" + }, + { + "descriptors": [ + { "defaultMessage": "Play", "id": "video.play" }, |