diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-27 13:20:15 +0200 |
commit | 659b8a12ece7110608ee84748e57647c08d1dbda (patch) | |
tree | 1d8350cdad20ad1eb8c67a4d17a18ff7183f22e5 /config/locales/ca.yml | |
parent | c2e528916cae422baee3d72a3b4409a23c476b3f (diff) | |
parent | 63c7b9157274f57c496399a1a5c728b32415034c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes
Diffstat (limited to 'config/locales/ca.yml')
-rw-r--r-- | config/locales/ca.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 636def5eb..b05398d22 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -283,7 +283,7 @@ ca: create_and_resolve: Resoldre amb nota create_and_unresolve: Reobrir amb nota delete: Esborrar - placeholder: Descriu les accions que s'han pres o qualsevol altra actualització d'aquest informe… + placeholder: Descriu les accions que s'han pres o qualsevol altra actualització relacionada… reopen: Reobrir informe report: 'Informe #%{id}' report_contents: Contingut @@ -619,7 +619,7 @@ ca: micro_messenger: MicroMessenger nokia: Nokia S40 Ovi Browser opera: Opera - otter: Altre + otter: Otter phantom_js: PhantomJS qq: QQ Browser safari: Safari |