about summary refs log tree commit diff
path: root/app/views/user_mailer/confirmation_instructions.pl.html.erb
diff options
context:
space:
mode:
authorspla <spla@mastodont.cat>2017-10-14 14:40:35 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-10-14 14:40:35 +0200
commitf63a40e7c2e3211758c321cdf9196d178c2930e0 (patch)
tree90457dd16edda2a715125c1ef86cce232f2228f2 /app/views/user_mailer/confirmation_instructions.pl.html.erb
parent1bdd694a0a62c4dce608c5bd43d3015c072d8524 (diff)
Updated Catalan strings (#5323)
* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master

* Syncing to master

* Added new Catalan strings

* removed config.secret_key line

* Corrected <sotrong> tag to <strong>

Line 515

* Removed extra line

* Reverted

* yarn.lock reverted

* Updated Catalan strings

* Updated Catalan strings
Diffstat (limited to 'app/views/user_mailer/confirmation_instructions.pl.html.erb')
0 files changed, 0 insertions, 0 deletions