Browse Source

i10n OC / FR update Pinned toots (#4842)

* Added column.pins

New strings

* Added column.pins

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

* Update password_change.oc.html.erb

* Update password_change.oc.text.erb

* Update reset_password_instructions.oc.html.erb

* Update reset_password_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb
pull/4/head
Quent-in 6 years ago
committed by Eugen Rochko
parent
commit
b00cc4b9bd
8 changed files with 12 additions and 10 deletions
  1. +1
    -0
      app/javascript/mastodon/locales/fr.json
  2. +1
    -0
      app/javascript/mastodon/locales/oc.json
  3. +2
    -2
      app/views/user_mailer/confirmation_instructions.oc.html.erb
  4. +2
    -2
      app/views/user_mailer/confirmation_instructions.oc.text.erb
  5. +2
    -2
      app/views/user_mailer/password_change.oc.html.erb
  6. +2
    -2
      app/views/user_mailer/password_change.oc.text.erb
  7. +1
    -1
      app/views/user_mailer/reset_password_instructions.oc.html.erb
  8. +1
    -1
      app/views/user_mailer/reset_password_instructions.oc.text.erb

+ 1
- 0
app/javascript/mastodon/locales/fr.json View File

@ -34,6 +34,7 @@
"column.mutes": "Comptes masqués",
"column.notifications": "Notifications",
"column.public": "Fil public global",
"column.pins": "Pouets épinglés",
"column_back_button.label": "Retour",
"column_header.hide_settings": "Masquer les paramètres",
"column_header.moveLeft_settings": "Déplacer la colonne vers la gauche",

+ 1
- 0
app/javascript/mastodon/locales/oc.json View File

@ -34,6 +34,7 @@
"column.mutes": "Personas en silenci",
"column.notifications": "Notificacions",
"column.public": "Flux public global",
"column.pins": "Tuts penjats",
"column_back_button.label": "Tornar",
"column_header.hide_settings": "Amagar los paramètres",
"column_header.moveLeft_settings": "Desplaçar la colomna a man drecha",

+ 2
- 2
app/views/user_mailer/confirmation_instructions.oc.html.erb View File

@ -1,8 +1,8 @@
<p>Bonjorn <%= @resource.email %>&nbsp;!<p>
<p>Bonjorn <%= @resource.email %> ! <p>
<p>Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)</p>
<p>Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : <br>
<p>Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : <br>
<%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %></p>
<p>Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.</p>

+ 2
- 2
app/views/user_mailer/confirmation_instructions.oc.text.erb View File

@ -1,8 +1,8 @@
Bonjorn <%= @resource.email %>&nbsp;!
Bonjorn <%= @resource.email %> ! 
Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)
er confirmar vòstre inscripcion, mercés de clicar sul ligam seguent :
er confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : 
<%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %>
Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.

+ 2
- 2
app/views/user_mailer/password_change.oc.html.erb View File

@ -1,3 +1,3 @@
<p>Bonjorn <%= @resource.email %>&nbsp;!</p>
<p>Bonjorn <%= @resource.email %> ! </p>
<p>Vos contactem per vos avisar que vòstre senhal per Mastodon es ben estat cambiat.</p>
<p>Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.</p>

+ 2
- 2
app/views/user_mailer/password_change.oc.text.erb View File

@ -1,3 +1,3 @@
Bonjorn <%= @resource.email %>&nbsp;!
Bonjorn <%= @resource.email %> ! 
Vos contactem per vos avisar que vòstre senhal per Mastodon es ben estat cambiat.
Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.

+ 1
- 1
app/views/user_mailer/reset_password_instructions.oc.html.erb View File

@ -1,4 +1,4 @@
<p>Bonjorn <%= @resource.email %>&nbsp;!</p>
<p>Bonjorn <%= @resource.email %> ! </p>
<p>Qualqu’un a demandat una reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.</p>

+ 1
- 1
app/views/user_mailer/reset_password_instructions.oc.text.erb View File

@ -1,4 +1,4 @@
Bonjorn <%= @resource.email %>&nbsp;!
Bonjorn <%= @resource.email %> ! 
Qualqu’un a demandat una reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.</p>

Loading…
Cancel
Save