diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 7ffe02d32..e3b33557c 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -88,7 +88,11 @@ http://k9mail.googlecode.com/ %s:%s - Redacta + Redacta + + + + Tria carpeta %s%s%s diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index cb85b1c09..5d033b497 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -94,7 +94,11 @@ http://k9mail.googlecode.com/ %s:%s - Nová + Nová + + + + Výběr složky %s%s%s diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 283942b9d..75c518d38 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Skriv + Skriv + + + + Vælg en mappe %s%s%s diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c21bdf955..23cc99265 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -88,7 +88,11 @@ http://k9mail.googlecode.com/. %s:%s - Verfassen + Verfassen + + + + Ordner wählen %s%s%s diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 002616310..3f04b71b9 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Σύνθεση + Σύνθεση + + + + Επιλογή φακέλου %s%s%s diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index e656ff426..c7207c6b1 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Redactar + Redactar + + + + Seleccionar carpeta %s%s%s diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 8eef9e540..06386a715 100755 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -92,6 +92,10 @@ http://k9mail.googlecode.com/ %s:%s Kirjoita + + + + Valitse kansio %s%s%s diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 8349db6af..80c5698c0 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -111,7 +111,11 @@ http://k9mail.googlecode.com/ (en anglais) %s:%s - Composer + Composer + + + + Choisir un dossier %s%s%s diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index da2bd1f85..5b5e43aca 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Redactar + Redactar + + + + Seleccionar carpeta %s%s%s diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 0749a7c85..044320be5 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -89,7 +89,11 @@ %s:%s - Levélírás + Levélírás + + + + Válasszon mappát %s%s%s diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 66e717b1e..024824092 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Componi + Componi + + + + Scegli la cartella %s%s%s diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 21ba3e504..d37b9e47c 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - חבר + חבר + + + + בחר תיקייה %s%s%s diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 4bc3ae5de..6cc20adf0 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -89,7 +89,11 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール %s:%s - 作成 + 作成 + + + + フォルダ選択 %s%s%s diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 859be9edd..fc6c8a5a5 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -88,7 +88,11 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클 %s:%s - 작성 + 작성 + + + + 폴더 선택 %s%s%s diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index bb4fe8e23..9d9a27616 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Ontwerp + Ontwerp + + + + Kies een map %s%s%s diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index fe3bdcac9..1a774843c 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -102,7 +102,11 @@ http://k9mail.googlecode.com/ %s:%s - Nie + Nie + + + + Wybierz folder %s%s%s diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index f7464136f..bef3e50d5 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Escrever + Escrever + + + + Escolher pasta %s%s%s diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index aa2e99988..4db7b1acb 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Написать новое письмо + Написать новое письмо + + + + Выберите папку %s%s%s diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index c05ba8741..e85f27d10 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Skriv + Skriv + + + + Välj en mapp %s%s%s diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 7194016f2..450a35750 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ adresine gönderin. %s:%s - Oluştur + Oluştur + + + + Klasör Seç %s%s%s diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index daf138c41..896874e89 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -89,7 +89,11 @@ http://k9mail.googlecode.com/ %s:%s - Написати новий лист + Написати новий лист + + + + Вибрати папку %s%s%s diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 214c35f18..0633e3cc7 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -88,7 +88,11 @@ %s：%s - 新邮件 + 新邮件 + + + + 选择文件夹 %s%s%s diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 1a2d2fcdb..9a4c97ca9 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -87,7 +87,11 @@ %s:%s - 新郵件 + 新郵件 + + + + 選擇信件匣 %s%s%s diff --git a/res/values/strings.xml b/res/values/strings.xml index 151d893e8..acbffb569 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -91,7 +91,11 @@ http://k9mail.googlecode.com/ %s:%s - Compose + Compose + Reply + Reply all + Forward + Choose Folder %s%s%s diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index 1910b4e8f..4198ff0d2 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -30,7 +30,6 @@ import com.actionbarsherlock.view.Window; import android.view.ContextThemeWrapper; import android.view.View; import android.view.View.OnClickListener; -import android.view.View.OnFocusChangeListener; import android.view.ViewGroup; import android.webkit.WebView; import android.webkit.WebViewClient; @@ -103,7 +102,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class MessageCompose extends K9Activity implements OnClickListener, OnFocusChangeListener { +public class MessageCompose extends K9Activity implements OnClickListener { private static final int DIALOG_SAVE_OR_DISCARD_DRAFT_MESSAGE = 1; private static final int DIALOG_REFUSE_TO_SAVE_DRAFT_MARKED_ENCRYPTED = 2; private static final int DIALOG_CONTINUE_WITHOUT_PUBLIC_KEY = 3; @@ -150,10 +149,9 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc private static final int MSG_PROGRESS_ON = 1; private static final int MSG_PROGRESS_OFF = 2; - private static final int MSG_UPDATE_TITLE = 3; - private static final int MSG_SKIPPED_ATTACHMENTS = 4; - private static final int MSG_SAVED_DRAFT = 5; - private static final int MSG_DISCARDED_DRAFT = 6; + private static final int MSG_SKIPPED_ATTACHMENTS = 3; + private static final int MSG_SAVED_DRAFT = 4; + private static final int MSG_DISCARDED_DRAFT = 5; private static final int ACTIVITY_REQUEST_PICK_ATTACHMENT = 1; private static final int CONTACT_PICKER_TO = 4; @@ -334,9 +332,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc case MSG_PROGRESS_OFF: setSupportProgressBarIndeterminateVisibility(false); break; - case MSG_UPDATE_TITLE: - updateTitle(); - break; case MSG_SKIPPED_ATTACHMENTS: Toast.makeText( MessageCompose.this, @@ -665,9 +660,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc mBccView.setTokenizer(new Rfc822Tokenizer()); mBccView.setValidator(mAddressValidator); - - mSubjectView.setOnFocusChangeListener(this); - if (savedInstanceState != null) { /* * This data gets used in onCreate, so grab it here instead of onRestoreInstanceState @@ -741,8 +733,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc if (mAction != Action.EDIT_DRAFT) { addAddresses(mBccView, mAccount.getAlwaysBcc()); } - - updateTitle(); } if (mAction == Action.REPLY || mAction == Action.REPLY_ALL) { @@ -830,6 +820,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc mSignatureView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize); updateMessageFormat(); + + setTitle(); } /** @@ -1116,18 +1108,25 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc updateMessageFormat(); } - private void updateTitle() { - if (mSubjectView.getText().length() == 0) { - setTitle(R.string.compose_title); - } else { - setTitle(mSubjectView.getText().toString()); - } - } - - @Override - public void onFocusChange(View view, boolean focused) { - if (!focused) { - updateTitle(); + private void setTitle() { + switch (mAction) { + case REPLY: { + setTitle(R.string.compose_title_reply); + break; + } + case REPLY_ALL: { + setTitle(R.string.compose_title_reply_all); + break; + } + case FORWARD: { + setTitle(R.string.compose_title_forward); + break; + } + case COMPOSE: + default: { + setTitle(R.string.compose_title_compose); + break; + } } }