diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-02-09 12:15:55 +0100 |
commit | dae5e446fe7294dba0e14311ef3da4dc8fff6a3a (patch) | |
tree | 33a76386b1e8bc9c968bfc49409f72000b7ec410 /config/locales/simple_form.kab.yml | |
parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
parent | 57c42c20c01b46f0d7cad5a357d56190274a3fa1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.
Diffstat (limited to 'config/locales/simple_form.kab.yml')
-rw-r--r-- | config/locales/simple_form.kab.yml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml index e62fd2447..db4369e92 100644 --- a/config/locales/simple_form.kab.yml +++ b/config/locales/simple_form.kab.yml @@ -5,27 +5,29 @@ kab: account_alias: acct: Specify the username@domain of the account you want to move from account_migration: - acct: Sekcem isem n umseqdac@taɣult n umiḍan wuɣur tebɣiḍ ad tuɣaleḍ + acct: Sekcem isem n umseqdac@taγult n umiḍan anida itebγiḍ ad gujjeḍ admin_account_action: - send_email_notification: Amseqdac ad t-id-yewweḍ usefhem ɣef wayen yeḍran akked umiḍan-is + send_email_notification: Amseqdac ad t-id-yewweḍ usefhem γef wayen yeḍran akked umiḍan-is type_html: Fren d acu ara txedmeḍ s <strong>%{acct}</strong> defaults: autofollow: Imdanen ara ijerrden s usnebgi-inek, ad k-ḍefṛen s wudem awurman - discoverable: Tabdert n yimaɣnuten d udem-nniḍen i umiḍan-ik akken ad yettwassen ugar + discoverable: Tabdert n yimaγnuten d udem-nniḍen i umiḍan-ik akken ad yettwassen ugar email: Ad n-teṭṭfeḍ imayl i usentem - irreversible: Tibarraḥin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat - locale: Tutlayt n ugrudem, imaylen d tilɣa + irreversible: Tijewwaqin i tessazedgeḍ ad ttwakksent i lebda, ula ma tekkseḍ imsizdeg-nni ar zdat + locale: Tutlayt n ugrudem, imaylen d tilγa password: Seqdec ma drus 8 n yisekkilen - setting_hide_network: Wid i teṭṭafaṛeḍ d wid i k-yeṭṭafaṛen ur d-ttwaseknen ara deg umaɣnu-inek + setting_hide_network: Wid i teṭṭafaṛeḍ d wid i k-yeṭṭafaṛen ur d-ttwaseknen ara deg umaγnu-inek username: Isem-ik n umseqdac ad yili d ayiwen, ulac am netta deg %{domain} featured_tag: - name: 'Ahat ad tebɣuḍ ad tesqedceḍ yiwen gar-asen:' + name: 'Ahat ad tebγuḍ ad tesqedceḍ yiwen gar-asen:' imports: data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun labels: account: fields: value: Agbur + account_migration: + acct: Tansa n umiḍan amaynut admin_account_action: types: silence: Sgugem @@ -49,6 +51,7 @@ kab: setting_display_media_hide_all: Ffer kullec setting_display_media_show_all: Sken kullec setting_hide_network: Ffer azetta-k·m + setting_theme: Asental n wesmel username: Isem n useqdac username_or_email: Isem n useqdac neγ imal whole_word: Awal akk @@ -57,7 +60,7 @@ kab: invite: comment: Awennit invite_request: - text: Acimi tebɣiḍ ad ternuḍ iman-ik? + text: Acimi tebγiḍ ad ternuḍ iman-ik? 'no': Ala required: mark: "*" |