diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
| commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
| tree | 766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/ca.yml | |
| parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
| parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/ca.yml')
| -rw-r--r-- | config/locales/ca.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 53b584a40..da82d6959 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -514,6 +514,7 @@ ca: '86400': 1 dia expires_in_prompt: Mai generate: Genera + invited_by: 'Has estat invitat per:' max_uses: one: 1 ús other: "%{count} usos" @@ -674,6 +675,7 @@ ca: disallowed_hashtags: one: 'conté una etiqueta no permesa: %{tags}' other: 'conté les etiquetes no permeses: %{tags}' + language_detection: Detecta automàticament el llenguatge open_in_web: Obre en la web over_character_limit: Límit de caràcters de %{max} superat pin_errors: |