about summary refs log tree commit diff
path: root/config/locales/doorkeeper.oc.yml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-09-09 14:27:47 -0500
committerDavid Yip <yipdw@member.fsf.org>2017-09-09 14:27:47 -0500
commitb9f7bc149b2a6abfbdaee83e6992b617b8bdb18e (patch)
tree355225f4424a6ea1b40c66c5540ccab42096e3bf /config/locales/doorkeeper.oc.yml
parente18ed4bbc7ab4e258d05a3e2a5db0790f67a8f37 (diff)
parent5d170587e3b6c1a3b3ebe0910b62a4c526e2900d (diff)
Merge branch 'origin/master' into sync/upstream
 Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
Diffstat (limited to 'config/locales/doorkeeper.oc.yml')
-rw-r--r--config/locales/doorkeeper.oc.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml
index 9f5d3fe55..3d12c9588 100644
--- a/config/locales/doorkeeper.oc.yml
+++ b/config/locales/doorkeeper.oc.yml
@@ -23,11 +23,11 @@ oc:
         edit: Modificar
         submit: Mandar
       confirmations:
-        destroy: Sètz segur ?
+        destroy: Sètz segur ?
       edit:
         title: Modificar l’aplicacion
       form:
-        error: Ops ! Verificatz vòstre formulari
+        error: Ops ! Verificatz vòstre formulari
       help:
         native_redirect_uri: Emplegatz %{native_redirect_uri} per d’ensages locales
         redirect_uri: Utilizatz una linha per URI
@@ -45,7 +45,7 @@ oc:
         callback_urls: urls de rapèls
         scopes: Encastres
         secret: Secret
-        title: 'Aplicacion : %{name}'
+        title: 'Aplicacion : %{name}'
     authorizations:
       buttons:
         authorize: Autorizar
@@ -62,7 +62,7 @@ oc:
       buttons:
         revoke: Revocar
       confirmations:
-        revoke: Ne sètz segur ?
+        revoke: Ne sètz segur ?
       index:
         application: Aplicacion
         created_at: Creada lo