diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 294 | ||||
| -rw-r--r-- | chrome/common/time_format.cc | 21 |
2 files changed, 214 insertions, 101 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e745f4b..41f6237 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -786,20 +786,18 @@ each locale. --> <ph name="ENGINE_NAME">$1<ex>Google</ex></ph> (Default) </message> - <!-- TODO(jungshik) : Improve the description to minimize translator errors. --> - <message name="IDS_TIME_SECS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> secs </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_SEC_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> sec </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_SEC_SINGULAR" desc=""> NA @@ -808,7 +806,7 @@ each locale. --> <if expr="lang in ['ar', 'ro', 'lv']"> <message name="IDS_TIME_SECS_ZERO" - desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, just copy the source string."> + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> secs </message> </if> @@ -821,7 +819,7 @@ each locale. --> <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_SECS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> secs </message> </if> @@ -834,7 +832,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_SECS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> secs </message> </if> @@ -847,7 +845,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_SECS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> secs </message> </if> @@ -860,26 +858,39 @@ each locale. --> <message name="IDS_TIME_MINS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> mins </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_MIN_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> min </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_MIN_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_MINS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> mins + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_MINS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_MINS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> mins </message> </if> @@ -892,7 +903,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_MINS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> mins </message> </if> @@ -905,7 +916,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_MINS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> mins </message> </if> @@ -918,26 +929,39 @@ each locale. --> <message name="IDS_TIME_HOURS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> hours </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_HOUR_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> hour </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_HOUR_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_HOURS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> hours + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_HOURS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_HOURS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> hours </message> </if> @@ -950,7 +974,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_HOURS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> hours </message> </if> @@ -963,7 +987,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_HOURS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> hours </message> </if> @@ -976,26 +1000,39 @@ each locale. --> <message name="IDS_TIME_DAYS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> days </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_DAY_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> day </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_DAY_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_DAYS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> days + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_DAYS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_DAYS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> days </message> </if> @@ -1008,7 +1045,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_DAYS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> days </message> </if> @@ -1021,7 +1058,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_DAYS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> days </message> </if> @@ -1034,17 +1071,17 @@ each locale. --> <message name="IDS_TIME_REMAINING_SECS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> secs left </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_REMAINING_SEC_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> sec left </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_REMAINING_SEC_SINGULAR" desc=""> NA @@ -1053,7 +1090,7 @@ each locale. --> <if expr="lang in ['ar', 'ro', 'lv']"> <message name="IDS_TIME_REMAINING_SECS_ZERO" - desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, just copy the source string."> + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> secs left </message> </if> @@ -1066,7 +1103,7 @@ each locale. --> <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_SECS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> secs left </message> </if> @@ -1079,7 +1116,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_SECS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> secs left </message> </if> @@ -1092,7 +1129,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_REMAINING_SECS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> secs left </message> </if> @@ -1105,26 +1142,39 @@ each locale. --> <message name="IDS_TIME_REMAINING_MINS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> mins left </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_REMAINING_MIN_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> min left </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_REMAINING_MIN_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_REMAINING_MINS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> mins left + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_REMAINING_MINS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_MINS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> mins left </message> </if> @@ -1137,7 +1187,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_MINS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> mins left </message> </if> @@ -1150,7 +1200,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_REMAINING_MINS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> mins left </message> </if> @@ -1163,26 +1213,39 @@ each locale. --> <message name="IDS_TIME_REMAINING_HOURS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> hours left </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_REMAINING_HOUR_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> hour left </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_REMAINING_HOUR_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_REMAINING_HOURS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> hours left + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_REMAINING_HOURS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_HOURS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> hours left </message> </if> @@ -1195,7 +1258,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_HOURS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> hours left </message> </if> @@ -1208,7 +1271,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_REMAINING_HOURS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> hours left </message> </if> @@ -1221,26 +1284,39 @@ each locale. --> <message name="IDS_TIME_REMAINING_DAYS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> days left </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_REMAINING_DAY_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> day left </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_REMAINING_DAY_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_REMAINING_DAYS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> days left + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_REMAINING_DAYS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_DAYS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> days left </message> </if> @@ -1253,7 +1329,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_REMAINING_DAYS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> days left </message> </if> @@ -1266,7 +1342,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_REMAINING_DAYS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> days left </message> </if> @@ -1277,18 +1353,19 @@ each locale. --> </message> </if> + <message name="IDS_TIME_ELAPSED_SECS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> secs ago </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_ELAPSED_SEC_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> sec ago </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_ELAPSED_SEC_SINGULAR" desc=""> NA @@ -1297,7 +1374,7 @@ each locale. --> <if expr="lang in ['ar', 'ro', 'lv']"> <message name="IDS_TIME_ELAPSED_SECS_ZERO" - desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, just copy the source string."> + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> secs ago </message> </if> @@ -1310,7 +1387,7 @@ each locale. --> <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_SECS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> secs ago </message> </if> @@ -1323,7 +1400,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_SECS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> secs ago </message> </if> @@ -1336,7 +1413,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_ELAPSED_SECS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> secs ago </message> </if> @@ -1349,26 +1426,39 @@ each locale. --> <message name="IDS_TIME_ELAPSED_MINS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> mins ago </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_ELAPSED_MIN_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> min ago </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_ELAPSED_MIN_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_ELAPSED_MINS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> mins ago + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_ELAPSED_MINS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_MINS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> mins ago </message> </if> @@ -1381,7 +1471,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_MINS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> mins ago </message> </if> @@ -1394,7 +1484,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_ELAPSED_MINS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> mins ago </message> </if> @@ -1407,26 +1497,39 @@ each locale. --> <message name="IDS_TIME_ELAPSED_HOURS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> hours ago </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_ELAPSED_HOUR_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> hour ago </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_ELAPSED_HOUR_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_ELAPSED_HOURS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> hours ago + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_ELAPSED_HOURS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_HOURS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> hours ago </message> </if> @@ -1439,7 +1542,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_HOURS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> hours ago </message> </if> @@ -1452,7 +1555,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_ELAPSED_HOURS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> hours ago </message> </if> @@ -1465,26 +1568,39 @@ each locale. --> <message name="IDS_TIME_ELAPSED_DAYS_DEFAULT" - desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, and Turkish, this is the only string necessary. For languages with singular-plural distinction, this is generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> + desc="This is necessary for every language. This is the default for all the numbers NOT covered by special cases (singular, dual/two, few, many) some languages need. For CJK, Vietnamese, Turkish and Kannada, this is the only string necessary. For languages with singular-plural distinction, this is the generic plural. For Lithuanian, NUMBER_DEFAULT is 11 .. 19."> <ph name="NUMBER_DEFAULT"><ex>37</ex>#</ph> days ago </message> - <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message name="IDS_TIME_ELAPSED_DAY_SINGULAR" - desc="NUMBER_ONE is one or one-like numbers : 1 (many European languages), 1 and 0 (French and Brazillian Portugese), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese and Turkish, but just copy the source string."> + desc="NUMBER_ONE is one or one-like numbers : 1 (many European and most Indian languages), 1 and 0 (French, Brazillian Portugese and Hindi), 1,21,31, .. (Russian, Ukrainian, Croatian, Servian, Latvian, Lithuanian), or 1, 101, 201, .. (Slovenian). Do NOT translate this for CJK, Vietnamese, Turkish and Kannada"> <ph name="NUMBER_ONE"><ex>1</ex>#</ph> day ago </message> </if> - <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr']"> + <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']"> <message translateable="false" name="IDS_TIME_ELAPSED_DAY_SINGULAR" desc=""> NA </message> </if> + <if expr="lang in ['ar', 'ro', 'lv']"> + <message name="IDS_TIME_ELAPSED_DAYS_ZERO" + desc="NUMBER_ZERO is 0 (Arabic, Latvian) or 0, 2..19, 101..119, ... (Romanian). For other languages, do NOT translate."> + <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> days ago + </message> + </if> + <if expr="lang not in ['ar', 'ro', 'lv']"> + <message translateable="false" name="IDS_TIME_ELAPSED_DAYS_ZERO" + desc=""> + NA + </message> + </if> + <if expr="lang in ['ga', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_DAYS_TWO" - desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, just copy the source string."> + desc="NUMBER_TWO is two or two-like/dual numbers : 2 (Arabic and Irish) or 2, 102, 202 ... (Slovenian). For other languages, do NOT translated."> <ph name="NUMBER_TWO"><ex>2</ex>#</ph> days ago </message> </if> @@ -1497,7 +1613,7 @@ each locale. --> <if expr="lang in ['ru', 'lt', 'hr', 'uk', 'cs', 'sk', 'pl', 'sl', 'ar']"> <message name="IDS_TIME_ELAPSED_DAYS_FEW" - desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, just copy the source string."> + desc="NUMBER_FEW is few or few-like numbers in Arabic, Russian, Polish, Croatian, Serbian, Ukrainian, Czech, Slovak, Slovenian, Latvian. For other languages, do NOT translate."> <ph name="NUMBER_FEW"><ex>3</ex>#</ph> days ago </message> </if> @@ -1510,7 +1626,7 @@ each locale. --> <if expr="lang == 'ar'"> <message name="IDS_TIME_ELAPSED_DAYS_MANY" - desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, just copy the source string."> + desc="NUMBER_MANY is 11 through 99 in Arabic. For all other languages, do NOT translate."> <ph name="NUMBER_MANY"><ex>23</ex>#</ph> days ago </message> </if> diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index c4bd179..80fe242b 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -30,8 +30,6 @@ static const char kFallbackFormatSuffixShort[] = "}"; static const char kFallbackFormatSuffixLeft[] = " left}"; static const char kFallbackFormatSuffixAgo[] = " ago}"; -static const int kInvalidMsgId = -1; - // Contains message IDs for various time units and pluralities. struct MessageIDs { // There are 4 different time units and 6 different pluralities. @@ -45,15 +43,15 @@ static const MessageIDs kTimeShortMessageIDs = { { IDS_TIME_SECS_TWO, IDS_TIME_SECS_FEW, IDS_TIME_SECS_MANY }, { - IDS_TIME_MINS_DEFAULT, IDS_TIME_MIN_SINGULAR, kInvalidMsgId, + IDS_TIME_MINS_DEFAULT, IDS_TIME_MIN_SINGULAR, IDS_TIME_MINS_ZERO, IDS_TIME_MINS_TWO, IDS_TIME_MINS_FEW, IDS_TIME_MINS_MANY }, { - IDS_TIME_HOURS_DEFAULT, IDS_TIME_HOUR_SINGULAR, kInvalidMsgId, + IDS_TIME_HOURS_DEFAULT, IDS_TIME_HOUR_SINGULAR, IDS_TIME_HOURS_ZERO, IDS_TIME_HOURS_TWO, IDS_TIME_HOURS_FEW, IDS_TIME_HOURS_MANY }, { - IDS_TIME_DAYS_DEFAULT, IDS_TIME_DAY_SINGULAR, kInvalidMsgId, + IDS_TIME_DAYS_DEFAULT, IDS_TIME_DAY_SINGULAR, IDS_TIME_DAYS_ZERO, IDS_TIME_DAYS_TWO, IDS_TIME_DAYS_FEW, IDS_TIME_DAYS_MANY } } }; @@ -66,17 +64,17 @@ static const MessageIDs kTimeRemainingMessageIDs = { { }, { IDS_TIME_REMAINING_MINS_DEFAULT, IDS_TIME_REMAINING_MIN_SINGULAR, - kInvalidMsgId, IDS_TIME_REMAINING_MINS_TWO, + IDS_TIME_REMAINING_MINS_ZERO, IDS_TIME_REMAINING_MINS_TWO, IDS_TIME_REMAINING_MINS_FEW, IDS_TIME_REMAINING_MINS_MANY }, { IDS_TIME_REMAINING_HOURS_DEFAULT, IDS_TIME_REMAINING_HOUR_SINGULAR, - kInvalidMsgId, IDS_TIME_REMAINING_HOURS_TWO, + IDS_TIME_REMAINING_HOURS_ZERO, IDS_TIME_REMAINING_HOURS_TWO, IDS_TIME_REMAINING_HOURS_FEW, IDS_TIME_REMAINING_HOURS_MANY }, { IDS_TIME_REMAINING_DAYS_DEFAULT, IDS_TIME_REMAINING_DAY_SINGULAR, - kInvalidMsgId, IDS_TIME_REMAINING_DAYS_TWO, + IDS_TIME_REMAINING_DAYS_ZERO, IDS_TIME_REMAINING_DAYS_TWO, IDS_TIME_REMAINING_DAYS_FEW, IDS_TIME_REMAINING_DAYS_MANY } } }; @@ -89,17 +87,17 @@ static const MessageIDs kTimeElapsedMessageIDs = { { }, { IDS_TIME_ELAPSED_MINS_DEFAULT, IDS_TIME_ELAPSED_MIN_SINGULAR, - kInvalidMsgId, IDS_TIME_ELAPSED_MINS_TWO, + IDS_TIME_ELAPSED_MINS_ZERO, IDS_TIME_ELAPSED_MINS_TWO, IDS_TIME_ELAPSED_MINS_FEW, IDS_TIME_ELAPSED_MINS_MANY }, { IDS_TIME_ELAPSED_HOURS_DEFAULT, IDS_TIME_ELAPSED_HOUR_SINGULAR, - kInvalidMsgId, IDS_TIME_ELAPSED_HOURS_TWO, + IDS_TIME_ELAPSED_HOURS_ZERO, IDS_TIME_ELAPSED_HOURS_TWO, IDS_TIME_ELAPSED_HOURS_FEW, IDS_TIME_ELAPSED_HOURS_MANY }, { IDS_TIME_ELAPSED_DAYS_DEFAULT, IDS_TIME_ELAPSED_DAY_SINGULAR, - kInvalidMsgId, IDS_TIME_ELAPSED_DAYS_TWO, + IDS_TIME_ELAPSED_DAYS_ZERO, IDS_TIME_ELAPSED_DAYS_TWO, IDS_TIME_ELAPSED_DAYS_FEW, IDS_TIME_ELAPSED_DAYS_MANY } } }; @@ -208,7 +206,6 @@ void TimeFormatter::BuildFormats(FormatType format_type, UnicodeString pattern; for (size_t j = 0; j < arraysize(kKeywords); ++j) { int msg_id = message_ids.ids[i][j]; - if (msg_id == kInvalidMsgId) continue; std::string sub_pattern = WideToUTF8(l10n_util::GetString(msg_id)); // NA means this keyword is not used in the current locale. // Even if a translator translated for this keyword, we do not |