From c5cf9e5c8cc2635b1f4ea0737f090917cdd7b5b9 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Fri, 29 Oct 2010 22:34:59 +0000
Subject: [PATCH] message_to_label and message_to_fmt were used from places
 that weren't their original sources. rename them to lie less.

---
 res/layout/message_view_header.xml                  | 2 +-
 res/values-cs/strings.xml                           | 4 ++--
 res/values-de/strings.xml                           | 4 ++--
 res/values-es/strings.xml                           | 2 +-
 res/values-fi/strings.xml                           | 4 ++--
 res/values-fr/strings.xml                           | 4 ++--
 res/values-it/strings.xml                           | 4 ++--
 res/values-ja/strings.xml                           | 4 ++--
 res/values-nl/strings.xml                           | 4 ++--
 res/values-pl/strings.xml                           | 4 ++--
 res/values-ru/strings.xml                           | 4 ++--
 res/values-sv/strings.xml                           | 4 ++--
 res/values-zh-rCN/strings.xml                       | 4 ++--
 res/values-zh-rTW/strings.xml                       | 2 +-
 res/values/strings.xml                              | 4 ++--
 src/com/fsck/k9/controller/MessagingController.java | 2 +-
 src/com/fsck/k9/helper/MessageHelper.java           | 2 +-
 17 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index c7878a913..720fbfe75 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -62,7 +62,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingRight="4dip"
-                    android:text="@string/message_view_to_label"
+                    android:text="@string/message_to_label"
                     android:textSize="10sp"
                     android:textStyle="bold"
                     android:textColor="?android:attr/textColorSecondary" />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index acd9145f9..f33512dd1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -230,7 +230,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
         <xliff:g id="sending">%s</xliff:g>
         <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Načti více zpráv</string>
-    <string name="message_list_to_fmt">Komu:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">Komu:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Smazat</string>
     <string name="message_list_mark_read_action">Označit jako přečtené</string>
     <string name="message_list_mark_unread_action">Označit jako nepřečtené</string>
@@ -250,7 +250,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
     <string name="message_compose_attachments_skipped_toast">Některé přílohy nelze přeposlat, protože ještě nebyly staženy.</string>
 
     <string name="message_view_from_format">Odesílatel: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">Komu:</string>
+    <string name="message_to_label">Komu:</string>
     <string name="message_view_cc_label">Kopie:</string>
     <string name="message_view_attachment_view_action">Otevřít</string>
     <string name="message_view_attachment_download_action">Uložit</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0c79b2a3b..9edd1e475 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -240,7 +240,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Weitere Nachrichten abrufen</string>
-    <string name="message_list_to_fmt">An:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">An:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Löschen</string>
     <string name="message_list_mark_read_action">Gelesen</string>
     <string name="message_list_mark_unread_action">Nicht gelesen</string>
@@ -262,7 +262,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
 
 
     <string name="message_view_from_format">Von: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">An:</string>
+    <string name="message_to_label">An:</string>
     <string name="message_view_cc_label">CC:</string>
     <string name="message_view_attachment_view_action">Öffnen</string>
     <string name="message_view_attachment_download_action">Speichern</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2263be880..28ed79ca7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -148,7 +148,7 @@
   <string name="message_view_show_pictures_instructions">Seleccione \"Mostrar imágenes\" para visualizar las imágenes integradas.</string>
   <string name="message_view_status_attachment_not_saved">No se pueden guardar los datos adjuntos en una tarjeta SD.</string>
   <string name="message_view_status_attachment_saved">Datos adjuntos guardados en tarjeta SD como <xliff:g id="filename">%s</xliff:g>.</string>
-  <string name="message_view_to_label">Para:</string>
+  <string name="message_to_label">Para:</string>
   <string name="move_to_action">Mover a</string>
   <string name="new_mailbox_dlg_title">Nuevo nombre de carpeta</string>
   <string name="next_action">Siguiente</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index be348b828..b859cdd46 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -238,7 +238,7 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiaka
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Hae lisää viestejä</string>
-    <string name="message_list_to_fmt">Vast.ottaja:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">Vast.ottaja:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Poista</string>
     <string name="message_list_mark_read_action">Merkitse luetuksi</string>
     <string name="message_list_mark_unread_action">Merkitse lukemattomaksi</string>
@@ -260,7 +260,7 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiaka
 
 
     <string name="message_view_from_format">Lähettäjä: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">Vast.ottaja:</string>
+    <string name="message_to_label">Vast.ottaja:</string>
     <string name="message_view_cc_label">Kopio:</string>
     <string name="message_view_attachment_view_action">Avaa</string>
     <string name="message_view_attachment_download_action">Tallenna</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 063c3529e..f7a916a61 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -227,7 +227,7 @@
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
   <string name="message_list_load_more_messages_action">Charger plus de messages</string>
-  <string name="message_list_to_fmt">Pour\u00A0: <xliff:g id="counterParty">%s</xliff:g></string>
+  <string name="message_to_fmt">Pour\u00A0: <xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_list_delete_action">Supprimer</string>
   <string name="message_list_mark_read_action">Marquer comme lu</string>
   <string name="message_list_mark_unread_action">Marquer comme non lu</string>
@@ -249,7 +249,7 @@
 
 
   <string name="message_view_from_format">De\u00A0: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-  <string name="message_view_to_label">Pour\u00A0:</string>
+  <string name="message_to_label">Pour\u00A0:</string>
   <string name="message_view_cc_label">Cc\u00A0:</string>
   <string name="message_view_attachment_view_action">Ouvrir</string>
   <string name="message_view_attachment_download_action">Enregistrer</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 118862b8f..2c2e52118 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -62,7 +62,7 @@
 	<string name="end_of_folder">Non vi sono altri messaggi</string>
 	<string name="message_header_mua">K-9 per Android <xliff:g id="version">%s</xliff:g></string>
 	<string name="message_compose_content_hint">Testo del messaggio</string>
-	<string name="message_list_to_fmt">A:<xliff:g id="counterParty">%s</xliff:g></string>
+	<string name="message_to_fmt">A:<xliff:g id="counterParty">%s</xliff:g></string>
 	<string name="message_view_from_format">Da: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
 	<string name="message_view_cc_label">Cc:</string>
 	<string name="message_delete_failed">Impossibile cancellare il messaggio</string>
@@ -342,7 +342,7 @@
 	<string name="message_view_show_pictures_instructions">Selezionare \"Mostra immagini\" per visualizzare le immagini incorporate.</string>
 	<string name="message_view_status_attachment_not_saved">Impossibile salvare l\'allegato sulla scheda SD.</string>
 	<string name="message_view_status_attachment_saved">Allegato salvato sulla scheda SD come <xliff:g id="filename">%s</xliff:g>.</string>
-	<string name="message_view_to_label">A:</string>
+	<string name="message_to_label">A:</string>
 	<string name="move_to_action">Sposta in</string>
 	<string name="new_mailbox_dlg_title">Nome della nuova cartella</string>
 	<string name="next_action">Avanti</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2572f7d6d..744dbd5fe 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -240,7 +240,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">他メールを読込</string>
-    <string name="message_list_to_fmt">宛先:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">宛先:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">削除</string>
     <string name="message_list_mark_read_action">既読にする</string>
     <string name="message_list_mark_unread_action">未読にする</string>
@@ -262,7 +262,7 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
 
 
     <string name="message_view_from_format">送信者: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">宛先:</string>
+    <string name="message_to_label">宛先:</string>
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">開く</string>
     <string name="message_view_attachment_download_action">保存</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3259d996a..57aaa62c3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -239,7 +239,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Laad meer berichten</string>
-    <string name="message_list_to_fmt">Aan:</string>
+    <string name="message_to_fmt">Aan:</string>
     <string name="message_list_delete_action">Verwijder</string>
     <string name="message_list_mark_read_action">Markeer als gelezen</string>
     <string name="message_list_mark_unread_action">Markeer als ongelezen</string>
@@ -261,7 +261,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cliënt voor Android, ge
 
 
     <string name="message_view_from_format">Van: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">Aan:</string>
+    <string name="message_to_label">Aan:</string>
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Open</string>
     <string name="message_view_attachment_download_action">Bewaar</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 329e011dc..b2f31fe50 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -238,7 +238,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Pobierz więcej wiadomości</string>
-    <string name="message_list_to_fmt">Do:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">Do:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Usuń</string>
     <string name="message_list_mark_read_action">Przecz.</string>
     <string name="message_list_mark_unread_action">Nieprz.</string>
@@ -258,7 +258,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
     <string name="message_compose_attachments_skipped_toast">Niektóre załączniki nie mogą byc przesłane dalej ponieważ nie zostały wcześniej pobrane.</string>
 
     <string name="message_view_from_format">Od: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">Do:</string>
+    <string name="message_to_label">Do:</string>
     <string name="message_view_cc_label">DW:</string>
     <string name="message_view_attachment_view_action">Otwórz</string>
     <string name="message_view_attachment_download_action">Zapisz</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3b696188c..d22fe0b33 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -217,7 +217,7 @@
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Загрузить болюше сообщений</string>
-    <string name="message_list_to_fmt">Для:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">Для:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Удалить</string>
     <string name="message_list_mark_read_action">Отметить как прочитанное</string>
     <string name="message_list_mark_unread_action">Отметить как непрочитанное</string>
@@ -237,7 +237,7 @@
     <string name="message_compose_attachments_skipped_toast">Некоторые вложения не могут быть пересланы, поскольку они не загрузились.</string>
 
     <string name="message_view_from_format">От: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">Для:</string>
+    <string name="message_to_label">Для:</string>
     <string name="message_view_cc_label">Копия:</string>
     <string name="message_view_attachment_view_action">Открыть</string>
     <string name="message_view_attachment_download_action">Сохранить</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a3ec8d0a4..8825af04a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -240,7 +240,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Hämta fler brev</string>
-    <string name="message_list_to_fmt">Till:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">Till:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Radera</string>
     <string name="message_list_mark_read_action">Markera som läst</string>
     <string name="message_list_mark_unread_action">Markera som oläst</string>
@@ -262,7 +262,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
 
 
     <string name="message_view_from_format">Från: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">Till:</string>
+    <string name="message_to_label">Till:</string>
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Öppna</string>
     <string name="message_view_attachment_download_action">Spara</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 86745ee93..58e378cac 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -227,7 +227,7 @@
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">加载更多邮件</string>
-    <string name="message_list_to_fmt">收件人：<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">收件人：<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">删除</string>
     <string name="message_list_mark_read_action">标记为已读</string>
     <string name="message_list_mark_unread_action">标记为未读</string>
@@ -249,7 +249,7 @@
 
 
     <string name="message_view_from_format">发件人：<xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">收件人：</string>
+    <string name="message_to_label">收件人：</string>
     <string name="message_view_cc_label">抄送：</string>
     <string name="message_view_attachment_view_action">打开</string>
     <string name="message_view_attachment_download_action">保存</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7440c3875..8d1e61c80 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -148,7 +148,7 @@
   <string name="message_view_show_pictures_instructions">選取 \"顯示圖片\" 即可顯示內嵌的圖片。</string>
   <string name="message_view_status_attachment_not_saved">無法將附件儲存到 SD 卡。</string>
   <string name="message_view_status_attachment_saved">將儲存到 SD 卡的附件做為 <xliff:g id="filename">%s</xliff:g>。</string>
-  <string name="message_view_to_label">收件者：</string>
+  <string name="message_to_label">收件者：</string>
   <string name="move_to_action">移到</string>
   <string name="new_mailbox_dlg_title">新資料夾名稱</string>
   <string name="next_action">下一步</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 140a72e9b..f8f8dc148 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -241,7 +241,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Load more messages</string>
-    <string name="message_list_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Delete</string>
     <string name="message_list_mark_read_action">Mark read</string>
     <string name="message_list_mark_unread_action">Mark unread</string>
@@ -263,7 +263,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
 
 
     <string name="message_view_from_format">From: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
-    <string name="message_view_to_label">To:</string>
+    <string name="message_to_label">To:</string>
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_attachment_view_action">Open</string>
     <string name="message_view_attachment_download_action">Save</string>
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 1345505ca..8f46e749f 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -4641,7 +4641,7 @@ public class MessagingController implements Runnable
                         String to = rcpts.length > 0 ? rcpts[0].toFriendly().toString() : null;
                         if (to != null)
                         {
-                            messageNotice.append(String.format(context.getString(R.string.message_list_to_fmt), to) +": "+subject);
+                            messageNotice.append(String.format(context.getString(R.string.message_to_fmt), to) +": "+subject);
                         }
                         else
                         {
diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java
index 0b37d0a87..cc8d3edd2 100644
--- a/src/com/fsck/k9/helper/MessageHelper.java
+++ b/src/com/fsck/k9/helper/MessageHelper.java
@@ -80,7 +80,7 @@ public class MessageHelper
             {
                 CharSequence to = Address.toFriendly(message .getRecipients(RecipientType.TO), contactHelper);
                 target.compareCounterparty = to.toString();
-                target.sender = new SpannableStringBuilder(String.format(mContext.getString(R.string.message_list_to_fmt), to));
+                target.sender = new SpannableStringBuilder(String.format(mContext.getString(R.string.message_to_fmt), to));
             }
             else
             {