diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
| commit | 3d033a468748338b6036cb24bb00ea4e88656ae6 (patch) | |
| tree | a1b3bcbe599a9298f4167769ea2c197f7ca596e6 /config/locales/ca.yml | |
| parent | e9052ceaafff786590fb66bee4550878cfb5a0df (diff) | |
| parent | c770b503c0e75015f8ba1ca90755b19326b64c3d (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts: Gemfile config/locales/simple_form.pl.yml
Diffstat (limited to 'config/locales/ca.yml')
| -rw-r--r-- | config/locales/ca.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 4b922552a..ffa639f6b 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -551,7 +551,7 @@ ca: reblog: title: "%{name} t'ha retootejat" remote_follow: - acct: Escriu l'usuari@domini de la persona que vols seguir + acct: Escriu el teu usuari@domini des del qual vols seguir missing_resource: No s'ha pogut trobar la URL de redirecció necessaria per al compte proceed: Comença a seguir prompt: 'Seguiràs a:' |