diff options
Diffstat (limited to 'res')
86 files changed, 119 insertions, 113 deletions
diff --git a/res/drawable-hdpi/empty_folders.png b/res/drawable-hdpi/empty_folders.png Binary files differnew file mode 100644 index 000000000..982a947a8 --- /dev/null +++ b/res/drawable-hdpi/empty_folders.png diff --git a/res/drawable-hdpi/empty_inbox.png b/res/drawable-hdpi/empty_inbox.png Binary files differnew file mode 100644 index 000000000..98dacfcf0 --- /dev/null +++ b/res/drawable-hdpi/empty_inbox.png diff --git a/res/drawable-hdpi/empty_search.png b/res/drawable-hdpi/empty_search.png Binary files differnew file mode 100644 index 000000000..976cb61d1 --- /dev/null +++ b/res/drawable-hdpi/empty_search.png diff --git a/res/drawable-hdpi/empty_spam.png b/res/drawable-hdpi/empty_spam.png Binary files differnew file mode 100644 index 000000000..7c2198b75 --- /dev/null +++ b/res/drawable-hdpi/empty_spam.png diff --git a/res/drawable-hdpi/empty_trash.png b/res/drawable-hdpi/empty_trash.png Binary files differnew file mode 100644 index 000000000..b0fa7e039 --- /dev/null +++ b/res/drawable-hdpi/empty_trash.png diff --git a/res/drawable-mdpi/empty_folders.png b/res/drawable-mdpi/empty_folders.png Binary files differnew file mode 100644 index 000000000..1a371cbb3 --- /dev/null +++ b/res/drawable-mdpi/empty_folders.png diff --git a/res/drawable-mdpi/empty_inbox.png b/res/drawable-mdpi/empty_inbox.png Binary files differnew file mode 100644 index 000000000..3a51a60e2 --- /dev/null +++ b/res/drawable-mdpi/empty_inbox.png diff --git a/res/drawable-mdpi/empty_search.png b/res/drawable-mdpi/empty_search.png Binary files differnew file mode 100644 index 000000000..dde376518 --- /dev/null +++ b/res/drawable-mdpi/empty_search.png diff --git a/res/drawable-mdpi/empty_spam.png b/res/drawable-mdpi/empty_spam.png Binary files differnew file mode 100644 index 000000000..f5343d8bb --- /dev/null +++ b/res/drawable-mdpi/empty_spam.png diff --git a/res/drawable-mdpi/empty_trash.png b/res/drawable-mdpi/empty_trash.png Binary files differnew file mode 100644 index 000000000..87f6d92d4 --- /dev/null +++ b/res/drawable-mdpi/empty_trash.png diff --git a/res/drawable-xhdpi/empty_folders.png b/res/drawable-xhdpi/empty_folders.png Binary files differnew file mode 100644 index 000000000..fa43006a8 --- /dev/null +++ b/res/drawable-xhdpi/empty_folders.png diff --git a/res/drawable-xhdpi/empty_inbox.png b/res/drawable-xhdpi/empty_inbox.png Binary files differnew file mode 100644 index 000000000..6d830a595 --- /dev/null +++ b/res/drawable-xhdpi/empty_inbox.png diff --git a/res/drawable-xhdpi/empty_search.png b/res/drawable-xhdpi/empty_search.png Binary files differnew file mode 100644 index 000000000..0bee01df5 --- /dev/null +++ b/res/drawable-xhdpi/empty_search.png diff --git a/res/drawable-xhdpi/empty_spam.png b/res/drawable-xhdpi/empty_spam.png Binary files differnew file mode 100644 index 000000000..cca17fd80 --- /dev/null +++ b/res/drawable-xhdpi/empty_spam.png diff --git a/res/drawable-xhdpi/empty_trash.png b/res/drawable-xhdpi/empty_trash.png Binary files differnew file mode 100644 index 000000000..831f3a8d7 --- /dev/null +++ b/res/drawable-xhdpi/empty_trash.png diff --git a/res/drawable-xxhdpi/empty_folders.png b/res/drawable-xxhdpi/empty_folders.png Binary files differnew file mode 100644 index 000000000..13c13ebcc --- /dev/null +++ b/res/drawable-xxhdpi/empty_folders.png diff --git a/res/drawable-xxhdpi/empty_inbox.png b/res/drawable-xxhdpi/empty_inbox.png Binary files differnew file mode 100644 index 000000000..436ab9a16 --- /dev/null +++ b/res/drawable-xxhdpi/empty_inbox.png diff --git a/res/drawable-xxhdpi/empty_search.png b/res/drawable-xxhdpi/empty_search.png Binary files differnew file mode 100644 index 000000000..4be182392 --- /dev/null +++ b/res/drawable-xxhdpi/empty_search.png diff --git a/res/drawable-xxhdpi/empty_spam.png b/res/drawable-xxhdpi/empty_spam.png Binary files differnew file mode 100644 index 000000000..b0a10a0cf --- /dev/null +++ b/res/drawable-xxhdpi/empty_spam.png diff --git a/res/drawable-xxhdpi/empty_trash.png b/res/drawable-xxhdpi/empty_trash.png Binary files differnew file mode 100644 index 000000000..a88ac173d --- /dev/null +++ b/res/drawable-xxhdpi/empty_trash.png diff --git a/res/layout/actionable_toast_row.xml b/res/layout/actionable_toast_row.xml index c9b87d66c..360562d1d 100644 --- a/res/layout/actionable_toast_row.xml +++ b/res/layout/actionable_toast_row.xml @@ -32,7 +32,6 @@ android:ellipsize="end" android:gravity="center_vertical" android:singleLine="true" - android:text="@string/no_conversations" android:textColor="@android:color/white" android:textSize="16sp" style="@style/ToastBarDescriptionTextStyle" /> diff --git a/res/layout/conversation_list.xml b/res/layout/conversation_list.xml index 4abb1f160..540d99c8f 100644 --- a/res/layout/conversation_list.xml +++ b/res/layout/conversation_list.xml @@ -35,21 +35,11 @@ <!-- Note: intentionally not called "empty" because we call setEmptyView programmatically--> <!-- Offset by height of undo bar and action bar --> - <com.android.mail.ui.EmptyConversationListView - android:id="@+id/empty_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="@dimen/empty_view_top_padding" - android:gravity="center" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="@string/no_conversations" - android:visibility="gone"/> + <include layout="@layout/conversation_list_empty_view" /> <com.android.mail.ui.SwipeableListView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentTop="true" - android:fadingEdge="none" style="@style/ConversationListFade" /> </FrameLayout> </com.android.mail.ui.MailSwipeRefreshLayout> diff --git a/res/layout/conversation_list_empty_view.xml b/res/layout/conversation_list_empty_view.xml new file mode 100644 index 000000000..93e905a0c --- /dev/null +++ b/res/layout/conversation_list_empty_view.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 Google Inc. + Licensed to The Android Open Source Project. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<com.android.mail.ui.ConversationListEmptyView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/empty_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:visibility="gone" > + + <ImageView + android:id="@+id/empty_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + <TextView + android:id="@+id/empty_text" + android:layout_width="@dimen/empty_view_text_width" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/empty_view_space" + android:fontFamily="sans-serif-light" + android:textAlignment="center" + android:textColor="#80000000" + android:textSize="@dimen/empty_view_text_size" /> + +</com.android.mail.ui.ConversationListEmptyView> diff --git a/res/layout/swipe_leavebehind_body.xml b/res/layout/swipe_leavebehind_body.xml index 82eef2879..aff4aa3c2 100644 --- a/res/layout/swipe_leavebehind_body.xml +++ b/res/layout/swipe_leavebehind_body.xml @@ -27,7 +27,6 @@ android:layout_weight="1" android:ellipsize="end" android:singleLine="true" - android:text="@string/no_conversations" android:textColor="@android:color/white" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingLeft="16dip" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index fb8365dd1..d5ce5dc75 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Gooi hierdie boodskap weg?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Laai tans…"</string> - <string name="no_conversations" msgid="35400008890372241">"Geen gesprekke nie."</string> + <string name="empty_folder" msgid="35400008890372241">"Geen gesprekke nie."</string> <string name="undo" msgid="6070869718469782251">"Ontdoen"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Ontster <xliff:g id="COUNT">%1$d</xliff:g> gesprek."</item> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index f67abdc24..6ecc1f980 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"ይሄ መልዕክት ይወገድ?"</string> <string name="loading_conversations" msgid="2649440958602369555">"በመጫን ላይ…"</string> - <string name="no_conversations" msgid="35400008890372241">"ምንም ውይይቶች የሉም።"</string> + <string name="empty_folder" msgid="35400008890372241">"ምንም ውይይቶች የሉም።"</string> <string name="undo" msgid="6070869718469782251">"ቀልብስ"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"የ<xliff:g id="COUNT">%1$d</xliff:g> ውይይት ኮከብ በማንሳት ላይ።"</item> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 2c45dd248..6e41cc077 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"هل تريد إلغاء هذه الرسالة؟"</string> <string name="loading_conversations" msgid="2649440958602369555">"جارٍ التحميل…"</string> - <string name="no_conversations" msgid="35400008890372241">"لا تتوفر محادثات."</string> + <string name="empty_folder" msgid="35400008890372241">"لا تتوفر محادثات."</string> <string name="undo" msgid="6070869718469782251">"تراجع"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"جارٍ إلغاء تمييز محادثة <xliff:g id="COUNT">%1$d</xliff:g> بنجمة."</item> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index b5f88fcc9..104b55458 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -165,7 +165,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Скасаваць гэта паведамленне?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Загрузка…"</string> - <string name="no_conversations" msgid="35400008890372241">"Няма размоў."</string> + <string name="empty_folder" msgid="35400008890372241">"Няма размоў."</string> <string name="undo" msgid="6070869718469782251">"Адмянiць"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Здымаецца пазнака з размоў (<xliff:g id="COUNT">%1$d</xliff:g>)."</item> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 3aad645c5..d8f25f21d 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Да се отхвърли ли това съобщение?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Зарежда се…"</string> - <string name="no_conversations" msgid="35400008890372241">"Няма кореспонденции."</string> + <string name="empty_folder" msgid="35400008890372241">"Няма кореспонденции."</string> <string name="undo" msgid="6070869718469782251">"Отмяна"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Звездата се премахва от <xliff:g id="COUNT">%1$d</xliff:g> кореспонденция."</item> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 24d5ec5ca..621291e07 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Vols descartar aquest missatge?"</string> <string name="loading_conversations" msgid="2649440958602369555">"S\'està carregant…"</string> - <string name="no_conversations" msgid="35400008890372241">"No hi ha cap conversa."</string> + <string name="empty_folder" msgid="35400008890372241">"No hi ha cap conversa."</string> <string name="undo" msgid="6070869718469782251">"Desfés"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"S\'està anul·lant <xliff:g id="COUNT">%1$d</xliff:g> conversa destacada."</item> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index fcce3e92e..081a37b03 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Zahodit tuto zprávu?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Načítání…"</string> - <string name="no_conversations" msgid="35400008890372241">"Žádné konverzace"</string> + <string name="empty_folder" msgid="35400008890372241">"Žádné konverzace"</string> <string name="undo" msgid="6070869718469782251">"Vrátit zpět"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Ruší se označení <xliff:g id="COUNT">%1$d</xliff:g> konverzace hvězdičkou."</item> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index d56595a54..749203a88 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Vil du kassere denne besked?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Indlæser..."</string> - <string name="no_conversations" msgid="35400008890372241">"Der er ingen samtaler."</string> + <string name="empty_folder" msgid="35400008890372241">"Der er ingen samtaler."</string> <string name="undo" msgid="6070869718469782251">"Fortryd"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Fjerner stjernemarkering fra <xliff:g id="COUNT">%1$d</xliff:g> samtale."</item> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index dd6d143bf..e7addd7a0 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Nachricht löschen?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Wird geladen…"</string> - <string name="no_conversations" msgid="35400008890372241">"Keine Konversationen"</string> + <string name="empty_folder" msgid="35400008890372241">"Keine Konversationen"</string> <string name="undo" msgid="6070869718469782251">"Rückgängig"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Markierung von <xliff:g id="COUNT">%1$d</xliff:g> Konversation wird aufgehoben..."</item> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 9001796ca..94865b02e 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Να απορριφθεί αυτό το μήνυμα;"</string> <string name="loading_conversations" msgid="2649440958602369555">"Γίνεται φόρτωση…"</string> - <string name="no_conversations" msgid="35400008890372241">"Δεν υπάρχουν συνομιλίες."</string> + <string name="empty_folder" msgid="35400008890372241">"Δεν υπάρχουν συνομιλίες."</string> <string name="undo" msgid="6070869718469782251">"Αναίρεση"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Κατάργηση αστεριού για <xliff:g id="COUNT">%1$d</xliff:g> συνομιλία."</item> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 346b1abb6..de431cf35 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Discard this message?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Loading…"</string> - <string name="no_conversations" msgid="35400008890372241">"No conversations."</string> + <string name="empty_folder" msgid="35400008890372241">"No conversations."</string> <string name="undo" msgid="6070869718469782251">"Undo"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversation."</item> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 346b1abb6..de431cf35 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Discard this message?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Loading…"</string> - <string name="no_conversations" msgid="35400008890372241">"No conversations."</string> + <string name="empty_folder" msgid="35400008890372241">"No conversations."</string> <string name="undo" msgid="6070869718469782251">"Undo"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Unstarring <xliff:g id="COUNT">%1$d</xliff:g> conversation."</item> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 211bf2e11..1a1f69b34 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"¿Quieres descartar este mensaje?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Cargando…"</string> - <string name="no_conversations" msgid="35400008890372241">"No hay conversaciones."</string> + <string name="empty_folder" msgid="35400008890372241">"No hay conversaciones."</string> <string name="undo" msgid="6070869718469782251">"Deshacer"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Quitando marca de estrella de <xliff:g id="COUNT">%1$d</xliff:g> conversación"</item> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index bab3841c3..5214eebe9 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"¿Quieres descartar este mensaje?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Cargando…"</string> - <string name="no_conversations" msgid="35400008890372241">"No hay conversaciones."</string> + <string name="empty_folder" msgid="35400008890372241">"No hay conversaciones."</string> <string name="undo" msgid="6070869718469782251">"Deshacer"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Anulando <xliff:g id="COUNT">%1$d</xliff:g> conversación destacada"</item> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 0ab72e721..aec9f0463 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Kas soovite sellest sõnumist loobuda?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Laadimine …"</string> - <string name="no_conversations" msgid="35400008890372241">"Meilivestlusi pole."</string> + <string name="empty_folder" msgid="35400008890372241">"Meilivestlusi pole."</string> <string name="undo" msgid="6070869718469782251">"Võta tagasi"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Tärnid eemaldatakse <xliff:g id="COUNT">%1$d</xliff:g> meilivestluselt."</item> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 70c0b8ec5..d5dbe6e98 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"از این پیام صرفنظر شود؟"</string> <string name="loading_conversations" msgid="2649440958602369555">"در حال بارگیری…"</string> - <string name="no_conversations" msgid="35400008890372241">"مکالمهای موجود نیست."</string> + <string name="empty_folder" msgid="35400008890372241">"مکالمهای موجود نیست."</string> <string name="undo" msgid="6070869718469782251">"لغو"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"در حال حذف ستاره <xliff:g id="COUNT">%1$d</xliff:g> مکالمه."</item> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 1f8d95e83..82977da02 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Hylätäänkö tämä viesti?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Ladataan…"</string> - <string name="no_conversations" msgid="35400008890372241">"Keskusteluita ei ole."</string> + <string name="empty_folder" msgid="35400008890372241">"Keskusteluita ei ole."</string> <string name="undo" msgid="6070869718469782251">"Kumoa"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Poistetaan tähti <xliff:g id="COUNT">%1$d</xliff:g> keskustelusta."</item> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 8e64683f2..5c4cc29e1 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Supprimer ce message ?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Chargement en cours…"</string> - <string name="no_conversations" msgid="35400008890372241">"Aucune conversation"</string> + <string name="empty_folder" msgid="35400008890372241">"Aucune conversation"</string> <string name="undo" msgid="6070869718469782251">"Annuler"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Désactivation du suivi de <xliff:g id="COUNT">%1$d</xliff:g> conversation en cours…"</item> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index e0420bfd8..57c78eb90 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Supprimer ce message ?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Chargement en cours…"</string> - <string name="no_conversations" msgid="35400008890372241">"Aucune conversation"</string> + <string name="empty_folder" msgid="35400008890372241">"Aucune conversation"</string> <string name="undo" msgid="6070869718469782251">"Annuler"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Désactivation du suivi de <xliff:g id="COUNT">%1$d</xliff:g> conversation en cours…"</item> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index f19342171..dd02e3bf5 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"यह संदेश छोड़ें?"</string> <string name="loading_conversations" msgid="2649440958602369555">"लोड हो रहा है…"</string> - <string name="no_conversations" msgid="35400008890372241">"कोई बातचीत नहीं."</string> + <string name="empty_folder" msgid="35400008890372241">"कोई बातचीत नहीं."</string> <string name="undo" msgid="6070869718469782251">"पूर्ववत करें"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"<xliff:g id="COUNT">%1$d</xliff:g> बातचीत के तारांकन हटाए जा रहे हैं."</item> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 5c2cb8eee..357686b48 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Odbaciti ovu poruku?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Učitavanje…"</string> - <string name="no_conversations" msgid="35400008890372241">"Nema razgovora."</string> + <string name="empty_folder" msgid="35400008890372241">"Nema razgovora."</string> <string name="undo" msgid="6070869718469782251">"Poništi"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Uklanjanje zvjezdice s <xliff:g id="COUNT">%1$d</xliff:g> razgovora."</item> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index e51730afc..8e40d26f9 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Elveti ezt az üzenetet?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Betöltés…"</string> - <string name="no_conversations" msgid="35400008890372241">"Nincsenek beszélgetések."</string> + <string name="empty_folder" msgid="35400008890372241">"Nincsenek beszélgetések."</string> <string name="undo" msgid="6070869718469782251">"Visszavonás"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"<xliff:g id="COUNT">%1$d</xliff:g> beszélgetés csillagozásának megszüntetése"</item> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 2defac795..dafea9858 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Մերժե՞լ այս հաղորդագրությունը"</string> <string name="loading_conversations" msgid="2649440958602369555">"Բեռնում..."</string> - <string name="no_conversations" msgid="35400008890372241">"Հաղորդագրություններ չկան:"</string> + <string name="empty_folder" msgid="35400008890372241">"Հաղորդագրություններ չկան:"</string> <string name="undo" msgid="6070869718469782251">"Հետարկել"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"<xliff:g id="COUNT">%1$d</xliff:g> խոսակցություն ապաաստղանշվում է:"</item> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 9cb8102f9..8e10b70a2 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Buang pesan ini?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Memuat…"</string> - <string name="no_conversations" msgid="35400008890372241">"Tidak ada percakapan."</string> + <string name="empty_folder" msgid="35400008890372241">"Tidak ada percakapan."</string> <string name="undo" msgid="6070869718469782251">"Urungkan"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Meredupkan bintang <xliff:g id="COUNT">%1$d</xliff:g> percakapan."</item> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b2cf46742..73eacf4ed 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Eliminare questo messaggio?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Caricamento…"</string> - <string name="no_conversations" msgid="35400008890372241">"Nessuna conversazione."</string> + <string name="empty_folder" msgid="35400008890372241">"Nessuna conversazione."</string> <string name="undo" msgid="6070869718469782251">"Annulla"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Rimozione di <xliff:g id="COUNT">%1$d</xliff:g> conversazione da Speciali."</item> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index e76f6a1f6..7cad16a1b 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"האם למחוק הודעה זו?"</string> <string name="loading_conversations" msgid="2649440958602369555">"טוען…"</string> - <string name="no_conversations" msgid="35400008890372241">"אין שיחות."</string> + <string name="empty_folder" msgid="35400008890372241">"אין שיחות."</string> <string name="undo" msgid="6070869718469782251">"בטל"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"מסיר כוכב משיחה <xliff:g id="COUNT">%1$d</xliff:g>."</item> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 5d39f3139..684b00bcd 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"このメールを破棄しますか？"</string> <string name="loading_conversations" msgid="2649440958602369555">"読み込んでいます…"</string> - <string name="no_conversations" msgid="35400008890372241">"スレッドがありません。"</string> + <string name="empty_folder" msgid="35400008890372241">"スレッドがありません。"</string> <string name="undo" msgid="6070869718469782251">"元に戻す"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドからスターを外しています。"</item> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 8e2a1b26a..e13cebc80 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"გაუქმდეს ეს შეტყობინება?"</string> <string name="loading_conversations" msgid="2649440958602369555">"იტვირთება..."</string> - <string name="no_conversations" msgid="35400008890372241">"მიმოწერები არ არის."</string> + <string name="empty_folder" msgid="35400008890372241">"მიმოწერები არ არის."</string> <string name="undo" msgid="6070869718469782251">"დაბრუნება"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"<xliff:g id="COUNT">%1$d</xliff:g> მიმოწერას მოეხსნა ვარსკვლავით მონიშვნა."</item> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index ead1857fe..f565836b8 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"បោះបង់សារនេះ?"</string> <string name="loading_conversations" msgid="2649440958602369555">"កំពុងផ្ទុក..."</string> - <string name="no_conversations" msgid="35400008890372241">"គ្មានការសន្ទនា។"</string> + <string name="empty_folder" msgid="35400008890372241">"គ្មានការសន្ទនា។"</string> <string name="undo" msgid="6070869718469782251">"មិនធ្វើវិញ"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"មិនដាក់ផ្កាយការសន្ទនា <xliff:g id="COUNT">%1$d</xliff:g> ។"</item> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 90d48e940..4501015bb 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"메시지를 삭제하시겠습니까?"</string> <string name="loading_conversations" msgid="2649440958602369555">"로드 중…"</string> - <string name="no_conversations" msgid="35400008890372241">"대화가 없습니다."</string> + <string name="empty_folder" msgid="35400008890372241">"대화가 없습니다."</string> <string name="undo" msgid="6070869718469782251">"실행취소"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"대화 <xliff:g id="COUNT">%1$d</xliff:g>개의 별표를 제거하는 중 입니다."</item> diff --git a/res/values-land/dimen.xml b/res/values-land/dimen.xml index 52327c011..96d531795 100644 --- a/res/values-land/dimen.xml +++ b/res/values-land/dimen.xml @@ -17,4 +17,7 @@ --> <resources> <dimen name="compose_scrollview_width">800dp</dimen> + + <dimen name="empty_view_text_width">380dip</dimen> + <dimen name="empty_view_space">8dip</dimen> </resources> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index 5c994d68e..c21bdb33a 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"ປິດການຂຽນອິເມວນີ້ບໍ່?"</string> <string name="loading_conversations" msgid="2649440958602369555">"ກຳລັງໂຫລດ..."</string> - <string name="no_conversations" msgid="35400008890372241">"ບໍ່ມີບົດສົນທະນາ."</string> + <string name="empty_folder" msgid="35400008890372241">"ບໍ່ມີບົດສົນທະນາ."</string> <string name="undo" msgid="6070869718469782251">"ແກ້ໄຂຄືນ"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"ກຳລັງຖອດດາວ <xliff:g id="COUNT">%1$d</xliff:g> ການສົນທະນາ."</item> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 65f2b31ba..531d4c7bb 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Atmesti šį pranešimą?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Įkeliama…"</string> - <string name="no_conversations" msgid="35400008890372241">"Nėra pokalbių."</string> + <string name="empty_folder" msgid="35400008890372241">"Nėra pokalbių."</string> <string name="undo" msgid="6070869718469782251">"Anuliuoti"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Atšaukiamas <xliff:g id="COUNT">%1$d</xliff:g> pokalb. žymėjimas žvaigždute."</item> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index dd0313c14..fa101c11b 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Vai atmest šo ziņojumu?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Notiek ielāde…"</string> - <string name="no_conversations" msgid="35400008890372241">"Nav nevienas sarunas."</string> + <string name="empty_folder" msgid="35400008890372241">"Nav nevienas sarunas."</string> <string name="undo" msgid="6070869718469782251">"Atsaukt"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Notiek zvaigznītes noņemšana no <xliff:g id="COUNT">%1$d</xliff:g> sarunas."</item> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index b0557da8b..4b89c882a 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Энэ зурвасыг устгах уу?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Ачаалж байна..."</string> - <string name="no_conversations" msgid="35400008890372241">"Харилцаа алга байна."</string> + <string name="empty_folder" msgid="35400008890372241">"Харилцаа алга байна."</string> <string name="undo" msgid="6070869718469782251">"Буцаах"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"<xliff:g id="COUNT">%1$d</xliff:g> харилцааны одыг арилгаж байна."</item> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 7b0750053..f518b7f7c 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Buang mesej ini?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Memuatkan..."</string> - <string name="no_conversations" msgid="35400008890372241">"Tiada perbualan."</string> + <string name="empty_folder" msgid="35400008890372241">"Tiada perbualan."</string> <string name="undo" msgid="6070869718469782251">"Buat asal"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Membuang bintang <xliff:g id="COUNT">%1$d</xliff:g> perbualan."</item> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index b91f86acd..071caf358 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Vil du forkaste denne e-posten?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Laster inn ..."</string> - <string name="no_conversations" msgid="35400008890372241">"Ingen samtaler."</string> + <string name="empty_folder" msgid="35400008890372241">"Ingen samtaler."</string> <string name="undo" msgid="6070869718469782251">"Angre"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Fjerner stjernemerking for <xliff:g id="COUNT">%1$d</xliff:g> samtale."</item> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 99cfdc7c1..11cf64400 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Dit bericht weggooien?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Laden…"</string> - <string name="no_conversations" msgid="35400008890372241">"Geen conversaties."</string> + <string name="empty_folder" msgid="35400008890372241">"Geen conversaties."</string> <string name="undo" msgid="6070869718469782251">"Ongedaan maken"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Ster verwijderen uit <xliff:g id="COUNT">%1$d</xliff:g> conversatie."</item> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index d362baec9..59d728ccc 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Odrzucić tę wiadomość?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Wczytuję…"</string> - <string name="no_conversations" msgid="35400008890372241">"Brak wątków."</string> + <string name="empty_folder" msgid="35400008890372241">"Brak wątków."</string> <string name="undo" msgid="6070869718469782251">"Cofnij"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Cofanie oznaczenia gwiazdką <xliff:g id="COUNT">%1$d</xliff:g> wątku."</item> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 3e2e09f03..34c12f947 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Rejeitar esta mensagem?"</string> <string name="loading_conversations" msgid="2649440958602369555">"A carregar…"</string> - <string name="no_conversations" msgid="35400008890372241">"Sem conversas."</string> + <string name="empty_folder" msgid="35400008890372241">"Sem conversas."</string> <string name="undo" msgid="6070869718469782251">"Anular"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"A remover a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversa."</item> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index b5f755296..2acdd038e 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Descartar esta mensagem?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Carregando..."</string> - <string name="no_conversations" msgid="35400008890372241">"Não há conversas."</string> + <string name="empty_folder" msgid="35400008890372241">"Não há conversas."</string> <string name="undo" msgid="6070869718469782251">"Desfazer"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Removendo a estrela de <xliff:g id="COUNT">%1$d</xliff:g> conversa."</item> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 2c93e385e..1c1b728eb 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Renunţaţi la acest mesaj?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Se încarcă…"</string> - <string name="no_conversations" msgid="35400008890372241">"Nicio conversaţie."</string> + <string name="empty_folder" msgid="35400008890372241">"Nicio conversaţie."</string> <string name="undo" msgid="6070869718469782251">"Anulaţi"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Se elimină steaua pentru <xliff:g id="COUNT">%1$d</xliff:g> conversaţie."</item> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 8c991c4d2..d20f71ef9 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Удалить это сообщение?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Загрузка…"</string> - <string name="no_conversations" msgid="35400008890372241">"Пока ничего нет"</string> + <string name="empty_folder" msgid="35400008890372241">"Пока ничего нет"</string> <string name="undo" msgid="6070869718469782251">"Отмена"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Цепочек, с которых снимается пометка: <xliff:g id="COUNT">%1$d</xliff:g>."</item> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 53b822791..e1022a069 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Zahodiť túto správu?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Načítavanie…"</string> - <string name="no_conversations" msgid="35400008890372241">"Žiadne konverzácie."</string> + <string name="empty_folder" msgid="35400008890372241">"Žiadne konverzácie."</string> <string name="undo" msgid="6070869718469782251">"Späť"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Zrušenie označenia hviezdičkou (počet konverzácií: <xliff:g id="COUNT">%1$d</xliff:g>)."</item> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 1a0e0d683..f94764fb3 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Želite zavreči sporočilo?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Nalaganje …"</string> - <string name="no_conversations" msgid="35400008890372241">"Ni pogovorov."</string> + <string name="empty_folder" msgid="35400008890372241">"Ni pogovorov."</string> <string name="undo" msgid="6070869718469782251">"Razveljavi"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Odstranjevanje zvezdice z <xliff:g id="COUNT">%1$d</xliff:g> pogovora."</item> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 92ab916f3..cf99578e7 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Желите ли да одбаците ову поруку?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Учитавање…"</string> - <string name="no_conversations" msgid="35400008890372241">"Нема преписки."</string> + <string name="empty_folder" msgid="35400008890372241">"Нема преписки."</string> <string name="undo" msgid="6070869718469782251">"Опозови"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Уклањање звездица са <xliff:g id="COUNT">%1$d</xliff:g> преписке."</item> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 1e03c0b1d..daf6110d6 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Vill du slänga meddelandet?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Läser in …"</string> - <string name="no_conversations" msgid="35400008890372241">"Inga konversationer."</string> + <string name="empty_folder" msgid="35400008890372241">"Inga konversationer."</string> <string name="undo" msgid="6070869718469782251">"Ångra"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Tar bort stjärnmärkning från <xliff:g id="COUNT">%1$d</xliff:g> konversation."</item> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 8d1ff0a7a..0bc5415f3 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Ujumbe huu utupwe?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Inapakia…"</string> - <string name="no_conversations" msgid="35400008890372241">"Hakuna mazungumzo."</string> + <string name="empty_folder" msgid="35400008890372241">"Hakuna mazungumzo."</string> <string name="undo" msgid="6070869718469782251">"Tendua"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Inaondoa nyota kwenye mazungumzo <xliff:g id="COUNT">%1$d</xliff:g>."</item> diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml index 024e7002c..57a7b7339 100644 --- a/res/values-sw600dp/dimen.xml +++ b/res/values-sw600dp/dimen.xml @@ -44,4 +44,8 @@ <dimen name="compose_area_end_padding">80dip</dimen> <dimen name="search_view_width">400dip</dimen> <dimen name="spinner_frame_width">170dp</dimen> + + <dimen name="empty_view_text_width">380dip</dimen> + <dimen name="empty_view_text_size">28sp</dimen> + <dimen name="empty_view_space">16dip</dimen> </resources> diff --git a/res/values-sw600dp/two_pane_dimen.xml b/res/values-sw600dp/two_pane_dimen.xml deleted file mode 100644 index 69beb5eb8..000000000 --- a/res/values-sw600dp/two_pane_dimen.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2012 Google Inc. - Licensed to The Android Open Source Project. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <dimen name="empty_view_top_padding">104dip</dimen> -</resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index d28de9056..c2db644a4 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"ยกเลิกข้อความนี้หรือไม่"</string> <string name="loading_conversations" msgid="2649440958602369555">"กำลังโหลด…"</string> - <string name="no_conversations" msgid="35400008890372241">"ไม่มีการสนทนา"</string> + <string name="empty_folder" msgid="35400008890372241">"ไม่มีการสนทนา"</string> <string name="undo" msgid="6070869718469782251">"เลิกทำ"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"กำลังยกเลิกการติดดาวการสนทนา <xliff:g id="COUNT">%1$d</xliff:g> รายการ"</item> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 664e8822f..ef5b9bee1 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"I-discard ang mensaheng ito?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Naglo-load…"</string> - <string name="no_conversations" msgid="35400008890372241">"Walang mga pag-uusap."</string> + <string name="empty_folder" msgid="35400008890372241">"Walang mga pag-uusap."</string> <string name="undo" msgid="6070869718469782251">"I-undo"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Inaalisan ng star ang <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap."</item> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 039a9ce5d..9f9acf66b 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Bu ileti silinsin mi?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Yükleniyor…"</string> - <string name="no_conversations" msgid="35400008890372241">"Hiçbir ileti dizisi yok."</string> + <string name="empty_folder" msgid="35400008890372241">"Hiçbir ileti dizisi yok."</string> <string name="undo" msgid="6070869718469782251">"Geri Al"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"<xliff:g id="COUNT">%1$d</xliff:g> ileti dizisinin yıldızı kaldırılıyor."</item> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 7b49c4a8f..422e961db 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Відхилити це повідомлення?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Завантаження…"</string> - <string name="no_conversations" msgid="35400008890372241">"Немає бесід."</string> + <string name="empty_folder" msgid="35400008890372241">"Немає бесід."</string> <string name="undo" msgid="6070869718469782251">"Відмінити"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Видалення зірочки з <xliff:g id="COUNT">%1$d</xliff:g> бесіди."</item> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 671a20e78..f49d67d0b 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Hủy tin nhắn này?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Đang tải…"</string> - <string name="no_conversations" msgid="35400008890372241">"Không có cuộc hội thoại nào."</string> + <string name="empty_folder" msgid="35400008890372241">"Không có cuộc hội thoại nào."</string> <string name="undo" msgid="6070869718469782251">"Hoàn tác"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Bỏ gắn dấu sao <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại."</item> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index f5de4cfcf..0e96beb82 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"要舍弃此邮件吗？"</string> <string name="loading_conversations" msgid="2649440958602369555">"正在加载…"</string> - <string name="no_conversations" msgid="35400008890372241">"无会话。"</string> + <string name="empty_folder" msgid="35400008890372241">"无会话。"</string> <string name="undo" msgid="6070869718469782251">"撤消"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"正在取消 <xliff:g id="COUNT">%1$d</xliff:g> 个会话的星标。"</item> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index ea6f9e3f4..057c3811e 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"要丟棄這封郵件嗎？"</string> <string name="loading_conversations" msgid="2649440958602369555">"正在載入..."</string> - <string name="no_conversations" msgid="35400008890372241">"無對話群組。"</string> + <string name="empty_folder" msgid="35400008890372241">"無對話群組。"</string> <string name="undo" msgid="6070869718469782251">"撤銷"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"正在移除 <xliff:g id="COUNT">%1$d</xliff:g> 個對話群組的星號。"</item> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 2ae5ac4a3..9e2e4769b 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"要捨棄這封郵件嗎？"</string> <string name="loading_conversations" msgid="2649440958602369555">"載入中..."</string> - <string name="no_conversations" msgid="35400008890372241">"無會話群組。"</string> + <string name="empty_folder" msgid="35400008890372241">"無會話群組。"</string> <string name="undo" msgid="6070869718469782251">"復原"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"正在移除 <xliff:g id="COUNT">%1$d</xliff:g> 個會話群組的星號。"</item> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index a6c738556..e1f4188e7 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -164,7 +164,7 @@ </plurals> <string name="confirm_discard_text" msgid="1149834186404614612">"Lahla lo mlayezo?"</string> <string name="loading_conversations" msgid="2649440958602369555">"Iyalayisha…"</string> - <string name="no_conversations" msgid="35400008890372241">"Azikho izingxoxo."</string> + <string name="empty_folder" msgid="35400008890372241">"Azikho izingxoxo."</string> <string name="undo" msgid="6070869718469782251">"Hlehlisa"</string> <plurals name="conversation_unstarred"> <item quantity="one" msgid="8315328190288744398">"Isusa izinkanyezi engxoxweni engu-<xliff:g id="COUNT">%1$d</xliff:g>."</item> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 6ecd708d8..ec3bf5207 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -199,5 +199,9 @@ <dimen name="teaser_arrow_margin_start">16dip</dimen> <dimen name="teaser_arrow_margin_end">12dip</dimen> + <dimen name="empty_view_text_width">228dip</dimen> + <dimen name="empty_view_text_size">22sp</dimen> + <dimen name="empty_view_space">16dip</dimen> + <dimen name="spam_warning_view_list_padding">16dip</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index f7fc4031b..6636e3003 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -348,8 +348,16 @@ <!-- Conversation list shared between the Activity and Widget --> <!-- Displayed in the middle of the screen when conversations are being loaded [CHAR LIMIT 100]--> <string name="loading_conversations">Loading\u2026</string> - <!-- Displayed in the middle of the screen when the inbox is empty [CHAR LIMIT 100]--> - <string name="no_conversations">No conversations.</string> + <!-- Displayed in the middle of the screen when an inbox is empty [CHAR LIMIT 100]--> + <string name="empty_inbox">You\'re all done! Please enjoy your day.</string> + <!-- Displayed in the middle of the screen when a search returns no results [CHAR LIMIT 100]--> + <string name="empty_search">Whoops! We didn\'t find anything for \"<xliff:g id="search_query">%1$s</xliff:g>\".</string> + <!-- Displayed in the middle of the screen when the spam folder is empty [CHAR LIMIT 100]--> + <string name="empty_spam_folder">Hooray, no spam here!</string> + <!-- Displayed in the middle of the screen when the trash folder is empty [CHAR LIMIT 100]--> + <string name="empty_trash_folder">No trash here. Thanks for recycling!</string> + <!-- Displayed in the middle of the screen when a folder is empty [CHAR LIMIT 100]--> + <string name="empty_folder">There is no mail here.</string> <!-- Undo bar strings --> <!-- Menu item: undo latest action [CHAR LIMIT=12]--> diff --git a/res/values/two_pane_dimen.xml b/res/values/two_pane_dimen.xml deleted file mode 100644 index b894dc770..000000000 --- a/res/values/two_pane_dimen.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2012 Google Inc. - Licensed to The Android Open Source Project. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <dimen name="empty_view_top_padding">38dip</dimen> -</resources> |
