Merge pull request #590 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 files changed, 26 insertions, 26 deletions

diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 747d09798..b0f9cd524 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -2,28 +2,28 @@
   "account.badges.bot": "Robot",
   "account.block": "Blokovat @{name}",
   "account.block_domain": "Skrýt vše z {domain}",
-  "account.blocked": "Blocked",
-  "account.direct": "Direct message @{name}",
-  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
-  "account.domain_blocked": "Domain hidden",
+  "account.blocked": "Blokován/a",
+  "account.direct": "Přímá zpráva pro uživatele @{name}",
+  "account.disclaimer_full": "Níže uvedené informace nemusejí zcela odrážet profil uživatele.",
+  "account.domain_blocked": "Doména skryta",
   "account.edit_profile": "Uprav profil",
   "account.follow": "Sleduj",
   "account.followers": "Sledovatelé",
   "account.follows": "Sleduje",
-  "account.follows_you": "Follows you",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.media": "Media",
-  "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
-  "account.mute": "Mute @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval. Click to cancel follow request",
-  "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Show boosts from @{name}",
+  "account.follows_you": "Sleduje vás",
+  "account.hide_reblogs": "Skrýt povýšení od uživatele @{name}",
+  "account.media": "Média",
+  "account.mention": "Zmínit uživatele @{name}",
+  "account.moved_to": "{name} se přesunul/a na:",
+  "account.mute": "Ignorovat uživatele @{name}",
+  "account.mute_notifications": "Skrýt oznámení od uživatele @{name}",
+  "account.muted": "Ztišen/a",
+  "account.posts": "Tooty",
+  "account.posts_with_replies": "Tooty s odpověďmi",
+  "account.report": "Nahlásit uživatele @{name}",
+  "account.requested": "Požadavek čeká na schválení. Kliknutím zrušíte požadavek o sledování",
+  "account.share": "Sdílet profil uživatele @{name}",
+  "account.show_reblogs": "Zobrazit povýšení od uživatele @{name}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Unfollow",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 37b5e73ee..90b88380a 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -166,7 +166,7 @@
   "navigation_bar.domain_blocks": "Skjulte domæner",
   "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.favourites": "Favoritter",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Dæmpede ord",
   "navigation_bar.follow_requests": "Følgeanmodninger",
   "navigation_bar.info": "Om denne instans",
   "navigation_bar.keyboard_shortcuts": "Hurtigtast",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index a34d7061d..447d68b3f 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -166,7 +166,7 @@
   "navigation_bar.domain_blocks": "Κρυφοί τομείς",
   "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
   "navigation_bar.favourites": "Αγαπημένα",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
   "navigation_bar.info": "Extended information",
   "navigation_bar.keyboard_shortcuts": "Συντομεύσεις",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index b20263df6..e16f9e2a0 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -166,7 +166,7 @@
   "navigation_bar.domain_blocks": "Domini nascosti",
   "navigation_bar.edit_profile": "Modifica profilo",
   "navigation_bar.favourites": "Apprezzati",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Parole silenziate",
   "navigation_bar.follow_requests": "Richieste di amicizia",
   "navigation_bar.info": "Informazioni estese",
   "navigation_bar.keyboard_shortcuts": "Tasti di scelta rapida",
@@ -288,7 +288,7 @@
   "tabs_bar.local_timeline": "Locale",
   "tabs_bar.notifications": "Notifiche",
   "tabs_bar.search": "Cerca",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {persona ne sta} other {persone ne stanno}} parlando",
   "ui.beforeunload": "La bozza andrà persa se esci da Mastodon.",
   "upload_area.title": "Trascina per caricare",
   "upload_button.label": "Aggiungi file multimediale",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 2461eaac2..eff880165 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -243,7 +243,7 @@
   "search_popout.tips.full_text": "Un tèxte simple que tòrna los estatuts qu’avètz escriches, mes en favorits, partejats, o ont sètz mencionat, e tanben los noms d’utilizaires, escais-noms e etiquetas que correspondonas.",
   "search_popout.tips.hashtag": "etiqueta",
   "search_popout.tips.status": "estatut",
-  "search_popout.tips.text": "Lo tèxt brut tòrna escais, noms d’utilizaire e etiquetas correspondents",
+  "search_popout.tips.text": "Lo tèxte brut tòrna escais, noms d’utilizaire e etiquetas correspondents",
   "search_popout.tips.user": "utilizaire",
   "search_results.accounts": "Gents",
   "search_results.hashtags": "Etiquetas",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index f05966c96..f820d9cf9 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -115,7 +115,7 @@
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rejeitar",
   "getting_started.developers": "Desenvolvedores",
-  "getting_started.documentation": "Documentation",
+  "getting_started.documentation": "Documentação",
   "getting_started.find_friends": "Encontre amizades do Twitter",
   "getting_started.heading": "Primeiros passos",
   "getting_started.invite": "Convide pessoas",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 66e312181..24ab1f83a 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -166,7 +166,7 @@
   "navigation_bar.domain_blocks": "Skryté domény",
   "navigation_bar.edit_profile": "Upraviť profil",
   "navigation_bar.favourites": "Obľúbené",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Utĺmené slová",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
   "navigation_bar.info": "O tomto Mastodon serveri",
   "navigation_bar.keyboard_shortcuts": "Klávesové skratky",
@@ -257,7 +257,7 @@
   "status.direct": "Súkromná správa @{name}",
   "status.embed": "Vložiť",
   "status.favourite": "Páči sa mi",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrované",
   "status.load_more": "Ukáž viac",
   "status.media_hidden": "Skryté médiá",
   "status.mention": "Spomeň @{name}",