diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-25 14:00:40 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-25 14:00:40 +0100 |
| commit | 4ed09276d5267181061dff438a0b10770db9f226 (patch) | |
| tree | cb8f358d58669626332ea01bcf0186d08b5eac90 /config/locales/ku.yml | |
| parent | 45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (diff) | |
| parent | 730bb3e211a84a2f30e3e2bbeae3f77149824a68 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.
Diffstat (limited to 'config/locales/ku.yml')
| -rw-r--r-- | config/locales/ku.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/locales/ku.yml b/config/locales/ku.yml index 0990d9768..899cd936a 100644 --- a/config/locales/ku.yml +++ b/config/locales/ku.yml @@ -1113,8 +1113,6 @@ ku: storage: Bîrdanaka medyayê featured_tags: add_new: Yeka nû tevlî bike - errors: - limit: Te jixwe berê pirtirîn hashtag destnîşan kiriye hint_html: "<strong> Hashtagên destnîşankirî çi ne? </strong> Ew bi eşkere li ser profîla te ya gelemperî têne xuyakirin û dihêlin ku mirov bi taybetî di binê wan hashtagan de li şandiyên te yên gelemperî bigere. Ew ji bo şopandina karên afirîner an projeyên demdirêj amûrek girîng in." filters: contexts: @@ -1182,8 +1180,6 @@ ku: validation_errors: one: Tiştek hîn ne rast e! Ji kerema xwe çewtiya li jêr di ber çavan re derbas bike other: Tiştek hîn ne rast e! Ji kerema xwe %{count} çewtî li jêr di ber çavan re derbas bike - html_validator: - invalid_markup: 'di nav de nîşana HTML a nederbasdar heye: %{error}' imports: errors: invalid_csv_file: 'Pelê CSV nederbasdar e. Çewtî: %{error}' @@ -1224,9 +1220,6 @@ ku: expires_at: Diqede uses: Bikaranîn title: Mirovan vexwîne - lists: - errors: - limit: Tu gihîştî hejmara rêzika a herî zêde login_activities: authentication_methods: otp: sepandina rastandina du-gavî @@ -1543,7 +1536,6 @@ ku: '7889238': 3 meh min_age_label: Şêmûga demê min_favs: Peyamên ku ji wê zêdetir hatine ecibandin veşêre - min_favs_hint: Şandî ku ji evqas hezkirin wergirtibe nayê jêbirin. Vala bihêle da ku şandiyan jê bibî tevlî ku çiqas hezkirin wergirtibe min_reblogs: Şandiyên ku bêtir hatine bilindkirin veşêre min_reblogs_hint: Şandî ku ji ji vê hejmarê bêtir bilindkirin wergirtibe nayê jêbirin. Vala bihêle da ku şandiyan jê bibî tevlî ku çiqas hezkirin wergirtibe stream_entries: |