diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
| commit | c077cdaba70eac154909cad412ece409acc2e688 (patch) | |
| tree | 7d13d319ce62475de15014406635f32a8742ca4b /config/locales/kab.yml | |
| parent | 67125534bc0fd48a45d6cb17a5c78712d8e87150 (diff) | |
| parent | 9870b175b477bbc984fc7945f1ebe07e3f2b0053 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.
Diffstat (limited to 'config/locales/kab.yml')
| -rw-r--r-- | config/locales/kab.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 24c40e8f1..fe042301d 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -600,13 +600,13 @@ kab: one: "1 wulɣu seg tirza-inek·inm taneqqarut ar tura \U0001F418" other: "%{count} ilɣa imaynuten seg tirza-nek·inem taneggarut ar tura \U0001F418" favourite: - subject: "{name} yesmenyaf addad-ik·im" + subject: "%{name} yesmenyaf addad-ik·im" follow: body: "%{name} yeṭafaṛ-ik-id tura!" subject: "%{name} yeṭafaṛ-ik-id tura" title: Ameḍfaṛ amaynut follow_request: - body: "{name} yessuter-d ad ak·akem-yeḍfer" + body: "%{name} yessuter-d ad ak·akem-yeḍfer" title: Asuter amaynut n teḍfeṛt mention: action: Err |