diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-10-30 18:15:28 +0100 |
| commit | eee36267d627ae08898d2b3301f56ce729055e82 (patch) | |
| tree | dae581a9867b8dcdd2c3ab0154794a1ff10ad98e /config/locales/simple_form.ku.yml | |
| parent | 26ff48ee48a5c03a2a4b0bd03fd322529e6bd960 (diff) | |
| parent | ac9fb0d654440ce1179bab4071941450aa994d2c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.
Diffstat (limited to 'config/locales/simple_form.ku.yml')
| -rw-r--r-- | config/locales/simple_form.ku.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml index a62e8eb40..7ef4e7ac3 100644 --- a/config/locales/simple_form.ku.yml +++ b/config/locales/simple_form.ku.yml @@ -77,7 +77,10 @@ ku: warn: Naveroka parzûnkirî li pişt hişyariyek ku sernavê parzûnê qal dike veşêre form_admin_settings: backups_retention_period: Arşîvên bikarhênerên çêkirî ji bo rojên diyarkirî tomar bike. + bootstrap_timeline_accounts: Ev ajimêr wê di pêşnîyarên şopandina bikarhênerên nû de werin derzîkirin. + closed_registrations_message: Dema ku tomarkirin girtî bin têne xuyakirin content_cache_retention_period: Şandiyên ji rajekarên din wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin. Dibe ku ev bê veger be. + custom_css: Tu dikarî awayên kesane li ser guhertoya malperê ya Mastodon bicîh bikî. media_cache_retention_period: Pelên medyayê yên daxistî wê piştî çend rojên diyarkirî dema ku li ser nirxek erênî were danîn werin jêbirin, û li gorî daxwazê ji nû ve werin daxistin. form_challenge: current_password: Tu dikevî qadeke ewledar @@ -216,7 +219,13 @@ ku: form_admin_settings: backups_retention_period: Serdema tomarkirina arşîva bikarhêner content_cache_retention_period: Serdema tomarkirina bîrdanka naverokê + custom_css: CSS a kesanekirî + mascot: Mascot a kesanekirî (legacy) media_cache_retention_period: Serdema tomarkirina bîrdanka medyayê + profile_directory: Rêgeha profilê çalak bike + registrations_mode: Kî dikare tomar bibe + require_invite_text: Ji bo tevlêbûnê sedemek pêdivî ye + show_domain_blocks: Astengkirinên navperê nîşan bide site_terms: Politîka taybetiyê trendable_by_default: Mafê bide rojevê bêyî ku were nirxandin interactions: |