Browse Source

Updating locale files

dariusk-working/4_4_0
Darius Kazemi 4 months ago
parent
commit
dfa0c9d603
  1. 6
      app/javascript/mastodon/locales/ar.json
  2. 4
      app/javascript/mastodon/locales/ast.json
  3. 4
      app/javascript/mastodon/locales/be.json
  4. 3
      app/javascript/mastodon/locales/ca.json
  5. 3
      app/javascript/mastodon/locales/cs.json
  6. 14
      app/javascript/mastodon/locales/cy.json
  7. 7
      app/javascript/mastodon/locales/da.json
  8. 12
      app/javascript/mastodon/locales/de.json
  9. 11
      app/javascript/mastodon/locales/el.json
  10. 5
      app/javascript/mastodon/locales/en-GB.json
  11. 3
      app/javascript/mastodon/locales/en.json
  12. 98
      app/javascript/mastodon/locales/eo.json
  13. 10
      app/javascript/mastodon/locales/es-MX.json
  14. 3
      app/javascript/mastodon/locales/es.json
  15. 3
      app/javascript/mastodon/locales/eu.json
  16. 21
      app/javascript/mastodon/locales/fa.json
  17. 3
      app/javascript/mastodon/locales/fi.json
  18. 6
      app/javascript/mastodon/locales/fr-CA.json
  19. 9
      app/javascript/mastodon/locales/fr.json
  20. 11
      app/javascript/mastodon/locales/fy.json
  21. 12
      app/javascript/mastodon/locales/gd.json
  22. 3
      app/javascript/mastodon/locales/gl.json
  23. 34
      app/javascript/mastodon/locales/he.json
  24. 11
      app/javascript/mastodon/locales/hu.json
  25. 11
      app/javascript/mastodon/locales/io.json
  26. 3
      app/javascript/mastodon/locales/is.json
  27. 8
      app/javascript/mastodon/locales/it.json
  28. 6
      app/javascript/mastodon/locales/ja.json
  29. 9
      app/javascript/mastodon/locales/ko.json
  30. 3
      app/javascript/mastodon/locales/lv.json
  31. 10
      app/javascript/mastodon/locales/nl.json
  32. 7
      app/javascript/mastodon/locales/no.json
  33. 13
      app/javascript/mastodon/locales/pl.json
  34. 8
      app/javascript/mastodon/locales/pt-BR.json
  35. 12
      app/javascript/mastodon/locales/pt-PT.json
  36. 12
      app/javascript/mastodon/locales/ru.json
  37. 40
      app/javascript/mastodon/locales/sc.json
  38. 3
      app/javascript/mastodon/locales/sk.json
  39. 8
      app/javascript/mastodon/locales/sq.json
  40. 3
      app/javascript/mastodon/locales/sv.json
  41. 3
      app/javascript/mastodon/locales/th.json
  42. 8
      app/javascript/mastodon/locales/tr.json
  43. 5
      app/javascript/mastodon/locales/uk.json
  44. 4
      app/javascript/mastodon/locales/vi.json
  45. 16
      app/javascript/mastodon/locales/zh-CN.json
  46. 3
      app/javascript/mastodon/locales/zh-TW.json

6
app/javascript/mastodon/locales/ar.json

@ -100,8 +100,6 @@
"alert.unexpected.message": "لقد طرأ خطأ غير متوقّع.",
"alert.unexpected.title": "المعذرة!",
"alt_text_badge.title": "نص بديل",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "أضف نصًا بديلًا",
"alt_text_modal.add_text_from_image": "أضف النص من الصورة",
"alt_text_modal.cancel": "إلغاء",
@ -109,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "قم بوصفها للأشخاص ذوي الإعاقة السمعية…",
"alt_text_modal.describe_for_people_with_visual_impairments": "قم بوصفها للأشخاص ذوي الإعاقة البصرية…",
"alt_text_modal.done": "تمّ",
>>>>>>> v4.4.0
"announcement.announcement": "إعلان",
"annual_report.summary.archetype.booster": "The cool-hunter",
"annual_report.summary.archetype.lurker": "المتصفح الصامت",
@ -344,19 +341,16 @@
"explore.trending_links": "المُستجدّات",
"explore.trending_statuses": "المنشورات",
"explore.trending_tags": ُسُوم",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow post to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this post only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, zero {}one {منشور معروض} two {منشور معروضَين} few {منشورات معروضة} many {منشورات معروضة} other {منشورات معروضة}}",
"featured_carousel.next": "التالي",
"featured_carousel.post": "منشور",
"featured_carousel.previous": "السابق",
"featured_carousel.slide": "{index} من {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "فئة عامل التصفية هذه لا تنطبق على السياق الذي وصلت فيه إلى هذه المشاركة. إذا كنت ترغب في تصفية المنشور في هذا السياق أيضا، فسيتعين عليك تعديل عامل التصفية.",
"filter_modal.added.context_mismatch_title": "عدم تطابق السياق!",
"filter_modal.added.expired_explanation": "انتهت صلاحية فئة عامل التصفية هذه، سوف تحتاج إلى تغيير تاريخ انتهاء الصلاحية لتطبيقها.",

4
app/javascript/mastodon/locales/ast.json

@ -215,16 +215,12 @@
"explore.trending_links": "Noticies",
"explore.trending_statuses": "Artículos",
"explore.trending_tags": "Etiquetes",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"filter_modal.added.context_mismatch_explanation": "Esta categoría de peñera nun s'aplica al contestu nel qu'accediesti a esti artículu. Si tamién quies que se peñere l'artículu nesti contestu, tienes d'editar la peñera.",
=======
"filter_modal.added.context_mismatch_explanation": "Esta categoría de peñera nun s'aplica al contestu nel qu'accediesti a esta publicación. Si tamién quies que se peñere la publicación nesti contestu, tienes d'editar la peñera.",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_title": "¡El contestu nun coincide!",
"filter_modal.added.expired_explanation": "Esta categoría de peñera caducó, tienes de camudar la so data de caducidá p'aplicala.",
"filter_modal.added.expired_title": "¡La peñera caducó!",

4
app/javascript/mastodon/locales/be.json

@ -82,12 +82,8 @@
"alert.rate_limited.title": "Ліміт перавышаны",
"alert.unexpected.message": "Узнікла нечаканая памылка.",
"alert.unexpected.title": "Вой!",
<<<<<<< HEAD
"alt_text_badge.title": "Альтернативный текст",
=======
"alt_text_badge.title": "Альтэрнатыўны тэкст",
"alt_text_modal.done": "Гатова",
>>>>>>> v4.4.0
"announcement.announcement": "Аб'ява",
"annual_report.summary.archetype.booster": "Трэнда-сьледнік",
"annual_report.summary.archetype.lurker": "Назіральнік",

3
app/javascript/mastodon/locales/ca.json

@ -334,19 +334,16 @@
"explore.trending_links": "Notícies",
"explore.trending_statuses": "Tuts",
"explore.trending_tags": "Etiquetes",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Publicació fixada} other {Publicacions fixades}}",
"featured_carousel.next": "Següent",
"featured_carousel.post": "Publicació",
"featured_carousel.previous": "Anterior",
"featured_carousel.slide": "{index} de {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Aquesta categoria de filtre no s'aplica al context en què has accedit a aquest tut. Si també vols que el tut es filtri en aquest context, hauràs d'editar el filtre.",
"filter_modal.added.context_mismatch_title": "El context no coincideix!",
"filter_modal.added.expired_explanation": "La categoria d'aquest filtre ha caducat, necessitaràs canviar la seva data de caducitat per a aplicar-la.",

3
app/javascript/mastodon/locales/cs.json

@ -341,19 +341,16 @@
"explore.trending_links": "Zprávy",
"explore.trending_statuses": "Příspěvky",
"explore.trending_tags": "Hashtagy",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {{counter} zvýrazněný příspěvek} few {{counter} zvýrazněné příspěvky} many {{counter} zvýrazněných příspěvků} other {{counter} zvýrazněných příspěvků}}",
"featured_carousel.next": "Další",
"featured_carousel.post": "Příspěvek",
"featured_carousel.previous": "Předchozí",
"featured_carousel.slide": "{index} z {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Tato kategorie filtrů se nevztahuje na kontext, ve kterém jste tento příspěvek otevřeli. Pokud chcete, aby byl příspěvek filtrován i v tomto kontextu, budete muset filtr upravit.",
"filter_modal.added.context_mismatch_title": "Kontext se neshoduje!",
"filter_modal.added.expired_explanation": "Tato kategorie filtrů vypršela, budete muset změnit datum vypršení platnosti, aby mohla být použita.",

14
app/javascript/mastodon/locales/cy.json

@ -99,9 +99,6 @@
"alert.rate_limited.title": "Cyfradd gyfyngedig",
"alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
"alert.unexpected.title": "Wps!",
<<<<<<< HEAD
"alt_text_badge.title": "Testun Amgen",
=======
"alt_text_badge.title": "Testun amgen",
"alt_text_modal.add_alt_text": "Ychwanegu testun amgen",
"alt_text_modal.add_text_from_image": "Ychwanegu testun o'r ddelwedd",
@ -110,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "Disgrifiwch hyn ar gyfer pobl â nam ar eu clyw…",
"alt_text_modal.describe_for_people_with_visual_impairments": "Disgrifiwch hyn ar gyfer pobl â nam ar eu golwg…",
"alt_text_modal.done": "Gorffen",
>>>>>>> v4.4.0
"announcement.announcement": "Cyhoeddiad",
"annual_report.summary.archetype.booster": "Y hyrwyddwr",
"annual_report.summary.archetype.lurker": "Y crwydryn",
@ -277,10 +273,7 @@
"domain_block_modal.they_cant_follow": "All neb o'r gweinydd hwn eich dilyn.",
"domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu blocio.",
"domain_block_modal.title": "Blocio parth?",
<<<<<<< HEAD
=======
"domain_block_modal.you_will_lose_num_followers": "Byddwch yn colli {followersCount, plural, one {{followersCountDisplay} dilynwr} other {{followersCountDisplay} dilynwyr}} a {followingCount, plural, one {{followingCountDisplay} person rydych yn dilyn} other {{followingCountDisplay} o bobl rydych yn eu dilyn}}.",
>>>>>>> v4.4.0
"domain_block_modal.you_will_lose_relationships": "Byddwch yn colli'r holl ddilynwyr a phobl rydych chi'n eu dilyn o'r gweinydd hwn.",
"domain_block_modal.you_wont_see_posts": "Fyddwch chi ddim yn gweld postiadau na hysbysiadau gan ddefnyddwyr ar y gweinydd hwn.",
"domain_pill.activitypub_lets_connect": "Mae'n caniatáu ichi gysylltu a rhyngweithio â phobl nid yn unig ar Mastodon, ond ar draws gwahanol apiau cymdeithasol hefyd.",
@ -348,21 +341,17 @@
"explore.trending_links": "Newyddion",
"explore.trending_statuses": "Postiadau",
"explore.trending_tags": "Hashnodau",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"filter_modal.added.context_mismatch_explanation": "Nid yw'r categori hidlo hwn yn berthnasol i'r cyd-destun yr ydych wedi cyrchu'r postiad hwn ynddo. Os ydych chi am i'r postiad gael ei hidlo yn y cyd-destun hwn hefyd, bydd yn rhaid i chi olygu'r hidlydd.",
=======
"featured_carousel.header": "{count, plural, one {Postiad wedi'i binio} other {Postiadau wedi'u pinio}}",
"featured_carousel.next": "Nesaf",
"featured_carousel.post": "Postiad",
"featured_carousel.previous": "Blaenorol",
"featured_carousel.slide": "{index} o {total}",
"filter_modal.added.context_mismatch_explanation": "Dyw'r categori hidlo hwn ddim yn berthnasol i'r cyd-destun yr ydych wedi cyrchu'r postiad hwn ynddo. Os ydych chi am i'r postiad gael ei hidlo yn y cyd-destun hwn hefyd, bydd yn rhaid i chi olygu'r hidlydd.",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_title": "Diffyg cyfatebiaeth cyd-destun!",
"filter_modal.added.expired_explanation": "Mae'r categori hidlydd hwn wedi dod i ben, bydd angen i chi newid y dyddiad dod i ben er mwyn iddo fod yn berthnasol.",
"filter_modal.added.expired_title": "Hidlydd wedi dod i ben!",
@ -943,7 +932,6 @@
"units.short.million": "{count}miliwn",
"units.short.thousand": "{count}mil",
"upload_area.title": "Llusgwch a gollwng i lwytho",
<<<<<<< HEAD
"upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_error.limit": "Wedi pasio'r uchafswm llwytho.",
"upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
@ -954,7 +942,6 @@
"upload_form.drag_and_drop.on_drag_end": "Cafodd atodiad cyfryngau {item} ei ollwng.",
"upload_form.drag_and_drop.on_drag_over": "Symudwyd atodiad cyfryngau {item}.",
"upload_form.drag_and_drop.on_drag_start": "Atodiad cyfryngau godwyd {item}.",
=======
"upload_button.label": "Ychwanegwch delweddau, fideo neu ffeil sain",
"upload_error.limit": "Wedi mynd heibio'r uchafswm llwytho.",
"upload_error.poll": "Does dim modd llwytho ffeiliau â phleidleisiau.",
@ -963,7 +950,6 @@
"upload_form.drag_and_drop.on_drag_end": "Cafodd atodiad cyfryngau {item} ei ollwng.",
"upload_form.drag_and_drop.on_drag_over": "Symudwyd atodiad cyfryngau {item}.",
"upload_form.drag_and_drop.on_drag_start": "Wedi codi atodiad cyfryngau {item}.",
>>>>>>> v4.4.0
"upload_form.edit": "Golygu",
"upload_progress.label": "Yn llwytho...",
"upload_progress.processing": "Wrthi'n prosesu…",

7
app/javascript/mastodon/locales/da.json

@ -341,19 +341,16 @@
"explore.trending_links": "Nyheder",
"explore.trending_statuses": "Indlæg",
"explore.trending_tags": "Hashtags",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Fastgjort indlæg} other {Fastgjorte indlæg}}",
"featured_carousel.next": "Næste",
"featured_carousel.post": "Indlæg",
"featured_carousel.previous": "Foregående",
"featured_carousel.slide": "{index} af {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Denne filterkategori omfatter ikke konteksten, hvorunder dette indlæg er tilgået. Redigér filteret, hvis indlægget også ønskes filtreret i denne kontekst.",
"filter_modal.added.context_mismatch_title": "Kontekstmisforhold!",
"filter_modal.added.expired_explanation": "Denne filterkategori er udløbet. Ændr dens udløbsdato, for at anvende den.",
@ -610,11 +607,7 @@
"notification.label.private_reply": "Privat svar",
"notification.label.reply": "Svar",
"notification.mention": "Omtale",
<<<<<<< HEAD
"notification.mentioned_you": "{name} nævnte dig",
=======
"notification.mentioned_you": "{name} omtalte dig",
>>>>>>> v4.4.0
"notification.moderation-warning.learn_more": "Læs mere",
"notification.moderation_warning": "Du har fået en moderationsadvarsel",
"notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",

12
app/javascript/mastodon/locales/de.json

@ -52,13 +52,8 @@
"account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
"account.in_memoriam": "Zum Andenken.",
"account.joined_short": "Mitglied seit",
<<<<<<< HEAD
"account.languages": "Ausgewählte Sprachen ändern",
"account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} bestätigt",
=======
"account.languages": "Sprache ändern.",
"account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} verifiziert",
>>>>>>> v4.4.0
"account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
"account.media": "Medien",
"account.mention": "@{name} erwähnen",
@ -346,19 +341,16 @@
"explore.trending_links": "Neuigkeiten",
"explore.trending_statuses": "Beiträge",
"explore.trending_tags": "Hashtags",
<<<<<<< HEAD
"federation.change": "Status-Föderation bearbeiten",
"federation.federated.long": "Status erlauben, andere Instanzen zu erreichen",
"federation.federated.short": "Föderiert",
"federation.local_only.long": "Status auf diese Instanz beschränken",
"federation.local_only.short": "Nur lokal",
=======
"featured_carousel.header": "{count, plural, one {Angehefteter Beitrag} other {Angeheftete Beiträge}}",
"featured_carousel.next": "Vor",
"featured_carousel.post": "Beitrag",
"featured_carousel.previous": "Zurück",
"featured_carousel.slide": "{index} von {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Diese Filterkategorie gilt nicht für den Kontext, in welchem du auf diesen Beitrag zugegriffen hast. Wenn der Beitrag auch in diesem Kontext gefiltert werden soll, musst du den Filter bearbeiten.",
"filter_modal.added.context_mismatch_title": "Kontext stimmt nicht überein!",
"filter_modal.added.expired_explanation": "Diese Filterkategorie ist abgelaufen. Du musst das Ablaufdatum für diese Kategorie ändern.",
@ -634,11 +626,7 @@
"notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
"notification.relationships_severance_event.learn_more": "Mehr erfahren",
"notification.relationships_severance_event.user_domain_block": "Du hast {target} blockiert – {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst, wurden entfernt.",
<<<<<<< HEAD
"notification.status": "{name} veröffentlichte gerade",
=======
"notification.status": "{name} postete …",
>>>>>>> v4.4.0
"notification.update": "{name} bearbeitete einen Beitrag",
"notification_requests.accept": "Akzeptieren",
"notification_requests.accept_multiple": "{count, plural, one {# Anfrage akzeptieren …} other {# Anfragen akzeptieren …}}",

11
app/javascript/mastodon/locales/el.json

@ -100,8 +100,6 @@
"alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
"alert.unexpected.title": "Ουπς!",
"alt_text_badge.title": "Εναλλακτικό κείμενο",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "Προσθήκη εναλλακτικού κειμένου",
"alt_text_modal.add_text_from_image": "Προσθήκη κειμένου από εικόνα",
"alt_text_modal.cancel": "Ακύρωση",
@ -109,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "Περιέγραψε αυτό για άτομα με προβλήματα ακοής…",
"alt_text_modal.describe_for_people_with_visual_impairments": "Περιέγραψε αυτό για άτομα με προβλήματα όρασης…",
"alt_text_modal.done": "Ολοκληρώθηκε",
>>>>>>> v4.4.0
"announcement.announcement": "Ανακοίνωση",
"annual_report.summary.archetype.booster": "Ο κυνηγός των φοβερών",
"annual_report.summary.archetype.lurker": "Ο διακριτικός",
@ -339,19 +336,16 @@
"explore.trending_links": "Νέα",
"explore.trending_statuses": "Αναρτήσεις",
"explore.trending_tags": "Ετικέτες",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Καρφιτσωμένη Ανάρτηση} other {Καρφιτσωμένες Αναρτήσεις}}",
"featured_carousel.next": "Επόμενο",
"featured_carousel.post": "Ανάρτηση",
"featured_carousel.previous": "Προηγούμενο",
"featured_carousel.slide": "{index} από {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Αυτή η κατηγορία φίλτρων δεν ισχύει για το περιεχόμενο εντός του οποίου προσπελάσατε αυτή την ανάρτηση. Αν θέλετε να φιλτραριστεί η ανάρτηση και εντός αυτού του πλαισίου, θα πρέπει να τροποποιήσετε το φίλτρο.",
"filter_modal.added.context_mismatch_title": "Ασυμφωνία περιεχομένου!",
"filter_modal.added.expired_explanation": "Αυτή η κατηγορία φίλτρων έχει λήξει, πρέπει να αλλάξετε την ημερομηνία λήξης για να ισχύσει.",
@ -935,11 +929,6 @@
"upload_button.label": "Πρόσθεσε εικόνες, ένα βίντεο ή ένα αρχείο ήχου",
"upload_error.limit": "Υπέρβαση ορίου μεγέθους ανεβασμένων αρχείων.",
"upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
<<<<<<< HEAD
"upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
"upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Για να επιλέξετε ένα συνημμένο αρχείο πολυμέσων, πατήστε το Space ή το Enter. Ενώ το σέρνετε, χρησιμοποιήστε τα πλήκτρα βέλους για να μετακινήσετε το συνημμένο αρχείο πολυμέσων προς οποιαδήποτε κατεύθυνση. Πατήστε ξανά το Space ή το Enter για να αποθέσετε το συνημμένο αρχείο πολυμέσων στη νέα του θέση ή πατήστε το Escape για ακύρωση.",
"upload_form.drag_and_drop.on_drag_cancel": "Η μετακίνηση ακυρώθηκε. Έγινε απόθεση του συνημμένου αρχείου πολυμέσων «{item}».",
"upload_form.drag_and_drop.on_drag_end": "Έγινε απόθεση του συνημμένου αρχείου πολυμέσων «{item}».",

5
app/javascript/mastodon/locales/en-GB.json

@ -906,11 +906,6 @@
"upload_button.label": "Add images, a video or an audio file",
"upload_error.limit": "File upload limit exceeded.",
"upload_error.poll": "File upload not allowed with polls.",
<<<<<<< HEAD
"upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
"upload_form.description": "Describe for people who are blind or have low vision",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "To pick up a media attachment, press space or enter. While dragging, use the arrow keys to move the media attachment in any given direction. Press space or enter again to drop the media attachment in its new position, or press escape to cancel.",
"upload_form.drag_and_drop.on_drag_cancel": "Dragging was cancelled. Media attachment {item} was dropped.",
"upload_form.drag_and_drop.on_drag_end": "Media attachment {item} was dropped.",

3
app/javascript/mastodon/locales/en.json

@ -341,19 +341,16 @@
"explore.trending_links": "News",
"explore.trending_statuses": "Posts",
"explore.trending_tags": "Hashtags",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow post to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this post only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
"featured_carousel.next": "Next",
"featured_carousel.post": "Post",
"featured_carousel.previous": "Previous",
"featured_carousel.slide": "{index} of {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
"filter_modal.added.context_mismatch_title": "Context mismatch!",
"filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",

98
app/javascript/mastodon/locales/eo.json

@ -26,12 +26,6 @@
"account.copy": "Kopii ligilon al profilo",
"account.direct": "Private mencii @{name}",
"account.disable_notifications": "Ĉesu sciigi min kiam @{name} afiŝas",
<<<<<<< HEAD
"account.domain_blocked": "Domajno blokita",
"account.edit_profile": "Redakti la profilon",
"account.enable_notifications": "Sciigu min kiam @{name} afiŝos",
"account.endorse": "Rekomendi ĉe via profilo",
=======
"account.domain_blocking": "Blokas domajnon",
"account.edit_profile": "Redakti la profilon",
"account.enable_notifications": "Sciigu min kiam @{name} afiŝos",
@ -39,7 +33,6 @@
"account.featured": "Montrita",
"account.featured.accounts": "Profiloj",
"account.featured.hashtags": "Kradvortoj",
>>>>>>> v4.4.0
"account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
"account.featured_tags.last_status_never": "Neniu afiŝo",
"account.follow": "Sekvi",
@ -71,10 +64,7 @@
"account.open_original_page": "Malfermi la originalan paĝon",
"account.posts": "Afiŝoj",
"account.posts_with_replies": "Afiŝoj kaj respondoj",
<<<<<<< HEAD
=======
"account.remove_from_followers": "Forigi {name}-n de sekvantoj",
>>>>>>> v4.4.0
"account.report": "Raporti @{name}",
"account.requested": "Atendo de aprobo. Klaku por nuligi la peton por sekvado",
"account.requested_follow": "{name} petis sekvi vin",
@ -87,13 +77,8 @@
"account.unblock_domain_short": "Malbloki",
"account.unblock_short": "Malbloki",
"account.unendorse": "Ne plu rekomendi ĉe la profilo",
<<<<<<< HEAD
"account.unfollow": "Ĉesi sekvi",
"account.unmute": "Ne plu silentigi @{name}",
=======
"account.unfollow": "Ne plu sekvi",
"account.unmute": "Malsilentigi @{name}",
>>>>>>> v4.4.0
"account.unmute_notifications_short": "Malsilentigu sciigojn",
"account.unmute_short": "Ne plu silentigi",
"account_note.placeholder": "Alklaku por aldoni noton",
@ -216,12 +201,7 @@
"compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
"compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
"compose_form.poll.type": "Stilo",
<<<<<<< HEAD
"compose_form.publish": "Afiŝo",
"compose_form.publish_form": "Nova afiŝo",
=======
"compose_form.publish": "Afiŝi",
>>>>>>> v4.4.0
"compose_form.reply": "Respondi",
"compose_form.save_changes": "Ĝisdatigi",
"compose_form.spoiler.marked": "Forigi la averton de enhavo",
@ -275,14 +255,7 @@
"disabled_account_banner.text": "Via konto {disabledAccount} estas nune malvalidigita.",
"dismissable_banner.community_timeline": "Jen la plej novaj publikaj afiŝoj de uzantoj, kies kontojn gastigas {domain}.",
"dismissable_banner.dismiss": "Eksigi",
<<<<<<< HEAD
"dismissable_banner.explore_links": "Tiuj novaĵoj estas aktuale priparolataj de uzantoj en tiu ĉi kaj aliaj serviloj, sur la malcentrigita reto.",
"dismissable_banner.explore_statuses": "Ĉi tiuj estas afiŝoj de la tuta socia reto, kiuj populariĝas hodiaŭ. Pli novaj afiŝoj kun pli da diskonigoj kaj plej ŝatataj estas rangigitaj pli alte.",
"dismissable_banner.explore_tags": "Ĉi tiuj kradvostoj populariĝas en ĉi tiu kaj aliaj serviloj en la malcentraliza reto nun.",
"dismissable_banner.public_timeline": "Ĉi tiuj estas la plej lastatempaj publikaj afiŝoj de homoj en la socia reto, kiujn homoj sur {domain} sekvas.",
=======
"dismissable_banner.public_timeline": "Ĉi tiuj estas la plej ĵusaj publikaj afiŝoj de homoj en la fediverso, kiujn la homoj en {domain} sekvas.",
>>>>>>> v4.4.0
"domain_block_modal.block": "Bloki servilon",
"domain_block_modal.block_account_instead": "Bloki @{name} anstataŭe",
"domain_block_modal.they_can_interact_with_old_posts": "Homoj de ĉi tiu servilo povas interagi kun viaj malnovaj afiŝoj.",
@ -355,17 +328,14 @@
"explore.trending_links": "Novaĵoj",
"explore.trending_statuses": "Afiŝoj",
"explore.trending_tags": "Kradvortoj",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.next": "Antaŭen",
"featured_carousel.post": "Afiŝi",
"featured_carousel.previous": "Malantaŭen",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Ĉi tiu filtrilkategorio ne kongruas kun la kunteksto en kiu vi akcesis ĉi tiun afiŝon. Se vi volas ke la afiŝo estas ankaŭ filtrita en ĉi tiu kunteksto, vi devus redakti la filtrilon.",
"filter_modal.added.context_mismatch_title": "Ne kongruas la kunteksto!",
"filter_modal.added.expired_explanation": "Ĉi tiu filtrilkategorio eksvalidiĝis, vu bezonos ŝanĝi la eksvaliddaton por ĝi.",
@ -382,11 +352,7 @@
"filter_modal.select_filter.subtitle": "Uzu ekzistantan kategorion aŭ kreu novan",
"filter_modal.select_filter.title": "Filtri ĉi tiun afiŝon",
"filter_modal.title.status": "Filtri afiŝon",
<<<<<<< HEAD
"filter_warning.matches_filter": "Filtrilo de kongruoj “{title}”",
=======
"filter_warning.matches_filter": "Filtrilo de kongruoj “<span>{title}</span>”",
>>>>>>> v4.4.0
"filtered_notifications_banner.pending_requests": "El {count, plural, =0 {neniu} one {unu persono} other {# homoj}} vi eble konas",
"filtered_notifications_banner.title": "Filtritaj sciigoj",
"firehose.all": "Ĉiuj",
@ -436,10 +402,7 @@
"hashtag.counter_by_accounts": "{count, plural,one {{counter} partoprenanto} other {{counter} partoprenantoj}}",
"hashtag.counter_by_uses": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}}",
"hashtag.counter_by_uses_today": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}} hodiaŭ",
<<<<<<< HEAD
=======
"hashtag.feature": "Prezenti en profilo",
>>>>>>> v4.4.0
"hashtag.follow": "Sekvi la kradvorton",
"hashtag.mute": "Silentigi #{hashtag}",
"hashtag.unfeature": "Ne prezenti en profilo",
@ -471,15 +434,6 @@
"ignore_notifications_modal.not_followers_title": "Ĉu ignori sciigojn de homoj, kiuj ne sekvas vin?",
"ignore_notifications_modal.not_following_title": "Ĉu ignori sciigojn de homoj, kiujn vi ne sekvas?",
"ignore_notifications_modal.private_mentions_title": "Ĉu ignori sciigojn de nepetitaj privataj mencioj?",
<<<<<<< HEAD
"interaction_modal.description.favourite": "Per konto ĉe Mastodon, vi povas stelumiti ĉi tiun afiŝon por sciigi la afiŝanton ke vi aprezigas ŝin kaj konservas por la estonteco.",
"interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povas sekvi {name} por ricevi iliajn afiŝojn en via hejma fluo.",
"interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
"interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu afiŝo.",
"interaction_modal.login.action": "Prenu min hejmen",
"interaction_modal.login.prompt": "Domajno de via hejma servilo, ekz. mastodon.social",
"interaction_modal.no_account_yet": "Ĉu ne estas ĉe Mastodon?",
=======
"info_button.label": "Helpo",
"info_button.what_is_alt_text": "<h1>Kio estas la alternativa teksto?</h1> <p>La alternativa teksto ofertas priskribojn de la bildoj por individuoj kun vidaj malfacilaĵoj, konektoj kun malalta larĝa bando aŭ kiuj serĉas plian kuntekston.</p> <p>Vi povas plibonigi alireblecon kaj komprenon por ĉiuj per skribado de klaraj, koncizaj, kaj objektivaj alternativaj tekstoj.</p><ul><li>Kaptu gravajn elementojn.</li><li> Resumu tekston en bildoj.</li> <li>Uzu regulan frazstrukturon.</li> <li>Evitu redundan informon.</li><li>Fokusu sur tendencoj kaj ĉefaj trovoj en kompleksaj visualoj (kiel diagramoj aŭ mapoj).</li></ul>",
"interaction_modal.action.favourite": "Por daŭrigi, vi devas stelumi el via konto.",
@ -489,7 +443,6 @@
"interaction_modal.action.vote": "Por daŭrigi, vi devas voĉdoni el via konto.",
"interaction_modal.go": "Iru",
"interaction_modal.no_account_yet": "Ĉu vi ankoraŭ ne havas konton?",
>>>>>>> v4.4.0
"interaction_modal.on_another_server": "En alia servilo",
"interaction_modal.on_this_server": "En ĉi tiu servilo",
"interaction_modal.title.favourite": "Stelumi la afiŝon de {name}",
@ -505,17 +458,10 @@
"keyboard_shortcuts.blocked": "Malfermi la liston de blokitaj uzantoj",
"keyboard_shortcuts.boost": "Diskonigi la mesaĝon",
"keyboard_shortcuts.column": "Fokusi kolumnon",
<<<<<<< HEAD
"keyboard_shortcuts.compose": "enfokusigi la tekstujon",
"keyboard_shortcuts.description": "Priskribo",
"keyboard_shortcuts.direct": "por malfermi la kolumnon pri privataj mencioj",
"keyboard_shortcuts.down": "iri suben en la listo",
=======
"keyboard_shortcuts.compose": "Enfokusigi la tekstaron",
"keyboard_shortcuts.description": "Priskribo",
"keyboard_shortcuts.direct": "por malfermi la kolumnon pri privataj mencioj",
"keyboard_shortcuts.down": "Movu malsupren en la listo",
>>>>>>> v4.4.0
"keyboard_shortcuts.enter": "Malfermi afiŝon",
"keyboard_shortcuts.favourite": "Stelumi afiŝon",
"keyboard_shortcuts.favourites": "Malfermi la liston de la stelumoj",
@ -523,27 +469,6 @@
"keyboard_shortcuts.heading": "Fulmoklavoj",
"keyboard_shortcuts.home": "Malfermi la hejman templinion",
"keyboard_shortcuts.hotkey": "Rapidklavo",
<<<<<<< HEAD
"keyboard_shortcuts.legend": "montri ĉi tiun noton",
"keyboard_shortcuts.local": "Malfermi la lokan templinion",
"keyboard_shortcuts.mention": "mencii la aŭtoron",
"keyboard_shortcuts.muted": "malfermi la liston de silentigitaj uzantoj",
"keyboard_shortcuts.my_profile": "malfermi vian profilon",
"keyboard_shortcuts.notifications": "malfermi la kolumnon de sciigoj",
"keyboard_shortcuts.open_media": "Malfermi plurmedion",
"keyboard_shortcuts.pinned": "Malfermu alpinglitajn afiŝojn-liston",
"keyboard_shortcuts.profile": "malfermi la profilon de la aŭtoro",
"keyboard_shortcuts.reply": "Respondu al afiŝo",
"keyboard_shortcuts.requests": "Malfermi la liston de petoj por sekvado",
"keyboard_shortcuts.search": "enfokusigi la serĉilon",
"keyboard_shortcuts.spoilers": "Montri/kaŝi la kampon de averto de enhavo (\"CW\")",
"keyboard_shortcuts.start": "malfermi la kolumnon «por komenci»",
"keyboard_shortcuts.toggle_hidden": "Montri/kaŝi tekston malantaŭ la averto de enhavo (\"CW\")",
"keyboard_shortcuts.toggle_sensitivity": "Montri/kaŝi plurmedion",
"keyboard_shortcuts.toot": "Komencu novan afiŝon",
"keyboard_shortcuts.unfocus": "malenfokusigi la tekstujon aŭ la serĉilon",
"keyboard_shortcuts.up": "iri supren en la listo",
=======
"keyboard_shortcuts.legend": "Montru ĉi tiun legendon",
"keyboard_shortcuts.local": "Malfermu la lokan templinion",
"keyboard_shortcuts.mention": "Menciu aŭtoron",
@ -564,7 +489,6 @@
"keyboard_shortcuts.translate": "Traduki afiŝon",
"keyboard_shortcuts.unfocus": "Senfokusigi verki tekstareon/serĉon",
"keyboard_shortcuts.up": "Movu supren en la listo",
>>>>>>> v4.4.0
"lightbox.close": "Fermi",
"lightbox.next": "Antaŭen",
"lightbox.previous": "Malantaŭen",
@ -618,14 +542,7 @@
"navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
"navigation_bar.blocks": "Blokitaj uzantoj",
"navigation_bar.bookmarks": "Legosignoj",
<<<<<<< HEAD
"navigation_bar.community_timeline": "Loka templinio",
"navigation_bar.compose": "Redakti novan afiŝon",
"navigation_bar.direct": "Privataj mencioj",
"navigation_bar.discover": "Malkovri",
=======
"navigation_bar.direct": "Privataj mencioj",
>>>>>>> v4.4.0
"navigation_bar.domain_blocks": "Blokitaj domajnoj",
"navigation_bar.favourites": "Stelumoj",
"navigation_bar.filters": "Silentigitaj vortoj",
@ -638,11 +555,6 @@
"navigation_bar.more": "Pli",
"navigation_bar.mutes": "Silentigitaj uzantoj",
"navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
<<<<<<< HEAD
"navigation_bar.personal": "Persone",
"navigation_bar.pins": "Alpinglitaj afiŝoj",
=======
>>>>>>> v4.4.0
"navigation_bar.preferences": "Preferoj",
"navigation_bar.search": "Serĉi",
"not_signed_in_indicator.not_signed_in": "Necesas saluti por aliri tiun rimedon.",
@ -906,15 +818,9 @@
"sign_in_banner.mastodon_is": "Mastodon estas la plej bona maniero resti ĝisdata pri aktualaĵoj.",
"sign_in_banner.sign_in": "Ensaluti",
"sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
<<<<<<< HEAD
"status.admin_account": "Malfermi fasadon de moderigado por @{name}",
"status.admin_domain": "Malfermu moderigan interfacon por {domain}",
"status.admin_status": "Malfermi ĉi tiun afiŝon en la kontrola interfaco",
=======
"status.admin_account": "Malfermi fasadon de la reguligado por @{name}",
"status.admin_domain": "Malfermi fasadon de la reguligado por {domain}",
"status.admin_status": "Malfermi ĉi tiun afiŝon en la fasado de la reguligado",
>>>>>>> v4.4.0
"status.block": "Bloki @{name}",
"status.bookmark": "Aldoni al la legosignoj",
"status.cancel_reblog_private": "Ne plu diskonigi",
@ -945,10 +851,6 @@
"status.mute_conversation": "Silentigi konversacion",
"status.open": "Pligrandigu ĉi tiun afiŝon",
"status.pin": "Alpingli al la profilo",
<<<<<<< HEAD
"status.pinned": "Alpinglita afiŝo",
=======
>>>>>>> v4.4.0
"status.read_more": "Legi pli",
"status.reblog": "Diskonigi",
"status.reblog_private": "Diskonigi kun la sama videbleco",

10
app/javascript/mastodon/locales/es-MX.json

@ -602,11 +602,7 @@
"notification.label.private_reply": "Respuesta privada",
"notification.label.reply": "Respuesta",
"notification.mention": "Mención",
<<<<<<< HEAD
"notification.mentioned_you": "{name} te ha mencionado",
=======
"notification.mentioned_you": "{name} te mencionó",
>>>>>>> v4.4.0
"notification.moderation-warning.learn_more": "Saber más",
"notification.moderation_warning": "Has recibido una advertencia de moderación",
"notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
@ -933,13 +929,7 @@
"upload_area.title": "Arrastra y suelta para subir",
"upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
"upload_error.limit": "Límite de subida de archivos excedido.",
<<<<<<< HEAD
"upload_error.poll": "Subida de archivos no permitida con encuestas.",
"upload_form.audio_description": "Describir para personas con problemas auditivos",
"upload_form.description": "Describir para los usuarios con dificultad visual",
=======
"upload_error.poll": "No se permite subir archivos con las encuestas.",
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Para recoger un archivo adjunto, pulsa la barra espaciadora o la tecla Intro. Mientras arrastras, usa las teclas de flecha para mover el archivo adjunto en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Intro para soltar el archivo adjunto en su nueva posición, o pulsa la tecla Escape para cancelar.",
"upload_form.drag_and_drop.on_drag_cancel": "Arrastre cancelado. El archivo adjunto {item} fue eliminado.",
"upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue eliminado.",

3
app/javascript/mastodon/locales/es.json

@ -341,19 +341,16 @@
"explore.trending_links": "Noticias",
"explore.trending_statuses": "Publicaciones",
"explore.trending_tags": "Etiquetas",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural,one {Publicación fijada} other {Publicaciones fijadas}}",
"featured_carousel.next": "Siguiente",
"featured_carousel.post": "Publicación",
"featured_carousel.previous": "Anterior",
"featured_carousel.slide": "{index} de {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
"filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
"filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",

3
app/javascript/mastodon/locales/eu.json

@ -331,18 +331,15 @@
"explore.trending_links": "Berriak",
"explore.trending_statuses": "Tutak",
"explore.trending_tags": "Traolak",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.next": "Hurrengoa",
"featured_carousel.post": "Argitaratu",
"featured_carousel.previous": "Aurrekoa",
"featured_carousel.slide": "{total}-tik {index}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Iragazki-kategoria hau ez zaio aplikatzen bidalketa honetara sartzeko erabili duzun testuinguruari. Bidalketa testuinguru horretan ere iragaztea nahi baduzu, iragazkia editatu beharko duzu.",
"filter_modal.added.context_mismatch_title": "Testuingurua ez dator bat!",
"filter_modal.added.expired_explanation": "Iragazki kategoria hau iraungi da, eragina izan dezan bere iraungitze-data aldatu beharko duzu.",

21
app/javascript/mastodon/locales/fa.json

@ -201,12 +201,7 @@
"compose_form.poll.duration": "مدت نظرسنجی",
"compose_form.poll.multiple": "چند گزینهای",
"compose_form.poll.option_placeholder": "گزینهٔ {number}",
<<<<<<< HEAD
"compose_form.poll.remove_option": "برداشتن این گزینه",
"compose_form.poll.single": "گزینش یکی",
=======
"compose_form.poll.single": "تک گزینهای",
>>>>>>> v4.4.0
"compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
"compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تکگزینهای",
"compose_form.poll.type": "سبک",
@ -233,17 +228,9 @@
"confirmations.discard_draft.post.title": "دور ریختن فرستهٔ پیشنویستان؟",
"confirmations.discard_edit_media.confirm": "دور انداختن",
"confirmations.discard_edit_media.message": "تغییرات ذخیره نشدهای در توضیحات یا پیشنمایش رسانه دارید. همگی نادیده گرفته شوند؟",
<<<<<<< HEAD
"confirmations.domain_block.confirm": "انسداد تمام دامنه",
"confirmations.domain_block.message": "آیا جدی جدی میخواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدود کردن یا خموشاندن چند حساب خاص کافی است و توصیه میشود. پس از این کار شما هیچ محتوایی را از این دامنه در خط زمانی عمومی یا آگاهیهایتان نخواهید دید. پیگیرانتان از این دامنه هم برداشته خواهند شد.",
"confirmations.edit.confirm": "ویرایش",
"confirmations.edit.message": "در صورت ویرایش، پیامی که در حال نوشتنش بودید از بین خواهد رفت. میخواهید ادامه دهید؟",
"confirmations.edit.title": "رونویسی فرسته؟",
=======
"confirmations.follow_to_list.confirm": "پیگیری و افزودن به سیاهه",
"confirmations.follow_to_list.message": "برای افزودن {name} به سیاهه باید پیش گرفته باشید.",
"confirmations.follow_to_list.title": "پیگیری کاربر؟",
>>>>>>> v4.4.0
"confirmations.logout.confirm": "خروج از حساب",
"confirmations.logout.message": "مطمئنید میخواهید خارج شوید؟",
"confirmations.logout.title": "خروج؟",
@ -354,19 +341,11 @@
"explore.trending_links": "اخبار",
"explore.trending_statuses": "فرستهها",
"explore.trending_tags": "برچسبها",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {فرسته سنجاقشده} other {فرستههای سنجاقشده}}",
"featured_carousel.next": "بعدی",
"featured_carousel.post": "فرسته",
"featured_carousel.previous": "قبلی",
"featured_carousel.slide": "{index} از {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "این دستهٔ پالایه به بافتاری که در آن به این فرسته دسترسی دارید اعمال نمیشود. اگر میخواهید فرسته در این بافتار هم پالوده شود، باید پالایه را ویرایش کنید.",
"filter_modal.added.context_mismatch_title": "بافتار نامطابق!",
"filter_modal.added.expired_explanation": "این دستهٔ پالایه منقضی شده است. برای اعمالش باید تاریخ انقضا را عوض کنید.",

3
app/javascript/mastodon/locales/fi.json

@ -342,19 +342,16 @@
"explore.trending_links": "Uutiset",
"explore.trending_statuses": "Julkaisut",
"explore.trending_tags": "Aihetunnisteet",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Kiinnitetty julkaisu} other {Kiinnitetyt julkaisut}}",
"featured_carousel.next": "Seuraava",
"featured_carousel.post": "Julkaisu",
"featured_carousel.previous": "Edellinen",
"featured_carousel.slide": "{index} / {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske asiayhteyttä, jossa olet tarkastellut tätä julkaisua. Jos haluat julkaisun suodatettavan myös tässä asiayhteydessä, muokkaa suodatinta.",
"filter_modal.added.context_mismatch_title": "Asiayhteys ei täsmää!",
"filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatusta käytettäisiin.",

6
app/javascript/mastodon/locales/fr-CA.json

@ -920,17 +920,11 @@
"upload_button.label": "Ajouter des images, une vidéo ou un fichier audio",
"upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
"upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
<<<<<<< HEAD
"upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
"upload_form.description": "Décrire pour les malvoyants",
"upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
=======
"upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
"upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
"upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
"upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
"upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.",
>>>>>>> v4.4.0
"upload_form.edit": "Modifier",
"upload_progress.label": "Envoi en cours...",
"upload_progress.processing": "Traitement en cours…",

9
app/javascript/mastodon/locales/fr.json

@ -341,18 +341,15 @@
"explore.trending_links": "Nouvelles",
"explore.trending_statuses": "Messages",
"explore.trending_tags": "Hashtags",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.next": "Suivant",
"featured_carousel.post": "Poste",
"featured_carousel.previous": "Précédent",
"featured_carousel.slide": "{index} de {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Cette catégorie de filtre ne s'applique pas au contexte dans lequel vous avez accédé à ce message. Si vous voulez que le message soit filtré dans ce contexte également, vous devrez modifier le filtre.",
"filter_modal.added.context_mismatch_title": "Incompatibilité du contexte !",
"filter_modal.added.expired_explanation": "Cette catégorie de filtre a expiré, vous devrez modifier la date d'expiration pour qu'elle soit appliquée.",
@ -929,17 +926,11 @@
"upload_button.label": "Ajouter des images, une vidéo ou un fichier audio",
"upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
"upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
<<<<<<< HEAD
"upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
"upload_form.description": "Décrire pour les malvoyant·e·s",
"upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
=======
"upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
"upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
"upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
"upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
"upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.",
>>>>>>> v4.4.0
"upload_form.edit": "Modifier",
"upload_progress.label": "Envoi en cours…",
"upload_progress.processing": "En cours…",

11
app/javascript/mastodon/locales/fy.json

@ -100,8 +100,6 @@
"alert.unexpected.message": "Der is in ûnferwachte flater bard.",
"alert.unexpected.title": "Oepsy!",
"alt_text_badge.title": "Alternative tekst",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "Alt-tekst tafoegje",
"alt_text_modal.add_text_from_image": "Tekst fan ôfbylding tafoegje",
"alt_text_modal.cancel": "Annulearje",
@ -109,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "Beskriuw dit foar dôven en hurdhearrige…",
"alt_text_modal.describe_for_people_with_visual_impairments": "Beskriuw dit foar blinen en fisueel beheinde…",
"alt_text_modal.done": "Klear",
>>>>>>> v4.4.0
"announcement.announcement": "Oankundiging",
"annual_report.summary.archetype.booster": "De cool-hunter",
"annual_report.summary.archetype.lurker": "De lurker",
@ -887,10 +884,7 @@
"status.reblogs.empty": "Net ien hat dit berjocht noch boost. Wannear’t ien dit docht, falt dat hjir te sjen.",
"status.redraft": "Fuortsmite en opnij opstelle",
"status.remove_bookmark": "Blêdwizer fuortsmite",
<<<<<<< HEAD
=======
"status.remove_favourite": "Ut favoriten fuortsmite",
>>>>>>> v4.4.0
"status.replied_in_thread": "Antwurde yn petear",
"status.replied_to": "Antwurde op {name}",
"status.reply": "Beäntwurdzje",
@ -933,11 +927,6 @@
"upload_button.label": "Ofbyldingen, in fideo- of in lûdsbestân tafoegje",
"upload_error.limit": "Oer de oplaadlimyt fan bestân.",
"upload_error.poll": "It opladen fan bestannen is yn enkêten net tastien.",
<<<<<<< HEAD
"upload_form.audio_description": "Describe for people with hearing loss",
"upload_form.description": "Describe for the visually impaired",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Druk op spaasje of Enter om in mediabylage op te pakken. Bruk de pylktoetsen om de bylage yn in bepaalde rjochting te ferpleatsen. Druk opnij op de spaasjebalke of Enter om de mediabylage op de nije posysje te pleatsen, of druk op Esc om te annulearjen.",
"upload_form.drag_and_drop.on_drag_cancel": "Slepen is annulearre. Mediabylage {item} is net ferpleatst.",
"upload_form.drag_and_drop.on_drag_end": "Mediabylage {item} is net ferpleatst.",

12
app/javascript/mastodon/locales/gd.json

@ -100,8 +100,6 @@
"alert.unexpected.message": "Thachair mearachd ris nach robh dùil.",
"alert.unexpected.title": "Oich!",
"alt_text_badge.title": "Roghainn teacsa",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "Cuir roghainn teacsa ris",
"alt_text_modal.add_text_from_image": "Cuir teacsa on dealbh ris",
"alt_text_modal.cancel": "Sguir dheth",
@ -109,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "Mìnich seo dhan fheadhainn air a bheil ciorram claisneachd…",
"alt_text_modal.describe_for_people_with_visual_impairments": "Mìnich seo dhan fheadhainn air a bheil cion-lèirsinne…",
"alt_text_modal.done": "Deiseil",
>>>>>>> v4.4.0
"announcement.announcement": "Brath-fios",
"annual_report.summary.archetype.booster": "Brosnaiche",
"annual_report.summary.archetype.lurker": "Eala-bhalbh",
@ -393,10 +390,6 @@
"footer.about": "Mu dhèidhinn",
"footer.directory": "Eòlaire nam pròifil",
"footer.get_app": "Faigh an aplacaid",
<<<<<<< HEAD
"footer.invite": "Thoir cuireadh",
=======
>>>>>>> v4.4.0
"footer.keyboard_shortcuts": "Ath-ghoiridean a’ mheur-chlàir",
"footer.privacy_policy": "Poileasaidh prìobhaideachd",
"footer.source_code": "Seall am bun-tùs",
@ -937,11 +930,6 @@
"upload_button.label": "Cuir ris dealbhan, video no faidhle fuaime",
"upload_error.limit": "Luchdaich thu suas na tha ceadaichte dhut a dh’fhaidhlichean mu thràth.",
"upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
<<<<<<< HEAD
"upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
"upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Airson ceanglachan meadhain a thogail, brùth air space no enter. Fhad ’ a bhios tu ’ga shlaodadh, cleachd na h-iuchraichean-saighde airson an ceanglachan meadhain a ghluasad gu comhair sam bith. Brùth air space no enter a-rithist airson an ceanglachen meadhain a leigeil às air an ionad ùr aige no brùth air escape airson sgur dheth.",
"upload_form.drag_and_drop.on_drag_cancel": "Chaidh sgur dhen t-slaodadh. Chaidh an ceanglachan meadhain {item} a leigeil às.",
"upload_form.drag_and_drop.on_drag_end": "Chaidh an ceanglachan meadhain {item} a leigeil às.",

3
app/javascript/mastodon/locales/gl.json

@ -341,19 +341,16 @@
"explore.trending_links": "Novas",
"explore.trending_statuses": "Publicacións",
"explore.trending_tags": "Cancelos",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Publicación fixada} other {Publicacións fixadas}}",
"featured_carousel.next": "Seguinte",
"featured_carousel.post": "Publicación",
"featured_carousel.previous": "Anterior",
"featured_carousel.slide": "{index} de {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro non se aplica ao contexto no que accedeches a esta publicación. Se queres que a publicación se filtre nese contexto tamén, terás que editar o filtro.",
"filter_modal.added.context_mismatch_title": "Non concorda o contexto!",
"filter_modal.added.expired_explanation": "Esta categoría de filtro caducou, terás que cambiar a data de caducidade para que se aplique.",

34
app/javascript/mastodon/locales/he.json

@ -1,9 +1,5 @@
{
<<<<<<< HEAD
"about.blocks": "שרתים מוגבלים",
=======
"about.blocks": "שרתים תחת פיקוח תוכן",
>>>>>>> v4.4.0
"about.contact": "יצירת קשר:",
"about.default_locale": "ברירת המחדל",
"about.disclaimer": "מסטודון היא תוכנת קוד פתוח חינמית וסימן מסחרי של Mastodon gGmbH.",
@ -47,10 +43,7 @@
"account.followers": "עוקבים",
"account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
"account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
<<<<<<< HEAD
=======
"account.followers_you_know_counter": "{counter} שמוכרים לך",
>>>>>>> v4.4.0
"account.following": "נעקבים",
"account.following_counter": "{count, plural,one {עוקב אחרי {count}}other {עוקב אחרי {counter}}}",
"account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
@ -107,8 +100,6 @@
"alert.unexpected.message": "אירעה שגיאה בלתי צפויה.",
"alert.unexpected.title": "אופס!",
"alt_text_badge.title": "כיתוב חלופי",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "הוספת מלל חלופי",
"alt_text_modal.add_text_from_image": "הוספת מלל מתוך התמונה",
"alt_text_modal.cancel": "ביטול",
@ -116,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "תיאור התוכן לכבדי שמיעה…",
"alt_text_modal.describe_for_people_with_visual_impairments": "תיאור התוכן לפגועי ראיה…",
"alt_text_modal.done": "סיום",
>>>>>>> v4.4.0
"announcement.announcement": "הכרזה",
"annual_report.summary.archetype.booster": "ההד-וניסט(ית)",
"annual_report.summary.archetype.lurker": "השורץ.ת השקט.ה",
@ -351,16 +341,11 @@
"explore.trending_links": "חדשות",
"explore.trending_statuses": "הודעות",
"explore.trending_tags": "תגיות",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {הודעה אחת נעוצה} two {הודעותיים נעוצות} many {הודעות נעוצות} other {הודעות נעוצות}}",
"featured_carousel.next": "הבא",
"featured_carousel.post": "הודעה",
"featured_carousel.previous": "הקודם",
"featured_carousel.slide": "{index} מתוך {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "קטגוריית המסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.",
"filter_modal.added.context_mismatch_title": "אין התאמה להקשר!",
"filter_modal.added.expired_explanation": "פג תוקפה של קטגוריית הסינון הזו, יש צורך לשנות את תאריך התפוגה כדי שהסינון יוחל.",
@ -427,10 +412,7 @@
"hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{counter} משתתפיםות}}",
"hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
"hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}} היום",
<<<<<<< HEAD
=======
"hashtag.feature": "מובלט בפרופיל",
>>>>>>> v4.4.0
"hashtag.follow": "לעקוב אחרי תגית",
"hashtag.mute": "להשתיק את #{hashtag}",
"hashtag.unfeature": "לא להבליט בפרופיל",
@ -528,17 +510,12 @@
"link_preview.author": "מאת {name}",
"link_preview.more_from_author": "עוד מאת {name}",
"link_preview.shares": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
<<<<<<< HEAD
"lists.account.add": "הוסף לרשימה",
"lists.account.remove": "הסר מרשימה",
=======
"lists.add_member": "הוספה",
"lists.add_to_list": "הוספה לרשימה",
"lists.add_to_lists": "הוספת {name} לרשימות",
"lists.create": "יצירה",
"lists.create_a_list_to_organize": "יצירת רשימה חדשה לארגון פיד הבית שלך",
"lists.create_list": "יצירת רשימה",
>>>>>>> v4.4.0
"lists.delete": "מחיקת רשימה",
"lists.done": "בוצע",
"lists.edit": "עריכת רשימה",
@ -954,11 +931,6 @@
"upload_button.label": "הוספת מדיה",
"upload_error.limit": "קובץ להעלאה חורג מנפח מותר.",
"upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
<<<<<<< HEAD
"upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
"upload_form.description": "תיאור לכבדי ראיה",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "כדי לבחור קובץ מוצמד, יש ללחוץ על מקש רווח או אנטר. בעת הגרירה, השתמשו במקשי החיצים כדי להזיז את הקובץ המוצמד בכל כיוון. לחצו רווח או אנטר בשנית כדי לעזוב את הקובץ במקומו החדש, או לחצו אסקייפ לביטול.",
"upload_form.drag_and_drop.on_drag_cancel": "הגרירה בוטלה. קובץ המדיה {item} נעזב.",
"upload_form.drag_and_drop.on_drag_end": "קובץ המדיה {item} נעזב.",

11
app/javascript/mastodon/locales/hu.json

@ -100,8 +100,6 @@
"alert.unexpected.message": "Váratlan hiba történt.",
"alert.unexpected.title": "Hoppá!",
"alt_text_badge.title": "Helyettesítő szöveg",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "Helyettesítő szöveg hozzáadása",
"alt_text_modal.add_text_from_image": "Szöveg hozzáadása a képből",
"alt_text_modal.cancel": "Mégse",
@ -109,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "Írd le a hallássérültek számára…",
"alt_text_modal.describe_for_people_with_visual_impairments": "Írd le a látássérültek számára…",
"alt_text_modal.done": "Kész",
>>>>>>> v4.4.0
"announcement.announcement": "Közlemény",
"annual_report.summary.archetype.booster": "A cool-vadász",
"annual_report.summary.archetype.lurker": "A settenkedő",
@ -344,19 +341,16 @@
"explore.trending_links": "Hírek",
"explore.trending_statuses": "Bejegyzések",
"explore.trending_tags": "Hashtagek",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Kiemelt bejegyzés} other {Kiemelt bejegyzések}}",
"featured_carousel.next": "Következő",
"featured_carousel.post": "Bejegyzés",
"featured_carousel.previous": "Előző",
"featured_carousel.slide": "{index} / {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Ez a szűrőkategória nem érvényes abban a környezetben, amelyből elérted ezt a bejegyzést. Ha ebben a környezetben is szűrni szeretnéd a bejegyzést, akkor szerkesztened kell a szűrőt.",
"filter_modal.added.context_mismatch_title": "Környezeti eltérés.",
"filter_modal.added.expired_explanation": "Ez a szűrőkategória elévült, a használatához módosítanod kell az elévülési dátumot.",
@ -942,11 +936,6 @@
"upload_button.label": "Képek, videó vagy audiófájl hozzáadása",
"upload_error.limit": "A fájlfeltöltési korlát elérésre került.",
"upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
<<<<<<< HEAD
"upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára",
"upload_form.description": "Leírás vak vagy gyengénlátó emberek számára",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Egy médiamelléklet kiválasztásához nyomj Szóközt vagy Entert. Húzás közben használd a nyílgombokat a médiamelléklet adott irányba történő mozgatásához. A médiamelléklet új pozícióba helyezéséhez nyomd meg a Szóközt vagy az Entert, vagy a megszakításhoz nyomd meg az Esc gombot.",
"upload_form.drag_and_drop.on_drag_cancel": "Az áthúzás megszakítva. A(z) {item} médiamelléklet el lett dobva.",
"upload_form.drag_and_drop.on_drag_end": "A(z) {item} médiamelléklet el lett dobva.",

11
app/javascript/mastodon/locales/io.json

@ -310,16 +310,12 @@
"explore.trending_links": "Novaji",
"explore.trending_statuses": "Posti",
"explore.trending_tags": "Hashtagi",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"filter_modal.added.context_mismatch_explanation": "Ca filtrilgrupo ne relatesas kun informo de ca acesesita posto. Se vu volas posto filtresar kun ca informo anke, vu bezonas modifikar filtrilo.",
=======
"filter_modal.added.context_mismatch_explanation": "Ca filtrilgrupo ne uzesis ad informo di ca adirita afisho.",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_title": "Kontenajneparigeso!",
"filter_modal.added.expired_explanation": "Ca filtrilgrupo expiris, vu bezonas chanjar expirtempo por apliko.",
"filter_modal.added.expired_title": "Expirinta filtrilo!",
@ -815,14 +811,9 @@
"status.favourites": "{count, plural, one {stelumo} other {stelumi}}",
"status.filter": "Filtragez ca posto",
"status.history.created": "{name} kreis ye {date}",
<<<<<<< HEAD
"status.history.edited": "{name} modifikis ye {date}",
"status.load_more": "Kargar pluse",
"status.local_only": "This post is only visible by other users of your instance",
=======
"status.history.edited": "{name} redaktis ye {date}",
"status.load_more": "Kargar plu",
>>>>>>> v4.4.0
"status.local_only": "This post is only visible by other users of your instance",
"status.media.open": "Klikez por apertar",
"status.media.show": "Klikez por montrar",
"status.media_hidden": "Audvidaji es celita",

3
app/javascript/mastodon/locales/is.json

@ -100,8 +100,6 @@
"alert.unexpected.message": "Upp kom óvænt villa.",
"alert.unexpected.title": "Úbbs!",
"alt_text_badge.title": "Hjálpartexti mynda",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "Bæta við hjálpartexta",
"alt_text_modal.add_text_from_image": "Bæta við texta úr mynd",
"alt_text_modal.cancel": "Hætta við",
@ -109,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "Lýstu þessu fyrir fólk með skerta heyrn…",
"alt_text_modal.describe_for_people_with_visual_impairments": "Lýstu þessu fyrir fólk með skerta sjón…",
"alt_text_modal.done": "Lokið",
>>>>>>> v4.4.0
"announcement.announcement": "Auglýsing",
"annual_report.summary.archetype.booster": "Svali gaurinn",
"annual_report.summary.archetype.lurker": "Lurkurinn",

8
app/javascript/mastodon/locales/it.json

@ -341,19 +341,16 @@
"explore.trending_links": "Notizie",
"explore.trending_statuses": "Post",
"explore.trending_tags": "Hashtag",
<<<<<<< HEAD
"federation.change": "Modifica federazione del post",
"federation.federated.long": "Consentirà ad altri server di pubblicare questo post",
"federation.federated.short": "Federazione",
"federation.local_only.long": "Questo post pubblicherà solo sul tuo server",
"federation.local_only.short": "Solo Locale",
=======
"featured_carousel.header": "{count, plural, one {Post appuntato} other {Post appuntati}}",
"featured_carousel.next": "Successivo",
"featured_carousel.post": "Post",
"featured_carousel.previous": "Precedente",
"featured_carousel.slide": "{index} di {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "La categoria di questo filtro non si applica al contesto in cui hai acceduto a questo post. Se desideri che il post sia filtrato anche in questo contesto, dovrai modificare il filtro.",
"filter_modal.added.context_mismatch_title": "Contesto non corrispondente!",
"filter_modal.added.expired_explanation": "La categoria di questo filtro è scaduta, dovrvai modificarne la data di scadenza per applicarlo.",
@ -939,11 +936,6 @@
"upload_button.label": "Aggiungi un file immagine, video o audio",
"upload_error.limit": "Limite di caricamento dei file superato.",
"upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
<<<<<<< HEAD
"upload_form.audio_description": "Descrizione per persone con deficit uditivi",
"upload_form.description": "Descrizione per ipovedenti",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Per selezionare un allegato multimediale, premi Spazio o Invio. Mentre trascini, usa i tasti con le frecce per spostare l'allegato multimediale in una qualsiasi direzione. Premi di nuovo Spazio o Invio per rilasciare l'allegato multimediale nella sua nuova posizione, oppure premi Esc per annullare.",
"upload_form.drag_and_drop.on_drag_cancel": "Il trascinamento è stato annullato. L'allegato multimediale {item} è stato eliminato.",
"upload_form.drag_and_drop.on_drag_end": "L'allegato multimediale {item} è stato eliminato.",

6
app/javascript/mastodon/locales/ja.json

@ -100,8 +100,6 @@
"alert.unexpected.message": "不明なエラーが発生しました。",
"alert.unexpected.title": "エラー!",
"alt_text_badge.title": "代替テキスト",
<<<<<<< HEAD
=======
"alt_text_modal.add_alt_text": "代替テキストを追加",
"alt_text_modal.add_text_from_image": "画像からテキストを追加",
"alt_text_modal.cancel": "キャンセル",
@ -109,7 +107,6 @@
"alt_text_modal.describe_for_people_with_hearing_impairments": "耳の不自由な方のために説明してください…",
"alt_text_modal.describe_for_people_with_visual_impairments": "目が不自由な方のために説明してください…",
"alt_text_modal.done": "完了",
>>>>>>> v4.4.0
"announcement.announcement": "お知らせ",
"annual_report.summary.archetype.booster": "トレンドハンター",
"annual_report.summary.archetype.lurker": "ROM専",
@ -336,18 +333,15 @@
"explore.trending_links": "ニュース",
"explore.trending_statuses": "投稿",
"explore.trending_tags": "ハッシュタグ",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.next": "次へ",
"featured_carousel.post": "投稿",
"featured_carousel.previous": "前へ",
"featured_carousel.slide": "{index} / {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "このフィルターカテゴリーはあなたがアクセスした投稿のコンテキストには適用されません。この投稿のコンテキストでもフィルターを適用するにはフィルターを編集する必要があります。",
"filter_modal.added.context_mismatch_title": "コンテキストが一致しません!",
"filter_modal.added.expired_explanation": "このフィルターカテゴリーは有効期限が切れています。適用するには有効期限を更新してください。",

9
app/javascript/mastodon/locales/ko.json

@ -341,19 +341,16 @@
"explore.trending_links": "소식",
"explore.trending_statuses": "게시물",
"explore.trending_tags": "해시태그",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, other {고정된 게시물}}",
"featured_carousel.next": "다음",
"featured_carousel.post": "게시물",
"featured_carousel.previous": "이전",
"featured_carousel.slide": "{total} 중 {index}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "이 필터 카테고리는 당신이 이 게시물에 접근한 문맥에 적용되지 않습니다. 만약 이 문맥에서도 필터되길 원한다면, 필터를 수정해야 합니다.",
"filter_modal.added.context_mismatch_title": "문맥 불일치!",
"filter_modal.added.expired_explanation": "이 필터 카테고리는 만료되었습니다, 적용하려면 만료 일자를 변경할 필요가 있습니다.",
@ -870,12 +867,8 @@
"status.filter": "이 게시물을 필터",
"status.history.created": "{name} 님이 {date}에 게시함",
"status.history.edited": "{name} 님이 {date}에 수정함",
<<<<<<< HEAD
"status.load_more": "더 보기",
"status.local_only": "This post is only visible by other users of your instance",
=======
"status.load_more": "더보기",
>>>>>>> v4.4.0
"status.local_only": "This post is only visible by other users of your instance",
"status.media.open": "클릭하여 열기",
"status.media.show": "클릭하여 보기",
"status.media_hidden": "미디어 숨겨짐",

3
app/javascript/mastodon/locales/lv.json

@ -316,17 +316,14 @@
"explore.trending_links": "Jaunumi",
"explore.trending_statuses": "Ieraksti",
"explore.trending_tags": "Tēmturi",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.next": "Tālāk",
"featured_carousel.previous": "Atpakaļ",
"featured_carousel.slide": "{index} / {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Šī atlases kategorija neattiecas uz kontekstu, kurā esi piekļuvis šim ierakstam. Ja vēlies, lai ieraksts tiktu atlasīts arī šajā kontekstā, Tev būs jālabo atlase.",
"filter_modal.added.context_mismatch_title": "Konteksta neatbilstība!",
"filter_modal.added.expired_explanation": "Šai atlases kategorijai ir beidzies derīguma termiņš. Lai to lietotu, Tev būs jāmaina derīguma termiņš.",

10
app/javascript/mastodon/locales/nl.json

@ -341,19 +341,16 @@
"explore.trending_links": "Nieuws",
"explore.trending_statuses": "Berichten",
"explore.trending_tags": "Hashtags",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Vastgezet bericht} other {Vastgezette berichten}}",
"featured_carousel.next": "Volgende",
"featured_carousel.post": "Bericht",
"featured_carousel.previous": "Vorige",
"featured_carousel.slide": "{index} van {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Deze filtercategorie is niet van toepassing op de context waarin je dit bericht hebt benaderd. Als je wilt dat het bericht ook in deze context wordt gefilterd, moet je het filter bewerken.",
"filter_modal.added.context_mismatch_title": "Context komt niet overeen!",
"filter_modal.added.expired_explanation": "Deze filtercategorie is verlopen. Je moet de vervaldatum wijzigen om de categorie toe te kunnen passen.",
@ -595,12 +592,6 @@
"notification.admin.report_statuses_other": "{name} rapporteerde {target}",
"notification.admin.sign_up": "{name} heeft zich geregistreerd",
"notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben zich geregistreerd",
<<<<<<< HEAD
"notification.favourite": "{name} markeerde jouw bericht als favoriet",
"notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht als favoriet gemarkeerd",
"notification.follow": "{name} volgt jou nu",
"notification.follow.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben je gevolgd",
=======
"notification.annual_report.message": "Jouw {year} #Wrapstodon staat klaar! Laat de hoogtepunten en memorabele momenten van jouw jaar zien op Mastodon!",
"notification.annual_report.view": "#Wrapstodon bekijken",
"notification.favourite": "{name} markeerde jouw bericht als favoriet",
@ -609,7 +600,6 @@
"notification.favourite_pm.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben je privébericht als favoriet gemarkeerd",
"notification.follow": "{name} volgt jou nu",
"notification.follow.name_and_others": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> volgen jou nou",
>>>>>>> v4.4.0
"notification.follow_request": "{name} wil jou graag volgen",
"notification.follow_request.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben gevraagd om je te volgen",
"notification.label.mention": "Vermelding",

7
app/javascript/mastodon/locales/no.json

@ -334,19 +334,16 @@
"explore.trending_links": "Nyheter",
"explore.trending_statuses": "Innlegg",
"explore.trending_tags": "Emneknagger",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {{counter} festet innlegg} other {{counter} festede innlegg}}",
"featured_carousel.next": "Neste",
"featured_carousel.post": "Innlegg",
"featured_carousel.previous": "Forrige",
"featured_carousel.slide": "{index} av {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Denne filterkategorien gjelder ikke for den konteksten du har åpnet dette innlegget i. Hvis du vil at innlegget skal filtreres i denne konteksten også, må du redigere filteret.",
"filter_modal.added.context_mismatch_title": "Feil sammenheng!",
"filter_modal.added.expired_explanation": "Denne filterkategorien er utløpt, du må endre utløpsdato for at den skal gjelde.",
@ -616,9 +613,6 @@
"notification.relationships_severance_event.user_domain_block": "Du har blokkert {target} og fjernet {followersCount} av følgerne dine og {followingCount, plural, one {# konto} other {# kontoer}} du følger.",
"notification.status": "{name} la nettopp ut",
"notification.update": "{name} redigerte et innlegg",
<<<<<<< HEAD
"notification_requests.minimize_banner": "Minimer banneret for filtrerte varsler",
=======
"notification_requests.accept": "Aksepter",
"notification_requests.accept_multiple": "{count, plural, one {Aksepter # forespørsel…} other {Aksepter # forespørsler…}}",
"notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aksepter forespørsel} other {Aksepter forespørsler}}",
@ -631,7 +625,6 @@
"notification_requests.minimize_banner": "Minimer banneret for filtrerte varsler",
"notification_requests.notifications_from": "Varsler fra {name}",
"notification_requests.title": "Filtrerte varlser",
>>>>>>> v4.4.0
"notification_requests.view": "Vis varsler",
"notifications.clear": "Fjern varsler",
"notifications.clear_confirmation": "Er du sikker på at du vil fjerne alle dine varsler permanent?",

13
app/javascript/mastodon/locales/pl.json

@ -310,26 +310,17 @@
"explore.trending_links": "Aktualności",
"explore.trending_statuses": "Wpisy",
"explore.trending_tags": "Hasztagi",
<<<<<<< HEAD
"federation.change": "Dostosuj federację wpisu",
"federation.federated.long": "Pozwól, aby wpis trafiał na inne instancje",
"federation.federated.short": "Sfederowany",
"federation.local_only.long": "Ogranicz ten wpis tylko do tej instancji",
"federation.local_only.short": "Tylko lokalny",
"filter_modal.added.context_mismatch_explanation": "Ta kategoria filtrów nie ma zastosowania do kontekstu, w którym uzyskałeś dostęp do tego wpisu. Jeśli chcesz, aby wpis został przefiltrowany również w tym kontekście, będziesz musiał edytować filtr.",
"filter_modal.added.context_mismatch_title": "Niezgodność kontekstów!",
"filter_modal.added.expired_explanation": "Ta kategoria filtra wygasła, będziesz musiał zmienić datę wygaśnięcia, aby ją zastosować.",
"filter_modal.added.expired_title": "Wygasły filtr!",
"filter_modal.added.review_and_configure": "Aby przejrzeć i skonfigurować tę kategorię filtrów, przejdź do {settings_link}.",
"filter_modal.added.review_and_configure_title": "Ustawienia filtra",
=======
"filter_modal.added.context_mismatch_explanation": "To filtrowanie nie dotyczy kategorii, w której pojawił się ten wpis. Jeśli chcesz, aby wpis był filtrowany również w tym kontekście, musisz edytować ustawienia filtrowania.",
"filter_modal.added.context_mismatch_title": "Niewłaściwy kontekst!",
"filter_modal.added.expired_explanation": "Ta kategoria filtrowania wygasła, aby ją zastosować, należy zmienić datę wygaśnięcia.",
"filter_modal.added.expired_title": "Filtr wygasł!",
"filter_modal.added.review_and_configure": "Aby przejrzeć i skonfigurować tę kategorię filtrowania, przejdź do {settings_link}.",
"filter_modal.added.review_and_configure_title": "Ustawienia filtrowania",
>>>>>>> v4.4.0
"filter_modal.added.settings_link": "strona ustawień",
"filter_modal.added.short_explanation": "Ten wpis został dodany do następującej kategorii filtrowania: {title}.",
"filter_modal.added.title": "Filtrowanie zostało dodane!",
@ -562,11 +553,7 @@
"notification.label.private_reply": "Komentarz bezpośredni",
"notification.label.reply": "Komentarz",
"notification.mention": "Wzmianka",
<<<<<<< HEAD
"notification.mentioned_you": "{name} wspomniał(a) o Tobie",
=======
"notification.mentioned_you": "{name} wzmiankuje cię",
>>>>>>> v4.4.0
"notification.moderation-warning.learn_more": "Dowiedz się więcej",
"notification.moderation_warning": "Otrzymano ostrzeżenie",
"notification.moderation_warning.action_delete_statuses": "Usunięto niektóre z twoich wpisów.",

8
app/javascript/mastodon/locales/pt-BR.json

@ -868,10 +868,7 @@
"status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
"status.redraft": "Excluir e rascunhar",
"status.remove_bookmark": "Remover do Salvos",
<<<<<<< HEAD
=======
"status.remove_favourite": "Remover dos favoritos",
>>>>>>> v4.4.0
"status.replied_in_thread": "Respondido na conversa",
"status.replied_to": "Em resposta a {name}",
"status.reply": "Responder",
@ -911,11 +908,6 @@
"upload_button.label": "Adicionar mídia",
"upload_error.limit": "Limite de anexação alcançado.",
"upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
<<<<<<< HEAD
"upload_form.audio_description": "Descrever para deficientes auditivos",
"upload_form.description": "Descrever para deficientes visuais",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Para pegar um anexo de mídia, pressione espaço ou enter. Enquanto arrastar, use as setas do teclado para mover o anexo de mídia em qualquer direção. Pressione espaço ou insira novamente para soltar o anexo de mídia em sua nova posição, ou pressione escape para cancelar.",
"upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo da mídia {item} foi descartado.",
"upload_form.drag_and_drop.on_drag_end": "O anexo {item} foi removido.",

12
app/javascript/mastodon/locales/pt-PT.json

@ -341,16 +341,11 @@
"explore.trending_links": "Notícias",
"explore.trending_statuses": "Publicações",
"explore.trending_tags": "#Etiquetas",
<<<<<<< HEAD
"federation.change": "Ajustar federação do post",
"federation.federated.long": "Permitir que o post chegue a outras instâncias",
"federation.federated.short": "Federado",
"federation.local_only.long": "Restringir o post somente à minha instância",
"federation.local_only.short": "Somente local",
"filter_modal.added.context_mismatch_explanation": "Esta categoria de filtro não se aplica ao contexto em que acedeu a esta publicação. Se pretender que esta publicação seja filtrada também neste contexto, terá que editar o filtro.",
"filter_modal.added.context_mismatch_title": "Contexto incoerente!",
"filter_modal.added.expired_explanation": "Esta categoria de filtro expirou, necessita alterar a data de validade para que ele seja aplicado.",
=======
"featured_carousel.header": "{count, plural, one {Publicação Afixada} other {Publicações Afixadas}}",
"featured_carousel.next": "Seguinte",
"featured_carousel.post": "Publicação",
@ -359,7 +354,6 @@
"filter_modal.added.context_mismatch_explanation": "Esta categoria de filtro não se aplica ao contexto em que acedeste a esta publicação. Se pretenderes que esta publicação seja filtrada também neste contexto, terás que editar o filtro.",
"filter_modal.added.context_mismatch_title": "O contexto não coincide!",
"filter_modal.added.expired_explanation": "Esta categoria de filtro expirou, tens de alterar a data de validade para que ele seja aplicado.",
>>>>>>> v4.4.0
"filter_modal.added.expired_title": "Filtro expirado!",
"filter_modal.added.review_and_configure": "Para rever e configurar mais detalhadamente esta categoria de filtro, vai a {settings_link}.",
"filter_modal.added.review_and_configure_title": "Definições do filtro",
@ -874,16 +868,10 @@
"status.history.created": "{name} criado em {date}",
"status.history.edited": "{name} editado em {date}",
"status.load_more": "Carregar mais",
<<<<<<< HEAD
"status.local_only": "Esse post só é visível para outros usuários da sua instância",
"status.media.open": "Clique para abrir",
"status.media.show": "Clique para ver",
"status.media_hidden": "Media escondida",
=======
"status.media.open": "Clicar para abrir",
"status.media.show": "Clicar para ver",
"status.media_hidden": "Multimédia oculta",
>>>>>>> v4.4.0
"status.mention": "Mencionar @{name}",
"status.more": "Mais",
"status.mute": "Ocultar @{name}",

12
app/javascript/mastodon/locales/ru.json

@ -340,23 +340,13 @@
"explore.title": "Актуальное",
"explore.trending_links": "Новости",
"explore.trending_statuses": "Посты",
<<<<<<< HEAD
"explore.trending_tags": "Хэштеги",
"explore.trending_tags": "Хештеги",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this post only to my instance",
"federation.local_only.short": "Local-only",
"filter_modal.added.context_mismatch_explanation": "Эта категория не применяется к контексту, в котором вы получили доступ к этому посту. Если вы хотите, чтобы пост был отфильтрован в этом контексте, вам придётся отредактировать фильтр.",
=======
"explore.trending_tags": "Хештеги",
"featured_carousel.header": "{count, plural, other {Закреплённые посты}}",
"featured_carousel.next": "Следующий",
"featured_carousel.post": "Пост",
"featured_carousel.previous": "Предыдущий",
"featured_carousel.slide": "{index} из {total}",
"filter_modal.added.context_mismatch_explanation": "Этот фильтр не применяется в том контексте, в котором вы видели этот пост. Если вы хотите, чтобы пост был отфильтрован в этом контексте, необходимо редактировать фильтр.",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_title": "Несоответствие контекста!",
"filter_modal.added.expired_explanation": "Этот фильтр истёк. Чтобы он был применён, вам нужно изменить срок действия фильтра.",
"filter_modal.added.expired_title": "Истёкший фильтр!",

40
app/javascript/mastodon/locales/sc.json

@ -171,12 +171,6 @@
"confirmations.delete_list.title": "Cantzellare sa lista?",
"confirmations.discard_edit_media.confirm": "Iscarta",
"confirmations.discard_edit_media.message": "Tenes modìficas non sarvadas a is descritziones o a is anteprimas de is cuntenutos, ddas boles iscartare su matessi?",
<<<<<<< HEAD
"confirmations.edit.confirm": "Modìfica",
"confirmations.edit.message": "Modifichende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
"confirmations.edit.title": "Boles subraiscrìere sa publicatzione?",
=======
>>>>>>> v4.4.0
"confirmations.logout.confirm": "Essi·nche",
"confirmations.logout.message": "Seguru chi boles essire?",
"confirmations.logout.title": "Boles serrare sa sessione?",
@ -184,12 +178,6 @@
"confirmations.redraft.confirm": "Cantzella e torra a fàghere",
"confirmations.redraft.message": "Seguru chi boles cantzellare e torrare a fàghere custa publicatzione? As a pèrdere is preferidos e is cumpartziduras, e is rispostas a su messàgiu originale ant a abarrare òrfanas.",
"confirmations.redraft.title": "Boles cantzellare e torrare a iscrìere sa publicatzione?",
<<<<<<< HEAD
"confirmations.reply.confirm": "Risponde",
"confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
"confirmations.reply.title": "Boles subraiscrìere sa publicatzione?",
=======
>>>>>>> v4.4.0
"confirmations.unfollow.confirm": "Non sigas prus",
"confirmations.unfollow.message": "Seguru chi non boles sighire prus a {name}?",
"confirmations.unfollow.title": "Boles tzessare de sighire s'utente?",
@ -340,13 +328,6 @@
"ignore_notifications_modal.filter_instead": "Opuru filtra",
"ignore_notifications_modal.filter_to_act_users": "As a pòdere ancora atzetare, refudare o sinnalare a utentes",
"ignore_notifications_modal.filter_to_avoid_confusion": "Filtrare agiudat a evitare possìbiles confusiones",
<<<<<<< HEAD
"interaction_modal.description.reply": "Podes rispòndere a custa publicatzione cun unu contu de Mastodon.",
"interaction_modal.login.action": "Torra a sa pàgina printzipale",
"interaction_modal.login.prompt": "Su domìniu de su serbidore domèsticu tuo, pro esempru mastodon.social",
"interaction_modal.no_account_yet": "Non ses in Mastodon?",
=======
>>>>>>> v4.4.0
"interaction_modal.on_this_server": "In custu serbidore",
"interaction_modal.title.follow": "Sighi a {name}",
"interaction_modal.title.reply": "Risponde a sa publicatzione de {name}",
@ -391,7 +372,6 @@
"lightbox.previous": "Pretzedente",
"limited_account_hint.title": "Custu profilu est istadu cuadu dae sa moderatzione de {domain}.",
"link_preview.shares": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
<<<<<<< HEAD
"lists.account.add": "Agiunghe a sa lista",
"lists.account.remove": "Boga dae sa lista",
"lists.delete": "Cantzella sa lista",
@ -400,10 +380,6 @@
"lists.exclusive": "Cua custas publicatziones dae sa pàgina printzipale",
"lists.new.create": "Agiunghe lista",
"lists.new.title_placeholder": "Tìtulu de sa lista noa",
=======
"lists.delete": "Cantzella sa lista",
"lists.edit": "Modìfica sa lista",
>>>>>>> v4.4.0
"lists.replies_policy.followed": "Cale si siat persone chi sighis",
"lists.replies_policy.list": "Persones de sa lista",
"lists.replies_policy.none": "Nemos",
@ -437,11 +413,6 @@
"navigation_bar.moderation": "Moderatzione",
"navigation_bar.mutes": "Persones a sa muda",
"navigation_bar.opened_in_classic_interface": "Publicatziones, contos e àteras pàginas ispetzìficas sunt abertas in manera predefinida in s'interfache web clàssica.",
<<<<<<< HEAD
"navigation_bar.personal": "Informatziones personales",
"navigation_bar.pins": "Publicatziones apicadas",
=======
>>>>>>> v4.4.0
"navigation_bar.preferences": "Preferèntzias",
"navigation_bar.search": "Chirca",
"not_signed_in_indicator.not_signed_in": "Ti depes identificare pro atzèdere a custa resursa.",
@ -556,10 +527,6 @@
"poll_button.remove_poll": "Cantzella su sondàgiu",
"privacy.change": "Modìfica s'istadu de riservadesa",
"privacy.direct.long": "Totu is utentes mentovados in sa publicatzione",
<<<<<<< HEAD
"privacy.direct.short": "Persones ispetzìficas",
=======
>>>>>>> v4.4.0
"privacy.private.long": "Isceti chie ti sighit",
"privacy.private.short": "Sighiduras",
"privacy.public.long": "Cale si siat persone a intro o a foras de Mastodon",
@ -639,15 +606,8 @@
"search_results.accounts": "Profilos",
"search_results.all": "Totus",
"search_results.hashtags": "Etichetas",
<<<<<<< HEAD
"search_results.nothing_found": "Impossìbile agatare currispondèntzias pro custos tèrmines de chirca",
"search_results.see_all": "Bide totu",
"search_results.statuses": "Publicatziones",
"search_results.title": "Chirca {q}",
=======
"search_results.see_all": "Bide totu",
"search_results.statuses": "Publicatziones",
>>>>>>> v4.4.0
"server_banner.about_active_users": "Gente chi at impreadu custu serbidore is ùrtimas 30 dies (Utentes cun Atividade a su Mese)",
"server_banner.active_users": "utentes ativos",
"server_banner.administered_by": "Amministradu dae:",

3
app/javascript/mastodon/locales/sk.json

@ -91,12 +91,9 @@
"alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
"alert.unexpected.title": "Ups!",
"alt_text_badge.title": "Alternatívny popis",
<<<<<<< HEAD
=======
"alt_text_modal.add_text_from_image": "Pridaj text z obrázka",
"alt_text_modal.cancel": "Zrušiť",
"alt_text_modal.done": "Hotovo",
>>>>>>> v4.4.0
"announcement.announcement": "Oznámenie",
"annual_report.summary.archetype.oracle": "Veštec",
"annual_report.summary.followers.followers": "sledovatelia",

8
app/javascript/mastodon/locales/sq.json

@ -336,19 +336,16 @@
"explore.trending_links": "Lajme",
"explore.trending_statuses": "Postime",
"explore.trending_tags": "Hashtagë",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, one {Postim i Fiksuar} other {Postime të Fiksuar}}",
"featured_carousel.next": "Pasuesi",
"featured_carousel.post": "Postim",
"featured_carousel.previous": "I mëparshmi",
"featured_carousel.slide": "{index} nga {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Kjo kategori filtrash nuk aplikohet për kontekstin nën të cilin po merreni me këtë postim. Nëse doni që postimi të filtrohet edhe në këtë kontekst, do t’ju duhet të përpunoni filtrin.",
"filter_modal.added.context_mismatch_title": "Mospërputhje kontekstesh!",
"filter_modal.added.expired_explanation": "Kjo kategori filtrash ka skaduar, do t’ju duhet të ndryshoni datën e skadimit për të, pa të aplikohet.",
@ -932,11 +929,6 @@
"upload_button.label": "Shtoni figura, një video ose një kartelë audio",
"upload_error.limit": "U tejkalua kufi ngarkimi kartelash.",
"upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
<<<<<<< HEAD
"upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
"upload_form.description": "Përshkruajeni për persona me probleme shikimi",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Që të merrni një bashkëngjitje media, shtypni tastin Space ose Enter. Teksa bëhet tërheqje, përdorni tastet shigjetë për ta shpënë bashkëngjitjen media në cilëndo drejtori që doni. Shtypni sërish Space ose Enter që të lihet bashkëngjitja media në pozicionin e vet të ri, ose shtypni Esc, që të anulohet veprimi.",
"upload_form.drag_and_drop.on_drag_cancel": "Tërheqja u anulua. Bashkëngjitja media {item} u la.",
"upload_form.drag_and_drop.on_drag_end": "Bashkëngjitja media {item} u la.",

3
app/javascript/mastodon/locales/sv.json

@ -335,19 +335,16 @@
"explore.trending_links": "Nyheter",
"explore.trending_statuses": "Inlägg",
"explore.trending_tags": "Hashtaggar",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural,one {Fäst inlägg} other {Fästa inlägg}}",
"featured_carousel.next": "Nästa",
"featured_carousel.post": "Inlägg",
"featured_carousel.previous": "Föregående",
"featured_carousel.slide": "{index} av {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "Denna filterkategori gäller inte för det sammanhang där du har tillgång till det här inlägget. Om du vill att inlägget ska filtreras även i detta sammanhang måste du redigera filtret.",
"filter_modal.added.context_mismatch_title": "Misspassning av sammanhang!",
"filter_modal.added.expired_explanation": "Denna filterkategori har utgått, du måste ändra utgångsdatum för att den ska kunna tillämpas.",

3
app/javascript/mastodon/locales/th.json

@ -317,18 +317,15 @@
"explore.trending_links": "ขาว",
"explore.trending_statuses": "โพสต",
"explore.trending_tags": "แฮชแทก",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.next": "ถดไป",
"featured_carousel.post": "โพสต",
"featured_carousel.previous": "กอนหนา",
"featured_carousel.slide": "{index} จาก {total}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "หมวดหมวกรองนไมนำไปใชบบรบททณไดเขาถงโพสต หากคณตองการกรองโพสตในบรบทนวย คณจะตองแกไขตวกรอง",
"filter_modal.added.context_mismatch_title": "บรบทไมตรงกน!",
"filter_modal.added.expired_explanation": "หมวดหมวกรองนหมดอายแลว คณจะตองเปลยนวนหมดอายสำหรบหมวดหมเพอนำไปใช",

8
app/javascript/mastodon/locales/tr.json

@ -165,10 +165,7 @@
"column.direct": "Özel mesajlar",
"column.directory": "Profillere göz at",
"column.domain_blocks": "Engellenen alan adları",
<<<<<<< HEAD
=======
"column.edit_list": "Listeyi düzenle",
>>>>>>> v4.4.0
"column.favourites": "Gözdelerin",
"column.firehose": "Anlık Akışlar",
"column.follow_requests": "Takip istekleri",
@ -933,11 +930,6 @@
"upload_button.label": "Resim, video veya ses dosyası ekleyin",
"upload_error.limit": "Dosya yükleme sınırı aşıldı.",
"upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
<<<<<<< HEAD
"upload_form.audio_description": "İşitme kaybı olan kişiler için yazı ekleyiniz",
"upload_form.description": "Görme engelliler için açıklama",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Bir medya eklentisini taşımak için, boşluk veya enter tuşuna basın. Sürükleme sırasında medya eklentisini herhangi bir yöne hareket ettirmek için ok tuşlarını kullanın. Medya eklentisini yeni konumuna bırakmak için tekrar boşluk veya enter tuşuna basın veya işlemi iptal etmek için escape tuşuna basın.",
"upload_form.drag_and_drop.on_drag_cancel": "Sürükleme iptal edildi. Medya eklentisi {item} bırakıldı.",
"upload_form.drag_and_drop.on_drag_end": "Medya eklentisi {item} bırakıldı.",

5
app/javascript/mastodon/locales/uk.json

@ -901,11 +901,6 @@
"upload_button.label": "Додати зображення, відео або аудіо",
"upload_error.limit": "Ви перевищили ліміт завантаження файлів.",
"upload_error.poll": "Не можна завантажувати файли до опитувань.",
<<<<<<< HEAD
"upload_form.audio_description": "Опишіть для людей із вадами слуху",
"upload_form.description": "Опишіть для людей з вадами зору",
=======
>>>>>>> v4.4.0
"upload_form.drag_and_drop.instructions": "Щоб вибрати медіавкладення, натисніть пробіл або Enter. Під час перетягування, використайте клавіші зі стрілками для переміщення вкладення в будь-якому напрямку. Натисніть пробіл або Enter знову, щоб залишити медіавкладення в новому положенні, або натисніть клавішу Escape, щоб скасувати.",
"upload_form.drag_and_drop.on_drag_cancel": "Перетягування скасовано. Медіавкладення {item} прибрано.",
"upload_form.drag_and_drop.on_drag_end": "Медіавкладення {item} прибрано.",

4
app/javascript/mastodon/locales/vi.json

@ -601,11 +601,7 @@
"notification.label.private_mention": "Nhắn riêng",
"notification.label.private_reply": "Trả lời riêng",
"notification.label.reply": "Trả lời",
<<<<<<< HEAD
"notification.mention": "Lượt nhắc",
=======
"notification.mention": "Nhắc đến bạn",
>>>>>>> v4.4.0
"notification.mentioned_you": "{name} nhắc đến bạn",
"notification.moderation-warning.learn_more": "Tìm hiểu",
"notification.moderation_warning": "Bạn vừa nhận một cảnh báo kiểm duyệt",

16
app/javascript/mastodon/locales/zh-CN.json

@ -329,21 +329,12 @@
"explore.title": "当前热门",
"explore.trending_links": "新闻",
"explore.trending_statuses": "嘟文",
<<<<<<< HEAD
"explore.trending_tags": "话题标签",
"explore.trending_tags": "话题",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow post to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this post only to my instance",
"federation.local_only.short": "Local-only",
"filter_modal.added.context_mismatch_explanation": "此过滤器类别不适用访问过嘟文的环境中。如要在此环境中过滤嘟文,你必须编辑此过滤器。",
"filter_modal.added.context_mismatch_title": "环境不匹配!",
"filter_modal.added.expired_explanation": "此过滤器类别已过期,你需要修改到期日期才能应用。",
"filter_modal.added.expired_title": "过滤器已过期!",
"filter_modal.added.review_and_configure": "要审核并进一步配置此过滤器分类,请前往{settings_link}。",
"filter_modal.added.review_and_configure_title": "过滤器设置",
=======
"explore.trending_tags": "话题",
"featured_carousel.next": "下一步",
"featured_carousel.post": "发嘟",
"featured_carousel.previous": "上一步",
@ -354,7 +345,6 @@
"filter_modal.added.expired_title": "过滤规则已过期!",
"filter_modal.added.review_and_configure": "要检查并进一步配置这条过滤规则,请前往{settings_link}。",
"filter_modal.added.review_and_configure_title": "过滤规则设置",
>>>>>>> v4.4.0
"filter_modal.added.settings_link": "设置页面",
"filter_modal.added.short_explanation": "此嘟文已被添加到以下过滤规则:{title}。",
"filter_modal.added.title": "已添加过滤规则 !",
@ -596,11 +586,7 @@
"notification.label.reply": "回复",
"notification.mention": "提及",
"notification.mentioned_you": "{name} 提到了你",
<<<<<<< HEAD
"notification.moderation-warning.learn_more": "了解更多",
=======
"notification.moderation-warning.learn_more": "详细了解",
>>>>>>> v4.4.0
"notification.moderation_warning": "你收到了一条管理警告",
"notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
"notification.moderation_warning.action_disable": "你的账号已被禁用。",

3
app/javascript/mastodon/locales/zh-TW.json

@ -341,19 +341,16 @@
"explore.trending_links": "最新消息",
"explore.trending_statuses": "嘟文",
"explore.trending_tags": "主題標籤",
<<<<<<< HEAD
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow post to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this post only to my instance",
"federation.local_only.short": "Local-only",
=======
"featured_carousel.header": "{count, plural, other {# 則釘選嘟文}}",
"featured_carousel.next": "下一個",
"featured_carousel.post": "嘟文",
"featured_carousel.previous": "上一個",
"featured_carousel.slide": "{total} 中的 {index}",
>>>>>>> v4.4.0
"filter_modal.added.context_mismatch_explanation": "此過濾器類別不是用您所存取嘟文的情境。若您想要此嘟文被於此情境被過濾,您必須編輯過濾器。",
"filter_modal.added.context_mismatch_title": "不符合情境!",
"filter_modal.added.expired_explanation": "此過濾器類別已失效,您需要更新過期日期以套用。",

Loading…
Cancel
Save