about summary refs log tree commit diff
path: root/config/locales/doorkeeper.fr.yml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-28 22:45:17 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-28 22:45:17 -0600
commitf4b2478af11bd5e2125eb245bda4fda7577817d1 (patch)
tree6a09934546f4e2ad8db8d43372ac3192834a42f1 /config/locales/doorkeeper.fr.yml
parent00ce2be148a06ddd7e692ce963dfab356e331629 (diff)
parente14c20582f9f455ade989307016e6726cb8ff959 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml
Diffstat (limited to 'config/locales/doorkeeper.fr.yml')
-rw-r--r--config/locales/doorkeeper.fr.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index a6b58156a..a5d9b9e03 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -6,7 +6,7 @@ fr:
         name: Nom
         redirect_uri: L’URL de redirection
         scope: Portée
-        scopes: Étendue
+        scopes: Étendues
         website: Site web de l'application
     errors:
       models:
@@ -41,7 +41,7 @@ fr:
         delete: Effacer
         name: Nom
         new: Nouvelle application
-        scopes: Scopes
+        scopes: Portées
         show: Voir
         title: Vos applications
       new: