Merge "Added filtering to the photo viewer." into jb-ub-mail
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3f9812e..11aa81f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 17fabd1..454f8ab 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"ይህ መለያ በራስ-ሰር እንዲመሳሰል አልተዋቀረም።"\n"መልዕክት አንዴ ለማመሳሰል "<b>"አሁን አመሳስል"</b>"ን ንካ፣ ወይም ደግሞ ይሄ መለያ መልዕክት በራስ-ሰር እንዲያመሳስል ለማዋቀር "<b>"የማመሳሰል ቅንብሮችን ቀይር"</b>"።"</string>
<string name="manual_sync" msgid="6743983544685622800">"አሁን አመሳስል"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"የማመሳሰል ቅንብሮችን ቀይር"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"ከመልዕክት ፎቶዎች"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"ፎቶ መጫን አልተቻለም።"</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"ቪዲዮ በዚህ ጊዜ አይገኝም። እባክህ አድስ።"</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"ንጥል በዚህ ጊዜ አይገኝም። እባክህ አድስ።"</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"ፎቶ አሁን አይገኝም።"</string>
+ <string name="loading_photo" msgid="6784297653634402137">"በመጫን ላይ…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"በመላክ ላይ…"</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"ይህ ምስል እንዳይወርድ በጣም ትልቅ ነው፣ ባነሰ ጥራት መሞከር ትፈልጋለህ?"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"ፎቶውን መሣሪያው ላይ ማስቀመጥ አልተቻለም።"</string>
+ <string name="yes" msgid="7474216525286833848">"አዎ"</string>
+ <string name="no" msgid="427548507197604096">"የለም"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"ፎቶ ማግኘት አልተቻለም።"</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> የ<xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" ተጨማሪ እይ »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"ልክ አሁን"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"<xliff:g id="COUNT">%d</xliff:g> ደቂቃ"</item>
+ <item quantity="other" msgid="4976118461634588647">"<xliff:g id="COUNT">%d</xliff:g> ደቂቃዎች"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> ሰዓት"</item>
+ <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> ሰዓታት"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> ቀን"</item>
+ <item quantity="other" msgid="2756574969735638578">"<xliff:g id="COUNT">%d</xliff:g> ቀናት"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"ፎቶ በማስገባት ላይ…"</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9c7f298..dfedca5 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 10b0a2d..7fb1d96 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5389b64..0facc38 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ea97088..e5bb1ba 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Aquest compte no està configurat per sincronitzar automàticament."\n"Toca "<b>"Sincronitza ara"</b>" per sincronitzar el correu una vegada o bé "<b>"Canvia la configuració de sincronització"</b>" per configurar aquest compte per sincronitzar el correu de manera automàtica."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincron. ara"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"Canvia config. sincronització"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"Fotos del missatge"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"La foto no es pot carregar."</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"El vídeo no està disponible en aquest moment. Actualitza."</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"L\'element no està disponible en aquest moment. Actualitza."</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"En aquests moments la foto no està disponible."</string>
+ <string name="loading_photo" msgid="6784297653634402137">"S\'està carregant…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"S\'està enviant…"</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"Aquesta imatge és massa gran per baixar-la. Vols tornar-ho a provar amb menys resolució?"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"La foto no s\'ha pogut desar al dispositiu."</string>
+ <string name="yes" msgid="7474216525286833848">"Sí"</string>
+ <string name="no" msgid="427548507197604096">"No"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"No trobem la foto."</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> de <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" Mostra\'n més »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"Ara mateix"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+ <item quantity="other" msgid="4976118461634588647">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> hora"</item>
+ <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> hores"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> dia"</item>
+ <item quantity="other" msgid="2756574969735638578">"<xliff:g id="COUNT">%d</xliff:g> dies"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"La foto s\'està inserint…"</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f024d60..60c234a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -46,7 +46,7 @@
<string name="confirm_send_message_with_no_subject" msgid="8900379985826988281">"V předmětu zprávy není žádný text."</string>
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"V těle zprávy není žádný text."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Odeslat tuto zprávu?"</string>
- <string name="message_discarded" msgid="5079975378884765445">"Zpráva byla zrušena."</string>
+ <string name="message_discarded" msgid="5079975378884765445">"Zpráva byla zahozena."</string>
<string name="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
<string name="custom_from_account_label" msgid="5069652141632649722">"Odeslat jako:"</string>
<string name="send" msgid="8242003661397555986">"Odeslat"</string>
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f75c348..e9e1a7c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4e05e79..cead866 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c261faa..ce1ae98 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ο λογαριασμός αυτός δεν έχει ρυθμιστεί για αυτόματο συγχρονισμό."\n"Αγγίξτε "<b>"Συγχρ. τώρα"</b>" για συγχρονισμό της αλληλογραφίας μία φορά ή "<b>"Αλλαγή ρυθμίσεων συγχρονισμού"</b>" για να ρυθμίσετε το λογαριασμό για αυτόματο συγχρονισμό της αλληλογραφίας."</string>
<string name="manual_sync" msgid="6743983544685622800">"Συγχρ. τώρα"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"Αλλαγή ρυθμίσεων συγχρονισμού"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"Φωτογραφίες από μήνυμα"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"Δεν ήταν δυνατή η φόρτωση της φωτογραφίας."</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"Μη διαθέσιμο βίντεο αυτή τη στιγμή. Κάντε ανανέωση."</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"Μη διαθ. αντικείμ. αυτή τη στιγμή. Κάντε ανανέωση."</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"Η φωτογραφία δεν είναι διαθέσιμη αυτήν τη στιγμή."</string>
+ <string name="loading_photo" msgid="6784297653634402137">"Γίνεται φόρτωση…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"Αποστολή…"</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"Το μέγεθος αυτής της εικόνας είναι πολύ μεγάλο για να γίνει λήψη, θα θέλατε να προσπαθήσετε ξανά με μικρότερη ανάλυση;"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"Δεν ήταν δυνατή η αποθήκευση της φωτογραφίας στη συσκευή."</string>
+ <string name="yes" msgid="7474216525286833848">"Ναι"</string>
+ <string name="no" msgid="427548507197604096">"Όχι"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"Δεν είναι δυνατή η εύρεση της φωτογραφίας."</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> από <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" Δείτε περισσότερα »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"Μόλις τώρα"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"<xliff:g id="COUNT">%d</xliff:g> λεπτό"</item>
+ <item quantity="other" msgid="4976118461634588647">"<xliff:g id="COUNT">%d</xliff:g> λεπτά"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> ώρα"</item>
+ <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> ώρες"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> ημέρα"</item>
+ <item quantity="other" msgid="2756574969735638578">"<xliff:g id="COUNT">%d</xliff:g> ημέρες"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Εισαγωγή φωτογραφίας…"</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c2f190f..e4f1882 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"This account isn\'t set up to sync automatically."\n"Touch "<b>"Sync Now"</b>" to sync mail once, or "<b>"Change Sync Settings"</b>" to set up this account to sync mail automatically."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sync now"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"Change sync settings"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"Photos from message"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"Photo could not be loaded"</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"Video not available at this time. Please refresh."</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"Item not available at this time. Please refresh."</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"Photo isn\'t available at the moment."</string>
+ <string name="loading_photo" msgid="6784297653634402137">"Loading…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"Sending…"</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"This image is too large to download, would you like to retry at smaller resolution?"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"The photo couldn\'t be saved to the device."</string>
+ <string name="yes" msgid="7474216525286833848">"Yes"</string>
+ <string name="no" msgid="427548507197604096">"No"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"Can\'t find photo."</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> of <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" See more »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"Just now"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+ <item quantity="other" msgid="4976118461634588647">"<xliff:g id="COUNT">%d</xliff:g> mins"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> hour"</item>
+ <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> hours"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> day"</item>
+ <item quantity="other" msgid="2756574969735638578">"<xliff:g id="COUNT">%d</xliff:g> days"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Inserting photo…"</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c8470e7..dc34d37 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8708eaa..9bc347d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Esta cuenta no está configurada para sincronizarse de forma automática."\n"Toca "<b>"Sincronizar ahora"</b>" para sincronizar el correo una vez o selecciona "<b>"Cambiar ajustes de sincronización"</b>" para configurar la sincronización automática del correo en esta cuenta."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronizar ahora"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"Cambiar ajustes de sincronización"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"Fotos del mensaje"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"No se puede cargar la foto."</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"Vídeo no disponible en este momento. Actualiza la página."</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"Elemento no disponible. Actualiza la página."</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"La foto no está disponible en este momento."</string>
+ <string name="loading_photo" msgid="6784297653634402137">"Cargando…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"Enviando…"</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"Esta imagen es demasiado grande para descargarla. ¿Quieres descargarla con una resolución menor?"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"La foto no se ha podido guardar en el dispositivo."</string>
+ <string name="yes" msgid="7474216525286833848">"Sí"</string>
+ <string name="no" msgid="427548507197604096">"No"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"No se puede encontrar la foto."</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> de <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" Más »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"Ahora"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+ <item quantity="other" msgid="4976118461634588647">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> hora"</item>
+ <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> horas"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> día"</item>
+ <item quantity="other" msgid="2756574969735638578">"<xliff:g id="COUNT">%d</xliff:g> días"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Insertando foto…"</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index c116bbf..77aa5b3 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 95da2e6..25e6202 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index fa67867..3960553 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 53cbb2f..7c6e0bb 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3e1087c..a1fa6fc 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 4078e2b..6b53b0e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8ef40e1..d0eeaa7 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3372f1b..860d6fd 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9d5a55c..8a81614 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 3a4492a..e804894 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"חשבון זה אינו מוגדר לסנכרון אוטומטי."\n"גע באפשרות "<b>"סנכרן כעת"</b>" כדי לסנכרן את הדואר פעם אחת, או באפשרות "<b>"שנה הגדרות סנכרון"</b>" כדי להגדיר חשבון זה לסנכרון דואר באופן אוטומטי."</string>
<string name="manual_sync" msgid="6743983544685622800">"סנכרן עכשיו"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"שנה הגדרות סנכרון"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"תמונות מההודעה"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"לא ניתן לטעון את התמונה."</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"הסרטון אינו זמין כעת. רענן."</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"הפריט אינו זמין כעת. רענן."</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"התמונה אינה זמינה כרגע."</string>
+ <string name="loading_photo" msgid="6784297653634402137">"טוען…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"שולח..."</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"התמונה הזו גדולה מדי להורדה, האם תרצה לנסות ברזולוציה נמוכה יותר?"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"לא ניתן לשמור את התמונה במכשיר."</string>
+ <string name="yes" msgid="7474216525286833848">"כן"</string>
+ <string name="no" msgid="427548507197604096">"לא"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"לא ניתן למצוא את התמונה."</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> מתוך <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" ראה עוד »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"ממש עכשיו"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"<xliff:g id="COUNT">%d</xliff:g> דקות"</item>
+ <item quantity="other" msgid="4976118461634588647">"<xliff:g id="COUNT">%d</xliff:g> דקות"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> שעות"</item>
+ <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> שעות"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> ימים"</item>
+ <item quantity="other" msgid="2756574969735638578">"<xliff:g id="COUNT">%d</xliff:g> ימים"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"מכניס תמונה…"</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 13329a0..2cf218a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1b0af44..24e6a18 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2cb87c3..3019daf 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d08b4de..c6162a5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 3054e39..aa86262 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 54e54f1..0b77f28 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4be2af2..18d1bdb 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 09b6222..4ca1fec 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 00770ff..1987d59 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1d8d224..85cb04b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 9195adf..30fde25 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7626055..60e66fb 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-sk-sw600dp/strings.xml b/res/values-sk-sw600dp/strings.xml
index 607a9e8..1f4eaa3 100644
--- a/res/values-sk-sw600dp/strings.xml
+++ b/res/values-sk-sw600dp/strings.xml
@@ -18,7 +18,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="add_cc_label" msgid="6156834609108442458">"+ Kópia/skr.kópia"</string>
- <string name="add_bcc_label" msgid="7648769906379235693">"+ Skrytá kópia"</string>
+ <string name="add_cc_label" msgid="6156834609108442458">"+ kópia/skr.kópia"</string>
+ <string name="add_bcc_label" msgid="7648769906379235693">"+ skrytá kópia"</string>
<string name="menu_label_options" msgid="501791283402303675">"Spravovať menovky"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index da6d0fa..1daafd2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8189d05..e5c742c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8286d00..7d06323 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ffca381..1212eee 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a163646..478d824 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akaunti hii haijasanidiwa kulandanishwa kiotomatiki."\n"Gusa"<b>"Landanisha Sasa"</b>" ili kulandanisha barua mara moja, au "<b>"Badilisha Mipangilio ya Kulandanisha"</b>" ili kusanidi akaunti hii ilandanishe barua kiotomatiki."</string>
<string name="manual_sync" msgid="6743983544685622800">"Landanisha sasa"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"Badilisha mipangilio ya ulandanishi"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"Picha kutoka kwenye ujumbe"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"Picha haikuweza kupakiwa."</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"Video haipatikani kwa sasa. Tafadhali onyesha upya."</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"Kipengee hakipatikani kwa sasa. Tafadhali onyesha upya."</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"Picha haipatikani hivi sasa."</string>
+ <string name="loading_photo" msgid="6784297653634402137">"Inapakia…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"Inatuma..."</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"Taswira hii ni kubwa mno kupakuliwa, je, ungependa kujaribu tena katika msongo mdogo?"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"Picha haingeweza kuhifadhiwa kwenye kifaa."</string>
+ <string name="yes" msgid="7474216525286833848">"Ndiyo"</string>
+ <string name="no" msgid="427548507197604096">"Hapana"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"Haiwezi kupata picha."</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> ya <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" Tazama zaidi »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"Sasa hivi"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"Dakika <xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="other" msgid="4976118461634588647">"Dakika <xliff:g id="COUNT">%d</xliff:g>"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"Saa <xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="other" msgid="1470820825143524326">"Saa <xliff:g id="COUNT">%d</xliff:g>"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"Siku <xliff:g id="COUNT">%d</xliff:g>"</item>
+ <item quantity="other" msgid="2756574969735638578">"Siku <xliff:g id="COUNT">%d</xliff:g>"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Picha inaingizwa..."</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0c481fd8..82548a3 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -302,44 +302,35 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"บัญชีนี้ไม่ได้รับการตั้งค่าให้ซิงค์อัตโนมัติ"\n"แตะ "<b>"ซิงค์เลย"</b>" เพื่อซิงค์เมลหนึ่งครั้ง หรือแตะ "<b>"เปลี่ยนการตั้งค่าการซิงค์"</b>" เพื่อตั้งค่าบัญชีนี้ให้ซิงค์เมลอัตโนมัติ"</string>
<string name="manual_sync" msgid="6743983544685622800">"ซิงค์เลย"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"เปลี่ยนการตั้งค่าการซิงค์"</string>
- <!-- no translation found for photo_view_default_title (305616940993932174) -->
- <skip />
- <!-- no translation found for photo_view_load_error (1802859675974843136) -->
- <skip />
- <!-- no translation found for photo_view_video_not_ready (8488887700991406631) -->
- <skip />
- <!-- no translation found for photo_view_placeholder_image (465734985000555852) -->
- <skip />
- <!-- no translation found for photo_network_error (6545183306958652345) -->
- <skip />
- <!-- no translation found for loading_photo (6784297653634402137) -->
- <skip />
- <!-- no translation found for post_operation_pending (1312168212880219407) -->
- <skip />
- <!-- no translation found for download_photo_retry (1894223549069749239) -->
- <skip />
- <!-- no translation found for download_photo_error (7511376299526085797) -->
- <skip />
- <!-- no translation found for yes (7474216525286833848) -->
- <skip />
- <!-- no translation found for no (427548507197604096) -->
- <skip />
- <!-- no translation found for camera_photo_error (653424229752191252) -->
- <skip />
- <!-- no translation found for photo_view_count (1568865177363028519) -->
- <skip />
- <!-- no translation found for truncated_info (4901078975545890098) -->
- <skip />
- <!-- no translation found for truncated_info_see_more (2068973974507128729) -->
- <skip />
- <!-- no translation found for posted_just_now (7872790861965011674) -->
- <skip />
- <!-- no translation found for num_minutes_ago:one (4750191148321568233) -->
- <!-- no translation found for num_minutes_ago:other (4976118461634588647) -->
- <!-- no translation found for num_hours_ago:one (2178354472031148118) -->
- <!-- no translation found for num_hours_ago:other (1470820825143524326) -->
- <!-- no translation found for num_days_ago:one (5538890823169916595) -->
- <!-- no translation found for num_days_ago:other (2756574969735638578) -->
- <!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
+ <string name="photo_view_default_title" msgid="305616940993932174">"รูปภาพจากข้อความ"</string>
+ <string name="photo_view_load_error" msgid="1802859675974843136">"ไม่สามารถโหลดรูปภาพ"</string>
+ <string name="photo_view_video_not_ready" msgid="8488887700991406631">"ไม่สามารถใช้วิดีโอได้ในขณะนี้ โปรดรีเฟรช"</string>
+ <string name="photo_view_placeholder_image" msgid="465734985000555852">"ไม่สามารถใช้รายการได้ในขณะนี้ โปรดรีเฟรช"</string>
+ <string name="photo_network_error" msgid="6545183306958652345">"รูปภาพไม่สามารถใช้ได้ในขณะนี้"</string>
+ <string name="loading_photo" msgid="6784297653634402137">"กำลังโหลด…"</string>
+ <string name="post_operation_pending" msgid="1312168212880219407">"กำลังส่ง…"</string>
+ <string name="download_photo_retry" msgid="1894223549069749239">"ภาพนี้มีขนาดใหญ่เกินไปสำหรับการดาวน์โหลด คุณอยากลองดาวน์โหลดที่ความละเอียดน้อยลงหรือไม่"</string>
+ <string name="download_photo_error" msgid="7511376299526085797">"ไม่สามารถบันทึกรูปภาพไปยังอุปกรณ์"</string>
+ <string name="yes" msgid="7474216525286833848">"ใช่"</string>
+ <string name="no" msgid="427548507197604096">"ไม่"</string>
+ <string name="camera_photo_error" msgid="653424229752191252">"ไม่พบรูปภาพ"</string>
+ <string name="photo_view_count" msgid="1568865177363028519">"<xliff:g id="CURRENT_POS">%d</xliff:g> จาก <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="truncated_info" msgid="4901078975545890098">"..."</string>
+ <string name="truncated_info_see_more" msgid="2068973974507128729">" ดูเพิ่มเติม »"</string>
+ <string name="posted_just_now" msgid="7872790861965011674">"เมื่อสักครู่"</string>
+ <plurals name="num_minutes_ago">
+ <item quantity="one" msgid="4750191148321568233">"<xliff:g id="COUNT">%d</xliff:g> นาที"</item>
+ <item quantity="other" msgid="4976118461634588647">"<xliff:g id="COUNT">%d</xliff:g> นาที"</item>
+ </plurals>
+ <plurals name="num_hours_ago">
+ <item quantity="one" msgid="2178354472031148118">"<xliff:g id="COUNT">%d</xliff:g> ชั่วโมง"</item>
+ <item quantity="other" msgid="1470820825143524326">"<xliff:g id="COUNT">%d</xliff:g> ชั่วโมง"</item>
+ </plurals>
+ <plurals name="num_days_ago">
+ <item quantity="one" msgid="5538890823169916595">"<xliff:g id="COUNT">%d</xliff:g> วัน"</item>
+ <item quantity="other" msgid="2756574969735638578">"<xliff:g id="COUNT">%d</xliff:g> วัน"</item>
+ </plurals>
+ <string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"กำลังแทรกรูปภาพ…"</string>
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
<skip />
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7501e4c..f991fda 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4156cd0..8ddbb5e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3bc3bab..1d97960 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2680c7f..4c60a7c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a7ad5e9..d99bdc3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 553b7cb..d39d508 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 613d2ad..de4db27 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -342,4 +342,6 @@
<!-- no translation found for num_days_ago:other (2756574969735638578) -->
<!-- no translation found for dialog_inserting_camera_photo (2711654208680211224) -->
<skip />
+ <!-- no translation found for cant_move_or_change_labels (7997792014816166601) -->
+ <skip />
</resources>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 76841d1..dc472fe 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -65,7 +65,6 @@
import com.android.mail.providers.UIProvider.ConversationColumns;
import com.android.mail.ui.AnimatedAdapter;
import com.android.mail.ui.ConversationSelectionSet;
-import com.android.mail.ui.DragListener;
import com.android.mail.ui.FolderDisplayer;
import com.android.mail.ui.SwipeableItemView;
import com.android.mail.ui.ViewMode;
@@ -162,7 +161,6 @@
private boolean mSwipeEnabled;
private int mLastTouchX;
private int mLastTouchY;
- private DragListener mDragListener;
private AnimatedAdapter mAdapter;
private static Bitmap MORE_FOLDERS;
@@ -367,29 +365,27 @@
}
public void bind(Cursor cursor, ViewMode viewMode, ConversationSelectionSet set, Folder folder,
- boolean checkboxesDisabled, boolean swipeEnabled, DragListener dragListener,
- AnimatedAdapter adapter) {
+ boolean checkboxesDisabled, boolean swipeEnabled, AnimatedAdapter adapter) {
bind(ConversationItemViewModel.forCursor(cursor), viewMode, set, folder,
- checkboxesDisabled, swipeEnabled, dragListener, adapter);
+ checkboxesDisabled, swipeEnabled, adapter);
}
public void bind(Conversation conversation, ViewMode viewMode, ConversationSelectionSet set,
Folder folder, boolean checkboxesDisabled, boolean swipeEnabled,
- DragListener dragListener, AnimatedAdapter adapter) {
+ AnimatedAdapter adapter) {
bind(ConversationItemViewModel.forConversation(conversation), viewMode, set, folder,
- checkboxesDisabled, swipeEnabled, dragListener, adapter);
+ checkboxesDisabled, swipeEnabled, adapter);
}
private void bind(ConversationItemViewModel header, ViewMode viewMode,
ConversationSelectionSet set, Folder folder, boolean checkboxesDisabled,
- boolean swipeEnabled, DragListener dragListener, AnimatedAdapter adapter) {
+ boolean swipeEnabled, AnimatedAdapter adapter) {
mViewMode = viewMode;
mHeader = header;
mSelectedConversationSet = set;
mDisplayedFolder = folder;
mCheckboxesEnabled = !checkboxesDisabled;
mSwipeEnabled = swipeEnabled;
- mDragListener = dragListener;
mAdapter = adapter;
setContentDescription(mHeader.getContentDescription(mContext));
requestLayout();
@@ -1298,7 +1294,6 @@
// Begin drag mode. Keep the conversation selected (NOT toggle
// selection) and start drag.
selectConversation();
- mDragListener.onStartDragMode();
// Clip data has form: [conversations_uri, conversationId1,
// maxMessageId1, label1, conversationId2, maxMessageId2, label2, ...]
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 1fa57af..6de5ce3 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -76,9 +76,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Set;
-import java.util.Timer;
import java.util.TimerTask;
@@ -119,9 +117,6 @@
/** Tag used when loading a folder list fragment. */
protected static final String TAG_FOLDER_LIST = "tag-folder-list";
- /** Are we on a tablet device or not. */
- public final boolean IS_TABLET_DEVICE;
-
protected Account mAccount;
protected Folder mFolder;
protected ActionBarView mActionBarView;
@@ -217,7 +212,6 @@
mFragmentManager = mActivity.getFragmentManager();
mViewMode = viewMode;
mContext = activity.getApplicationContext();
- IS_TABLET_DEVICE = Utils.useTabletUI(mContext);
mRecentFolderList = new RecentFolderList(mContext);
// Allow the fragment to observe changes to its own selection set. No other object is
// aware of the selected set.
@@ -248,22 +242,12 @@
}
@Override
- public int getMode() {
- return mViewMode.getMode();
- }
-
- @Override
public String getUnshownSubject(String subject) {
// Calculate how much of the subject is shown, and return the remaining.
return null;
}
@Override
- public void handleConversationLoadError() {
- // TODO(viki): Auto-generated method stub
- }
-
- @Override
public final ConversationCursor getConversationListCursor() {
return mConversationListCursor;
}
@@ -795,7 +779,6 @@
@Override
public void onPrepareDialog(int id, Dialog dialog, Bundle bundle) {
// TODO(viki): Auto-generated method stub
-
}
@Override
@@ -807,7 +790,6 @@
@Override
public void onPause() {
isLoaderInitialized = false;
-
enableNotifications();
commitLeaveBehindItems();
}
@@ -857,17 +839,7 @@
}
@Override
- public void onStartDragMode() {
- // TODO(viki): Auto-generated method stub
- }
-
- @Override
public void onStop() {
- // TODO(viki): Auto-generated method stub
- }
-
- @Override
- public void onStopDragMode() {
// TODO(viki): Auto-generated method stub
}
@@ -1095,7 +1067,11 @@
}
}
- @Override
+ /**
+ * Returns true if we are waiting for the account to sync, and cannot show any folders or
+ * conversation for the current account yet.
+ * @return
+ */
public boolean inWaitMode() {
final FragmentManager manager = mActivity.getFragmentManager();
final WaitFragment waitFragment =
@@ -1205,18 +1181,6 @@
lm.restartLoader(id, Bundle.EMPTY, this);
}
- /**
- * Start a loader with the given id. This should be called when we know that the previous
- * state of the application matches this state, and we are happy if we get the previously
- * created loader with this id. If that is not true, consider calling
- * {@link #restartOptionalLoader(int)} instead.
- * @param id
- */
- private void startLoader(int id) {
- final LoaderManager lm = mActivity.getLoaderManager();
- lm.initLoader(id, Bundle.EMPTY, this);
- }
-
@Override
public void registerConversationListObserver(DataSetObserver observer) {
mConversationListObservable.registerObserver(observer);
diff --git a/src/com/android/mail/ui/ActivityController.java b/src/com/android/mail/ui/ActivityController.java
index ee36df0..1eef46e 100644
--- a/src/com/android/mail/ui/ActivityController.java
+++ b/src/com/android/mail/ui/ActivityController.java
@@ -36,14 +36,12 @@
import com.android.mail.ui.FoldersSelectionDialog.FolderChangeCommitListener;
import com.android.mail.ui.ViewMode.ModeChangeListener;
-import java.util.Collection;
-
/**
* An Activity controller knows how to combine views and listeners into a functioning activity.
* ActivityControllers are delegates that implement methods by calling underlying views to modify,
* or respond to user action.
*/
-public interface ActivityController extends DragListener, LayoutListener, SubjectDisplayChanger,
+public interface ActivityController extends LayoutListener, SubjectDisplayChanger,
ModeChangeListener, ConversationListCallbacks, FolderChangeCommitListener,
FolderChangeListener, AccountChangeListener, LoaderManager.LoaderCallbacks<Cursor>,
ConversationSetObserver,
@@ -63,18 +61,6 @@
ConversationListContext getCurrentListContext();
/**
- * Return the current mode the activity is in. Values need to be matched against constants in
- * {@link ViewMode}.
- * @return
- */
- int getMode();
-
- /**
- *
- */
- void handleConversationLoadError();
-
- /**
* @see android.app.Activity#onActivityResult
* @param requestCode
* @param resultCode
@@ -241,8 +227,6 @@
*/
public void updateWaitMode();
- public boolean inWaitMode();
-
/**
* Show the folder list associated with the currently selected account.
*/
@@ -265,6 +249,11 @@
*/
boolean shouldShowFirstConversation();
+ /**
+ * Get the selected set of conversations. Guaranteed to return non-null, this should return
+ * an empty set if no conversation is currently selected.
+ * @return
+ */
public ConversationSelectionSet getSelectedSet();
/**
@@ -298,10 +287,10 @@
/**
* Load the default inbox associated with the current account.
*/
- public abstract void loadAccountInbox();
+ public void loadAccountInbox();
/**
* Return the folder currently being viewed by the activity.
*/
- public abstract Folder getFolder();
+ public Folder getFolder();
}
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 63fb1be..9856be9 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -78,7 +78,6 @@
private final SwipeableListView mListView;
private Settings mCachedSettings;
private boolean mSwipeEnabled;
- private DragListener mDragListener;
private HashMap<Long, LeaveBehindItem> mLeaveBehindItems = new HashMap<Long, LeaveBehindItem>();
/**
@@ -88,7 +87,7 @@
public AnimatedAdapter(Context context, int textViewResourceId, ConversationCursor cursor,
ConversationSelectionSet batch, Account account, Settings settings, ViewMode viewMode,
- SwipeableListView listView, DragListener dragListener) {
+ SwipeableListView listView) {
// Use FLAG_REGISTER_CONTENT_OBSERVER to ensure special
// ConversationCursor notifications (triggered by UI actions) cause any
// connected ListView to redraw.
@@ -101,7 +100,6 @@
mShowFooter = false;
mListView = listView;
mCachedSettings = settings;
- mDragListener = dragListener;
mSwipeEnabled = account.supportsCapability(UIProvider.AccountCapabilities.UNDO);
}
@@ -134,7 +132,7 @@
}
((ConversationItemView) view).bind(cursor, mViewMode, mBatchConversations, mFolder,
mCachedSettings != null ? mCachedSettings.hideCheckboxes : false,
- mSwipeEnabled, mDragListener, this);
+ mSwipeEnabled, this);
}
@Override
@@ -321,7 +319,7 @@
parent);
convView.bind(conversation, mViewMode, mBatchConversations, mFolder,
mCachedSettings != null ? mCachedSettings.hideCheckboxes : false, mSwipeEnabled,
- mDragListener, this);
+ this);
convView.startUndoAnimation(mViewMode, this);
return convView;
}
diff --git a/src/com/android/mail/ui/ControllableActivity.java b/src/com/android/mail/ui/ControllableActivity.java
index 486b863..ce573be 100644
--- a/src/com/android/mail/ui/ControllableActivity.java
+++ b/src/com/android/mail/ui/ControllableActivity.java
@@ -76,8 +76,6 @@
*/
FolderListFragment.FolderListSelectionListener getFolderListSelectionListener();
- DragListener getDragListener();
-
void onConversationSeen(Conversation conv);
/**
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index a7b02f7..1dbf8e0 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -204,8 +204,7 @@
mListAdapter = new AnimatedAdapter(mActivity.getApplicationContext(), -1,
getConversationListCursor(), mActivity.getSelectedSet(), mAccount,
- mActivity.getSettings(), mActivity.getViewMode(), mListView,
- mActivity.getDragListener());
+ mActivity.getSettings(), mActivity.getViewMode(), mListView);
mFooterView = (ConversationListFooterView) LayoutInflater.from(
mActivity.getActivityContext()).inflate(R.layout.conversation_list_footer_view,
null);
diff --git a/src/com/android/mail/ui/DragListener.java b/src/com/android/mail/ui/DragListener.java
deleted file mode 100644
index 1b693ba..0000000
--- a/src/com/android/mail/ui/DragListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * 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.
- *******************************************************************************/
-
-package com.android.mail.ui;
-
-
-/**
- * This interface is used to send notifications back to the calling
- * activity. MenuHandler takes care of updating the provider, so this
- * interface should be used for notification purposes only (such as updating
- * the UI).
- */
-// Called MenuHandler.ActivityCallback in the previous code.
-public interface DragListener {
- /**
- * Invoked when user starts drag and drop mode.
- */
- void onStartDragMode();
-
- /**
- * Invoked when user stops drag and drop mode.
- */
- void onStopDragMode();
-}
-
diff --git a/src/com/android/mail/ui/FolderSelectionActivity.java b/src/com/android/mail/ui/FolderSelectionActivity.java
index b9deaaf..bcf8c6f 100644
--- a/src/com/android/mail/ui/FolderSelectionActivity.java
+++ b/src/com/android/mail/ui/FolderSelectionActivity.java
@@ -291,11 +291,6 @@
}
@Override
- public DragListener getDragListener() {
- return null;
- }
-
- @Override
public boolean supportsDrag(DragEvent event, Folder folder) {
return false;
}
diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index dd2c149..d09bb71 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java
@@ -272,11 +272,6 @@
}
@Override
- public DragListener getDragListener() {
- return mController;
- }
-
- @Override
public boolean supportsDrag(DragEvent event, Folder folder) {
return mController.supportsDrag(event, folder);
}
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index edcbacb..e7d8927 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -22,7 +22,6 @@
import android.app.FragmentTransaction;
import android.net.Uri;
import android.os.Bundle;
-import android.view.MenuItem;
import com.android.mail.ConversationListContext;
import com.android.mail.R;
@@ -31,11 +30,8 @@
import com.android.mail.providers.Folder;
import com.android.mail.providers.Settings;
import com.android.mail.providers.UIProvider;
-import com.android.mail.providers.UIProvider.ConversationColumns;
import com.android.mail.utils.LogUtils;
-import java.util.Collection;
-
/**
* Controller for one-pane Mail activity. One Pane is used for phones, where screen real estate is
* limited. This controller also does the layout, since the layout is simpler in the one pane case.
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 9022d46..f2672a3 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -24,7 +24,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.view.Gravity;
-import android.view.MenuItem;
import android.widget.FrameLayout;
import com.android.mail.ConversationListContext;
@@ -32,14 +31,9 @@
import com.android.mail.providers.Account;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
-import com.android.mail.providers.Settings;
-import com.android.mail.providers.UIProvider;
-import com.android.mail.providers.UIProvider.ConversationColumns;
import com.android.mail.utils.LogUtils;
import com.android.mail.utils.Utils;
-import java.util.Collection;
-
/**
* Controller for two-pane Mail activity. Two Pane is used for tablets, where screen real estate
* abounds.