updating locales from bad merge

app/javascript/mastodon/locales/da.json

@@ -130,7 +130,7 @@
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
   "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
-  "block_modal.show_less": "Vis færre",
+  "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis flere",
   "block_modal.they_cant_mention": "Vedkommende kan ikke omtale eller følge dig.",
   "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
@@ -208,9 +208,9 @@
   "compose_form.publish": "Publicér",
   "compose_form.reply": "Svar",
   "compose_form.save_changes": "Opdatér",
-  "compose_form.spoiler.marked": "Fjern emnefelt",
-  "compose_form.spoiler.unmarked": "Tilføj emnefelt",
-  "compose_form.spoiler_placeholder": "Emnefelt (valgfrit)",
+  "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
+  "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
+  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.confirm": "Blokér",
   "confirmations.delete.confirm": "Slet",

app/javascript/mastodon/locales/fil.json

@@ -380,8 +380,5 @@
   "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
   "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
-  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira",
-  "upload_modal.apply": "Ilapat",
-  "upload_modal.applying": "Nilalapat…",
-  "upload_modal.choose_image": "Pumili ng larawan"
+  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira"
 }

app/javascript/mastodon/locales/ku.json

@@ -147,7 +147,6 @@
   "compose_form.lock_disclaimer.lock": "girtî ye",
   "compose_form.placeholder": "Çi di hişê te derbas dibe?",
   "compose_form.poll.duration": "Dema rapirsî yê",
-  "compose_form.poll.single": "Yekî hilbijêre",
   "compose_form.poll.switch_to_multiple": "Rapirsî yê biguherînin da ku destûr bidin vebijarkên pirjimar",
   "compose_form.poll.switch_to_single": "Rapirsîyê biguherîne da ku mafê bidî tenê vebijêrkek",
   "compose_form.poll.type": "Şêwaz",

app/javascript/mastodon/locales/la.json

@@ -65,7 +65,6 @@
   "bundle_column_error.retry": "Retemptare",
   "bundle_column_error.routing.title": "CCCCIIII",
   "bundle_modal_error.close": "Claudere",
-  "bundle_modal_error.message": "Aliquid pervagātum est dum hunc componentem onerābam.",
   "bundle_modal_error.retry": "Retemptare",
   "column.about": "De",
   "column.bookmarks": "Signa paginales",
@@ -115,11 +114,9 @@
   "empty_column.mutes": "Nondum quemquam usorem tacuisti.",
   "empty_column.notification_requests": "Omnia clara sunt! Nihil hic est. Cum novās notificātiōnēs accipīs, hic secundum tua praecepta apparebunt.",
   "empty_column.notifications": "Nōn adhūc habēs ullo notificātiōnēs. Cum aliī tē interagunt, hīc videbis.",
-  "explore.search_results": "Proventus explorationis",
   "explore.trending_statuses": "Contributa",
   "firehose.all": "Omnis",
   "footer.about": "De",
-  "footer.invite": "invitare populum",
   "generic.saved": "Servavit",
   "hashtag.column_header.tag_mode.none": "sine {additional}",
   "hashtag.column_settings.tag_mode.all": "Haec omnia",

app/javascript/mastodon/locales/lv.json

@@ -600,7 +600,6 @@
   "onboarding.profile.discoverable": "Padarīt manu profilu atklājamu",
   "onboarding.profile.display_name": "Attēlojamais vārds",
   "onboarding.profile.display_name_hint": "Tavs pilnais vārds vai Tavs joku vārds…",
-  "onboarding.profile.lead": "Šo vienmēr var pabeigt vēlāk iestatījumos, kur ir pieejamas vēl vairāk pielāgošanas iespēju.",
   "onboarding.profile.note": "Apraksts",
   "onboarding.profile.note_hint": "Tu vari @pieminēt citus cilvēkus vai #tēmturus…",
   "onboarding.profile.save_and_continue": "Saglabāt un turpināt",

app/javascript/mastodon/locales/ml.json

@@ -221,9 +221,6 @@
   "home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്‌ക്കുക",
   "home.pending_critical_update.link": "പുതുകൾ കാണുക",
   "home.show_announcements": "പ്രഖ്യാപനങ്ങൾ കാണിക്കുക",
-  "interaction_modal.login.action": "ആമുഖം വരെ എടുത്തോണ്ടു് പോവുക",
-  "interaction_modal.login.prompt": "ആമുഖപ്രദാനിയുടെ മേഖലപേരു്. ഉദ: mastodon.social",
-  "interaction_modal.no_account_yet": "മാസ്റ്റഡോണിൽ ഇല്ലേ?",
   "interaction_modal.on_this_server": "ഈ സെർവറീൽ",
   "interaction_modal.title.favourite": "പ്രിയപ്പെട്ട {name}-ന്റെ എഴുതു്",
   "interaction_modal.title.follow": "{name}-െ പിന്തുടരുക",

app/javascript/mastodon/locales/ne.json

@@ -31,7 +31,6 @@
   "account.featured.accounts": "प्रोफाइलहरू",
   "account.featured.hashtags": "ह्यासट्यागहरू",
   "account.featured_tags.last_status_never": "कुनै पोस्ट छैन",
-  "account.featured_tags.title": "{name}का विशेष ह्यासट्यागहरू",
   "account.follow": "फलो गर्नुहोस",
   "account.follow_back": "फलो ब्याक गर्नुहोस्",
   "account.followers": "फलोअरहरु",

app/javascript/mastodon/locales/pa.json

@@ -221,7 +221,6 @@
   "empty_column.home": "ਤੁਹਾਡੀ ਟਾਈਮ-ਲਾਈਨ ਖਾਲੀ ਹੈ! ਇਸ ਨੂੰ ਭਰਨ ਲਈ ਹੋਰ ਲੋਕਾਂ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ।",
   "empty_column.list": "ਇਸ ਸੂਚੀ ਵਿੱਚ ਹਾਲੇ ਕੁਝ ਵੀ ਨਹੀਂ ਹੈ। ਜਦੋਂ ਇਸ ਸੂਚੀ ਦੇ ਮੈਂਬਰ ਨਵੀਆਂ ਪੋਸਟਾਂ ਪਾਉਂਦੇ ਹਨ ਤਾਂ ਉਹ ਇੱਥੇ ਦਿਖਾਈ ਦੇਣਗੀਆਂ।",
   "errors.unexpected_crash.report_issue": "ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
-  "explore.search_results": "ਖੋਜ ਦੇ ਨਤੀਜੇ",
   "explore.suggested_follows": "ਲੋਕ",
   "explore.title": "ਰੁਝਾਨ",
   "explore.trending_links": "ਖ਼ਬਰਾਂ",

app/javascript/mastodon/locales/ro.json

@@ -50,7 +50,6 @@
   "account.mute_notifications_short": "Amuțește notificările",
   "account.mute_short": "Ignoră",
   "account.muted": "Pus pe silențios",
-  "account.mutual": "Mutual",
   "account.no_bio": "Nicio descriere furnizată.",
   "account.open_original_page": "Deschide pagina originală",
   "account.posts": "Postări",
@@ -295,8 +294,6 @@
   "home.show_announcements": "Afișează anunțurile",
   "interaction_modal.on_another_server": "Pe un alt server",
   "interaction_modal.on_this_server": "Pe acest server",
-  "interaction_modal.sign_in": "Nu sunteți autentificat la acest server. Unde este găzduit contul dvs.?",
-  "interaction_modal.sign_in_hint": "Sfat: acesta este site-ul web pe care v-ați înscris. Dacă nu vă amintiți, căutați e-mailul de bun venit în inboxul dvs. De asemenea, puteți introduce numele de utilizator complet! (de exemplu, @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Urmărește pe {name}",
   "interaction_modal.title.reblog": "Distribuie postarea lui {name}",
   "interaction_modal.title.reply": "Răspunde postării lui {name}",

app/javascript/mastodon/locales/sc.json

@@ -237,8 +237,6 @@
   "disabled_account_banner.text": "Su contu tuo {disabledAccount} no est ativu.",
   "dismissable_banner.community_timeline": "Custas sunt is publicatziones pùblicas prus reghentes dae gente cun contu in {domain}.",
   "dismissable_banner.dismiss": "Iscarta",
-  "dismissable_banner.explore_links": "Custas sunt is istòrias de noas prus cumpartzidas in sa rete oe. Is istòrias prus noas publicadas dae gente prus diversa ant a èssere priorizadas.",
-  "dismissable_banner.explore_statuses": "Custas sunt publicatziones dae sa rete detzentralizada chi sunt retzende atentzione oe. Is publicatziones prus noas cun prus cumpartziduras e preferèntzias ant a èssere priorizadas.",
   "domain_block_modal.block": "Bloca su serbidore",
   "domain_block_modal.block_account_instead": "Bloca imbetzes a @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Is persones de custu serbidore podent ancora interagire cun is publicatziones betzas tuas.",

app/javascript/mastodon/locales/sco.json

@@ -136,7 +136,6 @@
   "confirmations.delete_list.message": "Ye shair thit ye'r wantin fir tae delete this post fir ever?",
   "confirmations.discard_edit_media.confirm": "Fling awa",
   "confirmations.discard_edit_media.message": "Ye'v chynges tae the media description or preview thit ye'v no saved, fling them awa onie weys?",
-  "confirmations.edit.message": "Editin the noo will owerwrit the message yer componin. Are ye suir yer wantin tae proceed?",
   "confirmations.logout.confirm": "Log oot",
   "confirmations.logout.message": "Ye shair thit ye'r wantin tae log oot?",
   "confirmations.mute.confirm": "Wheesht",

app/javascript/mastodon/locales/si.json

@@ -536,7 +536,6 @@
   "navigation_bar.blocks": "අවහිර කළ අය",
   "navigation_bar.bookmarks": "පොත්යොමු",
   "navigation_bar.direct": "පෞද්ගලික සැඳහුම්",
-  "navigation_bar.discover": "සොයා ගන්න",
   "navigation_bar.domain_blocks": "අවහිර කළ වසම්",
   "navigation_bar.favourites": "ප්‍රියතමයන්",
   "navigation_bar.filters": "නිහඬ කළ වචන",

app/javascript/mastodon/locales/te.json

@@ -200,7 +200,6 @@
   "search.placeholder": "శోధన",
   "search_results.hashtags": "హాష్ ట్యాగ్లు",
   "search_results.statuses": "టూట్లు",
-  "search_results.title": "{q}",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_account": "@{name} కొరకు సమన్వయ వినిమయసీమను తెరువు",
   "status.admin_status": "సమన్వయ వినిమయసీమలో ఈ స్టేటస్ ను తెరవండి",

app/javascript/mastodon/locales/tok.json

@@ -38,7 +38,6 @@
   "account.featured.hashtags": "kulupu lipu",
   "account.featured_tags.last_status_at": "sitelen pini pi jan ni li tan {date}",
   "account.featured_tags.last_status_never": "toki ala li lon",
-  "account.featured_tags.title": "{name} la kulupu ni pi toki suli li pona",
   "account.follow": "o kute",
   "account.follow_back": "jan ni li kute e sina. o kute",
   "account.followers": "jan kute",
@@ -353,7 +352,6 @@
   "footer.about": "sona",
   "footer.directory": "lipu jan",
   "footer.get_app": "o jo e ilo",
-  "footer.invite": "o kama e jan ante",
   "footer.privacy_policy": "lawa len",
   "footer.source_code": "o lukin e toki ilo",
   "footer.status": "lon",
@@ -503,7 +501,6 @@
   "notifications.filter.polls": "pana lon pana ni",
   "onboarding.follows.search": "o alasa",
   "onboarding.profile.display_name": "nimi tawa jan ante",
-  "onboarding.profile.lead": "sina ken pana e ni lon tenpo kama, lon lipu pi ante nasin. ona la, nasin ante mute li lon.",
   "onboarding.profile.note": "sona sina",
   "poll.closed": "ona li pini",
   "poll.total_people": "{count, plural, other {jan #}}",

app/javascript/mastodon/locales/ug.json

@@ -38,13 +38,7 @@
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "explore.search_results": "ئىزدەش نەتىجىسى",
-  "footer.invite": "دوست تەكلىپ",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "interaction_modal.login.action": "باش بەتكە يۆتكەل",
-  "interaction_modal.login.prompt": "ئاساسىي مۇلازىمېتىرىڭىزنىڭ دائىرە نامى، مەسىلەن، mastodon.social",
-  "interaction_modal.no_account_yet": "Mastodon غا قوشۇلمىغانمۇ؟",
-  "interaction_modal.sign_in": "بۇ مۇلازىمېتىرغا تىزىمغا كىرمىدىڭىز. ھېساباتىڭىزنى قەيەردە تىزىملاتقان؟",
   "keyboard_shortcuts.back": "to navigate back",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "to boost",