From 5b90a9b604993aeb48f77997fcfc6fc38259357d Mon Sep 17 00:00:00 2001
From: Andrew Stadler <stadler@android.com>
Date: Thu, 27 May 2010 17:27:59 -0700
Subject: [PATCH] Fix format string ordering

* Three format strings had multiple replacement tokens, but the ordering
  information was missing.
* In five languages, the translations reverse the order, and the formatter
  crashes (because of types mismatching).
* This patch adds in the ordering information where needed

Bug: 2719864
Change-Id: I084e9c9ddab54901a5142710e8ef986223902c17
---
 res/values-ja/strings.xml     |  6 +++---
 res/values-ko/strings.xml     |  6 +++---
 res/values-ru/strings.xml     |  6 +++---
 res/values-tr/strings.xml     |  6 +++---
 res/values-zh-rCN/strings.xml |  6 +++---
 res/values/strings.xml        | 20 ++++++++++----------
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0fa37dbee..e768f28bb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -267,8 +267,8 @@
     <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchangeカレンダーを追加しました"</string>
     <string name="gal_searching_fmt" msgid="6140450617663543464">"<xliff:g id="DOMAIN">%s</xliff:g>を検索中..."</string>
   <plurals name="gal_completed_fmt">
-    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="DOMAIN">%s</xliff:g>からの結果: <xliff:g id="RESULTS">%d</xliff:g>件"</item>
-    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%s</xliff:g>からの結果: <xliff:g id="RESULTS">%d</xliff:g>件"</item>
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="DOMAIN">%2$s</xliff:g>からの結果: <xliff:g id="RESULTS">%1$d</xliff:g>件"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g>からの結果: <xliff:g id="RESULTS">%1$d</xliff:g>件"</item>
   </plurals>
-    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%s</xliff:g>からの結果: 最初の<xliff:g id="RESULTS">%d</xliff:g>件"</string>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%2$s</xliff:g>からの結果: 最初の<xliff:g id="RESULTS">%1$d</xliff:g>件"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a6e7de0cd..84d31b8de 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -267,8 +267,8 @@
     <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange 캘린더 추가됨"</string>
     <string name="gal_searching_fmt" msgid="6140450617663543464">"<xliff:g id="DOMAIN">%s</xliff:g> 검색 중..."</string>
   <plurals name="gal_completed_fmt">
-    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="DOMAIN">%s</xliff:g>의 검색결과 <xliff:g id="RESULTS">%d</xliff:g>개"</item>
-    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%s</xliff:g>의 검색결과 <xliff:g id="RESULTS">%d</xliff:g>개"</item>
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="DOMAIN">%2$s</xliff:g>의 검색결과 <xliff:g id="RESULTS">%1$d</xliff:g>개"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g>의 검색결과 <xliff:g id="RESULTS">%1$d</xliff:g>개"</item>
   </plurals>
-    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%s</xliff:g>의 처음 <xliff:g id="RESULTS">%d</xliff:g>개 검색결과"</string>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%2$s</xliff:g>의 처음 <xliff:g id="RESULTS">%1$d</xliff:g>개 검색결과"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b91ae04b8..acec2dc9c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -267,8 +267,8 @@
     <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Календарь Exchange добавлен"</string>
     <string name="gal_searching_fmt" msgid="6140450617663543464">"Поиск <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
   <plurals name="gal_completed_fmt">
-    <item quantity="one" msgid="7496785524617037642">"Результаты с <xliff:g id="DOMAIN">%s</xliff:g> (<xliff:g id="RESULTS">%d</xliff:g>)"</item>
-    <item quantity="other" msgid="7816121892960632123">"Кол-во результатов: <xliff:g id="RESULTS">%d</xliff:g> с <xliff:g id="DOMAIN">%s</xliff:g>"</item>
+    <item quantity="one" msgid="7496785524617037642">"Результаты с <xliff:g id="DOMAIN">%2$s</xliff:g> (<xliff:g id="RESULTS">%1$d</xliff:g>)"</item>
+    <item quantity="other" msgid="7816121892960632123">"Кол-во результатов: <xliff:g id="RESULTS">%1$d</xliff:g> с <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
-    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Первые результаты с <xliff:g id="DOMAIN">%s</xliff:g> (<xliff:g id="RESULTS">%d</xliff:g>)"</string>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Первые результаты с <xliff:g id="DOMAIN">%2$s</xliff:g> (<xliff:g id="RESULTS">%1$d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 107f03c59..05a9f8ebb 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -267,8 +267,8 @@
     <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange takvimi eklendi"</string>
     <string name="gal_searching_fmt" msgid="6140450617663543464">"<xliff:g id="DOMAIN">%s</xliff:g> aranıyor…"</string>
   <plurals name="gal_completed_fmt">
-    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="DOMAIN">%s</xliff:g> alanından <xliff:g id="RESULTS">%d</xliff:g> sonuç"</item>
-    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%s</xliff:g> alanından <xliff:g id="RESULTS">%d</xliff:g> sonuç"</item>
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="DOMAIN">%2$s</xliff:g> alanından <xliff:g id="RESULTS">%1$d</xliff:g> sonuç"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g> alanından <xliff:g id="RESULTS">%1$d</xliff:g> sonuç"</item>
   </plurals>
-    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%s</xliff:g> alanından ilk <xliff:g id="RESULTS">%d</xliff:g> sonuç"</string>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="DOMAIN">%2$s</xliff:g> alanından ilk <xliff:g id="RESULTS">%1$d</xliff:g> sonuç"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 836fe36c6..9f8e2890f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -267,8 +267,8 @@
     <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"已添加 Exchange 日历"</string>
     <string name="gal_searching_fmt" msgid="6140450617663543464">"正在搜索 <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
   <plurals name="gal_completed_fmt">
-    <item quantity="one" msgid="7496785524617037642">"来自 <xliff:g id="DOMAIN">%s</xliff:g> 的 <xliff:g id="RESULTS">%d</xliff:g> 条结果"</item>
-    <item quantity="other" msgid="7816121892960632123">"来自 <xliff:g id="DOMAIN">%s</xliff:g> 的 <xliff:g id="RESULTS">%d</xliff:g> 条结果"</item>
+    <item quantity="one" msgid="7496785524617037642">"来自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的 <xliff:g id="RESULTS">%1$d</xliff:g> 条结果"</item>
+    <item quantity="other" msgid="7816121892960632123">"来自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的 <xliff:g id="RESULTS">%1$d</xliff:g> 条结果"</item>
   </plurals>
-    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"来自 <xliff:g id="DOMAIN">%s</xliff:g> 的前 <xliff:g id="RESULTS">%d</xliff:g> 条结果"</string>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"来自 <xliff:g id="DOMAIN">%2$s</xliff:g> 的前 <xliff:g id="RESULTS">%1$d</xliff:g> 条结果"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c51b874fc..95b4e9ee5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -153,13 +153,13 @@
          one or more new messages; e.g, "279 unread (someone@google.com)". -->
     <plurals name="notification_new_one_account_fmt">
         <!-- Case of one new message. -->
-        <item quantity="one"><xliff:g id="unread_message_count" example="1">%d</xliff:g> unread (<xliff:g id="account">%s</xliff:g>)</item> 
+        <item quantity="one"><xliff:g id="unread_message_count" example="1">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item> 
 
         <!-- Case of "few" (small number of) new messages. -->
-        <item quantity="few"><xliff:g id="unread_message_count" example="2">%d</xliff:g> unread (<xliff:g id="account">%s</xliff:g>)</item> 
+        <item quantity="few"><xliff:g id="unread_message_count" example="2">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item> 
 
         <!-- Case of a plural number of new messages. -->
-        <item quantity="other"><xliff:g id="unread_message_count" example="279">%d</xliff:g> unread (<xliff:g id="account">%s</xliff:g>)</item>
+        <item quantity="other"><xliff:g id="unread_message_count" example="279">%1$d</xliff:g> unread (<xliff:g id="account">%2$s</xliff:g>)</item>
     </plurals>
 
 
@@ -242,7 +242,7 @@
     <!-- Hint text in Message composer body field -->
     <string name="message_compose_body_hint">Compose Mail</string>    
     <!-- Header for forwarded original messages -->
-    <string name="message_compose_fwd_header_fmt">\n\n-------- Original Message --------\nSubject: <xliff:g id="subject">%s</xliff:g>\nFrom: <xliff:g id="sender">%s</xliff:g>\nTo: <xliff:g id="to">%s</xliff:g>\nCC: <xliff:g id="cc">%s</xliff:g>\n\n</string>
+    <string name="message_compose_fwd_header_fmt">\n\n-------- Original Message --------\nSubject: <xliff:g id="subject">%1$s</xliff:g>\nFrom: <xliff:g id="sender">%2$s</xliff:g>\nTo: <xliff:g id="to">%3$s</xliff:g>\nCC: <xliff:g id="cc">%4$s</xliff:g>\n\n</string>
     <!-- Header for replied-to messages -->
     <string name="message_compose_reply_header_fmt">\n\n<xliff:g id="sender">%s</xliff:g> wrote:\n\n</string>
     <!-- Heading that appears before forwarded text -->
@@ -696,16 +696,16 @@
          "5 results from bigcompany.com..."  -->
     <plurals name="gal_completed_fmt">
         <!-- Case of one result from server. -->
-        <item quantity="one"><xliff:g id="results" example="1">%d</xliff:g> result
-        from <xliff:g id="domain">%s</xliff:g></item>
+        <item quantity="one"><xliff:g id="results" example="1">%1$d</xliff:g> result
+        from <xliff:g id="domain">%2$s</xliff:g></item>
 
         <!-- Case of multiple results from server -->
-        <item quantity="other"><xliff:g id="results" example="20">%d</xliff:g> results
-        from <xliff:g id="domain">%s</xliff:g></item>
+        <item quantity="other"><xliff:g id="results" example="20">%1$d</xliff:g> results
+        from <xliff:g id="domain">%2$s</xliff:g></item>
     </plurals>
     <!-- Displayed in small separator in to/cc/bcc dropdowns, when searching GAL completes,
          and a limited amount (not all) of the server results are being displayed.  This is
          always a larger value because it represents the limit of displayed results.  -->
-    <string name="gal_completed_limited_fmt">First <xliff:g id="results" example="20">%d</xliff:g>
-        results from <xliff:g id="domain">%s</xliff:g></string>
+    <string name="gal_completed_limited_fmt">First <xliff:g id="results" example="20">%1$d</xliff:g>
+        results from <xliff:g id="domain">%2$s</xliff:g></string>
 </resources>