diff options
author | ThibG <thib@sitedethib.com> | 2018-10-24 11:28:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-24 11:28:25 +0200 |
commit | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (patch) | |
tree | ac3f4100e27a9341c32c15e07661af841c547ec0 /config/locales/oc.yml | |
parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
parent | ed8d06212f439b9fe2f170a6f43d6be6d586ff80 (diff) |
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/oc.yml')
-rw-r--r-- | config/locales/oc.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 373d2ed44..22d0775f9 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -144,7 +144,6 @@ oc: role: Permissions roles: admin: Administrator - bot: Robòt moderator: Moderador staff: Personnal user: Uitlizaire @@ -337,9 +336,7 @@ oc: reported_by: Senhalat per resolved: Resolgut resolved_msg: Rapòrt corrèctament resolgut ! - silence_account: Metre lo compte en silenci status: Estatut - suspend_account: Suspendre lo compte title: Senhalament unassign: Levar unresolved: Pas resolgut |