49 Commits (da809f9eec45cdac0fa31ba89df91cd4ce4a5398)

Author	SHA1	Message	Date
SerCom_KC	c4d36d024c	Update Simplified Chinese translations (#6215) ... * i18n: (zh-CN) Add translations of #6125 * i18n: (zh-CN) Add translations of #6132 * i18n: (zh-CN) Add translations of #6099 * i18n: (zh-CN) Add translations of #6071 * i18n: (zh-CN) Improve translations	7 years ago
Quenty31	06636c6eca	l10n Occitan language: mailer update (#6193) ... * Create email_changed.oc.html.erb * Create email_changed.oc.text.erb * Update email_changed.oc.html.erb * Update email_changed.oc.html.erb * Create reconfirmation_instructions.oc.html.erb * Create reconfirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.text.erb * Update reconfirmation_instructions.oc.html.erb	7 years ago
Marcin Mikołajczak	53d99ebf4f	i18n: Update Polish translation (#6168) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Yamagishi Kazutoshi	1001922156	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) ... * yarn manage:translations * Add Japanese translation for #5997 * Add Japanese translation for #6003 * Add Japanese translation for #6004 * Add Japanese translation for #6071 * Add Japanese translation for #6099 * Add Japanese translation for #6125 * Add Japanese translation for #6132	7 years ago
Patrick Figel	04ecf44c2f	Add confirmation step for email changes (#6071) ... * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes	7 years ago
Branko Kokanovic	21b9da6418	Adding Serbian latin translations (#6146) ... Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.	7 years ago
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	7 years ago
Anna e só	0e6c4cb796	l10n: PT-BR translation updated (#5681) ... * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531. * Updated pt-BR.json * pt-BR.yml updated	7 years ago
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	7 years ago
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508) ... * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	7 years ago
Håkan Eriksson	a2b600428c	Swedish translation (#5406) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	7 years ago
Jeong Arm	0db47196fb	Fix stupid typo (#5184)	7 years ago
Jeong Arm	c30e492587	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
Jeong Arm	d841af4e80	Append confirmation link as plain text (#5146) ... * Append confirmation link as plain text Some mail application is malfunctioning with links. * Change description text	7 years ago
BruWalfas	c155d843f4	A few updates to the Spanish translation and some typos fixing (#4997) ... * So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message	8 years ago
Mingye Wang	c8969dca35	Minor Chinese check & jsx addition (#4973) ... * zh-*: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. * zh-*: apply suggestions for PR #4557 * zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation	8 years ago
Anna e só	c2bee07dbc	l10n: Full PT-BR translation (#4882) ... * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins	8 years ago
Quent-in	bc077018b8	i10n minors changes for 1.6 (#4867) ... * wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes	8 years ago
Quent-in	b00cc4b9bd	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	8 years ago
Masoud Abkenar	4b6cd1dfdb	i18n: update Persian translation (#4470) ... * i18n: update Persian translation * i18n: fix quotes	8 years ago
Sylvhem	8fecd80108	Various fixes in the French translation (#4107) ... * Changement de « Changement de mot de passe » en « Sécurité » * Suppression de « (Two-factor auth) » Change la valeur de la chaîne « two_factor_authentication » de « Identification à deux facteurs (Two-factor auth) » à « Identification à deux facteurs ». La traduction anglaise entre parathentèse était redondante et gênait la lecture. Change the value of the "two_factor_authentication" from "Identification à deux facteurs (Two-factor auth)" to "Identification à deux facteurs". The English translation in brackets was superflous and was getting in the way of the reader. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était jusqu’ici incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both. * Remplace « ... » par « … » Remplace les séries de trois points par le caractère dédié « … » (U+2026). Replace all the series of three dots by the dedicated character "…" (U+2026). * Mise à jour Crée config/locales/activerecord.fr.yml, ajoute de nouvelles chaînes et met à jour certains textes. Les compteurs de caractères pour le pseudonyme et la biographie devrait maintenant pouvoir fonctionner même quand l’interface est en français. Create config/locales/activerecord.fr.yml, add new strings et update some textes. The caracters counters for the username and the biography should now work even when the interface is in French. * Remplace « A » par « À » Remplace « A » par « À » aux endroits où le mot est mal orthographié. Replace "A" by "À" when the wrong word is used. * Ajout d’espaces insécables Ajoute des espaces insécables suivant les régles nécessaires en typographie française. Add non-breaking spaces following rules of French typography. * Remplace « certain » par « certain·e » Harmonise la traduction en remplaçant « certain » par sa forme épicène. Harmonize the translation by replacing "certain" (sure) by its epicene form. * Corrige un angliscisme Remplace « adresse e-mail » par « adresse électronique ». Replace "adresse e-mail" (e-mail address) by "adresse électronique" (electronic address).	8 years ago
m4sk1n	126f929c39	i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Midgard	16d0aed403	Use instance name in email notifications instead of "Mastodon" (#3763) ... * Use instance name in "password changed" mail instead of "Mastodon". Fixes tootsuite#2620. * Use instance name in password reset mail instead of "Mastodon".	8 years ago
Matt Jankowski	b25e42a77f	Misc tidying and clean ups (#3445) ... * Remove trailing whitespace in i18n mailers * Use query methods instead of #present? on AR attributes * Delegate Status#account_domain method * Delegate Mention #account_username and #account_acct methods	8 years ago
Quent-in	4b0c667c09	i18n update for Occitan language (#3362) ... * Update simple_form.oc.yml * Added check spam folder * Update oc.json abonats => seguidors * Update oc.yml * Update oc.json Added translations + corrections * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * i18n mailer * Update reset_password_instructions.oc.html.erb	8 years ago
Masoud Abkenar	b69365e397	Persian translation update (#3206) ... * Persian translation update * Persian translation update: new files * Persian translation update * activerecord.fa.yml language code * Persian translation update * fix indent	8 years ago
vidarlee	440441ccb3	Enhance for the Chinese translation (#3198) ... * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175	8 years ago
ButterflyOfFire	8ed3fa1693	Update reset_password_instructions.ar.html.erb (#3163) ... Forgot to translate this string :p. Now Done !	8 years ago
spla	a51c8074df	Add catalan language (#3084) ... * 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	8 years ago
Quent-in	fed585e3f4	i18n mailer files for Occitan language (#2924) ... * Create reset_password_instructions.oc.html.erb * Create reset_password_instructions.oc.text.erb * Create password_change.oc.html.erb * Create password_change.oc.text.erb * Create confirmation_instructions.oc.html.erb * Create confirmation_instructions.oc.text.erb	8 years ago
jeroenpraat	406229d927	Updating and extending Dutch strings (#2930) ... * Update nl * Update nl * Update nl * Create confirmation_instructions.nl.html.erb * Create confirmation_instructions.nl.text.erb * Create password_change.nl.html.erb * Create password_change.nl.text.erb * Create reset_password_instructions.nl.html.erb * Create reset_password_instructions.nl.text.erb	8 years ago
ButterflyOfFire	7140def5c9	Update simple_form.ar.yml (#2908) ... * Update simple_form.ar.yml Added missing strings that were introduced to simple_form.ar.yml and completing translation. * Create confirmation_instructions.ar.html.erb * Create confirmation_instructions.ar.text.erb * Create password_change.ar.html.erb * Create password_change.ar.text.erb * Create reset_password_instructions.ar.text.erb * Create reset_password_instructions.ar.html.erb	8 years ago
Koala Yeung	cbd673601c	Add Thai langauge (#2903) ... * Updated Thai language * locale: remove unused translation in Thai * locale: add Thai to settings menu and application * locale: fix activerecord.th.yml format	8 years ago
Özcan Zafer AYAN	983593ddf4	Add Turkish yml file (#2878) ... * Add Turkish yml file * Add translation files for Turkish * Deleted click_to_edit key and val Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line	8 years ago
Ira	ee1486a7de	i18n: Update Hebrew interface translation. (#2880) ... * follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...	8 years ago
m4sk1n	fd1e29c3f8	i18n: Updated Polish translation (#2832) ... * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
ヨイツの賢狼ホロ | 3rd style	1c469ca98b	i18n: Update zh-CN [ Chinese (China) ] translations. (#2699) ... * Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys	8 years ago
Audun Larsen	e68c0ce5f6	Norwegian translation for email notifications (#2673) ... * Create confirmation_instructions.no.html.erb * Create confirmation_instructions.no.text.erb * Create password_change.no.html.erb * Create password_change.no.text.erb * Create reset_password_instructions.no.html.erb * Create reset_password_instructions.no.text.erb * Translates html welcome email * Translates welcome email * Translates html password changed email * Translates password changed email * Translates html reset password email * Translates reset password email * Fixes typo in translation * Fixes typo in translation	8 years ago
Ira	438ce5809f	Add Hebrew interface translation. (#2573) ... * follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...	8 years ago
Giuseppe Pignataro	2bd46f442d	Italian translation (#2654) ... * Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml	8 years ago
Koala Yeung	a23eaf720e	Update Russian translation (rebased) (#2503) ... * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Update Russian translation * Fix merge conflicts Redid Works by @rkarabut	8 years ago
Koala Yeung	935aecdc32	Add Indonesian (Bahasa Indonesia / id) translation (#2200) ... * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * fix InvalidLocaleData on a string * fix InvalidLocaleData on a string * Fix language keys in Indonesian ruby locale (id) Use "id" instead of "en" as object keys. * Removed obsoleted translation (id)	8 years ago
anon	f8ae12909c	Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975)	8 years ago
Thomas Citharel	d90d23699c	Make Reporting admin section translatable (#1549) ... * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
pinfort	6f5268b02d	Add Japanese translation (#1552) ... * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx	8 years ago
Olivier Humbert	082bef3027	French translation update (#1271) ... * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	8 years ago
Thomas Citharel	41f8fde83e	Update french translation (#1148) ... Add french translation for emails sent Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add non-breaking spaces Signed-off-by: Thomas Citharel <tcit@tcit.fr> changes and fixes to the nbsps Signed-off-by: Thomas Citharel <tcit@tcit.fr> French update a few fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr> fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954)	8 years ago
Eugen Rochko	116ab27e08	i18n for devise mailer too	8 years ago