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/oc.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/oc.yml')
| -rw-r--r-- | config/locales/oc.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 7af4a339d..1d5ed61fe 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -600,8 +600,6 @@ oc: storage: Mèdias gardats featured_tags: add_new: Ajustar una etiqueta nòva - errors: - limit: Avètz ja utilizat lo maximum d’etiquetas filters: contexts: account: Perfils @@ -642,8 +640,6 @@ oc: validation_errors: one: I a quicòm que truca ! Mercés de corregir l’error çai-jos other: I a quicòm que truca ! Mercés de corregir las %{count} errors çai-jos - html_validator: - invalid_markup: 'conten un balisatge HTML invalid : %{error}' imports: modes: merge: Fondre @@ -681,9 +677,6 @@ oc: expires_at: Expirats uses: Usatges title: Convidar de monde - lists: - errors: - limit: Avètz atengut lo maximum de listas login_activities: authentication_methods: password: senhal @@ -947,7 +940,6 @@ oc: '7889238': 3 meses min_age_label: Sulhet d’ancianetat min_favs: Gardar al mens las publicacion en favorit - min_favs_hint: Suprimís pas las publicacions qu’an recebut al mens aquesta quantitat de favorits. Daissar blanc per suprimir las publicacion quina quantitat de favorits qu’ajan min_reblogs: Gardar las publicacions partejadas al mens min_reblogs_hint: Suprimís pas vòstras publicacions qu’an agut aqueste nombre de partiment. Daissar blanc per suprimir las publicacions sens far cas als partiments stream_entries: |