cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity
mastodon/app/views/user_mailer
History
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
 		2017-09-16 18:48:38 +02:00
..
confirmation_instructions.ar.html.erb Update simple_form.ar.yml (#2908) 2017-05-08 15:58:38 +02:00
confirmation_instructions.ar.text.erb Misc tidying and clean ups (#3445) 2017-05-31 20:38:17 +02:00
confirmation_instructions.ca.html.erb Add catalan language (#3084) 2017-05-17 00:25:10 +02:00
confirmation_instructions.ca.text.erb Add catalan language (#3084) 2017-05-17 00:25:10 +02:00
confirmation_instructions.en.html.erb Make Reporting admin section translatable (#1549) 2017-04-12 17:11:49 +02:00
confirmation_instructions.en.text.erb Make Reporting admin section translatable (#1549) 2017-04-12 17:11:49 +02:00
confirmation_instructions.fa.html.erb i18n: update Persian translation (#4470) 2017-07-31 19:40:57 +02:00
confirmation_instructions.fa.text.erb i18n: update Persian translation (#4470) 2017-07-31 19:40:57 +02:00
confirmation_instructions.fi.html.erb Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
confirmation_instructions.fi.text.erb Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
confirmation_instructions.fr.html.erb Various fixes in the French translation (#4107) 2017-07-08 01:27:22 +02:00
confirmation_instructions.fr.text.erb Various fixes in the French translation (#4107) 2017-07-08 01:27:22 +02:00
confirmation_instructions.he.html.erb i18n: Update Hebrew interface translation. (#2880) 2017-05-07 15:20:34 +02:00
confirmation_instructions.he.text.erb i18n: Update Hebrew interface translation. (#2880) 2017-05-07 15:20:34 +02:00
confirmation_instructions.id.html.erb Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
confirmation_instructions.id.text.erb Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
confirmation_instructions.it.html.erb Italian translation (#2654) 2017-05-01 18:14:51 +02:00
confirmation_instructions.it.text.erb Italian translation (#2654) 2017-05-01 18:14:51 +02:00
confirmation_instructions.ja.html.erb Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975) 2017-04-17 10:32:09 +02:00
confirmation_instructions.ja.text.erb Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975) 2017-04-17 10:32:09 +02:00
confirmation_instructions.nl.html.erb Updating and extending Dutch strings (#2930) 2017-05-08 23:11:12 +02:00
confirmation_instructions.nl.text.erb Updating and extending Dutch strings (#2930) 2017-05-08 23:11:12 +02:00
confirmation_instructions.no.html.erb Norwegian translation for email notifications (#2673) 2017-05-02 20:18:43 +02:00
confirmation_instructions.no.text.erb Norwegian translation for email notifications (#2673) 2017-05-02 20:18:43 +02:00
confirmation_instructions.oc.html.erb i10n minors changes for 1.6 (#4867) 2017-09-09 18:22:56 +02:00
confirmation_instructions.oc.text.erb i10n minors changes for 1.6 (#4867) 2017-09-09 18:22:56 +02:00
confirmation_instructions.pl.html.erb i18n: Updated Polish translation (#2832) 2017-05-06 11:06:55 +02:00
confirmation_instructions.pl.text.erb i18n: Updated Polish translation (#2832) 2017-05-06 11:06:55 +02:00
confirmation_instructions.pt-BR.html.erb l10n: Full PT-BR translation (#4882) 2017-09-11 08:40:29 +09:00
confirmation_instructions.pt-BR.text.erb l10n: Full PT-BR translation (#4882) 2017-09-11 08:40:29 +09:00
confirmation_instructions.ru.html.erb Update Russian translation (rebased) (#2503) 2017-04-26 22:33:54 +02:00
confirmation_instructions.ru.text.erb Update Russian translation (rebased) (#2503) 2017-04-26 22:33:54 +02:00
confirmation_instructions.tr.html.erb Add Turkish yml file (#2878) 2017-05-07 16:20:53 +02:00
confirmation_instructions.tr.text.erb Add Turkish yml file (#2878) 2017-05-07 16:20:53 +02:00
confirmation_instructions.zh-cn.html.erb Minor Chinese check & jsx addition (#4973) 2017-09-16 18:48:38 +02:00
confirmation_instructions.zh-cn.text.erb Minor Chinese check & jsx addition (#4973) 2017-09-16 18:48:38 +02:00
password_change.ar.html.erb Update simple_form.ar.yml (#2908) 2017-05-08 15:58:38 +02:00
password_change.ar.text.erb Update simple_form.ar.yml (#2908) 2017-05-08 15:58:38 +02:00
password_change.ca.html.erb Add catalan language (#3084) 2017-05-17 00:25:10 +02:00
password_change.ca.text.erb Add catalan language (#3084) 2017-05-17 00:25:10 +02:00
password_change.en.html.erb Use instance name in email notifications instead of "Mastodon" (#3763) 2017-06-27 14:22:36 +02:00
password_change.en.text.erb Use instance name in email notifications instead of "Mastodon" (#3763) 2017-06-27 14:22:36 +02:00
password_change.fa.html.erb Persian translation update (#3206) 2017-05-22 00:20:13 +02:00
password_change.fa.text.erb Persian translation update (#3206) 2017-05-22 00:20:13 +02:00
password_change.fi.html.erb Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
password_change.fi.text.erb Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
password_change.fr.html.erb Update french translation (#1148) 2017-04-08 13:11:16 +02:00
password_change.fr.text.erb Update french translation (#1148) 2017-04-08 13:11:16 +02:00
password_change.he.html.erb Add Hebrew interface translation. (#2573) 2017-05-02 08:54:35 -04:00
password_change.he.text.erb Add Hebrew interface translation. (#2573) 2017-05-02 08:54:35 -04:00
password_change.id.html.erb Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
password_change.id.text.erb Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
password_change.it.html.erb Italian translation (#2654) 2017-05-01 18:14:51 +02:00
password_change.it.text.erb Italian translation (#2654) 2017-05-01 18:14:51 +02:00
password_change.ja.html.erb Add Japanese translation (#1552) 2017-04-11 21:52:09 +02:00
password_change.ja.text.erb Add Japanese translation (#1552) 2017-04-11 21:52:09 +02:00
password_change.nl.html.erb Updating and extending Dutch strings (#2930) 2017-05-08 23:11:12 +02:00
password_change.nl.text.erb Updating and extending Dutch strings (#2930) 2017-05-08 23:11:12 +02:00
password_change.no.html.erb Norwegian translation for email notifications (#2673) 2017-05-02 20:18:43 +02:00
password_change.no.text.erb Norwegian translation for email notifications (#2673) 2017-05-02 20:18:43 +02:00
password_change.oc.html.erb i10n minors changes for 1.6 (#4867) 2017-09-09 18:22:56 +02:00
password_change.oc.text.erb i10n minors changes for 1.6 (#4867) 2017-09-09 18:22:56 +02:00
password_change.pl.html.erb i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976) 2017-06-27 23:10:43 +02:00
password_change.pl.text.erb i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976) 2017-06-27 23:10:43 +02:00
password_change.pt-BR.html.erb l10n: Full PT-BR translation (#4882) 2017-09-11 08:40:29 +09:00
password_change.pt-BR.text.erb l10n: Full PT-BR translation (#4882) 2017-09-11 08:40:29 +09:00
password_change.ru.html.erb Update Russian translation (rebased) (#2503) 2017-04-26 22:33:54 +02:00
password_change.ru.text.erb Update Russian translation (rebased) (#2503) 2017-04-26 22:33:54 +02:00
password_change.th.html.erb Add Thai langauge (#2903) 2017-05-08 15:56:00 +02:00
password_change.th.text.erb Add Thai langauge (#2903) 2017-05-08 15:56:00 +02:00
password_change.tr.html.erb Add Turkish yml file (#2878) 2017-05-07 16:20:53 +02:00
password_change.tr.text.erb Add Turkish yml file (#2878) 2017-05-07 16:20:53 +02:00
password_change.zh-cn.html.erb Enhance for the Chinese translation (#3198) 2017-05-21 11:23:59 +02:00
password_change.zh-cn.text.erb Enhance for the Chinese translation (#3198) 2017-05-21 11:23:59 +02:00
reset_password_instructions.ar.html.erb Update reset_password_instructions.ar.html.erb (#3163) 2017-05-20 13:38:33 +02:00
reset_password_instructions.ar.text.erb Update simple_form.ar.yml (#2908) 2017-05-08 15:58:38 +02:00
reset_password_instructions.ca.html.erb Add catalan language (#3084) 2017-05-17 00:25:10 +02:00
reset_password_instructions.ca.text.erb Add catalan language (#3084) 2017-05-17 00:25:10 +02:00
reset_password_instructions.en.html.erb Use instance name in email notifications instead of "Mastodon" (#3763) 2017-06-27 14:22:36 +02:00
reset_password_instructions.en.text.erb Use instance name in email notifications instead of "Mastodon" (#3763) 2017-06-27 14:22:36 +02:00
reset_password_instructions.fa.html.erb Persian translation update (#3206) 2017-05-22 00:20:13 +02:00
reset_password_instructions.fa.text.erb Persian translation update (#3206) 2017-05-22 00:20:13 +02:00
reset_password_instructions.fi.html.erb Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
reset_password_instructions.fi.text.erb Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
reset_password_instructions.fr.html.erb Various fixes in the French translation (#4107) 2017-07-08 01:27:22 +02:00
reset_password_instructions.fr.text.erb Various fixes in the French translation (#4107) 2017-07-08 01:27:22 +02:00
reset_password_instructions.he.html.erb Add Hebrew interface translation. (#2573) 2017-05-02 08:54:35 -04:00
reset_password_instructions.he.text.erb Add Hebrew interface translation. (#2573) 2017-05-02 08:54:35 -04:00
reset_password_instructions.id.html.erb Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
reset_password_instructions.id.text.erb Add Indonesian (Bahasa Indonesia / id) translation (#2200) 2017-04-21 19:16:26 +02:00
reset_password_instructions.it.html.erb Italian translation (#2654) 2017-05-01 18:14:51 +02:00
reset_password_instructions.it.text.erb Italian translation (#2654) 2017-05-01 18:14:51 +02:00
reset_password_instructions.ja.html.erb Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975) 2017-04-17 10:32:09 +02:00
reset_password_instructions.ja.text.erb Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975) 2017-04-17 10:32:09 +02:00
reset_password_instructions.nl.html.erb Updating and extending Dutch strings (#2930) 2017-05-08 23:11:12 +02:00
reset_password_instructions.nl.text.erb Updating and extending Dutch strings (#2930) 2017-05-08 23:11:12 +02:00
reset_password_instructions.no.html.erb Norwegian translation for email notifications (#2673) 2017-05-02 20:18:43 +02:00
reset_password_instructions.no.text.erb Norwegian translation for email notifications (#2673) 2017-05-02 20:18:43 +02:00
reset_password_instructions.oc.html.erb i10n minors changes for 1.6 (#4867) 2017-09-09 18:22:56 +02:00
reset_password_instructions.oc.text.erb i10n minors changes for 1.6 (#4867) 2017-09-09 18:22:56 +02:00
reset_password_instructions.pl.html.erb i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976) 2017-06-27 23:10:43 +02:00
reset_password_instructions.pl.text.erb i18n: Use instance name in email notifications instead of Mastodon (pl) (#3976) 2017-06-27 23:10:43 +02:00
reset_password_instructions.pt-BR.html.erb l10n: Full PT-BR translation (#4882) 2017-09-11 08:40:29 +09:00
reset_password_instructions.pt-BR.text.erb l10n: Full PT-BR translation (#4882) 2017-09-11 08:40:29 +09:00
reset_password_instructions.ru.html.erb Update Russian translation (rebased) (#2503) 2017-04-26 22:33:54 +02:00
reset_password_instructions.ru.text.erb Update Russian translation (rebased) (#2503) 2017-04-26 22:33:54 +02:00
reset_password_instructions.th.html.erb Add Thai langauge (#2903) 2017-05-08 15:56:00 +02:00
reset_password_instructions.th.text.erb Add Thai langauge (#2903) 2017-05-08 15:56:00 +02:00
reset_password_instructions.tr.html.erb Add Turkish yml file (#2878) 2017-05-07 16:20:53 +02:00
reset_password_instructions.tr.text.erb Add Turkish yml file (#2878) 2017-05-07 16:20:53 +02:00
reset_password_instructions.zh-cn.html.erb Minor Chinese check & jsx addition (#4973) 2017-09-16 18:48:38 +02:00
reset_password_instructions.zh-cn.text.erb Minor Chinese check & jsx addition (#4973) 2017-09-16 18:48:38 +02:00