diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-21 08:28:59 +0200 |
commit | 0e74d4da592d6ac5e3c52b0f9c6b1906376aa707 (patch) | |
tree | 66ae31bd3fd0228ebc6f92325cf43c7f02e4263d /config/locales/gd.yml | |
parent | 7a75bce1b43df290baf6842e2bb3d3eb0acd76d5 (diff) | |
parent | 27f41768e8d66d97c8d705d764e534e52ea13af9 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.
Diffstat (limited to 'config/locales/gd.yml')
-rw-r--r-- | config/locales/gd.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 931cea4fb..387ba6c2a 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -40,7 +40,6 @@ gd: other: post two: phost status_count_before: A dh’fhoillsich - tagline: Lean air caraidean ’s rùraich feadhainn ùra terms: Teirmichean na seirbheise unavailable_content: Frithealaichean fo mhaorsainneachd unavailable_content_description: @@ -446,6 +445,7 @@ gd: destroyed_msg: Chan eil an àrainn ’ga bacadh tuilleadh domain: Àrainn edit: Deasaich bacadh na h-àrainne + existing_domain_block: Chuir thu cuingeachaidhean nas teinne air %{name} mu thràth. existing_domain_block_html: Chuir thu cuingeachadh nas teinne air %{name} mu thràth, feumaidh tu a <a href="%{unblock_url}">dì-bhacadh</a> an toiseach. new: create: Cruthaich bacadh @@ -949,7 +949,6 @@ gd: applications: created: Chaidh an t-iarrtas a chruthachadh destroyed: Chaidh an t-iarrtas a sguabadh às - invalid_url: Tha an t-URL a thugadh seachad mì-dhligheach regenerate_token: Ath-ghin an tòcan inntrigidh token_regenerated: Chaidh an tòcan inntrigidh ath-ghintinn warning: Bi glè chùramach leis an dàta seo. Na co-roinn le duine sam bith e! |