Rename IDS ids to be more consistent in ui_strings.grd.

ui/base/strings/ui_strings.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- This file contains definitions of resources that will be translated for
 each locale. Specifically, these are UI strings that are used by app/ that
 need to be translated for each locale.-->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
     <!-- TODO add each of your output files.  Modify the three below, and add
@@ skipping 201 matching lines @@
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">
 
       <!-- time format -->
       <message name="IDS_TIME_SECS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_SEC_SINGULAR"
+      <message name="IDS_TIME_SECS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_SEC_SINGULAR"
+      <message translateable="false" name="IDS_TIME_SECS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <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, do NOT translate.">
         <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> secs
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_LONG_SECS_DEFAULT"
                desc="This is necessary for every language. It 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> seconds
       </message>
 
       <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message name="IDS_TIME_LONG_SEC_SINGULAR"
+      <message name="IDS_TIME_LONG_SECS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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> second
       </message>
       </if>
       <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message translateable="false" name="IDS_TIME_LONG_SEC_SINGULAR"
+      <message translateable="false" name="IDS_TIME_LONG_SECS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_LONG_SECS_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> seconds
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_LONG_SECS_2ND_DEFAULT"
                desc="Second part of 'xx minutes yy seconds' time format. This is necessary for every language. It 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> seconds
       </message>
 
       <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message name="IDS_TIME_LONG_SEC_2ND_SINGULAR"
+      <message name="IDS_TIME_LONG_SECS_2ND_SINGULAR"
                desc="Second part of 'xx minutes yy seconds' time format where yy (NUMBER_ONE) is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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> second
       </message>
       </if>
       <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message translateable="false" name="IDS_TIME_LONG_SEC_2ND_SINGULAR"
+      <message translateable="false" name="IDS_TIME_LONG_SECS_2NDS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_LONG_SECS_2ND_ZERO"
                desc="Second part of 'xx minutes yy seconds' time format where yy (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> seconds
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_MINS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_MIN_SINGULAR"
+      <message name="IDS_TIME_MINS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_MIN_SINGULAR"
+      <message translateable="false" name="IDS_TIME_MINS_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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_LONG_MINS_DEFAULT"
                desc="This is necessary for every language. It 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> minutes
       </message>
 
       <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message name="IDS_TIME_LONG_MIN_SINGULAR"
+      <message name="IDS_TIME_LONG_MINS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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> minute
       </message>
       </if>
       <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message translateable="false" name="IDS_TIME_LONG_MIN_SINGULAR"
+      <message translateable="false" name="IDS_TIME_LONG_MINS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_LONG_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> minutes
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_LONG_MINS_1ST_DEFAULT"
                desc="First part of 'xx minutes yy seconds' time format (including the space between first and second part, if the language requires a space there). This is necessary for every language. It 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> minutes '''
       </message>
 
       <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message name="IDS_TIME_LONG_MIN_1ST_SINGULAR"
+      <message name="IDS_TIME_LONG_MINS_1ST_SINGULAR"
                desc="First part of 'xx minutes yy seconds' time format (including the space between first and second part, if the language requires a space there) where xx (NUMBER_ONE) is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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> minute '''
       </message>
       </if>
       <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message translateable="false" name="IDS_TIME_LONG_MIN_1ST_SINGULAR"
+      <message translateable="false" name="IDS_TIME_LONG_MINS_1ST_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_LONG_MINS_1ST_ZERO"
                desc="First part of 'xx minutes yy seconds' time format (including the space between first and second part, if the language requires a space there) where xx (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> minutes '''
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_LONG_MINS_2ND_DEFAULT"
                desc="Second part of 'xx hours yy minutes' time format. This is necessary for every language. It 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> minutes
       </message>
 
       <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message name="IDS_TIME_LONG_MIN_2ND_SINGULAR"
+      <message name="IDS_TIME_LONG_MINS_2ND_SINGULAR"
                desc="Second part of 'xx hours yy minutes' time format where yy (NUMBER_ONE) is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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> minute
       </message>
       </if>
       <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message translateable="false" name="IDS_TIME_LONG_MIN_2ND_SINGULAR"
+      <message translateable="false" name="IDS_TIME_LONG_MINS_2ND_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_LONG_MINS_2ND_ZERO"
                desc="Second part of 'xx hours yy minutes' time format where yy (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> minutes
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_HOURS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_HOUR_SINGULAR"
+      <message name="IDS_TIME_HOURS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_HOUR_SINGULAR"
+      <message translateable="false" name="IDS_TIME_HOURS_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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_HOURS_1ST_DEFAULT"
                desc="First part of 'xx hours yy minutes' time format (including the space between first and second part, if the language requires a space there). This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_HOUR_1ST_SINGULAR"
+      <message name="IDS_TIME_HOURS_1ST_SINGULAR"
                desc="First part of 'xx hours yy minutes' time format (including the space between first and second part, if the language requires a space there) where xx (NUMBER_ONE) is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_HOUR_1ST_SINGULAR"
+      <message translateable="false" name="IDS_TIME_HOURS_1ST_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_HOURS_1ST_ZERO"
                desc="First part of 'xx hours yy minutes' time format (including the space between first and second part, if the language requires a space there) where xx (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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_HOURS_2ND_DEFAULT"
                desc="Second part of 'xx days yy hours' time format. This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_HOUR_2ND_SINGULAR"
+      <message name="IDS_TIME_HOURS_2ND_SINGULAR"
                desc="Second part of 'xx days yy hours' time format where yy (NUMBER_ONE) is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_HOUR_2ND_SINGULAR"
+      <message translateable="false" name="IDS_TIME_HOURS_2ND_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_HOURS_2ND_ZERO"
                desc="Second part of 'xx days yy hours' time format where yy (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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_DAYS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_DAY_SINGULAR"
+      <message name="IDS_TIME_DAYS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_DAY_SINGULAR"
+      <message translateable="false" name="IDS_TIME_DAYS_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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_DAYS_1ST_DEFAULT"
                desc="First part of 'xx days yy hours' time format (including the space between first and second part, if the language requires a space there). This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_DAY_1ST_SINGULAR"
+      <message name="IDS_TIME_DAYS_1ST_SINGULAR"
                desc="First part of 'xx days yy hours' time format (including the space between first and second part, if the language requires a space there) where xx (NUMBER_ONE) is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_DAY_1ST_SINGULAR"
+      <message translateable="false" name="IDS_TIME_DAYS_1ST_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_DAYS_1ST_ZERO"
                desc="First part of 'xx days yy hours' time format (including the space between first and second part, if the language requires a space there) where xx (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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_REMAINING_SECS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_REMAINING_SEC_SINGULAR"
+      <message name="IDS_TIME_REMAINING_SECS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_REMAINING_SEC_SINGULAR"
+      <message translateable="false" name="IDS_TIME_REMAINING_SECS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <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, do NOT translate.">
         <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> secs left
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_REMAINING_LONG_SECS_DEFAULT"
                desc="This is necessary for every language. It 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> seconds left
       </message>
 
       <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message name="IDS_TIME_REMAINING_LONG_SEC_SINGULAR"
+      <message name="IDS_TIME_REMAINING_LONG_SECS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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> second left
       </message>
       </if>
       <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message translateable="false" name="IDS_TIME_REMAINING_SEC_SINGULAR"
+      <message translateable="false" name="IDS_TIME_REMAINING_SECS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_REMAINING_LONG_SECS_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> seconds left
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_REMAINING_MINS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_REMAINING_MIN_SINGULAR"
+      <message name="IDS_TIME_REMAINING_MINS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_REMAINING_MIN_SINGULAR"
+      <message translateable="false" name="IDS_TIME_REMAINING_MINS_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>
@@ skipping 43 matching lines @@
         NA
       </message>
       </if>
 
       <message name="IDS_TIME_REMAINING_LONG_MINS_DEFAULT"
                desc="This is necessary for every language. It 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> minutes left
       </message>
 
       <if expr="lang not in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message name="IDS_TIME_REMAINING_LONG_MIN_SINGULAR"
+      <message name="IDS_TIME_REMAINING_LONG_MINS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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> minute left
       </message>
       </if>
       <if expr="lang in ['zh-CN', 'zh-TW', 'ko', 'ja', 'vi', 'tr', 'kn']">
-      <message translateable="false" name="IDS_TIME_REMAINING_LONG_MIN_SINGULAR"
+      <message translateable="false" name="IDS_TIME_REMAINING_LONG_MINS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <if expr="lang in ['ar', 'ro', 'lv']">
       <message name="IDS_TIME_REMAINING_LONG_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> minutes left
       </message>
@@ skipping 43 matching lines @@
         NA
       </message>
       </if>
 
       <message name="IDS_TIME_REMAINING_HOURS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_REMAINING_HOUR_SINGULAR"
+      <message name="IDS_TIME_REMAINING_HOURS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_REMAINING_HOUR_SINGULAR"
+      <message translateable="false" name="IDS_TIME_REMAINING_HOURS_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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_REMAINING_DAYS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_REMAINING_DAY_SINGULAR"
+      <message name="IDS_TIME_REMAINING_DAYS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_REMAINING_DAY_SINGULAR"
+      <message translateable="false" name="IDS_TIME_REMAINING_DAYS_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>
@@ skipping 43 matching lines @@
         NA
       </message>
       </if>
 
       <message name="IDS_TIME_ELAPSED_SECS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_ELAPSED_SEC_SINGULAR"
+      <message name="IDS_TIME_ELAPSED_SECS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_ELAPSED_SEC_SINGULAR"
+      <message translateable="false" name="IDS_TIME_ELAPSED_SECS_SINGULAR"
                desc="">
         NA
       </message>
       </if>
 
       <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, do NOT translate.">
         <ph name="NUMBER_ZERO"><ex>0</ex>#</ph> secs ago
       </message>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_ELAPSED_MINS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_ELAPSED_MIN_SINGULAR"
+      <message name="IDS_TIME_ELAPSED_MINS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_ELAPSED_MIN_SINGULAR"
+      <message translateable="false" name="IDS_TIME_ELAPSED_MINS_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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_ELAPSED_HOURS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_ELAPSED_HOUR_SINGULAR"
+      <message name="IDS_TIME_ELAPSED_HOURS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_ELAPSED_HOUR_SINGULAR"
+      <message translateable="false" name="IDS_TIME_ELAPSED_HOURS_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>
@@ skipping 44 matching lines @@
       </message>
       </if>
 
 
       <message name="IDS_TIME_ELAPSED_DAYS_DEFAULT"
                desc="This is necessary for every language. It 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', 'kn']">
-      <message name="IDS_TIME_ELAPSED_DAY_SINGULAR"
+      <message name="IDS_TIME_ELAPSED_DAYS_SINGULAR"
                desc="NUMBER_ONE is a one or one-like number: 1 (many European and most Indian languages), 1 and 0 (French, Brazilian Portuguese and Hindi), 1, 21, 31, ... (Russian, Ukrainian, Croatian, Serbian, 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', 'kn']">
-      <message translateable="false" name="IDS_TIME_ELAPSED_DAY_SINGULAR"
+      <message translateable="false" name="IDS_TIME_ELAPSED_DAYS_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>
@@ skipping 455 matching lines @@
       </message>
       <message name="IDS_APP_LIST_FOLDER_CLOSE_FOLDER_ACCESSIBILE_NAME" desc="The spoken feedback text for closing an app launcher folder">
         Close folder
       </message>      
       <message name="IDS_APP_LIST_SPEECH_HINT_TEXT" desc="The text label in the speech recognition UI to ask the user to speak the search query">
         Speak now
       </message>
     </messages>
   </release>
 </grit>