Merge "Fix dangling comma in 'to view' when filled from intent."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3831181..dc008c7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -95,6 +95,7 @@
         android:icon="@mipmap/ic_launcher_email"
         android:label="@string/app_name"
         android:name="Email"
+        android:requiredAccountType="com.android.exchange,com.android.email"
         android:theme="@style/EmailTheme"
         android:hardwareAccelerated="false"
         >
diff --git a/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java b/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
index 51a62fd..f8bc9cc 100644
--- a/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
+++ b/emailcommon/src/com/android/emailcommon/internet/Rfc822Output.java
@@ -260,6 +260,7 @@
                     writeBoundary(writer, multipartBoundary, false);
                     Attachment attachment =
                         Attachment.getContent(attachmentsCursor, Attachment.class);
+                    attachment.mAccountKey = message.mAccountKey;
                     writeOneAttachment(context, writer, stream, attachment);
                     writer.write("\r\n");
                 } while (attachmentsCursor.moveToNext());
@@ -321,12 +322,13 @@
             out.write('\r');
             out.write('\n');
             out.flush();
-        }
-        catch (FileNotFoundException fnfe) {
+        } catch (final FileNotFoundException fnfe) {
             // Ignore this - empty file is OK
-        }
-        catch (IOException ioe) {
+        } catch (final IOException ioe) {
             throw new MessagingException("Invalid attachment.", ioe);
+        } catch (final SecurityException se) {
+            throw new MessagingException(MessagingException.GENERAL_SECURITY,
+                    "No permissions for attachment", attachment);
         }
     }
 
diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java
index 97a6f12..254a10b 100755
--- a/emailcommon/src/com/android/emailcommon/provider/Account.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Account.java
@@ -70,7 +70,7 @@
     // Whether or not the user has asked for notifications of new mail in this account
     public final static int FLAGS_NOTIFY_NEW_MAIL = 1<<0;
     // Whether or not the user has asked for vibration notifications with all new mail
-    public final static int FLAGS_VIBRATE_ALWAYS = 1<<1;
+    public final static int FLAGS_VIBRATE = 1<<1;
     // Bit mask for the account's deletion policy (see DELETE_POLICY_x below)
     public static final int FLAGS_DELETE_POLICY_MASK = 1<<2 | 1<<3;
     public static final int FLAGS_DELETE_POLICY_SHIFT = 2;
@@ -82,8 +82,6 @@
     // required by the server; in this state, the user MUST be alerted to the need to update
     // security settings.  Sync adapters SHOULD NOT attempt to sync when this flag is set.
     public static final int FLAGS_SECURITY_HOLD = 1<<5;
-    // Whether or not the user has asked for vibration notifications when the ringer is silent
-    public static final int FLAGS_VIBRATE_WHEN_SILENT = 1<<6;
     // Whether the account supports "smart forward" (i.e. the server appends the original
     // message along with any attachments to the outgoing message)
     public static final int FLAGS_SUPPORTS_SMART_FORWARD = 1<<7;
@@ -373,8 +371,7 @@
     /**
      * @return the flags for this account
      * @see #FLAGS_NOTIFY_NEW_MAIL
-     * @see #FLAGS_VIBRATE_ALWAYS
-     * @see #FLAGS_VIBRATE_WHEN_SILENT
+     * @see #FLAGS_VIBRATE
      */
     public int getFlags() {
         return mFlags;
@@ -383,8 +380,7 @@
     /**
      * Set the flags for this account
      * @see #FLAGS_NOTIFY_NEW_MAIL
-     * @see #FLAGS_VIBRATE_ALWAYS
-     * @see #FLAGS_VIBRATE_WHEN_SILENT
+     * @see #FLAGS_VIBRATE
      * @param newFlags the new value for the flags
      */
     public void setFlags(int newFlags) {
@@ -574,7 +570,7 @@
                 return c.getLong(Account.ID_PROJECTION_COLUMN);
             }
         } finally {
-            c.close();
+            if (c != null && !c.isClosed()) c.close();
         }
         return Account.NO_ACCOUNT;
     }
@@ -976,4 +972,4 @@
         sb.append(']');
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
index f9fe696..add9f53 100755
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -25,6 +25,7 @@
 import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Binder;
 import android.os.Environment;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -155,6 +156,7 @@
      */
     public static <T extends EmailContent> T restoreContentWithId(Context context,
             Class<T> klass, Uri contentUri, String[] contentProjection, long id) {
+        long token = Binder.clearCallingIdentity();
         Uri u = ContentUris.withAppendedId(contentUri, id);
         Cursor c = context.getContentResolver().query(u, contentProjection, null, null, null);
         if (c == null) throw new ProviderUnavailableException();
@@ -166,6 +168,7 @@
             }
         } finally {
             c.close();
+            Binder.restoreCallingIdentity(token);
         }
     }
 
diff --git a/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java b/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
index 15d1cca..55ae014 100644
--- a/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
+++ b/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
@@ -99,7 +99,7 @@
             KeyManager keyManager =
                     KeyChainKeyManager.fromAlias(context, hostAuth.mClientCertAlias);
             SSLCertificateSocketFactory underlying = SSLUtils.getSSLSocketFactory(
-                    hostAuth.shouldTrustAllServerCerts());
+                    hostAuth.shouldTrustAllServerCerts(), 0 /* no timeout */);
             underlying.setKeyManagers(new KeyManager[] { keyManager });
             registry.register(
                     new Scheme(schemeName, new SSLSocketFactory(underlying), hostAuth.mPort));
diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
index b21c68f..85b77c1 100644
--- a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
+++ b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
@@ -47,19 +47,20 @@
      * Optionally bypass all SSL certificate checks.
      *
      * @param insecure if true, bypass all SSL certificate checks
+     * @param timeout the timeout value in milliseconds or {@code 0} for an infinite timeout.
      */
     public synchronized static SSLCertificateSocketFactory getSSLSocketFactory(
-            boolean insecure) {
+            boolean insecure, int timeout) {
         if (insecure) {
             if (sInsecureFactory == null) {
                 sInsecureFactory = (SSLCertificateSocketFactory)
-                        SSLCertificateSocketFactory.getInsecure(0, null);
+                        SSLCertificateSocketFactory.getInsecure(timeout, null);
             }
             return sInsecureFactory;
         } else {
             if (sSecureFactory == null) {
                 sSecureFactory = (SSLCertificateSocketFactory)
-                        SSLCertificateSocketFactory.getDefault(0, null);
+                        SSLCertificateSocketFactory.getDefault(timeout, null);
             }
             return sSecureFactory;
         }
@@ -70,7 +71,7 @@
      * Apache HTTP stack.
      */
     public static SSLSocketFactory getHttpSocketFactory(boolean insecure, KeyManager keyManager) {
-        SSLCertificateSocketFactory underlying = getSSLSocketFactory(insecure);
+        SSLCertificateSocketFactory underlying = getSSLSocketFactory(insecure, 0 /* no timeout */);
         if (keyManager != null) {
             underlying.setKeyManagers(new KeyManager[] { keyManager });
         }
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index eed5b89..b5cc80e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Sinkroniseeropsies"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk as ongelees"</string>
     <string name="move_action" msgid="3059189775933985898">"Skuif"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Jonger"</string>
+    <string name="older_action" msgid="4504015635360605471">"Ouer"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Voeg Cc/Bcc by"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Heg lêer aan"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkroniseer e-pos"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkroniseer e-pos vir hierdie rekening"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreer"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreer ook wanneer e-pos aankom"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altyd"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Net wanneer stil"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreer"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Kies \'n luitoon"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Bedienerinstellings"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Verwyder rekening"</string>
diff --git a/res/values-af/uploader.xml b/res/values-af/uploader.xml
deleted file mode 100644
index 25ec5f0..0000000
--- a/res/values-af/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Kitsoplaai"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Kitsoplaai-album"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Oplaai"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Klaar"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Laat wag"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto\'s • %3$d video\'s"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto\'s • %2$d video\'s"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"lae battery"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"fotokwota is oorskry"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"swerwing"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"wag vir Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"uitgestel tot gelaai word"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"wag vir verbinding"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"herprobeer oor %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Wys hangende oplaaisels"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Wys afgehandelde oplaaisels"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Sien aanlyn"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Wys hangende oplaaisels"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Versteek hangende oplaaisels"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Wys details"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Versteek details"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Instellings"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"%s opgelaai"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Rekening"</string>
-    <string name="upload" msgid="2615541458361216022">"Laai op"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Kanselleer"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Laai op na "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" vir "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Oplaai-inisialisering het misluk."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Lêer nie beskikbaar nie"</string>
-    <string name="account_error" msgid="1904775271866104941">"Kon nie rekeninginligting ophaal nie."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Daar was \'n probleem om by jou rekening aan te meld."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Wag om weer te probeer"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Wag vir WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Oplaai"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Misluk"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Afgehandel"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"oplaai"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"handmatig laat wag"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"laat wag - lae battery"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"laat wag - stel uit tot gelaai word"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"laat wag - wag vir verbinding"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"wag tans - PWA-kwota is op"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"laat wag - wag vir Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"laat wag - swerwend"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"wag om te herprobeer"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuut"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minute"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minute"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Geen dataverbinding nie"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Rekening se skyfkwota is op"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Lêer nie gekry nie"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Diensfout"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Netwerkfout"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Stawing het misluk"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Hangende oplaaisels [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Afgehandelde oplaaisels [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Laat oplaaisels wag"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Hervat oplaaisels"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Laai nou op"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Laai later op"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Moenie oplaai nie"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Sien"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Herprobeer"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Oplaai gekanselleer"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Oplaai reeds afgehandel"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sinkroniseer almal"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Vorige sinkronisering:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Lys afgehandelde items is leeg."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Kitsoplaai"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Oplaaisels afgehandel"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Oplaaisels wagtend"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Kitsoplaai is nog nie geaktiveer nie"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Groot lêers sal net oor \'n WiFi-verbinding opgelaai word."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Skandeer tans vir lêers..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Berei tans <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto\'s en <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video\'s voor vir oplaai..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Geen bykomende foto\'s/video\'s hoef opgelaai te word nie."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Kon nie met die bediener kommunikeer nie. Probeer later weer."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sinkroniseer alle gekanselleer"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sinkroniseer almal"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Sien afgehandel"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Sien hangende"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Algemeen"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Laat wag alle oplaaisels"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Krag"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Laai net op wanneer die foon herlaai word."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Laai net op wanneer Wi-Fi beskikbaar is."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Foto\'s"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Rekening"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Oplaaivoorwaardes"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Fotogrootte"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Video\'s"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Rekening"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Die foto\'s-rekening sal gebruik word om video\'s op te laai."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Oplaaivoorwaardes"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Foto\'s se verbindingsinstellings word vir eers gebruik."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Net foto\'s via mobielnetwerke"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Foto\'s en video\'s via mobielnetwerke"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Foto\'s en video\'s net via Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Meer oor"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Kitsoplaai-weergawe"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Aanbevole: 1600 pixels (vir deling, druk en sluimerskerms)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Oorspronklike grootte (stadigste oplaai)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"wag tans - SD-kaart nie beskikbaar nie"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kaart onbeskikbaar"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Kitsoplaai-instellings"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Kitsoplaai"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Laai outomaties nuwe foto\'s en video\'s na \'n private webalbum op"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Oplaaistatus"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Gevorderd"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobieloplaaisels"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Swerfoplaaisels"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Laai foto\'s en video\'s op wanneer swerf op datanetwerk"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Battery-oplaaisels"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Laai foto\'s en video\'s op net terwyl battery laai"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Laai bestaande foto\'s op"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Laai nou enige bestaande foto\'s en video\'s van jou foon af op"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Gedeaktiveer"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Laai (%1$d%%) op"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d of %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Wag tans: raak om oplaai te hervat"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Laai bestaande foto\'s op"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Om foto\'s en video\'s op te laai wat nog nie van jou foon na \'n private album op die web opgelaai is nie, kan \'n rukkie neem, maar sal in die agtergrond gedoen word. Is jy seker jy wil voortgaan?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ja"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nee"</string>
-</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c76dc85..d1bc33a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ኢሜይል አመሳስል"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ለእዚህ መለያ ኢሜይል አስምር"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"ንዘር"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"ኢሜይል ሲደርስ እንዲሁ ንዘር"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ዘወትር"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"ፀጥታ ሲሆን ብቻ"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"በፍፁም"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"ንዘር"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"የደወል ቅላጼ ምረጥ"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"የአገልጋይ ቅንብሮች"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"መለያ አስወግድ"</string>
diff --git a/res/values-am/uploader.xml b/res/values-am/uploader.xml
deleted file mode 100644
index 5a0c08e..0000000
--- a/res/values-am/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"በፍጥነት ስቀል"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"በፍጥነት አልበም ስቀል"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"በመስቀል ላይ"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"ጨርሷል"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"ለአፍታ ቆሟል"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %1$d ፎቶዎች • %2$d ቪዲዮዎች"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d  ፎቶዎች • %2$d  ቪዲዮዎች"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"አነስተኛ ባትሪ"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"የፎቶዎች ኮታ በዝቷል"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"በመንቀሳቀስ ላይ"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"WiFi በመጠበቅ ላይ"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"ኃይል እስኪሞላ ድረስ ዘግይቷል"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"ተያያዥ በመጠበቅ ላይ"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"በ%s  ድጋሚ በመሞከር ላይ"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"በይደር ያሉ ስቀሎች አሳይ"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"ያለቁ ስቀሎች አሳይ"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"መስመር ላይ እይ"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"በይደር ያሉ ስቀሎች አሳይ"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"በይደር ላይ ያሉ ስቀሎችን ደብቅ"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"ዝርዝሮች አሳይ"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"ዝርዝሮች ደብቅ"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"ቅንብሮች"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"%s ተሰቅሏል"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"መለያ"</string>
-    <string name="upload" msgid="2615541458361216022">"ስቀል"</string>
-    <string name="ok" msgid="2516349681897895312">"እሺ"</string>
-    <string name="cancel" msgid="1207103189404543868">"ይቅር"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"ወደ"<b>"%s"</b>" መስቀል"</string>
-    <string name="uploading_for" msgid="1735961974624867111">" ለ"<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"የስቀል ማስነሻ አልተሳካም።"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"ፋይል የለም።"</string>
-    <string name="account_error" msgid="1904775271866104941">"የመለያ መረጃ ሰርስረህ አውጣ ተስኗል።"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"ወደ መለያዎ ለመግባት ችግር ነበር።"</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"ድጋሚ  ለመሞከር በመጠበቅ ላይ"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"WiFi በመጠበቅ ላይ"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"በመስቀል ላይ"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"ተስኗል"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"ተጠናቋል"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"በመስቀል ላይ"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"በእጅ ለአፍታ ቆይቷል"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"ለአፍታ ቆሟል- አነስተኛ ባትሪ"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"ለአፍታ ቆሟል- ኃይል እስኪሞላ ዘግይቷል"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"ለአፍታ ቆሟል- ትይይዝ በመጠበቅ ላይ"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"ለአፍታ ቆሟል- ከPWA ኮታ ውጪ"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"ለአፍታ ቆሟል- wifi በመጠበቅላይ"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">" በእንቅስቃሴ ላይ ለአፍታ ቆሟል"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"ድጋሚ  ለመሞከር በመጠበቅ ላይ"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 ደቂቃ"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 ደቂቃዎች"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 ደቂቃዎች"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"ምንም የውሂብ ተያያዥነት የለም"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"የመለያ ከዲስክ ኮታ አንሷል"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"ፋይል አልተገኘም"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"የአገልግሎት ስህተት"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"የአውታረ መረብ ስህተት"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"ማረጋገጫ  ተስኗል"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"በይደር ያሉ ስቀሎች [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"የተጠናቀቁ ስቀሎች [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"ስቀል ለአፍታ አቁም"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"ስቀሎች  አስቀጥል"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"አሁን ስቀል"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"ኋላ ስቀል"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"አትስቀል"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"ዕይ"</string>
-    <string name="manager_retry" msgid="939534318469518843">"እንደገና ሞክር"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"ስቀል ቀርቷል።"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"ስቀል አስቀድሞ ጨርሷል"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"ሁሉንም አስምር"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"የመጨረሻ አስምር:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"የጨርሰዋል አይነቶች ዝርዝር ባዶ ነው።"</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"በፍጥነት ስቀል"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"ስቀል ጨርሷል"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"ስቀል ለአፍታ ቆሟል"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"በፍጥነት ስቀልገና አልገበረም"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"ትልቅ ፋይሎች በWiFi ተያያዦች ላይ ብቻ ይሰቀላሉ።"</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"ለፋይሎች በመቃኘት ላይ..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"ለስቀል<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> ፎቶዎች እና <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> ቪዲዮዎች በማዘጋጀት ላይ..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"ምንም ተጨማሪ ፎቶዎች/ቪዲዮዎች መስቀል አያስፈልግም።"</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"ከአገልጋዩ ጋር የመገናኘት ችግር ነበር። እባክዎ ትንሽ ቆይተው እንደገና ይሞክሩ።"</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"ሁሉን አስምር ቀርቷል"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"ሁሉንም አሳምር"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"ዕይታ ተጠናቋል"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"በይደር ያለን እይ"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"አጠቃላይ"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"ሁሉንም ስቀሎች ለአፍታ አቁም"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"ኃይል"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"ስልኩ ቻርጅ ሲደረግ ብቻ ስቀል።"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Wi-Fi ሲገኝ ብቻ ስቀል።"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"ፎቶዎች"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"መለያ"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"ሁኔታዎችን ስቀል"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"የስልክ መጠን"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"ቪዲዮዎች"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"መለያ"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"የፎቶዎች መለያ የቪዲዮ ስቀሎችን ይጠቀማል።"</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"ሁኔታዎችን ስቀል"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"የፎቶ ተያያዥነት ቅንብሮች ለአሁን ተጠቅመዋል።"</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"ፎቶዎችን ብቻ በተንቀሳቃሽ አውታረ መረቦች በኩል"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"ፎቶዎች &amp; ቪዲዮዎችን በተንቀሳቃሽ አውታረ መረቦች በኩል"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"ፎቶዎች &amp; ቪዲዮዎችን በWi-Fi  በኩልብቻ"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"ስለ"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"የበፍጥነት ስቀል ዕትም"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"የሚመከር: 1600 ፒክስል (አትም እና የማያ ምስሎች)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"ዋና መጠን(ዘገምተኛ ስቀል)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"ለአፍታ ቆሟል-  SD  ካርድ አልተገኘም"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD ካር ድ የለም"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"የበፍጥነት ስቀል ቅንብሮች"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"በፍጥነት ስቀል"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"በራስ ሰር አዲስ ፎቶዎች &amp;  ቪዲዮዎች ወደ ግል የድረ አልበሞች ስቀል"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"ሁኔታስቀል"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"ከፍተኛ"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"የተንቀሳቃሽ ስቀሎች"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"የእንቅስቃሴ ላይ ስቀሎች"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"በውሂብ አውታረመረብ እንቅስቃሴ ላይ ፎቶዎች&amp; ቪዲዮዎች ስቀል"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"ባትሪ ስቀል"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"ኃይል በመሙላት ላይ ብቻ ፎቶዎች&amp; ቪዲዮዎች ስቀል"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"ያሉትን ፎቶዎች ስቀል"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"ያሉትንማንኛውም ፎቶዎች&amp; ቪዲዮዎች ከስልክዎ ላይ ይስቀሉ"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"ቦዝኗል"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s \"%2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"በመስቀል ላይ(%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d of %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"ለአፍታ ቆሟል፡ስቀልንለማስቀጠል ንካ"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"ያሉትን ፎቶዎች ስቀል"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"ከስልክዎ ላይ ወደ ድረ የግል አልበም አስቀድሞያልተሰቀሉ ፎቶዎች እና ቪዲዮዎች የተወሰነ ጊዜ ሊወስዱ ይችላሉ፣ ነገር ግን ከዳራ ይከናወናሉ። እርግጠኛ ነዎት ለመቀጠል ይፈልጋሉ?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"አዎ"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"አይ"</string>
-</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cb41a1e..f914b9d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"مزامنة البريد الإلكتروني"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"مزامنة البريد الإلكتروني لهذا الحساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"اهتزاز"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"الاهتزاز أيضًا عند استلام بريد إلكتروني"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"دومًا"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط عندما يكون صامتًا"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"مطلقًا"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"اهتزاز"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"اختيار نغمة الرنين"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"إعدادات الخادم"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"إزالة الحساب"</string>
diff --git a/res/values-ar/uploader.xml b/res/values-ar/uploader.xml
deleted file mode 100644
index dae9b4c..0000000
--- a/res/values-ar/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"تحميل فوري"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"ألبوم التحميل الفوري"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"تحميل"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"التحميلات المنتهية"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"متوقف مؤقتًا"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d من الصور • %3$d من مقاطع الفيديو"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d من الصور • %2$d من مقاطع الفيديو"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"طاقة البطارية منخفضة"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"تم تجاوز حصة الصور"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"التجوال"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"في انتظار اتصال WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"متأخر لحين الشحن"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"في انتظار الاتصال"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"إعادة المحاولة في %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"إظهار التحميلات المعلقة"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"إظهار التحميلات المنتهية"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"عرض عبر الإنترنت"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"إظهار التحميلات المعلقة"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"إخفاء التحميلات المعلقة"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"إظهار التفاصيل"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"إخفاء التفاصيل"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"الإعدادات"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"تم تحميل %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"الحساب"</string>
-    <string name="upload" msgid="2615541458361216022">"تحميل"</string>
-    <string name="ok" msgid="2516349681897895312">"موافق"</string>
-    <string name="cancel" msgid="1207103189404543868">"إلغاء"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"تحميل إلى "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" لـ "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"أخفقت تهيئة التحميل."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"الملف غير متوفر."</string>
-    <string name="account_error" msgid="1904775271866104941">"أخفق استرداد معلومات الحساب."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"حدثت مشكلة أثناء تسجيل الدخول إلى حسابك."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"في انتظار إعادة المحاولة"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"في انتظار اتصال WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"تحميل"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"أخفق"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"مكتمل"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"تحميل"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"تم الإيقاف مؤقتًا يدويًا"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"تم الإيقاف مؤقتًا - طاقة البطارية منخفضة"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"تم الإيقاف مؤقتًا - متأخر لحين الشحن"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"تم الإيقاف مؤقتًا - في انتظار الاتصال"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"تم الإيقاف مؤقتًا - نفدت حصة PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"تم الإيقاف مؤقتًا - في انتظار اتصال WiFi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"تم الإيقاف مؤقتًا - تجوال"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"في انتظار إعادة المحاولة"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"دقيقة واحدة"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"دقيقتان"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 دقائق"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"ليس هناك اتصال بيانات"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"نفدت الحصة المخصصة للحساب على القرص"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"لم يتم العثور على الملف"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"خطأ في الخدمة"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"خطأ في الشبكة"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"أخفقت المصادقة"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"التحميلات المعلقة [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"التحميلات المكتملة [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"إيقاف التحميلات مؤقتًا"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"استئناف التحميلات"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"تحميل الآن"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"التحميل لاحقًا"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"عدم التحميل"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"عرض"</string>
-    <string name="manager_retry" msgid="939534318469518843">"إعادة المحاولة"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"تم إلغاء التحميل."</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"انتهى التحميل فعلاً"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"مزامنة الكل"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"آخر مزامنة: "\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"قائمة العناصر المنتهية فارغة."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"تحميل فوري"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"انتهت التحميلات"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"تم إيقاف التحميلات مؤقتًا"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"لم يتم تنشيط التحميل الفوري بعد."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"سيتم تحميل الملفات كبيرة الحجم عبر اتصال WiFi فقط."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"جارٍ الفحص للملفات..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"جارٍ تحضير <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> من الصور و<xliff:g id="VIDEOCOUNT">%2$d</xliff:g> من مقاطع الفيديو للتحميل..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"ليست هناك صور/مقاطع فيديو إضافية يلزم تحميلها."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"حدثت مشكلة أثناء الاتصال بالخادم. الرجاء إعادة المحاولة لاحقًا."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"تم إلغاء مزامنة الكل"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"مزامنة الكل"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"عرض التحميلات المكتملة"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"عرض التحميلات المعلقة"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"عام"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"إيقاف جميع التحميلات مؤقتًا"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"طاقة"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"عدم التحميل إلا أثناء شحن الهاتف."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"تحميل عند توفر اتصال Wi-Fi فقط."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"صور"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"الحساب"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"شروط التحميل"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"حجم الصورة"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"مقاطع فيديو"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"الحساب"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"سيُستخدم حساب الصور لتحميلات الفيديو."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"شروط التحميل"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"يتم استخدام إعدادات اتصال الصور حاليًا."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"تحميل الصور فقط عبر شبكات الجوال"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"تحميل الصور ومقاطع الفيديو عبر شبكات الجوال"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"تحميل الصور ومقاطع الفيديو عبر اتصال Wi-Fi فقط"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"حول"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"إصدار التحميل الفوري"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"الموصى به: 1600 بكسل (للمشاركة وعمليات الطباعة وشاشات التوقف)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"الحجم الأصلي (أبطأ تحميل)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"تم الإيقاف مؤقتًا - بطاقة SD غير متوفرة"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"بطاقة SD غير متوفرة"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"إعدادات التحميل فوري"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"تحميل فوري"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"تحميل الصور ومقاطع الفيديو الجديدة تلقائيًا إلى ألبوم خاص على الويب"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"حالة التحميل"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"متقدمة"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"تحميلات الجوال"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"تحميلات التجوال"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"تحميل الصور ومقاطع الفيديو عند التجوال عبر شبكة بيانات"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"تحميلات عند الشحن"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"تحميل الصور ومقاطع الفيديو عند الشحن فقط"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"تحميل الصور الحالية"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"تحميل أية صور ومقاطع فيديو حالية من الهاتف الآن"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"معطّل"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"تحميل (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d من %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"تم الإيقاف مؤقتًا: المس لاستئناف التحميل"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"تحميل الصور الحالية"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"قد يستغرق تحميل الصور ومقاطع الفيديو التي لم يتم تحميلها فعليًا من الهاتف إلى ألبوم خاص على الويب بعض الوقت، ولكنه سيتم في الخلفية. هل تريد بالتأكيد المتابعة؟"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"نعم"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"لا"</string>
-</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c276ad9..ef29e79 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Сінхранізаваць электронную пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Сінхранізацыя электроннай пошты для гэтага ўліковага запісу"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібрацыя"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Таксама вібраваць пры атрыманні электроннага лiста"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Заўсёды"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Толькі ў рэжыме без гуку"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколі"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібрацыя"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Выбраць рынгтон"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Налады сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Выдаліць уліковы запіс"</string>
diff --git a/res/values-be/uploader.xml b/res/values-be/uploader.xml
deleted file mode 100644
index eef060d..0000000
--- a/res/values-be/uploader.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Імгненная загрузка"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Альбом імгненных загрузак"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Загрузка"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Гатова"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Прыпыненыя"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% ... %2$d фота ... %3$d відэа"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фатаграфій ... %2$d відэа"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"нізкі зарад батарэі"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"перавышана квота для фатаграфій"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роўмінг"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"чаканне Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"адкладзена да зарадкі"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"чаканне падключэння"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
-    <skip />
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Паказаць загрузкі, якія чакаюць"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Паказаць завершаныя загрузкі"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Прагляд у Iнтэрнэце"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Паказаць загрузкі, якія чакаюць"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Схаваць загрузкі, якія чакаюць"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Паказваць падрабязнасці"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Схаваць падрабязнасці"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Налады"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Загружана %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Уліковы запіс"</string>
-    <string name="upload" msgid="2615541458361216022">"Загрузіць"</string>
-    <string name="ok" msgid="2516349681897895312">"ОК"</string>
-    <string name="cancel" msgid="1207103189404543868">"Адмена"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Загрузка на "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" для "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Збой ініцыялізацыі загрузкі."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Файл недаступны."</string>
-    <string name="account_error" msgid="1904775271866104941">"Не ўдалося атрымаць інфармацыю пра ўліковым запіс."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Праблема ўвахода ў ваш уліковы запіс."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Чаканне паўтора"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Чаканне Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Загрузка"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Няўдала"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Завершана"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"загрузка"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"прыпынены ўручную"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"прыпынена – нізкі зарад батарэі"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"прыпынена – адкладзена да зарадкі"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"прыпынена – чаканне падключэння"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"прыпынена – перавышана квота PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"прыпынена – чаканне Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"прыпынена – роўмінг"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"чаканне паўтора"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 хвіліна"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 хвіліны"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 хвілін"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Няма падключэння дадзеных"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Уліковы запіс вычарпаў дыскавую квоту"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Файл не знойдзены"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Памылка паслугі"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Памылка сеткі"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Памылка аўтарызацыіі"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Чакаецца загрузак: [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Завершана загрузак: [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Прыпыніць загрузкі"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Працягнуць загрузкі"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Загрузіць зараз"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Загрузіць пазней"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Не загружаць"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Выгляд"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Паўтор"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Загрузка адмененая"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Загрузка ўжо завершаная"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Сінхранізаваць усё"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Апошняя сінхранізацыя:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Спіс гатовых элементаў пусты."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Імгненная загрузка"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Загрузкі завершаныя"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Загрузкі прыпыненыя"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Імгненная загрузка не была актываваная"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Вялікія файлы будуць загружаныя толькі праз WiFi-злучэнне."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Пошук файлаў..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Падрыхтоўка фатаграфій (<xliff:g id="PHOTOCOUNT">%1$d</xliff:g>) і відэа (<xliff:g id="VIDEOCOUNT">%2$d</xliff:g>) да загрузкі..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Няма дадатковых фатаграфій/відэа для загрузкі."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Узнікла праблема сувязі з серверам. Паспрабуйце пазней."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Сінхранізаваць усе адмененыя"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Сінхранізаваць усё"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Прагледзець завершаныя"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Праглядзець чакаючыя"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Агульныя"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Прыпыніць усе загрузкі"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Сілкаванне"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Загружаць, толькі калі тэлефон заражаецца."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Загружаць, толькі калі Wi-Fi даступны."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Фатаграфіі"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Уліковы запіс"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Умовы загрузкі"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Памер фота"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Відэа"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Уліковы запіс"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Уліковы запіс фота будзе выкарыстаны для загрузкі відэа."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Умовы загрузкі"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Цяпер выкарыстоўваюцца настройкі сувязі фота."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Толькі фатаграфіі праз мабільныя сеткі"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Фота і відэа праз мабільныя сеткі"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Фота і відэа толькі праз Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Інфармацыя"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Версія імг. загр."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Рэкамендавана: 1600 пікселяў (для публікацыі, друку і заставак)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Арыгінальны памер (самая павольная загрузка)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"прыпынена – SD-карта недаступная"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-карта недаступная"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Нал. імгн. загр."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Імгненная загрузка"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Аўтаматычна загружаць новыя фатаграфіі і відэа ў прыватны вэб-альбом"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Стан загрузкі"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Пашыраныя налады"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Мабільныя загрузкі"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Загрузка ў роўмінгу"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Загружаць фота і відэа пры роўмінгу ў сетцы перадачы дадзеных"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Загрузка на акумулятары"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Загружаць фота і відэа толькі падчас зарадкі"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Загрузіць існуючыя фатаграфіі"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Загрузіць зараз усе існуючыя фатаграфіі і відэа з тэлефона"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Адключана"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Загрузка (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d з %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Прыпынена: дакраніцеся, каб аднавіць загрузку"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Загрузіць існуючыя фатаграфіі"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Загрузка фатаграфій і відэа, што яшчэ не загружаны, з вашага тэлефона ў прыватны альбом у вэбе можа заняць некаторы час, але будзе ажыццяўляцца ў фонавым рэжыме. Працягнуць?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Так"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Не"</string>
-</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 549fa8c..a288a25 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхрон на имейлите"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон на имейлите за този профил"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибриране"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Да вибрира и при нов имейл"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Винаги"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само при тих режим"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никога"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибриране"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Избор на мелодия"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки на сървъра"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Премахване на профил"</string>
diff --git a/res/values-bg/uploader.xml b/res/values-bg/uploader.xml
deleted file mode 100644
index 1c38811..0000000
--- a/res/values-bg/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Незабавно качване"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Албум за незабавни качвания"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Качва се"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Завършени"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"На пауза"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d снимки • %3$d видеоклипа"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d снимки • %2$d видеоклипа"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"изтощена батерия"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"квотата за снимки бе надхвърлена"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роуминг"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"изчаква се WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"отложено, докато се зарежда"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"изчаква се връзка"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"повторен опит след %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Показване на чакащите качвания"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Показване на завършените качвания"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Преглед онлайн"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Показване на чакащите качвания"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Скриване на чакащите качвания"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Показване на подробностите"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Скриване на подробностите"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Настройки"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Качени: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Профил"</string>
-    <string name="upload" msgid="2615541458361216022">"Качване"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Отказ"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Качва се във: "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" за "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s „%2$s“"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Качването не започна успешно."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Файлът не е наличен."</string>
-    <string name="account_error" msgid="1904775271866104941">"Извличането на информация за профила не бе успешно."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Възникна проблем при влизането в профила ви."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Изчаква се за нов опит"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Изчаква се WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Качва се"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Неуспешно"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Завършено"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"качва се"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"ръчно поставено на пауза"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"на пауза – изтощена батерия"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"на пауза – отложено, докато се зарежда"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"на пауза – изчаква се връзка"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"на пауза - квотата за Picasa Уеб Албуми е изчерпана"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"на пауза – изчаква се WiFi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"на пауза – роуминг"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"изчаква се за нов опит"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 минута"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 минути"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 минути"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Няма връзка за данни"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Дисковата квота за профила е изчерпана"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Файлът не бе намерен"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Грешка в услугата"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Грешка в мрежата"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Удостоверяването не бе успешно"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Чакащи качвания [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Завършени качвания [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Поставяне на качванията на пауза"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Възобновяване на качванията"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Качване сега"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Качване по-късно"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Без качване"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Преглед"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Нов опит"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Качването е анулирано"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Качването вече приключи"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Синхронизиране на всичко"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Последно синхронизиране:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Списъкът със завършените елементи е празен."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Незабавно качване"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Качванията са завършени"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Качванията са на пауза"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Незабавното качване още не е активирано"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Големите файлове ще бъдат качвани само с WiFi връзка."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Сканира се за файлове..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> снимки и <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> видеоклипа се подготвят за качване..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Няма допълнителни снимки/видеоклипове, които трябва да бъдат качени."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Възникна проблем при установяването на връзка със сървъра. Моля, опитайте отново по-късно."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Синхронизирането на всичко бе анулирано"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Синхронизиране на всичко"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Преглед на завършените"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Преглед на чакащите"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Общи"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Поставяне на всички качвания на пауза"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Захранване"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Да се качва само когато телефонът се зарежда."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Да се качва само когато е налице Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Снимки"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Профил"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Условия за качване"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Размер на снимката"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Видеоклипове"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Профил"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Профилът за снимки ще се използва за качване на видеоклипове."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Условия за качване"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Засега се използват настройките на връзката за снимки."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Само снимки чрез мобилни мрежи"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Снимки и видеоклипове чрез мобилни мрежи"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Снимки и клипове само чрез Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Информация"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Незаб. качв.: Версия"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Препоръчително: 1 600 пиксела (за споделяне, отпечатване и скрийнсейвъри)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Оригинален размер (най-бавно качване)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"на пауза – няма налична SD карта"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Няма налична SD карта"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Незаб. качв.: Настр."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Незабавно качване"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Автоматично качване на новите снимки и видеоклипове в частен уеб албум"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Състояние на качването"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Разширени"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Мобилни качвания"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Качвания при роуминг"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Качване на видеоклипове и снимки при роуминг в мрежата за данни"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Качване при зареждане"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Качване на снимки и видеоклипове само при зареждане"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Качване на съществуващите снимки"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Качване на всички съществуващи снимки и видеоклипове от телефона ви сега"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Деактивирано"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Качва се (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d от %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"На пауза: Докоснете, за да възобновите качването"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Качване на съществуващите снимки"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Качването на снимки и видеоклипове, които още не са качени от телефона ви в частен албум в мрежата, може да отнеме известно време, но ще бъде извършено на заден план. Наистина ли искате да продължите?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Да"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Не"</string>
-</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index eda9ca9..7f048c8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronitza el correu electrònic"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincr. miss. correu d\'aquest compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibra també quan arribi correu electrònic"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Només quan està en silenci"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibra"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Tria un to"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Elimina el compte"</string>
diff --git a/res/values-ca/uploader.xml b/res/values-ca/uploader.xml
deleted file mode 100644
index 13b33af..0000000
--- a/res/values-ca/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Càrrega instantània"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Àlbum de càrrega instantània"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"S\'està penjant"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Finalitzades"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Aturat"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d vídeos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos • %2$d vídeos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"bateria baixa"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"s\'ha superat la quota de fotos"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"itinerància"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"s\'està esperant la Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"endarrerida fins a la càrrega"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"s\'està esperant la connexió"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"es tornarà a provar d\'aquí a %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Mostra les càrregues pendents"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Mostra les càrregues finalitzades"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Mostra en línia"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Mostra les càrregues pendents"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Amaga les càrregues pendents"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Mostra els detalls"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Amaga els detalls"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Configuració"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Penjats: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Compte"</string>
-    <string name="upload" msgid="2615541458361216022">"Penja"</string>
-    <string name="ok" msgid="2516349681897895312">"D\'acord"</string>
-    <string name="cancel" msgid="1207103189404543868">"Cancel·la"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"S\'està penjant a "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" per a "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$S \"%2$S\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"S\'ha produït un error en inicialitzar la càrrega."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"El fitxer no està disponible."</string>
-    <string name="account_error" msgid="1904775271866104941">"No s\'ha pogut recuperar la informació del compte."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"S\'ha produït un problema en iniciar la sessió al compte."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"S\'està esperant per tornar-ho a provar"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Esperant la Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"S\'està penjant"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Ha fallat"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Completat"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"s\'està penjant"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"aturat manualment"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"aturat: bateria baixa"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"aturat: endarrerida fins a la càrrega"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"aturat: s\'està esperant la connexió"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"aturat: fora de quota PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"aturat: s\'està esperant la Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"aturat: en itinerància"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"s\'està esperant per tornar a provar"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minut"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuts"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minuts"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Sense connexió de dades"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"El compte s\'ha quedat sense quota de disc"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Fitxer no trobat"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Error al servei"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Error de xarxa"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Error en l\'autenticació"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Càrregues pendents [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Càrregues finalitzades [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Posa les càrregues en pausa"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Reprèn les càrregues"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Penja-la ara"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Penja més tard"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"No la pengis"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Visualitza"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Torna-ho a provar"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"S\'ha cancel·lat la càrrega"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"La càrrega ja ha finalitzat"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sincronitza-ho tot"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Darrera sincronització:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"La llista d\'elements finalitzats és buida."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Càrrega instantània"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Càrregues finalitzades"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Càrregues en pausa"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"La càrrega instantània encara no s\'ha activat"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Els fitxers grans només es penjaran mitjançant una connexió Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"S\'estan cercant fitxers..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"S\'estan preparant <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotos i <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> vídeos per a la càrrega..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"No cal penjar fotos/vídeos addicionals."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"S\'ha produït un error en comunicar amb el servidor. Torna-ho a provar més tard."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"S\'ha cancel·lat la Sincronització de tot"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sincronitza-ho tot"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Visualització finalitzada"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Mostra les pendents"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"General"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pausa totes les càrregues"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Energia"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Penja només quan el telèfon s\'estigui carregant."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Penja només quan la Wi-Fi estigui disponible."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Compte"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Condicions de càrrega"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Mida de la foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Vídeos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Compte"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"El compte de fotos s\'utilitzarà per a càrregues de vídeos."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Condicions de càrrega"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"S\'està utilitzant la configuració de connectivitat de fotos."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Només fotos mitjançant xarxes mòbils"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotos i vídeos mitjançant xarxes de telefonia mòbil"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotos i vídeos només mitjançant Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Quant a"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Versió de càrrega instantània"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recomanat: 1.600 píxels (per compartir, impressions i estalvis de pantalla)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Mida original (càrrega més lenta)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"aturat: targeta SD no disponible"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Targeta SD no disponible"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Conf. Càrrega instantània"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Càrrega instantània"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Penja automàticament fotos i vídeos nous a un àlbum web privat"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Estat de la càrrega"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avançada"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Càrregues de mòbil"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Càrregues d\'itinerància"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Penja les fotos i els vídeos a la xarxa de dades en itinerancia"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Pujades amb bateria"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Penja fotos i vídeos només quan s\'etigui carregant"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Càrrega de fotos existents"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Penja fotos i vídeos existents del telèfon ara"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Desactivat"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$S: %2$S"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"S\'està penjant (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d de %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"En pausa: toca per reprendre la càrrega"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Carrega les fotos existents"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Penjar fotos i vídeos que encara no s\'han penjat des del telèfon a un àlbum privat al web pot trigar una mica, però es durà a terme en segon pla. Estàs segur que vols continuar?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Sí"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"No"</string>
-</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7e4dd7c..0f45527 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -61,7 +61,7 @@
     <string name="close_action" msgid="533058985745238100">"Zavřít"</string>
     <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Poslat všechny zprávy"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Výběr přílohy"</string>
-    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Přesunout do"</string>
+    <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Přesunout"</string>
     <string name="status_loading_messages" msgid="6552307237621292344">"Načítání zpráv..."</string>
     <string name="status_network_error" msgid="2611654064403817391">"Problém s připojením."</string>
     <string name="error_loading_message_body" msgid="6775234299515596760">"Text zprávy se nepodařilo načíst. Zpráva je možná příliš velká a proto ji nelze zobrazit."</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizovat e-maily"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizovat e-mail pro tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrace"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Při příchodu e-mailu také vibrovat"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Pouze v tichém režimu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrace"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vybrat vyzvánění"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serveru"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odebrat účet"</string>
diff --git a/res/values-cs/uploader.xml b/res/values-cs/uploader.xml
deleted file mode 100644
index 0ce8a86..0000000
--- a/res/values-cs/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Okamžité nahrávání"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album okamžitého nahrávání"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Nahrávání"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Dokončeno"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pozastaveno"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • Fotografie: %2$d • Videa: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Fotografie:%1$d • Videa: %2$d"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"slabá baterie"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"byla překročena kvóta pro počet fotografií"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"čekání na síť Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"odloženo až do nabití"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"čeká se na připojení"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"další pokus za %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Zobrazit čekající nahrávání"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Zobrazit dokončená nahrávání"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Zobrazit online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Zobrazit čekající nahrávání"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Skrýt čekající nahrávání"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Zobrazit podrobnosti"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skrýt podrobnosti"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Nastavení"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Nahráno: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Účet"</string>
-    <string name="upload" msgid="2615541458361216022">"Nahrát"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Zrušit"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Nahrávání: "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" pro uživatele "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s „%2$s“"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Inicializace nahrávání se nezdařila."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Soubor není dostupný."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nepodařilo se načíst informace o účtu."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Při přihlašování do účtu došlo k chybě."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Čekání na opakování"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Čekání na připojení k síti Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Nahrávání"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Nezdařilo se"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Dokončeno"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"nahrávání"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"ručně pozastaveno"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"pozastaveno – slabá baterie"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"pozastaveno – odloženo až do nabití"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"pozastaveno – čekání na připojení"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pozastaveno – překročili jste kvótu PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"pozastaveno – čekání na síť Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pozastaveno – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"čekání na opakování"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuta"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuty"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minut"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Žádné datové připojení"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Účet překročil limit místa na disku"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Soubor nebyl nalezen."</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Chyba služby"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Chyba sítě"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Ověření se nezdařilo."</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Nevyřízená nahrávání [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Dokončená nahrávání [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pozastavit nahrávání"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Pokračovat v nahrávání"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Nahrát"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Nahrát později"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Nenahrávat"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Zobrazit"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Opakovat"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Nahrávání zrušeno"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Nahrávání již bylo dokončeno"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Synchronizovat vše"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Poslední synchronizace:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Seznam dokončených položek je prázdný."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Okamžité nahrávání"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Nahrávání dokončena"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Nahrávání pozastavena"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Okamžité nahrávání zatím nebylo aktivováno"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Velké soubory se nahrají pouze prostřednictvím připojení Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Vyhledávání souborů..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Příprava <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotografií a <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videí k nahrání..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Není potřeba nahrávat žádné další fotografie nebo videa."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Při komunikaci se serverem došlo k potížím. Zkuste to prosím znovu později."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Synchronizace všeho zrušena"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synchronizovat vše"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Zobrazit dokončená"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Zobrazit čekající"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Obecné"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pozastavit všechna nahrávání"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Napájení"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Nahrávat pouze při nabíjení telefonu."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Nahrávat, jen když je k dispozici síť Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotografie"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Účet"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Podmínky nahrávání"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Velikost fotografie"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videa"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Účet"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Videa se nahrají pomocí účtu pro fotografie."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Podmínky nahrávání"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Momentálně se používá nastavení připojení pro fotografie."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Pomocí mobilních sítí nahrávat jen fotky"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotografie a videa prostřednictvím mobilních sítí"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotografie a videa jen prostřednictvím sítí Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"O aplikaci"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Verze Okamžitého nahrávání"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Doporučeno: 1600 pixelů (pro sdílení, tisk a spořiče obrazovky)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Původní velikost (nejpomalejší nahrávání)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"pozastaveno – karta SD není dostupná"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Karta SD není dostupná"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Nastav. okamž. nahr."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Okamžité nahrávání"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automaticky nahrávat nové fotografie a videa do soukromého webového alba"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Stav nahrávání"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Pokročilé"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Nahrávání pomocí mobilního datového připojení"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Nahrávání při roamingu"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Nahrávat fotky a videa při roamingu v datové síti"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Nahrávání dle baterie"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotografie a videa nahrávat jen při nabíjení"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Nahrát existující fotky"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Nahrát všechny existující fotky a videa z telefonu"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Vypnuto"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Nahrávání (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d z celkem %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pozastaveno. Nahrávání obnovíte dotykem."</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Nahrát existující fotky"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Nahrání zatím nenahraných fotek a videí z telefonu do soukromého alba na webu může chvíli trvat, ale proběhne na pozadí. Chcete pokračovat?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ano"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Ne"</string>
-</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index eb23493..0b1a914 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-mails"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-mail for denne konto"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også, når der kommer e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun ved lydløs"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vælg ringetone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverindstillinger"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern konto"</string>
diff --git a/res/values-da/uploader.xml b/res/values-da/uploader.xml
deleted file mode 100644
index cc8f0e8..0000000
--- a/res/values-da/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Øjeblikkelig upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album for Øjeblikkelig upload"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"uploader"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Afsluttet"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Midlertidigt standset"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d billeder • %3$d videoer"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d billeder • %2$d videoer"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"lavt batteriniveau"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"Billedkvote overskredet"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"venter på Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"udsat indtil opladning"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"venter på forbindelse"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"prøver igen om %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Vis afventende uploads"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Vis afsluttede uploads"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Vis på nettet"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Vis afventende uploads"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Skjul afventende uploads"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Vis detaljer"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skjul detaljer"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Indstillinger"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Uploadet %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Konto"</string>
-    <string name="upload" msgid="2615541458361216022">"Upload"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Annuller"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Uploader til "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" for "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Upload kunne ikke igangsættes."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Filen er ikke tilgængelig."</string>
-    <string name="account_error" msgid="1904775271866104941">"Kunne ikke hente kontooplysninger."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Der opstod et problem med at logge ind på din konto."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Venter på at prøve igen"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Venter på Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"uploader"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Mislykket"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Fuldført"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"uploader"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"midlertidigt standset manuelt"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"midlertidigt standset – lavt batteriniveau"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"midlertidigt standset – udsat indtil opladning"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"midlertidigt standset – venter på forbindelse"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"midlertidigt standset - PWA-kvote overskredet"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"midlertidigt standset – venter på Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"midlertidigt standset – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"venter på at prøve igen"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minut"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minutter"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minutter"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Ingen dataforbindelse"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Kontoen er uden for diskkvote"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Filen blev ikke fundet"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Tjenestefejl"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Netværksfejl"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Godkendelsen mislykkedes"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Afventende uploads [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Gennemførte uploads [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Stands uploads midlertidigt"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Genoptag uploads"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Upload nu"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Upload senere"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Skal ikke uploades"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Vis"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Prøv igen"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Upload annulleret"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Upload er allerede færdig"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Synkroniser alle"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Sidste synkronisering:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Listen over afsluttede punkter er tom."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Øjeblikkelig upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Uploads er afsluttet"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Uploads er midlertidigt standset"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Øjeblikkelig upload er ikke aktiveret endnu"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Store filer vil kun uploades via en Wi-Fi-forbindelse."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Søger efter filer..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Forbereder <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> billeder og <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videoer til upload..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Ingen yderligere billeder/videoer skal uploades."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Der opstod et problem med serveren. Prøv igen senere."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Synkroniser alle annullerede"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synkroniser alle"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Vis gennemførte"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Vis afventende"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Generelt"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Stands alle uploads midlertidigt"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Strøm"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Upload kun, når telefonen er ved at blive opladet."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Upload kun, når Wi-Fi er tilgængelig."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Billeder"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Konto"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Uploadbetingelser"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Billedstørrelse"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videoer"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Konto"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Billedkontoen bruges til videouploads."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Betingelser for upload"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Billedernes forbindelsesindstillinger bruges i øjeblikket."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Kun billeder via mobilnetværk"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Billeder og videoer via mobilnetværk"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Kun billeder og videoer via Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Om"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Øjebl. upload-v."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Anbefales: 1600 pixel (til deling, udskrivning og screensavere)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Oprindelig størrelse (langsomste upload)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"midlertidigt standset – SD-kort ikke tilgængeligt"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kortet er ikke tilgængeligt"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Indst. for Øjeb. upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Øjeblikkelig upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Upload automatisk nye billeder og videoer til et privat album på nettet"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Uploadstatus"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avanceret"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobiluploads"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Roaminguploads"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Upload billeder og videoer, når der søges efter datanetværk"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Batteriuploads"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Upload kun billeder og videoer under opladning"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Upload eksisterende billeder"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Upload alle eksisterende billeder og videoer fra din telefon nu"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Deaktiveret"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Uploader (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d af %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Midlertidigt standset: Tryk for at genoptage upload"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Upload eksisterende billeder"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Det kan tage et stykke tid at uploade billeder og videoer, der ikke allerede er blevet uploadet, fra din telefon til et privat album på nettet, men det vil ske i baggrunden. Er du sikker på, at du vil fortsætte?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ja"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nej"</string>
-</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 32b1875..fcc668d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -70,7 +70,7 @@
     <item quantity="other" msgid="371256717624461324">"Nachrichten verschieben"</item>
   </plurals>
     <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Verschieben wird für POP3-Konten nicht unterstützt."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Verschieben nicht möglich, da mehrere Konten ausgewählt wurden."</string>
+    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Verschieben nicht möglich, weil mehrere Konten ausgewählt wurden."</string>
     <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Nachrichten im Postausgang und den Ordnern \"Entwürfe\" und \"Gesendet\" können nicht verschoben werden."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -183,7 +183,7 @@
     <string name="attachment_info_wifi_settings" msgid="96432970927503597">"WLAN-Einstellungen"</string>
     <string name="attachment_info_application_settings" msgid="4124655487276125596">"App-Einstellungen"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"Anhang kann nicht geöffnet werden."</string>
-    <string name="attachment_info_malware" msgid="6576029010855055528">"Sie können diese Datei nicht öffnen oder speichern, da diese Art von Anhang möglicherweise schädliche Software enthält."</string>
+    <string name="attachment_info_malware" msgid="6576029010855055528">"Sie können diese Datei nicht öffnen oder speichern, weil diese Art von Anhang möglicherweise schädliche Software enthält."</string>
     <string name="attachment_info_policy" msgid="3560422300127587508">"Dieser Anhang kann aufgrund der Sicherheitsrichtlinien dieses Kontos nicht gespeichert oder geöffnet werden."</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Dieser Anhang ist zu groß, um ihn über ein Mobilfunknetz herunterzuladen. Sie können ihn herunterladen, sobald Sie das nächste Mal mit einem WLAN-Netzwerk verbunden sind."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"Sie verfügen über keine App, mit der Sie diesen Anhang öffnen können. Laden Sie eine entsprechende App von Android Market herunter."</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-Mails synchr."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-Mails dieses Kontos synchronisieren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Immer"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Nur im Lautlos-Modus"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nie"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Klingelton auswählen"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servereinstellungen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto entfernen"</string>
diff --git a/res/values-de/uploader.xml b/res/values-de/uploader.xml
deleted file mode 100644
index c8a6f21..0000000
--- a/res/values-de/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Sofort-Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Sofort-Upload-Album"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Upload wird durchgeführt"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Abgeschlossen"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Angehalten"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d Fotos • %3$d Videos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d Fotos • %2$d Videos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"Niedriger Akkustand"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"Fotokontingent überschritten"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"Roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"Warten auf WLAN"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"Zuerst Akku laden"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"Warten auf Verbindung"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"Erneuter Versuch in %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Ausstehende Uploads anzeigen"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Abgeschlossene Uploads anzeigen"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Online anzeigen"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Ausstehende Uploads anzeigen"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ausstehende Uploads ausblenden"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Details anzeigen"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Details ausblenden"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Einstellungen"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Hochgeladen: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Konto"</string>
-    <string name="upload" msgid="2615541458361216022">"Hochladen"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Abbrechen"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Hochladen auf "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" für "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Die Initialisierung des Uploads ist fehlgeschlagen."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Datei nicht verfügbar"</string>
-    <string name="account_error" msgid="1904775271866104941">"Abrufen von Kontoinformationen fehlgeschlagen"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Bei der Anmeldung in Ihrem Konto ist ein Problem aufgetreten."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Warten auf erneuten Versuch"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Warten auf WLAN"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Upload wird durchgeführt"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Fehlgeschlagen"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Abgeschlossen"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"Hochladen"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"Manuell ausgesetzt"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"Ausgesetzt - Akku schwach"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"Ausgesetzt - zuerst Akku laden"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"Ausgesetzt - Warten auf Verbindung"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"Ausgesetzt - PWA-Kontingent erschöpft"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"Ausgesetzt - Warten auf WLAN"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"Ausgesetzt - Roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"Warten auf erneuten Versuch"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 Minute"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 Minuten"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 Minuten"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Keine Datenverbindung"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Das Speicherplatzkontingent für das Konto ist überschritten."</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Datei nicht gefunden"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Dienstfehler"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Netzwerkfehler"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Authentifizierung fehlgeschlagen"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Ausstehende Uploads [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Abgeschlossene Uploads [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Uploads anhalten"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Mit Uploads fortfahren"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Jetzt hochladen"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Später hochladen"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Nicht hochladen"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Anzeigen"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Erneut versuchen"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Upload abgebrochen"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Upload bereits beendet"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Alle synchronisieren"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Letzte Synchronisierung:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Die Liste der abgeschlossenen Elemente ist leer."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Sofort-Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Uploads beendet"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Uploads angehalten"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Sofort-Upload wurde noch nicht aktiviert."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Große Dateien werden nur über eine WLAN-Verbindung hochgeladen."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Dateien werden gesucht..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> Fotos und <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> Videos werden für den Upload vorbereitet..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Es müssen keine zusätzlichen Fotos/Videos hochgeladen werden."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Bei der Kommunikation mit dem Server ist ein Problem aufgetreten. Versuchen Sie es später erneut."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Synchronisierung aller Elemente abgebrochen"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Alle synchronisieren"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Abgeschlossene anzeigen"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Ausstehende anzeigen"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Allgemein"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Alle Uploads anhalten"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Akku aufladen"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Nur hochladen, wenn Akku geladen wird"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"WLAN"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Nur hochladen, wenn WLAN verfügbar ist"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Konto"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Upload-Einstellungen"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Fotogröße"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Konto"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Das Konto für Fotos wird für Video-Uploads verwendet."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Upload-Einstellungen"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Vorerst werden die Verbindungseinstellungen für Fotos verwendet."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Nur Fotos über Mobilfunknetze"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotos und Videos über Mobilfunknetze"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotos und Videos nur über WLAN"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Über"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Sofort-Upload-Version"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Empfohlen: 1600 Pixel (für Weitergabe, Druck und Bildschirmschoner)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Originalgröße (langsamster Upload)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"Ausgesetzt - SD-Karte nicht verfügbar"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-Karte nicht verfügbar"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Einstellungen für Sofort-Upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Sofort-Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Neue Fotos und Videos automatisch in ein privates Webalbum hochladen"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Upload-Status"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Erweitert"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobile Uploads"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Roaming-Uploads"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Fotos und Videos bei Roaming im Datennetz hochladen"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Akku-Uploads"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotos und Videos nur hochladen, wenn der Akku geladen wird"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Vorhandene Fotos hochladen"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Jetzt alle vorhandenen Fotos und Videos von Ihrem Telefon hochladen"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Deaktiviert"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Hochladen (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d von %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Angehalten: zum Fortsetzen des Uploads tippen"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Vorhandene Fotos hochladen"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Das Hochladen von Fotos und Videos, die noch nicht von Ihrem Telefon in ein privates Album im Web hochgeladen wurden, kann einige Zeit dauern. Der Upload wird jedoch im Hintergrund ausgeführt. Möchten Sie wirklich fortfahren?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ja"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nein"</string>
-</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b4ad068..74e74ae 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Συγχρονισμός ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Συγχρονισμός μηνυμάτων ηλεκτρονικού ταχυδρομείου για αυτόν τον λογαριασμό"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Δόνηση"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Δόνηση και κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Πάντα"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Μόνο στο αθόρυβο"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ποτέ"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Δόνηση"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Επιλέξτε ήχο κλήσης"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ρυθμίσεις διακομιστή"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Κατάργηση λογαριασμού"</string>
diff --git a/res/values-el/uploader.xml b/res/values-el/uploader.xml
deleted file mode 100644
index 5cc8922..0000000
--- a/res/values-el/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Άμεση μεταφόρτωση"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Άλμπουμ άμεσης μεταφόρτωσης"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Μεταφόρτωση"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Ολοκληρώθηκε"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Σε παύση"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d φωτογραφίες • %3$d βίντεο"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d φωτογραφίες • %2$d βίντεο"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"χαμηλή ισχύς μπαταρίας"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"υπέρβαση ορίου φωτογραφιών"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"περιαγωγή"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"αναμονή για WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"καθυστέρηση μέχρι τη φόρτιση"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"αναμονή για σύνδεση"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"επανάληψη σε %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Εμφάνιση μεταφορτώσεων σε εκκρεμότητα"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Εμφάνιση ολοκληρωμένων μεταφορτώσεων"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Προβολή στο διαδίκτυο"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Εμφάνιση μεταφορτώσεων σε εκκρεμότητα"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Απόκρυψη μεταφορτώσεων σε εκκρεμότητα"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Εμφάνιση λεπτομερειών"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Απόκρυψη λεπτομερειών"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Ρυθμίσεις"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Μεταφορτώθηκαν %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Λογαριασμός"</string>
-    <string name="upload" msgid="2615541458361216022">"Μεταφόρτωση"</string>
-    <string name="ok" msgid="2516349681897895312">"ΟΚ"</string>
-    <string name="cancel" msgid="1207103189404543868">"Ακύρωση"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Μεταφόρτωση σε "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" για "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Η προετοιμασία της μεταφόρτωσης απέτυχε."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Το αρχείο δεν είναι διαθέσιμο."</string>
-    <string name="account_error" msgid="1904775271866104941">"Αποτυχία ανάκτησης πληροφοριών λογαριασμού."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Παρουσιάστηκε πρόβλημα κατά τη σύνδεση στον λογαριασμό σας."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Αναμονή για επανάληψη"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Αναμονή για WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Μεταφόρτωση"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Αποτυχία"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Ολοκληρώθηκε"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"μεταφόρτωση"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"μη αυτόματη παύση"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"παύση - χαμηλή ισχύς μπαταρίας"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"παύση - καθυστέρηση μέχρι τη φόρτιση"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"παύση - αναμονή για σύνδεση"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"παύση - εκτός ορίου PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"παύση - αναμονή για wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"παύση - περιαγωγή"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"αναμονή για επανάληψη"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 λεπτό"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 λεπτά"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 λεπτά"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Δεν υπάρχει σύνδεση δεδομένων"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Εξαντλήθηκε ο ελεύθερος αποθηκευτικός χώρος στον λογαριασμό"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Το αρχείο δεν βρέθηκε"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Σφάλμα υπηρεσίας"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Σφάλμα δικτύου"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Ο έλεγχος ταυτότητας απέτυχε"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Μεταφορτώσεις σε εκκρεμότητα [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Ολοκληρωμένες μεταφορτώσεις [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Παύση μεταφορτώσεων"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Συνέχιση μεταφορτώσεων"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Άμεση μεταφόρτωση"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Μεταφόρτωση αργότερα"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Να μην γίνει μεταφόρτωση"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Προβολή"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Επανάληψη"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Η μεταφόρτωση ακυρώθηκε"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Η μεταφόρτωση ήδη ολοκληρώθηκε"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Συγχρονισμός όλων"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Τελευταίος συγχρονισμός:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Η λίστα ολοκληρωμένων αντικειμένων είναι κενή."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Άμεση μεταφόρτωση"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Οι μεταφορτώσεις ολοκληρώθηκαν"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Οι μεταφορτώσεις τέθηκαν σε παύση"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Η λειτουργία \"Άμεση μεταφόρτωση\" δεν έχει ενεργοποιηθεί ακόμα"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Η μεταφόρτωση των μεγάλων αρχείων θα γίνεται μόνο μέσω σύνδεσης WiFi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Σάρωση για αρχεία..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Προετοιμασία <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> φωτογραφιών και <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> βίντεο για μεταφόρτωση..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Δεν είναι απαραίτητη η μεταφόρτωση πρόσθετων φωτογραφιών/βίντεο."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Παρουσιάστηκε πρόβλημα κατά την επικοινωνία με το διακομιστή. Προσπαθήστε ξανά αργότερα."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Ακυρώθηκε ο συγχρονισμός όλων"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Συγχρονισμός όλων"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Προβολή ολοκληρωμένων"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Προβολή μεταφορτώσεων σε εκκρεμότητα"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Γενικά"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Παύση όλων των μεταφορτώσεων"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Ισχύς"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Να πραγματοποιείται μεταφόρτωση μόνο κατά τη φόρτιση του τηλεφώνου."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Μεταφόρτωση μόνο όταν υπάρχει διαθέσιμο Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Φωτογραφίες"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Λογαριασμός"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Προϋποθέσεις μεταφόρτωσης"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Μέγεθος φωτογραφίας"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Βίντεο"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Λογαριασμός"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Για τις μεταφορτώσεις βίντεο θα χρησιμοποιηθεί ο λογαριασμός φωτογραφιών"</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Προϋποθέσεις μεταφόρτωσης"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Προς το παρόν χρησιμοποιούνται οι ρυθμίσεις συνδεσιμότητας φωτογραφιών."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Μόνο φωτογραφίες μέσω δικτύων κινητής τηλεφωνίας"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Φωτογραφίες και βίντεο μέσω δικτύων κινητής τηλεφωνίας"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Φωτογραφίες και βίντεο μόνο μέσω Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Σχετικά με"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Άμεση μεταφόρτωση"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Συνιστάται: 1600 εικονοστοιχεία (για κοινή χρήση, εκτυπώσεις και προφυλάξεις οθόνης)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Αρχικό μέγεθος (πιο αργή μεταφόρτωση)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"παύση - μη διαθέσιμη κάρτα SD"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Μη διαθέσιμη κάρτα SD"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Ρυθμ. άμεσης μεταφ."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Άμεση μεταφόρτωση"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Αυτόματη μεταφόρτωση νέων φωτογραφιών και βίντεο σε προσωπικό άλμπουμ ιστού"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Κατάσταση μεταφόρτωσης"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Σύνθετες ρυθμίσεις"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Μεταφορτώσεις για κινητά"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Μεταφορτώσεις περιαγωγής"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Μεταφόρτωση φωτογραφιών και βίντεο κατά την περιαγωγή σε δίκτυο δεδομένων"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Μεταφ. με μπαταρία"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Μεταφόρτωση φωτογραφιών και βίντεο μόνο κατά τη φόρτιση"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Μεταφόρτωση υπαρχουσών φωτογραφιών"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Άμεση μεταφόρτωση όλων των υπαρχουσών φωτογραφιών και βίντεο από το τηλέφωνό σας"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Απενργοποιημένο"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Μεταφόρτωση (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d από %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Παύση: αγγίξτε για να συνεχιστεί η μεταφόρτωση"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Μεταφόρτωση υπαρχουσών φωτογραφιών"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Η μεταφόρτωση φωτογραφιών και βίντεο που δεν έχουν ήδη μεταφορτωθεί από το τηλέφωνό σας σε ιδιωτικό λεύκωμα στον ιστό μπορεί να διαρκέσει ορισμένο χρονικό διάστημα, αλλά θα γίνει στο παρασκήνιο. Είστε βέβαιοι ότι θέλετε να συνεχίσετε;"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ναι"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Όχι"</string>
-</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 49f5442..d254454 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sync Email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sync email for this account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrate"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Also vibrate when email arrives"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Always"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Only when silent"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Never"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrate"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Choose ringtone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Server settings"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remove account"</string>
diff --git a/res/values-en-rGB/uploader.xml b/res/values-en-rGB/uploader.xml
deleted file mode 100644
index 17bcf92..0000000
--- a/res/values-en-rGB/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Instant Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Instant Upload Album"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Uploading"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Finished"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Paused"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d photos • %3$d videos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d photos • %2$d videos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"low battery"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"exceeded photo quota"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"waiting for Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"delayed until charging"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"waiting for connection"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"retrying in %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Show Pending Uploads"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Show Finished Uploads"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"View Online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Show Pending Uploads"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Hide Pending Uploads"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Show Details"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Hide Details"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Settings"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Uploaded %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Account"</string>
-    <string name="upload" msgid="2615541458361216022">"Upload"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Cancel"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Uploading to "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" for "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Upload initialisation failed."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"File not available."</string>
-    <string name="account_error" msgid="1904775271866104941">"Failed to retrieve account information."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"There was a problem while signing in to your account."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Waiting to retry"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Waiting for Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Uploading"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Failed"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Completed"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"uploading"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"manually paused"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"paused - low battery"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"paused - delayed until charging"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"paused - waiting for connection"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"paused - out of PWA quota"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"paused - waiting for Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"paused - roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"waiting to retry"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minute"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minutes"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minutes"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"No data connection"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Account is out of disk quota"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"File not found"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Service error"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Network error"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Authentication failed"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Pending uploads [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Completed uploads [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pause uploads"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Resume uploads"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Upload now"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Upload later"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Do not upload"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"View"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Retry"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Upload cancelled"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Upload already finished"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sync all"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Last Sync:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Finished items list is empty."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Instant Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Uploads finished"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Uploads paused"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Instant Upload hasn\'t been activated yet"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Large files will be uploaded over a Wi-Fi connection only."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Scanning for files..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Preparing <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> photos and <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videos for upload..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"No additional photos/videos need to be uploaded."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"There was a problem while communicating with the server. Please try again later."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sync all cancelled"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sync All"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"View Completed"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"View Pending"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"General"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pause all uploads"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Power"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Upload only when the phone is being charged."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Upload only when Wi-Fi is available."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Photos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Account"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Upload conditions"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Photo size"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Account"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"The photo account will be used for video uploads."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Upload conditions"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Photo connectivity settings are used for now."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Only photos via mobile networks"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Photos &amp; videos via mobile networks"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Photos &amp; videos via Wi-Fi only"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"About"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Instant Upload Version"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recommended: 1,600 pixels (for sharing, prints and screensavers)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Original size (slowest upload)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"paused - SD card unavailable"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD card unavailable"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Instant Upload settings"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automatically upload new photos &amp; videos to a private web album"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Upload status"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Advanced"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobile uploads"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Roaming uploads"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Upload photos &amp; videos when roaming on data network"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Battery uploads"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Upload photos &amp; videos only when charging"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Upload existing photos"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Upload any existing photos &amp; videos from your phone now"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Disabled"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Uploading (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">":%1$d of %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Paused: touch to resume uploading"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Upload existing photos"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Uploading photos and videos that have not already been uploaded from your phone to a private album on the web can take a while, but will be done in the background. Are you sure that you want to continue?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Yes"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"No"</string>
-</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f8d855f..8fc73d3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -53,8 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leídos"</string>
     <string name="move_action" msgid="3059189775933985898">"Mover"</string>
-    <string name="newer_action" msgid="8950909456802330593">"Más nuevo"</string>
-    <string name="older_action" msgid="4504015635360605471">"Más ant."</string>
+    <string name="newer_action" msgid="8950909456802330593">"Nuevos"</string>
+    <string name="older_action" msgid="4504015635360605471">"Antiguos"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ CC/CCO"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Agregar CC/CCO"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar un archivo"</string>
@@ -268,9 +268,9 @@
     <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Puerto"</string>
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipo de seguridad"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ninguno"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos los certificados)"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (aceptar todos)"</string>
     <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceptar todos los certificados)"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (aceptar todos)"</string>
     <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar correo del servidor"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar el correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un correo"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencioso"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-es-rUS/uploader.xml b/res/values-es-rUS/uploader.xml
deleted file mode 100644
index b3d5839..0000000
--- a/res/values-es-rUS/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Instant Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Álbum de Instant Upload"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Cargando"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Completadas"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pausado"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d videos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos • %2$d videos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"batería baja"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"se excedió el cupo de fotos"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"Itinerancia"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"esperando Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"retrasado por falta de carga"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"esperando conexión"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"se volverá a intentar en %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Mostrar cargas pendientes"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Mostrar las cargas completadas"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Ver en línea"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Mostrar cargas pendientes"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ocultar cargas pendientes"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Mostrar detalles"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalles"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Configuración"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"%s cargados"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Cuenta"</string>
-    <string name="upload" msgid="2615541458361216022">"Cargar"</string>
-    <string name="ok" msgid="2516349681897895312">"Aceptar"</string>
-    <string name="cancel" msgid="1207103189404543868">"Cancelar"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Cargando a "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" para "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Error de inicialización de carga"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Archivo no disponible"</string>
-    <string name="account_error" msgid="1904775271866104941">"No se recuperó información de la cuenta."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Hubo un problema al acceder a tu cuenta."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Esperando para volver a intentar"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Esperando Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Cargando"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Error"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Completado"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"cargando"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"pausado manualmente"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"en pausa: batería baja"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"en pausa: retrasado hasta que se cargue"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"en pausa: esperando conexión"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"en pausa: se excedió el cupo de PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"en pausa: esperando Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pausado: itinerancia"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"esperando para volver a intentar"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuto"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minutos"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minutos"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Sin conexión de datos"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"No hay espacio en disco disponible para la cuenta."</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Archivo no encontrado"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Error del servicio"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Error de red"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Error de autenticación"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Cargas pendientes [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Cargas completadas [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pausar cargas"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Reanudar cargas"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Cargar ahora"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Cargar más tarde"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"No cargar"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Ver"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Intentar nuevamente"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Carga cancelada"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Carga ya finalizada"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sincronizar todo"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Última sincronización:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"La lista de elementos completados está vacía."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Instant Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Cargas finalizadas"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Cargas pausadas"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Aún no se ha activado Instant Upload."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Los archivos grandes solo se cargarán con una conexión Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Buscando archivos..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Preparando <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotos y <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videos para cargar..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"No es necesario cargar fotos o videos adicionales."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Se ha producido un problema al establecer comunicación con el servidor. Vuelve a intentarlo más tarde."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Se canceló Sincronizar todo."</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sincronizar todo"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Vista completada"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Ver cargas pendientes"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"General"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pausar todas las cargas"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Energía"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Subir solo cuando se esté cargando el teléfono."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Cargar solo cuando la conexión Wi-Fi esté disponible."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Cuenta"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Condiciones de carga"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Tamaño de foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Cuenta"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"La cuenta de fotos se utilizará mientras se sube el video."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Condiciones de carga"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Por ahora, se utiliza la configuración de conectividad de fotos."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Solo fotos a través de redes para celulares"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotos y videos a través de redes para celulares"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotos y videos solo a través de Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Acerca de"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Vers. Instant Upload"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recomendado: 1600 píxeles (para uso compartido, impresiones y protectores de pantalla)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Tamaño original (carga más lenta)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"en pausa: tarjeta SD no disponible"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Tarjeta SD no disponible"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Configuración de Instant Upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Cargar automáticamente fotos y videos nuevos en un álbum web privado"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Estado de la carga"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avanzado"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Cargas por dispositivos móviles"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Cargas de itinerancia"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Cargar fotos y videos en itinerancia de red de datos"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Cargas de la batería"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Subir fotos y videos solo durante la carga"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Cargar fotos existentes"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Cargar fotos y videos existentes desde el teléfono ahora"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Inhabilitada"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Cargando (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d de %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"En pausa: toca para reanudar la carga."</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Cargar fotos existentes"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Subir fotos y videos que no hayas subido previamente a un álbum privado de la web desde tu teléfono puede demorar unos minutos. Este proceso se realizará en segundo plano. ¿Estás seguro de que deseas continuar?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Sí"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"No"</string>
-</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 11dd9f2..1121964 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar correo de esta cuenta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un mensaje"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencio"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibración"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ajustes del servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-es/uploader.xml b/res/values-es/uploader.xml
deleted file mode 100644
index fb6ff2a..0000000
--- a/res/values-es/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Subida instantánea"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Álbum de Subida instantánea"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Subiendo"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Subidas completadas"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"En pausa"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d vídeos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos, %2$d vídeos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"batería baja"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"cuota de fotos superada"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"itinerancia"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"esperando red Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"en pausa hasta que se ponga a cargar"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"esperando conexión"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"se volverá a intentar en %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Mostrar subidas pendientes"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Mostrar subidas finalizadas"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Ver online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Mostrar subidas pendientes"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ocultar subidas pendientes"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Mostrar detalles"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalles"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Ajustes"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Subido el: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Cuenta"</string>
-    <string name="upload" msgid="2615541458361216022">"Subir"</string>
-    <string name="ok" msgid="2516349681897895312">"Aceptar"</string>
-    <string name="cancel" msgid="1207103189404543868">"Cancelar"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Subiendo a "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" para "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Error al iniciar la subida"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Archivo no disponible"</string>
-    <string name="account_error" msgid="1904775271866104941">"Error al recuperar la información de la cuenta"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Se ha producido un error al acceder a tu cuenta."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Esperando para intentar de nuevo"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Esperando red Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Subiendo"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Con error"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Completado"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"subiendo"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"pausado manualmente"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"en pausa: batería baja"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"en pausa: detenido hasta que se ponga a cargar"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"en pausa: esperando conexión"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"en pausa: no hay espacio en Álbumes web de Picasa"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"en pausa: esperando red Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"en pausa: itinerancia"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"esperando para nuevo intento"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuto"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minutos"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minutos"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Sin conexión de datos"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"No hay espacio disponible en la cuenta."</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Archivo no encontrado"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Error del servicio"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Error de red"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Error de autenticación"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Subidas pendientes [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Subidas completadas [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pausar subidas"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Reanudar subidas"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Subir ahora"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Subir más tarde"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"No subir"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Ver"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Volver a intentarlo"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Subida cancelada"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"La subida ya ha finalizado."</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sincronizar todo"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Última sincronización:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"La lista de elementos finalizados está vacía."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Subida instantánea"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Fin de la subida"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Subidas en pausa"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Aún no se ha activado la Subida instantánea."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Los archivos grandes solo se subirán con conexión Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Buscando archivos..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Preparando la subida de <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotos y <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> vídeos..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"No hay fotos o vídeos adicionales que subir."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Se ha producido un error al establecer comunicación con el servidor. Inténtalo de nuevo más tarde."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sincronizar todo cancelado"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sincronizar todo"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Vista de subidas completadas"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Ver subidas pendientes"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"General"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pausar todas las subidas"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Carga necesaria para subir"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Subir solo cuando el teléfono se esté cargando"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Subir solo cuando la conexión Wi-Fi esté disponible"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Cuenta"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Condiciones de subida"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Tamaño de foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Vídeos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Cuenta"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Se usará la cuenta de fotos mientras se sube el vídeo."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Condiciones de subida"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Por ahora se usan los ajustes de conectividad de fotos."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Solo fotos si se usan datos"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Subir fotos y vídeos a través de redes móviles"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Subir fotos y vídeos solo con Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Acerca de"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Versión de Subida instantánea"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recomendado: 1600 píxeles (para compartir, imprimir y salvapantallas)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Tamaño original (subida más lenta)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"en pausa: tarjeta SD no disponible"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Tarjeta SD no disponible"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Ajustes de Subida instantánea"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Subida instantánea"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Subir automáticamente nuevas fotos y vídeos a un álbum web privado"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Estado de la subida"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avanzados"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Subidas móviles"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Subidas en itinerancia"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Subir fotos y vídeos en itinerancia en redes de datos"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Subir en carga"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Subir fotos y vídeos solo cuando el dispositivo se está cargando"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Subir fotos y vídeos disponibles"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Subir fotos y vídeos disponibles en tu teléfono ahora mismo"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Inhabilitada"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Cargando (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d de %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"En pausa: toca para continuar la subida"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Subir fotos disponibles"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Subir fotos y vídeos que no hayas subido previamente desde tu teléfono a un álbum web privado puede llevar tiempo, aunque se hará en segundo plano. ¿Seguro que quieres continuar?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Sí"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"No"</string>
-</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f4523ba..2e01766 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sünkrooni meil"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Konto meili sünkroonimine"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreering"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreeri ka meilisõnumi saabumisel"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alati"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Ainult hääletus režiimis"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mitte kunagi"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreering"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Vali helin"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serveri seaded"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto eemaldamine"</string>
diff --git a/res/values-et/uploader.xml b/res/values-et/uploader.xml
deleted file mode 100644
index a13e319..0000000
--- a/res/values-et/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Instant Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Instant Uploadi album"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Üleslaadimine"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Lõpetatud"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Peatatud"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotot • %3$d videot"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotot • %2$d videot"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"aku tühjeneb"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"fotode limiit on ületatud"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"rändlus"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"WiFi-ühenduse ootamine"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"laadimiseni edasi lükatud"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"ühenduse ootamine"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"uuesti proovimine: %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Näita ootel üleslaadimisi"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Näita lõpetatud üleslaadimisi"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Kuva onlainis"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Näita ootel üleslaadimisi"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Peida ootel üleslaadimised"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Kuva üksikasjad"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Peida üksikasjad"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Seaded"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Üles laaditud %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Konto"</string>
-    <string name="upload" msgid="2615541458361216022">"Laadi üles"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Tühista"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Üleslaadimine teenusesse "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" – "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s „%2$s”"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Üleslaadimise lähtestamine ebaõnnestus."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Fail pole saadaval."</string>
-    <string name="account_error" msgid="1904775271866104941">"Kontoteabe vastuvõtmine ebaõnnestus."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Kontole sisselogimisel tekkis probleem."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Uuesti proovimise ootel"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"WiFi-ühenduse ootamine"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Üleslaadimine"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Ebaõnnestus"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Lõpetatud"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"üleslaadimine"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"käsitsi peatatud"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"peatatud — aku tühi"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"peatatud — laadimiseni edasi lükatud"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"peatatud — ühenduse ootamine"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"peatatud – PWA limiit on täis"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"peatatud — WiFi-ühenduse ootamine"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"peatatud — rändlus"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"uuesti proovimise ootel"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minut"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minutit"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minutit"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Andmesideühendus puudub"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Konto kettaruum on täis"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Faili ei leitud"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Teenuse viga"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Võrgu viga"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Autentimine ebaõnnestus"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Ootel üleslaadimised [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Lõpetatud üleslaadimised [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Peata üleslaadimised"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Jätka üleslaadimist"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Laadi kohe üles"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Laadi hiljem üles"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Ära laadi üles"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Kuva"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Proovi uuesti"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Üleslaadimine tühistatud"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Üleslaadimine on juba lõppenud"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sünkrooni kõik"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Viimane sünkroonimine:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Lõpetatud üksuste loend on tühi."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Instant Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Üleslaadimised lõpetatud"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Üleslaadimine peatatud"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Instant Upload pole veel aktiveeritud"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Suuri faile saab üles laadida ainult WiFi kaudu."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Failide otsimine ..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto ja <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video üleslaadimise ettevalmistamine ..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Täiendavaid fotosid/videoid pole vaja üles laadida."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Serveriga ühenduse loomisel ilmnes probleem. Proovige hiljem uuesti."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Käsk Sünkrooni kõik tühistatud"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sünkrooni kõik"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Kuva lõpetatud"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Kuva ootel"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Üldine"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Peata kõik üleslaadimised"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Toide"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Laadi üles ainult telefoni laadimisel."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"WiFi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Laadi üles ainult siis, kui WiFi on saadaval."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotod"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Konto"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Üleslaadimise tingimused"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Foto suurus"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videod"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Konto"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Videote üleslaadimiseks kasutatakse fotode kontot."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Üleslaadimise tingimused"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Nüüd kasutatakse fotode ühenduvusseadeid."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Ainult fotod mobiilsidevõrkude kaudu"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotod ja videod mobiilsidevõrkude kaudu"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotod ja videod ainult WiFi kaudu"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Teave"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Instant Uploadi versioon"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Soovitatav: 1600 pikslit (jagamiseks, printimiseks ja ekraanisäästjatele)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Originaalsuurus (aeglaseim üleslaadimine)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"peatatud – SD-kaart pole kättesaadav"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kaart pole kättesaadav"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Instant Uploadi seaded"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Laadi uued fotod ja videod automaatselt üles privaatsesse veebialbumisse"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Üleslaadimise olek"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Täpsemalt"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobiilside üleslaadimised"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Üleslaadimised rändlusel"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Laadi fotod ja videod üles andmesidevõrgus rändluse ajal"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Akuga üleslaadimised"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Laadi fotosid ja videoid üles ainult laadimise ajal"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Laadi olemasolevad fotod üles"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Laadi kõik olemasolevad fotod ja videod telefonist nüüd üles"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Keelatud"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Üleslaadimine (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d/%2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Peatatud: puudutage üleslaadimise jätkamiseks"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Laadi olemasolevad fotod üles"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Nende fotode ja videote üleslaadimine, mis pole veel telefonist privaatsesse veebialbumisse üles laaditud, võtab veidi aega, kuid seda tehakse taustal. Kas soovite kindlasti jätkata?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Jah"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Ei"</string>
-</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 40f0f77..beecdb8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -185,7 +185,7 @@
     <string name="attachment_info_unknown" msgid="8342655396805943320">"پیوست باز نمی‌شود."</string>
     <string name="attachment_info_malware" msgid="6576029010855055528">"شما نمی‌توانید این فایل را ذخیره یا باز کنید زیرا این نوع پیوست ممکن است حاوی نرم‌افزار مخرب باشد."</string>
     <string name="attachment_info_policy" msgid="3560422300127587508">"به دلیل خط‌مشی‌های امنیتی، این حساب را نمی‌توان ذخیره یا باز کرد."</string>
-    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"این پیوست برای دانلود از طریق شبکه تلفن همراه خیلی بزرگ است. می‌توانید دفعه دیگر که به یک شبکه Wi-Fi متصل می‌شوید، آنرا دانلود کنید."</string>
+    <string name="attachment_info_wifi_only" msgid="1481120960014563617">"این پیوست برای دانلود از طریق شبکهٔ تلفن همراه خیلی بزرگ است. می‌توانید دفعه دیگر که به یک شبکه Wi-Fi متصل می‌شوید، آنرا دانلود کنید."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"هیچ برنامه نصب شده‌ای برای باز کردن این پیوست وجود ندارد. یک برنامه مناسب از Android Market نصب کنید."</string>
     <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"این پیوست یک برنامه است. باید قبل از نصب آن، منبع‌های ناشناس را در تنظیمات &gt; برنامه‌ها بررسی کنید."</string>
     <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"نمی‌توان برنامه‎ها را به طور مستقیم از ایمیل نصب کرد. ابتدا این برنامه را ذخیره کنید و سپس آنرا با استفاده از برنامه \"دانلودها\" نصب کنید."</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"همگام‌سازی ایمیل"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"همگام‌سازی ایمیل برای این حساب"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"لرزش"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"همچنین لرزش هنگام دریافت ایمیل"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"همیشه"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط هنگام ساکت بودن"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"هرگز"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"لرزش"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"انتخاب آهنگ زنگ"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"تنظیمات سرور"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"حذف حساب"</string>
diff --git a/res/values-fa/uploader.xml b/res/values-fa/uploader.xml
deleted file mode 100644
index f4657da..0000000
--- a/res/values-fa/uploader.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Instant Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"آلبوم Instant Upload"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"در حال آپلود"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"تمام شد"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"موقتاً متوقف شد"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d عکس • %3$d ویدیو"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d عکس ؟؟؟ %2$d ویدیو"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"باتری ضعیف است"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"از تعداد مجاز عکس‌ها بیشتر شد"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"رومینگ"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"در انتظار WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"تأخیر تا زمان شارژ شدن"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"در انتظار برقراری اتصال"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
-    <skip />
-    <string name="summary_menu_show_pending" msgid="658361192495996">"نمایش آپلودهای در حال تعلیق"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"نمایش آپلودهای تکمیل شده"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"مشاهده به صورت آنلاین"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"نمایش آپلودهای در حال تعلیق"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"پنهان کردن آپلودهای در حال تعلیق"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"نمایش جزئیات"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"پنهان کردن جزئیات"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"تنظیمات"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for format_date_uploaded (803752037646090928) -->
-    <skip />
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"حساب"</string>
-    <string name="upload" msgid="2615541458361216022">"آپلود"</string>
-    <string name="ok" msgid="2516349681897895312">"تأیید"</string>
-    <string name="cancel" msgid="1207103189404543868">"لغو"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"در حال آپلود در "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" برای "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"آماده‌سازی آپلود انجام نشد"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"فایل موجود نیست."</string>
-    <string name="account_error" msgid="1904775271866104941">"اطلاعات حساب بازیابی نشد."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"مشکلی در ورود شما به حساب وجود داشت."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"در انتظار سعی مجدد"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"در انتظار WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"در حال آپلود"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"انجام نشد"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"کامل شد"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"در حال آپلود"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"توقف موقت به صورت دستی"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"موقتاً متوقف شد - باتری ضعیف است"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"موقتاً متوقف شد - تأخیر تا زمان شارژ شدن"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"موقتاً متوقف شد - در انتظار برقراری اتصال"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"موقتاً متوقف شد - سهمیه PWA تمام شد"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"موقتاً متوقف شد - در انتظار wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"موقتاً متوقف شد - در حال رومینگ"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"در انتظار سعی مجدد"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 دقیقه"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 دقیقه"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 دقیقه"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"بدون اتصال داده"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"فضای دیسک حساب پر است"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"فایل یافت نشد"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"خطای سرویس"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"خطای شبکه"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"تأیید اعتبار انجام نشد"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"آپلودهای در حال تعلیق [%d]"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
-    <skip />
-    <string name="manager_pause" msgid="7046645023617816964">"توقف موقت آپلودها"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"ازسرگیری آپلودها"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"اکنون آپلود شود"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"بعداً آپلود شود"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"آپلود نشود"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"مشاهده"</string>
-    <string name="manager_retry" msgid="939534318469518843">"سعی مجدد"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"آپلود لغو شد"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"آپلود قبلاً تمام شده است"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"همگام‌سازی همه"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"آخرین همگام‌سازی:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"لیست موارد تمام شده خالی است."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Instant Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"آپلودها تمام شد"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"آپلود موقتاً متوقف شد"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Instant Upload هنوز فعال نشده است"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"فایل‌های بزرگ فقط از طریق اتصال WiFi آپلود می‌شوند."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"درحال اسکن فایل‌ها..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"آماده‌سازی <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> عکس و <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> ویدیو برای آپلود..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"لازم نیست هیچ عکس/ویدیوی دیگری آپلود شود."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"هنگام ارتباط با سرور مشکلی پیش آمد. لطفاً بعداً دوباره امتحان کنید."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"همگام‌سازی همه لغو شد"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"همگام‌سازی همه"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"مشاهده موارد کامل شده"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"مشاهده موارد در حال تعلیق"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"عمومی"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"توقف موقت همه آپلودها"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"برق"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"فقط در هنگام شارژ تلفن  آپلود شود."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"فقط هنگام در دسترس بودن Wi-Fi، آپلود انجام شود."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"عکس‌ها"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"حساب"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"شرایط آپلود"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"اندازه عکس"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"ویدیوها"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"حساب"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"از حساب عکس‌ها برای آپلودهای ویدیو استفاده می‌شود."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"شرایط آپلود"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"در حال حاضر از تنظیمات اتصال عکس‌ها استفاده می‌شود."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"فقط عکس‌ها از طریق شبکه‌های تلفن همراه"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"عکس‌ها و ویدیوها از طریق شبکه‌های تلفن همراه"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"آپلود عکس‌ها و ویدیوها فقط از طریق Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"درباره"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"نسخه Instant Upload"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"توصیه می‌شود: 1600 پیکسل (برای اشتراک‌گذاری، موارد چاپی و محافظ‌های صفحه)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"اندازه اولیه (کندترین آپلود)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"موقتاً متوقف شد - کارت SD موجود نیست"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"کارت SD موجود نیست"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"تنظیمات Instant Upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"آپلود عکس‌ها و ویدیوهای جدید به صورت خودکار در یک آلبوم وب خصوصی"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"وضعیت آپلود"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"پیشرفته"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"آپلودهای تلفن همراه"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"آپلودهای رومینگ"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"آپلود  عکس‌ها و ویدیوها در هنگام رومینگ در شبکه داده انجام شود"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"آپلودهای باتری"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"آپلود عکس‌ها و ویدیوها فقط هنگام شارژ کردن"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"آپلود عکس‌های موجود"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"هرگونه عکس و ویدیوی موجود در تلفن خود را هم اکنون آپلود کنید"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"غیرفعال شد"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"درحال آپلود (%1$d%%)"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
-    <skip />
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"موقتاً متوقف شد: برای از سرگیری آپلود، لمس کنید"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"آپلود عکس‌های موجود"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"آپلود عکس‌ها و ویدیوهایی که هنوز از تلفن شما در یک آلبوم خصوصی روی وب آپلود نشده‌اند ممکن است کمی طول بکشد، اما در پس زمینه انجام خواهد شد. آیا مطمئن هستید که می‌خواهید ادامه دهید؟"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"بله"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"خیر"</string>
-</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e0244cc..8130638 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronoi sähköposti"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronoi tämän tilin sähköpostit"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Värinä"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Käytä värinää, kun sähköpostiviesti saapuu"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Aina"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Vain äänettömässä tilassa"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ei koskaan"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Värinä"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Valitse soittoääni"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Palvelinasetukset"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Poista tili"</string>
diff --git a/res/values-fi/uploader.xml b/res/values-fi/uploader.xml
deleted file mode 100644
index 8ca406f..0000000
--- a/res/values-fi/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Pikalataus"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Pikalatausalbumi"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Ladataan"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Valmiit"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Keskeytetty"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d kuvaa • %3$d videota"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d valokuvaa • %2$d videota"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"akku lähes tyhjä"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"kuvakiintiö ylitetty"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"odotetaan wifi-yhteyttä"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"lykätty lataukseen asti"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"odotetaan yhteyttä"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"uuteen yritykseen %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Näytä odottavat lataukset"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Näytä valmiit lataukset"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Näytä verkossa"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Näytä odottavat lataukset"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Piilota odottavat lataukset"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Näytä tiedot"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Piilota tiedot"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Asetukset"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Ladattu %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Tili"</string>
-    <string name="upload" msgid="2615541458361216022">"Lataa"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Peruuta"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Ladataan kohteeseen "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" kohteelle "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Latauksen alustus epäonnistui."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Tiedosto ei käytettävissä."</string>
-    <string name="account_error" msgid="1904775271866104941">"Tilitietojen hakeminen epäonnistui."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Ongelma tiliin kirjautumisessa."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Odotetaan uutta yritystä"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Odotetaan wifi-yhteyttä"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Ladataan"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Epäonnistui"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Valmis"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"ladataan"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"keskeytetty manuaalisesti"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"keskeytetty - akku lähes tyhjä"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"keskeytetty - lykätty lataukseen asti"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"keskeytetty - odotetaan yhteyttä"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"keskeytetty - PWA-kiintiö täynnä"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"keskeytetty - odotetaan wifi-yhteyttä"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"keskeytetty - roaming-tilassa"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"odotetaan uutta yritystä"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuutti"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuuttia"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minuuttia"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Ei tiedonsiirtoyhteyttä"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Tilin tilakiintiö on täynnä"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Tiedostoa ei löydy"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Palveluvirhe"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Verkkovirhe"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Todennus epäonnistui"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Odottavat lataukset [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Valmiit lataukset [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Keskeytä lataus"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Jatka latausta"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Lataa nyt"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Lataa myöhemmin"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Älä lataa"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Näytä"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Yritä uudelleen"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Lataus peruutettu"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Lataus on jo valmis"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Synkronoi kaikki"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Viimeisin synkronointi:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Valmiiden kohteiden luettelo on tyhjä."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Pikalataus"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Lataukset valmiit"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Lataus keskeytetty"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Pikalatausta ei ole vielä aktivoitu"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Suuret tiedostot ladataan vain wifi-yhteyden kautta."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Etsitään tiedostoja..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Valmistellaan <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> kuvaa ja <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videota ladattaviksi..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Ei enää ladattavia kuvia tai videoita."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Ongelma palvelinyhteydessä. Yritä myöhemmin uudelleen."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Kaikkien synkronointi peruutettu"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synkronoi kaikki"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Näytä valmiit"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Näytä odottavat"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Yleiset"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Keskeytä kaikki lataukset"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Virta"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Lataa vain, kun puhelin on kytketty laturiin."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wifi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Lataa vain, kun wifi-yhteys on käytettävissä."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Valokuvat"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Tili"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Latausehdot"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Kuvan koko"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videot"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Tili"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Valokuvatiliä käytetään videolatauksiin."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Latausehdot"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Käytetään valokuvien yhteysasetuksia."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Lataa vain kuvia mobiiliverkon kautta"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Lataa kuvia ja videoita mobiiliverkkojen kautta"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Lataa kuvia ja videoita vain wifi-yhteyden kautta"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Tietoja"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Pikalatausversio"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Suositus: 1 600 pikseliä (jakamiseen, tulostukseen ja näytönsäästäjiin)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Alkuperäinen koko (hitain lataus)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"keskeytetty - SD-kortti ei käytettävissä"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kortti ei käytettävissä"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Pikalatauksen asetukset"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Pikalataus"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Lataa uudet kuvat ja videot automaattisesti yksityiseen verkkoalbumiin"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Latauksen tila"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Lisäasetukset"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Lataus mobiiliyhteydellä"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Roaming-lataus"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Lataa kuvia ja videoita roaming-tilassa"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Lataus akkuvirralla"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Lataa kuvia ja videoita vain laturin ollessa kytkettynä"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Lataa nykyiset kuvat"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Lataa puhelimen kaikki nykyiset kuvat ja videot nyt"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Ei käytössä"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Ladataan (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d / %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Keskeytetty, jatka latausta koskettamalla"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Lataa nykyiset kuvat"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Uusien valokuvien ja videoiden lataaminen puhelimesta yksityiseen verkkoalbumiin voi kestää jonkin aikaa, mutta lataus suoritetaan taustalla. Haluatko jatkaa?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Kyllä"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Ei"</string>
-</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 543f03f..83e9e2d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchr. messagerie"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchroniser les e-mails pour ce compte"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreur"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer à la réception d\'un e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Toujours"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"En mode silencieux"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jamais"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreur"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Sélectionner une sonnerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Paramètres du serveur"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Supprimer le compte"</string>
diff --git a/res/values-fr/uploader.xml b/res/values-fr/uploader.xml
deleted file mode 100644
index 42de0bc..0000000
--- a/res/values-fr/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Instant Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album Instant Upload"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Transfert..."</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Terminé"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Interrompu"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d photos • %3$d vidéos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d photos et %2$d vidéos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"batterie faible"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"quota photos dépassé"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"itinérance"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"en attente d\'une connexion Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"reporté jusqu\'à la mise en charge"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"en attente de connexion"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"nouvelle tentative dans %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Afficher les transferts en attente"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Afficher les transferts terminés"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Afficher en ligne"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Afficher les transferts en attente"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Masquer les transferts en attente"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Afficher les détails"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Masquer les détails"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Paramètres"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Transféré le %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Compte"</string>
-    <string name="upload" msgid="2615541458361216022">"Transférer"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Annuler"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Transfert vers "<b>"%s"</b>"..."</string>
-    <string name="uploading_for" msgid="1735961974624867111">" pour "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Échec de l\'initialisation du transfert."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Fichier non disponible."</string>
-    <string name="account_error" msgid="1904775271866104941">"Échec de la récupération des informations du compte."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Un problème est survenu lors de la connexion à votre compte."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"En attente d\'une nouvelle tentative"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"En attente d\'une connexion Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Transfert..."</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Échec."</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Terminé"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"transfert..."</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"interrompu manuellement"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"interrompu : batterie faible"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"interrompu : reporté jusqu\'à la mise en charge"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"interrompu : en attente de connexion"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"interrompu : quota PWA dépassé"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"interrompu : en attente de connexion Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"interrompu : itinérance"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"en attente d\'une nouvelle tentative"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"Une minute"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"Deux minutes"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"cinq minutes"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Aucune connexion Internet"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Le compte a dépassé le quota d\'espace libre sur le disque."</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Fichier introuvable."</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Erreur du service."</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Erreur réseau."</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Échec de l\'authentification."</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Transferts en attente [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Transferts terminés [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Interrompre les transferts"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Reprendre les transferts"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Transférer"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Transférer ultérieurement"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Ne pas transférer"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Afficher"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Réessayer"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Transfert annulé."</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Transfert déjà terminé."</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Tout synchroniser"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Dernière synchronisation :"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"La liste des éléments terminés est vide"</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Instant Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Transferts terminés"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Transferts interrompus"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Instant Upload n\'a pas encore été activé."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Les fichiers volumineux ne seront transférés qu\'au moyen d\'une connexion Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Recherche de fichiers..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Préparation du transfert de <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> photos et de <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> vidéos..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Aucune autre photo ou vidéo à transférer."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Un problème est survenu lors de la communication avec le serveur. Veuillez réessayer ultérieurement."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Opération \"Tout synchroniser\" annulée."</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Tout synchroniser"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Afficher les transferts terminés"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Afficher les transferts en attente"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Paramètres généraux"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Interrompre tous les transferts"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"En charge"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Transférer uniquement lorsque le téléphone est en charge"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Transférer uniquement lorsqu\'une connexion Wi-Fi est disponible"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Photos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Compte"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Conditions de transfert"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Taille de la photo"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Vidéos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Compte"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Le compte de photos sera utilisé pour transférer des vidéos."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Conditions de transfert"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Les paramètres de connectivité des photos sont actuellement utilisés"</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Réseaux mobiles uniquement pour les photos"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Photos et vidéos via les réseaux mobiles"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Photos et vidéos via Wi-Fi uniquement"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"À propos de"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Version Instant Upload"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recommandé : 1 600 pixels (pour le partage, l\'impression et les fonds d\'écran)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Taille d\'origine (transfert le plus lent)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"interrompu : carte SD non disponible"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Carte SD non disponible"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Param. Instant Upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Transférer automatiquement les nouvelles photos et vidéos vers un album Web privé"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"État du transfert"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avancés"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Transferts via connexion mobile"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Transferts en itinérance"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Transférer les photos et les vidéos en itinérance"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Transferts en charge"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Transférer les photos et les vidéos uniquement lors de la mise en charge"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Transférer les photos existantes"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Transférer toutes les photos et les vidéos de votre téléphone"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Désactivé"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s : %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Transfert (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d sur %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Transfert interrompu : appuyez pour reprendre."</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Transférer les photos existantes"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Le transfert de photos et de vidéos n\'ayant pas déjà été transférées à partir de votre téléphone vers un album Web privé peut prendre un certain temps. Toutefois, cette opération se fera en arrière-plan. Voulez-vous vraiment continuer ?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Oui"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Non"</string>
-</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 03acd70..faf4429 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"समन्वयन विकल्‍प"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"बिना पढ़ी के रूप में चिह्नित करें"</string>
     <string name="move_action" msgid="3059189775933985898">"ले जाएं"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"नया"</string>
+    <string name="older_action" msgid="4504015635360605471">"पुराना"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bcc जोड़ें"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc जोड़ें"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"फ़ाइल अनुलग्‍न करें"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ईमेल समन्‍वयित करें"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"इस खाते के लिए ईमेल सिंक करें"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"कंपन"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"जब ईमेल आए, तो कंपन भी करें"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"हमेशा"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"केवल मौन होने पर"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"कभी नहीं"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"कंपन"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"रिंगटोन चुनें"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"सर्वर सेटिंग"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"खाता निकालें"</string>
diff --git a/res/values-hi/uploader.xml b/res/values-hi/uploader.xml
deleted file mode 100644
index b06101a..0000000
--- a/res/values-hi/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"झटपट अपलोड"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"झटपट अपलोड एल्‍बम"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"अपलोड हो रहा है"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"पूर्ण"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"रोका गया"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d फ़ोटो • %3$d वीडियो"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d फ़ोटो • %2$d वीडियो"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"कम बैटरी"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"फ़ोटो कोटा पार हुआ"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"रोमिंग"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"WiFi की प्रतीक्षा कर रहा है"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"चार्ज होने तक विलंबित"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"कनेक्‍शन की प्रतीक्षा कर रहा है"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"%s में पुन: प्रयास कर रहा है"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"लंबित अपलोड दिखाएं"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"पूर्ण अपलोड दिखाएं"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"ऑनलाइन देखें"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"लंबित अपलोड दिखाएं"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"लंबित अपलोड छुपाएं"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"विवरण दिखाएं"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"विवरण छुपाएं"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"सेटिंग"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"अपलोड किया गया %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"खाता"</string>
-    <string name="upload" msgid="2615541458361216022">"अपलोड करें"</string>
-    <string name="ok" msgid="2516349681897895312">"ठीक"</string>
-    <string name="cancel" msgid="1207103189404543868">"रद्द करें"</string>
-    <string name="uploading_to" msgid="3986362895940069510"><b>"%s"</b>" पर अपलोड कर रहा है"</string>
-    <string name="uploading_for" msgid="1735961974624867111">" "<b>"%s"</b>" के लिए"</string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"अपलोड प्रारंभ विफल."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"फ़ाइल उपलब्ध नहीं है."</string>
-    <string name="account_error" msgid="1904775271866104941">"खाता जानकारी पुनर्प्राप्त करने में विफल."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"आपके खाते में साइन इन करने में समस्या थी."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"पुन: प्रयास की प्रतीक्षा कर रहा है"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"WiFi की प्रतीक्षा कर रहा है"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"अपलोड हो रही है"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"विफल"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"पूर्ण"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"अपलोड हो रहा है"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"मैन्युअल रूप से रोका गया"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"रोका गया - कम बैटरी"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"रोका गया - चार्ज होने तक विलंबित"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"रोका गया - कनेक्‍शन की प्रतीक्षा कर रहा है"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"रोका गया - PWA कोटा पार हो गया"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"रोका गया - wifi की प्रतीक्षा कर रहा है"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"रोका गया - रोमिंग"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"पुन: प्रयास की प्रतीक्षा कर रहा है"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 मिनट"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 मिनट"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 मिनट"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"कोई डेटा कनेक्शन नहीं"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"खाते में डिस्‍क कोटा नहीं है"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"फ़ाइल नहीं मिली"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"सेवा त्रुटि"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"नेटवर्क त्रुटि"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"प्रमाणीकरण विफल"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"लंबित अपलोड [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"पूर्ण किए गए अपलोड [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"अपलोड रोकें"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"अपलोड फिर से शुरू करें"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"अभी अपलोड करें"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"बाद में अपलोड करें"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"अपलोड न करें"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"देखें"</string>
-    <string name="manager_retry" msgid="939534318469518843">"पुनः प्रयास करें"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"अपलोड रद्द"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"अपलोड पहले ही पूर्ण हो चुका है"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"सभी को समन्वयित करें"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"पिछला समन्वयन:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"पूर्ण आइटम सूची रिक्त है."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"झटपट अपलोड"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"अपलोड पूर्ण"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"अपलोड रोके गए"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"झटपट अपलोड अभी तक सक्रिय नहीं किया गया"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"बड़ी फ़ाइलें केवल WiFi कनेक्शन पर ही अपलोड की जाएंगी."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"फ़ाइलों के लिए स्कैन कर रहा है..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"अपलोड करने के लिए <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> फ़ोटो और <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> वीडियो तैयार किए जा रहे हैं..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"कोई अतिरिक्त फ़ोटो/वीडियो अपलोड करने की आवश्यकता नहीं है."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"सर्वर के साथ संचार करने में समस्या थी. कृपया बाद में पुनः प्रयास करें."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"सभी रद्द किए गए समन्वयित करें"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"सभी को समन्वयित करें"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"पूर्ण देखें"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"लंबित देखें"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"सामान्य"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"सभी अपलोड रोकें"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"पावर"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"केवल तभी अपलोड करें जब फ़ोन चार्ज किया जा रहा हो."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"केवल तभी अपलोड करें जब Wi-Fi उपलब्ध हो."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"फ़ोटो"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"खाता"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"अपलोड परिस्थितियां"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"फ़ोटो आकार"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"वीडियो"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"खाता"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"वीडियो अपलोड करने के लिए फ़ोटो खाता उपयोग किया जाएगा."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"अपलोड परिस्थितियां"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"अभी फ़ोटो कनेक्टिविटी सेटिंग का उपयोग किया जा रहा है."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"मोबाइल नेटवर्क द्वारा केवल फ़ोटो"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"मोबाइल नेटवर्क द्वारा फ़ोटो और वीडियो"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"केवल Wi-Fi द्वारा फ़ोटो और वीडियो"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"के बारे में"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"झटपट अपलोड संस्‍करण"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"अनुशंसित: 1600 पिक्सेल (साझा करने, प्रिंट करने और स्क्रीन सेवर के लिए)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"मूल आकार (सबसे धीमा अपलोड)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"रोका गया - SD कार्ड उपलब्‍ध नहीं है"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD कार्ड अनुपलब्ध"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"झटपट अपलोड सेटिंग"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"झटपट अपलोड"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"किसी निजी वेब एल्‍बम में स्‍वचालित रूप से नए फ़ोटो और वीडियो अपलोड करें"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"अपलोड स्थिति"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"उन्नत"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"मोबाइल अपलोड"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"रोमिंग अपलोड"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"डेटा नेटवर्क पर रोमिंग में होने पर फ़ोटो और वीडि‍यो अपलोड करें"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"बैटरी अपलोड"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"केवल चार्ज होते समय फ़ोटो और वीडियो अपलोड करें"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"मौजूदा फ़ोटो अपलोड करें"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"अब अपने फ़ोन से कोई भी मौजूदा फ़ोटो और वीडियो अपलोड करें"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"अक्षम"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"अपलोड हो रहा है (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %2$d में से %1$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"रोका गया: अपलोड करना फिर से शुरू करने के लिए स्‍पर्श करें"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"मौजूदा फ़ोटो अपलोड करें"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"जो फ़ोटो और वीडियो आपके फ़ोन से वेब पर किसी निजी एल्बम में पहले से ही अपलोड नहीं किए गए हैं उन्हें अपलोड करने में कुछ समय लग सकता है, लेकिन पृष्ठभूमि में काम पूरा हो जाएगा. क्या आप वाकई जारी रखना चाहते हैं?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"हां"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"नहीं"</string>
-</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 42a3e99..5c15db6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sink. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sink. e-pošte za ovaj račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibracija"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibracija i kad stigne e-pošta"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Uvijek"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo ako je bešumno"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikad"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibracija"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Odaberite melodiju zvona"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Postavke poslužitelja"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ukloni račun"</string>
diff --git a/res/values-hr/uploader.xml b/res/values-hr/uploader.xml
deleted file mode 100644
index e84da77..0000000
--- a/res/values-hr/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Automatsko slanje"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album za automatsko slanje"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Prijenos"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Završeno"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pauzirano"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • Fotografija: %2$d • Videozapisa: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Fotografija: %1$d • videozapisa: %2$d"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"slaba baterija"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"premašena kvota fotografija"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"čeka se WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"odgođeno do punjenja"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"čekanje na vezu"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"ponovni pokušaj za %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Prikaži prijenose na čekanju"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Prikaži završene prijenose"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Prikaži online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Prikaži prijenose na čekanju"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Sakrij prijenose na čekanju"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Prikaži pojedinosti"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sakrij pojedinosti"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Postavke"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Preneseno %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Račun"</string>
-    <string name="upload" msgid="2615541458361216022">"Šalji"</string>
-    <string name="ok" msgid="2516349681897895312">"U redu"</string>
-    <string name="cancel" msgid="1207103189404543868">"Odustani"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Prijenos na "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" za "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Nije uspjelo pokretanje prijenosa."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Datoteka nije dostupna."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nije uspio dohvat podataka o računu."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Došlo je do problema s prijavom na vaš račun."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Čekanje na ponovni pokušaj"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Čeka se WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Prijenos"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Neuspješno"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Dovršeno"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"prijenos"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"pauzirano ručno"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"pauzirano - slaba baterija"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"pauzirano - odgođeno do punjenja"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"pauzirano - čekanje na vezu"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pauzirano - premašena kvota PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"pauzirano - čeka se wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pauzirano - roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"čeka se ponovni pokušaj"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuta"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minute"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minuta"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Nema podatkovne veze"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Račun je ostao bez kvote na disku"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Datoteka nije pronađena"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Pogreška usluge"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Mrežna pogreška"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Provjera autentičnosti nije uspjela"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Slanja na čekanju [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Dovršeni prijenosi [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pauziraj prijenose"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Nastavi prijenose"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Pošalji sada"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Pošalji kasnije"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Ne šalji"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Prikaži"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Pokušaj ponovo"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Prijenos otkazan"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Prijenos je već završen"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sinkroniziraj sve"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Zadnja sinkronizacija:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Popis završenih stavki je prazan."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Automatsko slanje"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Prijenosi su završeni"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Slanja su pauzirani"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Automatsko slanje još nije aktivirano"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Velike datoteke prenosit će se samo putem WiFi veze."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Skeniranje datoteka..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Priprema <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotografija i <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videozapisa za prijenos..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Nema potrebe za prijenos dodatnih fotografija/videozapisa."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Pojavio se problem u komunikaciji s poslužiteljem. Pokušajte ponovo kasnije."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Nalog Sinkroniziraj sve otkazan"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sinkroniziraj sve"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Prikaži preneseno"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Prikaži stavke na čekanju"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Opće"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pauziraj sva slanja"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Napajanje"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Šalji samo dok se telefon puni."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Šalji samo kada je Wi-Fi dostupan."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotografije"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Račun"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Uvjeti prijenosa"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Veličina fotografije"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videozapisi"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Račun"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Račun fotografija upotrebljavat će se za slanje videozapisa."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Uvjeti slanja"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Zasad se upotrebljavaju postavke povezivosti fotografija."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Samo fotografije putem mobilnih mreža"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotografije i videozapisi putem mobilnih mreža"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotog. i videoz. samo putem Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"O"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Verzija Autom. slanja"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Preporučeno: 1600 piksela (za dijeljenje, ispis i čuvare zaslona)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Izvorna veličina (najsporiji prijenos)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"pauzirano - SD kartica nije dostupna"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD kartica nije dostupna"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Postavke Automatskog slanja"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Automatsko slanje"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automatski prijenos novih fotografija i videozapisa u privatni web-album"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Status prijenosa"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Napredno"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobilni prijenosi"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Prijenosi u roamingu"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Pošaljite fotografije i videozapise za vrijeme roaminga na mreži za prijenos podataka"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Slanje tijekom punj."</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Prijenos fotografija i videozapisa samo tijekom punjenja"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Prijenos postojećih fotografija"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Prijenos svih postojećih fotografija i videozapisa s telefona sada"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Onemogućeno"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Prijenos (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d od %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pauzirano: dodirnite za nastavak slanja"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Prijenos postojećih fotografija"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Prijenos fotografija i videozapisa koji još nisu preneseni s telefona u privatni album na webu može potrajati neko vrijeme, ali to će se odvijati u pozadini. Jeste li sigurni da želite nastaviti?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Da"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Ne"</string>
-</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5a77070..536081b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail szinkroniz."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"A fiók e-mailjeinek szinkronizálása"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rezgés"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Rezgés e-mail érkezésekor is"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Mindig"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Csak néma üzemmódban"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Soha"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rezgés"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Válasszon csengőhangot"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Szerverbeállítások"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fiók törlése"</string>
diff --git a/res/values-hu/uploader.xml b/res/values-hu/uploader.xml
deleted file mode 100644
index 2560959..0000000
--- a/res/values-hu/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Azonnali feltöltés"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Azonnali feltöltés albuma"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Feltöltés"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Befejeződött"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Szüneteltetve"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotó • %3$d videó"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotó • %2$d videó"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"alacsony töltöttség"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"túllépte a fotókra vonatkozó kvótát"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"barangolás"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"várakozás Wi-Fi kapcsolatra"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"töltésig elhalasztva"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"várakozás az összeköttetésre"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"%s múlva újabb próbálkozás"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Függőben lévő feltöltések megjelenítése"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Befejezett feltöltések megjelenítése"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Megtekintés online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Függőben lévő feltöltések megjelenítése"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Függőben lévő feltöltések elrejtése"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Részletek megjelenítése"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Részletek elrejtése"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Beállítások"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"%s feltöltve"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Fiók"</string>
-    <string name="upload" msgid="2615541458361216022">"Feltöltés"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Mégse"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Feltöltés ide: "<b></b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" a következőnek: "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Nem sikerült elindítani a feltöltést."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"A fájl nem érhető el."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nem sikerült lekérni a fiókadatokat."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Gond volt a fiókjába történő bejelentkezéssel."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Újrapróbálásra vár"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Várakozás Wi-Fi kapcsolatra"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Feltöltés"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Meghiúsult"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Kész"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"feltöltés"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"manuálisan szüneteltetve"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"szüneteltetve -- alacsony töltöttség"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"szüneteltetve -- elhalasztva a töltésig"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"szüneteltetve -- várakozás csatlakozásra"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"szüneteltetve -- elfogyott a PWA kvóta"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"szüneteltetve -- várakozás a Wi-Fire"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"szüneteltetve -- barangolás"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"újrapróbálásra vár"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 perc"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 perc"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 perc"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Nincs adatkapcsolat"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"A fiókban nem áll rendelkezésre elegendő lemezkvóta"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"A fájl nem található"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Szolgáltatáshiba"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Hálózati hiba"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Azonosítás sikertelen"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Függőben lévő feltöltések [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Befejezett feltöltések [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Feltöltések szüneteltetése"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"A feltöltések folytatása"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Feltöltés most"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Feltöltés később"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Ne legyen feltöltve"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Megtekintés"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Újra"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"A feltöltés leállítva"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"A feltöltés már befejeződött"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Az összes szinkronizálása"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Utolsó szinkronizálás:"\n\n</string>
-    <string name="finished_empty" msgid="689924777356099393">"A befejezett elemek listája üres."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Azonnali feltöltés"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"A feltöltések befejeződtek"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"A feltöltések szüneteltetve"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Az azonnali feltöltés még nincs aktiválva"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Nagy fájlok csak Wi-Fi kapcsolaton keresztül kerülnek feltöltésre."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Fájlok keresése..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotó és <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videó előkészítése feltöltéshez..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Nincs szükség további fotók/videók feltöltésére."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Hiba történt a szerverrel folytatott kommunikáció során. Próbálkozzon újra később."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Összes megszakított szinkronizálása"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Az összes szinkronizálása"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Befejezettek megtekintése"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Függőben lévők megtekintése"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Általános"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Az összes feltöltés szüneteltetése"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Töltés szükséges"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Feltöltés csak akkor, ha a telefon töltőn van."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Feltöltés csak akkor, ha van elérhető Wi-Fi hálózat."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotók"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Fiók"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Feltöltési feltételek"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Fénykép mérete"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videók"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Fiók"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"A Fotók-fiók lesz használatban a videofeltöltések során is."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Feltöltési feltételek"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Most a fényképekkel kapcsolatos kapcsolódási beállításokat használja."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Mobilhálózaton keresztül csak képek"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotók és videók mobilhálózaton keresztül"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotók és videók csak Wi-Fin keresztül"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Névjegy"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Verziószám"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Javasolt: 1600 képpont (megosztásra, nyomtatásra és képernyőkímélőnek)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Eredeti méret (leglassabb feltöltés)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"szüneteltetve -- az SD-kártya nem érhető el"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Az SD-kártya nem érhető el"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Feltöltési beállítások"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Azonnali feltöltés"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Új fotók és videók automatikus feltöltése egy személyes albumba az interneten"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Feltöltés állapota"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Haladó"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobil feltöltések"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Feltöltés barangoláskor"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Fotók és videók feltöltése adathálózaton történő barangolás során"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Feltöltés akkumulátornál"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotók és videók feltöltése csak töltés közben"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Már meglévő fotók feltöltése"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Bármely meglévő fotó és videó azonnali feltöltése telefonjáról"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Kikapcsolva"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Feltöltés (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %2$d/%1$d."</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Felfüggesztve: a feltöltés folytatásához érintse meg"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Már meglévő fotók feltöltése"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Eltarthat egy ideig azoknak a fotóknak és videóknak a feltöltése, amelyek még nem lettek feltöltve telefonjáról egy interneten található személyes albumba, de a művelet a háttérben fog történni. Biztos benne, hogy folytatja?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Igen"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nem"</string>
-</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a0aeeb2..876a64b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkronkan email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkronkan email untuk akun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar ketika email tiba"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Selalu"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Hanya saat senyap"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Tidak pernah"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Setelan server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hapus akun"</string>
diff --git a/res/values-in/uploader.xml b/res/values-in/uploader.xml
deleted file mode 100644
index fa9c3be..0000000
--- a/res/values-in/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Unggah Sekejap"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album Unggah Sekejap"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Mengunggah"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Selesai"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Dijeda"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto • %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto • %2$d video"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"baterai lemah"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"kuota foto melebihi batas"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"menunggu WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"ditunda hingga pengisian daya"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"menunggu sambungan"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"mencoba ulang dalam %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Tampilkan Unggahan yang Tertunda"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Tampilkan Unggahan yang Sudah Selesai"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Lihat Secara Daring"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Tampilkan Unggahan yang Tertunda"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Sembunyikan Unggahan yang Tertunda"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Tampilkan Detail"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sembunyikan Detail"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Setelan"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Diunggah %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Akun"</string>
-    <string name="upload" msgid="2615541458361216022">"Unggah"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Batal"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Mengunggah ke "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" untuk "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Inisiasi unggahan gagal."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Berkas tidak tersedia."</string>
-    <string name="account_error" msgid="1904775271866104941">"Gagal mengambil informasi akun."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Terjadi masalah saat masuk ke akun Anda."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Menunggu untuk mencoba lagi"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Menunggu WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Mengunggah"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Gagal"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Selesai"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"mengunggah"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"dijeda secara manual"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"dijeda - baterai lemah"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"dijeda - ditunda hingga pengisian daya"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"dijeda - menunggu sambungan"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"dijeda - melebihi kuota AWP"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"dijeda - menunggu wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"dijeda - roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"menunggu untuk mencoba lagi"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 menit"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 menit"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 menit"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Tidak ada sambungan data"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Kuota diska akun habis"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Berkas tidak ditemukan"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Galat layanan"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Galat jaringan"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Autentikasi gagal"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Unggahan yang tertunda [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Unggahan yang selesai [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Jeda unggahan"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Lanjutkan unggahan"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Unggah sekarang"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Unggah nanti"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Jangan unggah"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Lihat"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Coba lagi"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Unggahan dibatalkan"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Pengunggahan telah selesai"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sinkronkan semua"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Sinkronisasi Terakhir:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Daftar item yang selesai kosong."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Unggah Sekejap"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Unggahan selesai"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Unggahan dijeda"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Unggah Sekejap belum diaktifkan"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Berkas berukuran besar akan diunggah melalui sambungan WiFi saja."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Memindai berkas..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Menyiapkan <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto dan <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video untuk diunggah..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Tidak ada foto/video tambahan yang perlu diunggah."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Terjadi masalah saat berkomunikasi dengan server. Coba lagi nanti."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sinkronkan semua yang dibatalkan"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sinkronkan Semua"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Lihat yang Selesai"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Lihat yang Tertunda"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Umum"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Jeda semua unggahan"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Daya"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Unggah ketika ponsel sedang mengisi daya saja."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Unggah hanya ketika Wi-Fi tersedia."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Foto"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Akun"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Kondisi unggahan"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Ukuran foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Video"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Akun"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Akun foto akan digunakan untuk unggahan video."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Kondisi pengunggahan"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Setelan konektivitas foto digunakan untuk saat ini."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Foto melalui jaringan seluler saja"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Foto &amp; video melalui jaringan seluler"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Foto &amp; video melalui Wi-Fi saja"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Tentang"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Versi Unggah Sekejap"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Disarankan: 1600 piksel (untuk berbagi, dicetak, dan screensaver)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Ukuran asli (unggahan paling lambat)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"dijeda - kartu SD tidak tersedia"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Kartu SD tidak tersedia"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Setelan Unggah Sekejap"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Unggah Sekejap"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Otomatis mengunggah foto &amp; video baru ke album web pribadi"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Status unggahan"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Lanjutan"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Unggahan seluler"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Unggahan roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Unggah foto &amp; video saat roaming di jaringan data"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Unggahan baterai"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Unggah foto &amp; video saat mengisi daya saja"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Unggah foto yang ada"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Unggah foto &amp; video apa pun yang ada di ponsel Anda sekarang"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Nonaktif"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Mengunggah (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d dari %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Dijeda: sentuh untuk melanjutkan pengunggahan"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Unggah foto yang ada"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Mengunggah foto dan video yang belum diunggah dari ponsel ke album pribadi di web membutuhkan waktu beberapa lama, tetapi akan dilakukan di latar belakang. Yakin ingin melanjutkan?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ya"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Tidak"</string>
-</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6dad0c1..78c7952 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizza email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizza le email per questo account"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrazione"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Attiva anche vibrazione all\'arrivo di email"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo in modalità silenziosa"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrazione"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Scegli suoneria"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Impostazioni server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Rimuovi account"</string>
diff --git a/res/values-it/uploader.xml b/res/values-it/uploader.xml
deleted file mode 100644
index e1fa61b..0000000
--- a/res/values-it/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Caricam. istantaneo"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album caricamento istantaneo"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Caricamento"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Terminati"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"In pausa"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto • %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto • %2$d video"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"batteria in esaurimento"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"quota foto superata"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"in attesa di Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"ritardata fino a ricarica"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"in attesa di connessione"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"nuovo tentativo tra %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Mostra caricamenti in attesa"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Mostra caricamenti terminati"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Visualizza online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Mostra caricamenti in attesa"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Nascondi caricamenti in attesa"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Mostra dettagli"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Nascondi dettagli"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Impostazioni"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Data caricamento: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Account"</string>
-    <string name="upload" msgid="2615541458361216022">"Carica"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Annulla"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Caricamento su "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" per "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Inizializzazione caricamento non riuscita."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"File non disponibile."</string>
-    <string name="account_error" msgid="1904775271866104941">"Impossibile recuperare i dati dell\'account."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Errore durante l\'accesso all\'account."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"In attesa di nuovo tentativo"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"In attesa di Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Caricamento"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Non riuscito"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Completato"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"caricamento"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"messo in pausa manualmente"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"in pausa - batteria in esaurimento"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"in pausa - ritardata fino a ricarica"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"in pausa - in attesa di connessione"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"in pausa - quota PWA superata"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"in pausa - in attesa di Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"in pausa - roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"in attesa di nuovo tentativo"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuto"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuti"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minuti"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Nessuna connessione dati"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"L\'account ha superato la quota disco"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"File non trovato"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Errore del servizio"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Errore di rete"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Autenticazione non riuscita"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Caricamenti in attesa [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Caricamenti completati [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Sospendi caricamenti"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Riprendi caricamenti"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Carica ora"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Carica più tardi"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Non caricare"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Visualizza"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Riprova"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Caricamento annullato"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Caricamento già terminato"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sincronizza tutto"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Ultima sincronizzazione:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"L\'elenco di elementi terminati è vuoto."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Caricam. istantaneo"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Caricamenti terminati"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Caricamenti sospesi"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"La funzione Caricamento istantaneo non è stata ancora attivata"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"I file di grandi dimensioni verranno caricati solo tramite connessioni Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Ricerca file..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Preparazione di <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto e <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video per il caricamento..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Nessun altro video/foto da caricare."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Si è verificato un problema di comunicazione con il server. Riprova più tardi."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sincronizzazione di tutti gli elementi annullata"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sincronizza tutto"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Visualizza Completati"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Visualizza sospesi"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Generale"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Metti in pausa tutti i caricamenti"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Alimentazione"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Carica soltanto quando il telefono è in carica."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Carica soltanto quando è disponibile la rete Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Foto"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Account"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Condizioni caricamento"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Dimensioni foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Video"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Account"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Per i caricamenti video verrà utilizzato l\'account Foto."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Condizioni caricamento"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Per il momento sono in uso le impostazioni di connettività delle foto."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Solo foto tramite reti mobili"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Foto e video tramite reti mobili"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Foto e video solo tramite Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Informazioni"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Vers. Caric. istant."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Consigliate: 1600 pixel (per condivisione, stampe e screensaver)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Dimensioni originali (caricamento più lento)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"in pausa - scheda SD non disponibile"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Scheda SD non disponibile"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Impost. Caric. istant."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Caricam. istantaneo"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Carica automaticamente nuove foto e nuovi video in un album web privato"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Stato del caricamento"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avanzate"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Caricamenti dal cellulare"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Caricamenti in ​​roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Carica foto e video durante il roaming su rete di dati"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Caricamento batteria"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Carica foto e video solo durante ricarica"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Carica foto esistenti"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Carica foto e video esistenti dal tuo telefono ora"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Disattivata"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Caricamento (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d di %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"In pausa: tocca per riprendere il caricamento"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Carica foto esistenti"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Caricare le foto e i video che non siano già stati caricati dal tuo telefono in un album privato sul Web può richiedere un po\' di tempo, ma sarà fatto in background. Continuare?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Sì"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"No"</string>
-</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c9f1a52..4993d8e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"סנכרן דוא\"ל"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"סנכרן דוא\"ל בחשבון זה"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"רטט"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"הוסף גם רטט כשמגיע דוא\"ל"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"תמיד"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"במצב שקט בלבד"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"אף פעם"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"רטט"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"בחר רינגטון"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"הגדרות שרת"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"הסר חשבון"</string>
diff --git a/res/values-iw/uploader.xml b/res/values-iw/uploader.xml
deleted file mode 100644
index 712280b..0000000
--- a/res/values-iw/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"העלאה מיידית"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"האלבום \'העלאה מיידית\'"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"העלאה"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"העלאות שהסתיימו"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"מושהה"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • ‏%2$d תמונות • %3$d סרטוני וידאו"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d תמונות • %2$d סרטוני וידאו"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"סוללה חלשה"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"חריגה ממכסת התמונות"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"נדידה"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"ממתין ל-WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"מעוכב עד לטעינה"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"ממתין לחיבור"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"מנסה שוב בתוך %S"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"הצג העלאות ממתינות"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"הצג העלאות שהסתיימו"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"הצג באופן מקוון"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"הצג העלאות ממתינות"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"הסתר העלאות ממתינות"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"הצג פרטים"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"הסתר פרטים"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"הגדרות"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"הועלה בתאריך %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"חשבון"</string>
-    <string name="upload" msgid="2615541458361216022">"העלה"</string>
-    <string name="ok" msgid="2516349681897895312">"אישור"</string>
-    <string name="cancel" msgid="1207103189404543868">"ביטול"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"מעלה אל "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" עבור "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"הפעלת ההעלאה נכשלה."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"הקובץ לא זמין."</string>
-    <string name="account_error" msgid="1904775271866104941">"אחזור פרטי החשבון נכשל."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"היתה בעיה בכניסה לחשבונך."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"ממתין לניסיון חוזר"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"ממתין ל-WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"העלאה מתבצעת"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"נכשל"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"הושלם"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"מעלה"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"מושהה באופן ידני"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"הושהה - סוללה חלשה"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"מושהה - מעוכב עד לטעינה"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"מושהה - ממתין לחיבור"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"הושהה - חריגה ממיכסת PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"מושהה - ממתין ל-WiFi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"מושהה - בנדידה"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"ממתין לניסיון חוזר"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"דקה אחת"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 דקות"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 דקות"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"אין חיבור נתונים"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"אזלה מכסת הדיסק עבור החשבון"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"הקובץ לא נמצא"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"שגיאת שירות"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"שגיאת רשת"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"האימות נכשל"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"העלאות ממתינות [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"העלאות שהושלמו [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"השהה העלאות"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"המשך בהעלאות"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"העלה עכשיו"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"העלה מאוחר יותר"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"אל תעלה"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"הצג"</string>
-    <string name="manager_retry" msgid="939534318469518843">"נסה שוב"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"ההעלאה בוטלה"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"ההעלאה כבר הסתיימה"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"סנכרן הכל"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"סינכרון אחרון:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"רשימת הפריטים שהסתיימו ריקה."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"העלאה מיידית"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"ההעלאות הסתיימו"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"ההעלאות הושהו"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"\'העלאה מיידית\' לא הופעלה עדיין"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"קבצים גדולים יועלו דרך חיבור WiFi בלבד."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"סורק לאיתור קבצים..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"מכין <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> תמונות ו-<xliff:g id="VIDEOCOUNT">%2$d</xliff:g> סרטוני וידאו להעלאה..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"אין צורך להעלות תמונות/סרטוני וידאו נוספים."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"אירעה בעיה בתקשורת עם השרת. נסה שוב מאוחר יותר."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"האפשרות \'סנכרן הכל\' מבוטלת"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"סנכרן הכל"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"הצג העלאות שהושלמו"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"הצג העלאות ממתינות"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"כללי"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"השהה את כל ההעלאות"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"טעינה"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"העלה רק כשהטלפון בטעינה."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"העלה רק כאשר Wi-Fi זמין."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"תמונות"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"חשבון"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"תנאי העלאה"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"גודל תמונה"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"סרטוני וידאו"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"חשבון"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"חשבון התמונות ישמש להעלאות סרטוני וידאו."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"תנאי העלאה"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"נעשה שימוש בינתיים בהגדרות קישוריות של תמונות."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"רק תמונות דרך רשתות לנייד"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"תמונות וסרטוני וידאו דרך רשתות לנייד"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"תמונות וסרטוני וידאו באמצעות Wi-Fi בלבד"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"אודות"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"גרסת \'העלאה מיידית\'"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"מומלץ: 1,600 פיקסלים (לשיתוף, הדפסות ושומרי מסך)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"גודל מקורי (ההעלאה האיטית ביותר)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"מושהה - כרטיס SD לא זמין"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"כרטיס SD לא זמין"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"הגדרות \'העלאה מיידית\'"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"העלאה מיידית"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"העלה באופן אוטומטי תמונות וסרטוני וידאו חדשים לאלבום פרטי באינטרנט"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"סטטוס העלאה"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"מתקדם"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"העלאות לנייד"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"העלאות בזמן נדידה"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"העלה תמונות וסרטוני וידאו בעת נדידה ברשת נתונים"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"העלאות בעת טעינת סוללה"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"העלה תמונות וסרטוני וידאו רק בעת טעינה"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"העלאת תמונות קיימות"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"העלה תמונות וסרטוני וידאו קיימים מהטלפון שלך כעת"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"מושבת"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"מעלה (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d מתוך %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"מושהה: גע כדי לחדש את ההעלאה"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"העלאת תמונות קיימות"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"העלאת תמונות וסרטוני וידאו שעדיין לא הועלו מהטלפון שלך לאלבום פרטי באינטרנט עשויה להימשך זמן מה, אך תתבצע ברקע. האם אתה בטוח שברצונך להמשיך?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"כן"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"לא"</string>
-</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ff80379..558ca89 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"メールを同期する"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"このアカウントのメールを同期"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"バイブレーション"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"メール受信: バイブレーションON"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"常に使用"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"マナーモード時のみ"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"使用しない"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"バイブレーション"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"着信音を選択"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"サーバー設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"アカウントを削除"</string>
diff --git a/res/values-ja/uploader.xml b/res/values-ja/uploader.xml
deleted file mode 100644
index c3d7ec4..0000000
--- a/res/values-ja/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"インスタントアップロード"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"インスタントアップロードのアルバム"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"アップロード中"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"完了"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"一時停止"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% - 画像%2$d件 - 動画%3$d件"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"画像%1$d件 - 動画%2$d件"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"電池残量低下"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"画像の割り当て容量の上限を超過"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"ローミング中"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"Wi-Fiを待機中"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"充電まで保留"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"接続を待機中"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"%s後に再試行"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"保留中のアップロードを表示"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"完了したアップロードを表示"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"オンラインで表示"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"保留中のアップロードを表示"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"保留中のアップロードを表示しない"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"詳細を表示"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"詳細を表示しない"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"設定"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"アップロード済み: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"アカウント"</string>
-    <string name="upload" msgid="2615541458361216022">"アップロード"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"キャンセル"</string>
-    <string name="uploading_to" msgid="3986362895940069510"><b>"%s"</b>"にアップロードしています"</string>
-    <string name="uploading_for" msgid="1735961974624867111">" (ユーザー: "<b>"%s"</b>")"</string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s「%2$s」"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"アップロードの初期化に失敗しました。"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"ファイルにアクセスできません。"</string>
-    <string name="account_error" msgid="1904775271866104941">"アカウント情報を取得できませんでした。"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"アカウントへのログインで問題が発生しました。"</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"再試行を待機中"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Wi-Fi接続を待機中"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"アップロード中"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"失敗"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"完了"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"アップロード中"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"手動により一時停止"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"一時停止 - 電池残量低下"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"一時停止 - 充電まで保留"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"一時停止 - 接続を待機中"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"一時停止 - PWA割り当て容量の不足"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"一時停止 - Wi-Fiを待機中"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"一時停止 - ローミング中"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"再試行を待機中"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1分"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2分"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5分"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"データ接続がありません"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"アカウントに割り当てられたディスク容量の上限を超えています"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"ファイルが見つかりません"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"サービスエラー"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"ネットワークエラー"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"認証できませんでした"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"保留中のアップロード(%d)"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"完了したアップロード(%d)"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"アップロードを一時停止"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"アップロードを再開"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"今すぐアップロード"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"後でアップロード"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"アップロードしない"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"表示"</string>
-    <string name="manager_retry" msgid="939534318469518843">"再試行"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"アップロードをキャンセルしました"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"アップロードは既に完了しています"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"すべて同期"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"最終同期: "\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"完了アイテムリストが空です。"</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"インスタントアップロード"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"アップロードが完了しました"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"アップロードを一時停止しました"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"インスタントアップロードが有効になっていません"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"大きなファイルはWi-Fi接続時のみアップロードされます。"</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"ファイルをスキャンしています..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"画像<xliff:g id="PHOTOCOUNT">%1$d</xliff:g>件、動画<xliff:g id="VIDEOCOUNT">%2$d</xliff:g>件のアップロードを準備しています..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"アップロードの必要な画像/動画は他にありません。"</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"サーバーとの通信で問題が発生しました。しばらくしてからもう一度お試しください。"</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"同期をすべてキャンセルしました"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"すべて同期"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"完了済みを表示"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"保留中を表示"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"全般"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"アップロードをすべて一時停止"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"電源"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"端末充電時のみアップロードする。"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Wi-Fiが利用できるときのみアップロードする。"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"画像"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"アカウント"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"アップロード条件"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"画像サイズ"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"動画"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"アカウント"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"画像用のアカウントを動画のアップロードに使用します。"</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"アップロード条件"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"画像の接続設定を使用します。"</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"モバイルネットワークでは画像のみ送信"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"モバイルネットワークで画像と動画を送信"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Wi-Fi接続時にのみ画像と動画を送信"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"概要"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"インスタントアップロードのバージョン"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"推奨: 1600ピクセル(共有、印刷、スクリーンセーバー用)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"元のサイズ(最も遅いアップロード)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"一時停止 - SDカード使用不能"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SDカード使用不能"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"インスタントアップロード設定"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"インスタントアップロード"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"新しい画像と動画を限定公開のウェブアルバムに自動的にアップロード"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"アップロードステータス"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"詳細設定"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"モバイルアップロード"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"ローミング時にアップロード"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"データネットワークでのローミング時に画像と動画をアップロード"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"充電中にアップロード"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"充電時にのみ画像と動画をアップロード"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"既存の画像をアップロード"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"既存の画像と動画を携帯端末から今すぐアップロード"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"無効"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"アップロード中(%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d/%2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"一時停止:タップしてアップロードを再開"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"既存の画像をアップロード"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"アップロードしたことのない画像や動画の場合は、携帯端末からウェブ上の限定公開アルバムへのアップロードに時間がかかることがあります。ただし、処理はバックグラウンドで行われます。続行してもよろしいですか?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"はい"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"いいえ"</string>
-</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ed96d4c..dea494b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"이메일 동기화"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"이 계정의 이메일을 동기화합니다."</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"진동"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"이메일이 오면 진동도 함께 울림"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"항상"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"무음 시에만"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"안함"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"진동"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"벨소리 선택"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"서버 설정"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"계정 삭제"</string>
@@ -404,7 +399,7 @@
     <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"동기화 옵션"</string>
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"동기화 옵션(<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_preferences_header" msgid="9077316556563252246">"동기화 설정"</string>
-    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"주파수 확인"</string>
+    <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"확인 빈도"</string>
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"동기화할 일 수"</string>
     <string name="account_shortcut_picker_name" msgid="1994861845225243190">"이메일 계정"</string>
     <string name="account_shortcut_picker_title" msgid="1039929224016048015">"계정 선택"</string>
diff --git a/res/values-ko/uploader.xml b/res/values-ko/uploader.xml
deleted file mode 100644
index adbc79f..0000000
--- a/res/values-ko/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"자동 업로드"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"자동 업로드 앨범"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"업로드 중"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"완료"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"일시중지됨"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • 사진 %2$d장 • 동영상 %3$d개"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"사진 %1$d장 • 동영상 %2$d개"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"배터리 전원 부족"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"사진 용량을 초과했습니다."</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"로밍 중"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"WiFi 대기 중"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"충전될 때까지 지연됨"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"연결 대기 중"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"%s 후에 다시 시도"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"대기 중인 업로드 표시"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"완료된 업로드 표시"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"온라인으로 보기"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"대기 중인 업로드 표시"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"대기 중인 업로드 숨기기"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"세부정보 표시"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"세부정보 숨기기"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"설정"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"업로드 날짜: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"계정"</string>
-    <string name="upload" msgid="2615541458361216022">"업로드"</string>
-    <string name="ok" msgid="2516349681897895312">"확인"</string>
-    <string name="cancel" msgid="1207103189404543868">"취소"</string>
-    <string name="uploading_to" msgid="3986362895940069510"><b>"%s"</b>"에 업로드"</string>
-    <string name="uploading_for" msgid="1735961974624867111">" "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \'%2$s\'"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"업로드 초기화에 실패했습니다."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"파일이 없습니다."</string>
-    <string name="account_error" msgid="1904775271866104941">"계정 정보를 검색하지 못했습니다."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"계정에 로그인하는 동안 문제가 발생했습니다."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"재시도 대기 중"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"WiFi 대기 중"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"업로드 중"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"실패"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"완료됨"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"업로드 중"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"수동으로 일시중지됨"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"일시중지됨 - 배터리 전원 부족"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"일시중지됨 - 충전될 때까지 지연됨"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"일시중지됨 - 연결 대기중"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"일시중지됨 - Picasa 웹앨범 용량 초과"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"일시중지됨 - wifi 대기 중"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"일시중지됨 - 로밍 중"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"재시도 대기 중"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1분"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2분"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5분"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"데이터 연결 없음"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"계정의 디스크 용량이 부족합니다."</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"파일을 찾을 수 없음"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"서비스 오류"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"네트워크 오류"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"인증 실패"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"대기 중인 업로드 [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"완료된 업로드 [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"업로드 일시중지"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"업로드 다시 시작"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"지금 업로드"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"나중에 업로드"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"업로드 안함"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"보기"</string>
-    <string name="manager_retry" msgid="939534318469518843">"다시 시도"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"업로드가 취소되었습니다."</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"업로드를 이미 완료했습니다."</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"모두 동기화"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"마지막 동기화 시간:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"완료된 항목 목록이 비어 있습니다."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"자동 업로드"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"업로드 완료됨"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"업로드 일시중지됨"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"자동 업로드가 아직 활성화되지 않았습니다."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"대용량 파일은 WiFi 연결을 통해서만 업로드됩니다."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"파일 검색 중..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"업로드할 사진 <xliff:g id="PHOTOCOUNT">%1$d</xliff:g>장과 동영상 <xliff:g id="VIDEOCOUNT">%2$d</xliff:g>개를 준비하는 중..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"사진/동영상을 추가로 업로드할 필요가 없습니다."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"서버와 통신하는 중에 문제가 발생했습니다. 나중에 다시 시도해 주세요."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"모두 동기화 취소됨"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"모두 동기화"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"완료된 업로드 보기"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"대기 중인 업로드 보기"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"일반"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"모든 업로드 일시중지"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"전원"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"휴대전화가 충전 중일 때만 업로드합니다."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Wi-Fi가 사용 가능한 경우에만 업로드합니다."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"사진"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"계정"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"업로드 조건"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"사진 크기"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"동영상"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"계정"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"동영상 업로드에 사진 계정이 사용됩니다."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"업로드 조건"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"현재 사진 연결 설정이 사용되고 있습니다."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"모바일 네트워크를 통해 사진만 업로드"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"모바일 네트워크를 통해 사진과 동영상 업로드"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Wi-Fi를 통해서만 사진과 동영상 업로드"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"정보"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"자동 업로드 버전"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"권장: 1600픽셀(공유, 인쇄 및 스크린세이버용)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"원본 크기(가장 느린 업로드)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"일시중지됨 - SD 카드를 사용할 수 없음"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD 카드를 사용할 수 없음"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"자동 업로드 설정"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"자동 업로드"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"새 사진과 동영상을 자동으로 비공개 웹앨범에 업로드"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"업로드 상태"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"고급"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"모바일 업로드"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"로밍 중 업로드"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"데이터 네트워크에서 로밍 시 사진 및 동영상을 업로드합니다."</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"배터리 업로드"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"충전할 때만 사진과 동영상 업로드"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"기존 사진 업로드"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"지금 휴대전화에서 기존 사진 및 동영상 업로드"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"사용중지됨"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"업로드 중(%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d/%2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"일시중지됨: 업로드를 다시 시작하려면 터치"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"기존 사진 업로드"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"아직 업로드되지 않은 사진과 동영상을 휴대전화에서 비공개 웹앨범으로 업로드하려면 시간이 걸릴 수 있습니다. 이 작업은 백그라운드에서 진행됩니다. 계속하시겠습니까?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"예"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"아니요"</string>
-</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c12e7e7..b2a0599 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinchron. el. paštą"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinchron. šios paskyros el. paštą"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibruoti"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Taip pat vibruoti, kai gaunamas el. laiškas"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Visada"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tik kai veikia tyliai"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niekada"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibruoti"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pasirinkti skambėjimo toną"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverio nustatymai"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Pašalinti paskyrą"</string>
diff --git a/res/values-lt/uploader.xml b/res/values-lt/uploader.xml
deleted file mode 100644
index d1a65c6..0000000
--- a/res/values-lt/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Momentinis įkėlimas"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Momentinių įkėlimų albumas"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Įkeliama"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Baigta"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pristabdyta"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d nuotrauk. • %3$d vaizdo įraš."</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d nuotrauk. • %2$d vaizdo įraš."</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"akumuliatorius senka"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"viršyta nuotraukų kvota"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"tarptinklinis ryšys"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"laukiama „Wi-Fi“"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"atidėta iki įkrovimo"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"laukiama ryšio"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"bandoma iš naujo po %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Rodyti laukiamus įkėlimus"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Rodyti baigtus įkėlimus"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Žiūrėti prisijungus"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Rodyti laukiamus įkėlimus"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Slėpti laukiamus įkėlimus"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Rodyti išsamią informaciją"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Slėpti išsamią informaciją"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Nustatymai"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Įkelta %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Paskyra"</string>
-    <string name="upload" msgid="2615541458361216022">"Įkelti"</string>
-    <string name="ok" msgid="2516349681897895312">"Gerai"</string>
-    <string name="cancel" msgid="1207103189404543868">"Atšaukti"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Įkeliama į "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"„%1$s“ „%2$s“"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Nepavyko inicijuoti įkėlimo."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Failas nepasiekiamas."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nepavyko nuskaityti paskyros informacijos."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Prisijungiant prie paskyros kilo problema."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Laukiama, kol bus galima bandyti iš naujo"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Laukiama „Wi-Fi“"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Įkeliama"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Įvyko klaida"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Užbaigta"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"įkeliama"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"pristabdyta rankomis"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"pristabdyta – akumuliatorius senka"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"pristabdyta – atidėta iki įkrovimo"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"pristabdyta – laukiama ryšio"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pristabdyta - nebėra PWA kvotos"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"pristabdyta – laukiama „Wi-Fi“"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pristabdyta – tarptinklinis ryšys"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"laukiama, kol bus galima bandyti iš naujo"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 min."</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 min."</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 min."</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Nėra duomenų ryšio"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Paskyroje nėra disko kvotos"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Failas nerastas"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Paslaugos klaida"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Tinklo klaida"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Nepavyko nustatyti tapatybės"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Laukiami įkėlimai [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Baigti įkėlimai [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pristabdyti įkėlimus"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Atnaujinti įkėlimus"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Įkelti dabar"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Įkelti vėliau"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Neįkelti"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Žiūrėti"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Bandyti dar kartą"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Įkėlimas atšauktas"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Įkėlimas jau baigtas"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sinchronizuoti viską"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Paskutinį kartą sinchronizuota:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Baigtų elementų sąrašas tuščias."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Momentinis įkėlimas"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Įkėlimai baigti"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Įkėlimai pristabdyti"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Momentinis įkėlimas dar nesuaktyvintas"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Dideli failai bus įkelti naudojant tik „Wi-Fi“ ryšį."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Nuskaitomi failai..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Ruošiama įkelti <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> nuotrauk. ir <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> vaizdo įraš..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Nereikia įkelti jokių papildomų nuotraukų / vaizdo įrašų."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Bandant susisiekti su serveriu kilo problema. Bandykite dar kartą vėliau."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sinchronizuoti visus atšauktus"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sinchronizuoti viską"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Peržiūrėti užbaigtus"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Žiūrėti laukiamus"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Bendroji informacija"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pristabdyti visus įkėlimus"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Maitinimas"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Įkelti, tik kai telefonas įkraunamas."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Įkelti, tik kai pasiekiamas „Wi-Fi“."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Nuotraukos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Paskyra"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Įkėlimo sąlygos"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Nuotraukos dydis"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Vaizdo įrašai"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Paskyra"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Nuotraukų paskyra bus naudojama vaizdo įrašams įkelti."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Įkėlimo sąlygos"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Dabar naudojami nuotraukų jungiamumo nustatymai."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Tik per mobiliojo ryšio tinklus gautos nuotraukos"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Įkelti nuotraukas ir vaizdo įrašus per mobiliojo ryšio tinklus"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Įkelti nuotraukas ir vaizdo įrašus tik per „Wi-Fi“"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Apie"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Moment. įkėl. vers."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Rekomenduojama: 1 600 pikselių (bendrinant, spausdinant ir naudojant ekrano užsklandas)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Pradinis dydis (lėčiausias įkėlimas)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"pristabdyta – SD kortelė nepasiekiama"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD kortelė nepasiekiama"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Moment. įkėl. nust."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Momentinis įkėlimas"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automatiškai įkelti naujas nuotraukas ir vaizdo įrašus į privatų žiniatinklio albumą"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Įkėlimo būsena"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Išplėstiniai"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Įkėlimai mobiliuoju ryšiu"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Įkėlimai tarptinkliniu ryšiu"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Įkelti nuotraukas ir vaizdo įrašus, kai duomenų tinkle veikia tarptinklinis ryšys"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Įkėlimai kraunant"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Nuotraukas ir vaizdo įrašus įkelti, tik kai įkraunama"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Įkelti esamas nuotraukas"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Dabar įkelti visas esamas nuotraukas ir vaizdo įrašus iš telefono"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Neleidžiama"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Įkeliama (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d iš %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pristabdyta: palieskite, kad būtų atnaujintas įkėlimas"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Įkelti esamas nuotraukas"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Nuotraukų ir vaizdo įrašų, kurie dar nebuvo įkelti iš telefono į privatų albumą žiniatinklyje, įkėlimas gali užtrukti, tačiau jis bus atliekamas fone. Ar tikrai norite tęsti?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Taip"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Ne"</string>
-</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 92e0f48..843453d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhronizēt e-pastu"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhronizēt e-pastu šim kontam"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrozvans"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Izmantot vibrozvanu, kad tiek saņemts e-pasta ziņojums"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vienmēr"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tikai klusuma režīmā"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nekad"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrozvans"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Izvēlēties zvana signālu"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Servera iestatījumi"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konta noņemšana"</string>
diff --git a/res/values-lv/uploader.xml b/res/values-lv/uploader.xml
deleted file mode 100644
index d333de6..0000000
--- a/res/values-lv/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Tūlītēja augšupiel."</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Tūlītējās augšupielādes albums"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Notiek augšupielāde"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Pabeigtas"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pārtrauktas"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotoattēli • %3$d videoklipi"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotoattēli • %2$d videoklipi"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"zems akumulatora uzlādes līmenis"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"pārsniegta fotoattēlu kvota"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"viesabonēšana"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"tiek gaidīta Wi-Fi savienojuma izveide"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"darbība apturēta, kamēr notiek uzlāde"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"tiek gaidīta savienojuma izveide"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"atkārtots mēģinājums pēc: %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Rādīt neapstiprinātās augšupielādes"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Rādīt pabeigtās augšupielādes"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Skatīt tiešsaistē"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Rādīt neapstiprinātās augšupielādes"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Slēpt neapstiprinātās augšupielādes"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Rādīt informāciju"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Slēpt informāciju"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Iestatījumi"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Augšupielādēts: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Konts"</string>
-    <string name="upload" msgid="2615541458361216022">"Augšupielādēt"</string>
-    <string name="ok" msgid="2516349681897895312">"Labi"</string>
-    <string name="cancel" msgid="1207103189404543868">"Atcelt"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Notiek augšupielāde šeit: "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" lietotājam "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s, “%2$s”"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Neizdevās inicializēt augšupielādi."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Fails nav pieejams."</string>
-    <string name="account_error" msgid="1904775271866104941">"Neizdevās izgūt konta informāciju."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Pierakstoties kontā, radās problēma."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Tiek gaidīts, lai mēģinātu vēlreiz"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Tiek gaidīts Wi-Fi savienojums"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Notiek augšupielāde"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Neizdevās"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Pabeigta"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"notiek augšupielāde"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"manuāli pārtraukta"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"pārtraukta — zems akumulatora uzlādes līmenis"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"pārtraukta — darbība apturēta, kamēr notiek uzlāde"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"pārtraukta — tiek gaidīta savienojuma izveide"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pārtraukta — nav PWA kvotas"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"pārtraukta — tiek gaidīta Wi-Fi savienojuma izveide"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pārtraukta — notiek viesabonēšana"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"tiek gaidīts, lai mēģinātu vēlreiz"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minūte"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minūtes"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minūtes"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Nav datu savienojuma"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Konta diska kvota nav pietiekama."</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Fails nav atrasts"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Pakalpojuma kļūda"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Tīkla kļūda"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Autentifikācija neizdevās"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Neapstiprinātas augšupielādes [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Pabeigtās augšupielādes [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pārtraukt augšupielādes"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Atsākt augšupielādes"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Augšupielādēt tūlīt"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Augšupielādēt vēlāk"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Neveikt augšupielādi"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Skatīt"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Mēģināt vēlreiz"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Augšupielāde ir atcelta."</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Augšupielāde jau ir pabeigta."</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sinhronizēt visus"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Pēdējā sinhronizācija:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Pabeigto vienumu saraksts ir tukšs."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Tūlītēja augšupielāde"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Augšupielādes ir pabeigtas."</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Augšupielādes ir pārtrauktas."</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Tūlītējā augšupielāde vēl nav aktivizēta."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Lieli faili tiks augšupielādēti, izmantojot tikai Wi-Fi savienojumu."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Notiek failu skenēšana..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Notiek <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotoattēlu un <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videoklipu sagatavošana augšupielādei..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Nav nepieciešams augšupielādēt papildu fotoattēlus/videoklipus."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Veidojot savienojumu ar serveri, radās problēma. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Visu vienumu sinhronizācija ir atcelta."</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sinhronizēt visu"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Skatīšana pabeigta"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Skatīt neapstiprinātās"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Vispārīgi"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pārtraukt visas augšupielādes"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Jauda"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Augšupielādēt tikai tad, kad ir uzlādēts tālrunis."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Augšupielādēt tikai tad, ja ir pieejams Wi-Fi tīkls"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotoattēli"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Konts"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Augšupielādēšanas nosacījumi"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Fotoattēla lielums"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videoklipi"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Konts"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Fotoattēlu konts tiks izmantots videoklipu augšupielādēm."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Augšupielādēšanas nosacījumi"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Pašlaik tiek izmantoti fotoattēlu savienojamības iestatījumi."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Tikai fotoattēliem, izmantojot mobilo sakaru tīklus"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotoattēli un videoklipi: izmantojot mobilo sakaru tīklus"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotoattēli un videoklipi: tikai izmantojot Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Par"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Tūlīt. augšup. vers."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Ieteicams: 1600 pikseļi (kopīgošanai, izdrukām un ekrānsaudzētājiem)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Sākotnējais lielums (lēnākā augšupielāde)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"pārtraukta — SD karte nav pieejama"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD karte nav pieejama"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Tūl. augšup. iest."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Tūlītēja augšupiel."</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automātiski augšupielādēt jaunus fotoattēlus un videoklipus privātā albumā tīmeklī"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Augšupielādes statuss"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Papildu"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Augšupielādes, izmantojot mobilos sakarus"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Augšupielādes, izmantojot viesabonēšanu"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Augšupielādēt fotoattēlus un videoklipus datu tīklā viesabonēšanas laikā"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Augšupielādes lādējot"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Augšupielādēt fotoattēlus un videoklipus tikai uzlādes laikā"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Augšupielādēt esošos fotoattēlus"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Augšupielādēt visus esošos fotoattēlus un videoklipus no tālruņa tūlīt"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Atspējota"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Notiek augšupielāde (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d no %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Augšupielāde ir pārtraukta; pieskarieties, lai to atsāktu"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Esošo fotoattēlu augšupielāde"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Vēl neaugšupielādēto fotoattēlu un videoklipu augšupielāde no tālruņa privātā albumā tīmeklī var ilgt noteiktu laiku, taču tā tiks veikta fonā. Vai tiešām vēlaties turpināt?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Jā"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nē"</string>
-</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index e9ee2de..effce35 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Segerakkan e-mel"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Segerakkan e-mel untuk akaun ini"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar semasa e-mel diterima"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sentiasa"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apabila senyap sahaja"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jangan sekali-kali"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Tetapan pelayan"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alih keluar akaun"</string>
diff --git a/res/values-ms/uploader.xml b/res/values-ms/uploader.xml
deleted file mode 100644
index 1b760de..0000000
--- a/res/values-ms/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Muat Naik Srta-merta"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Muat Naik Album Serta-merta"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Memuat naik"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Selesai"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Dijeda"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto • %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto • %2$d video"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"bateri lemah"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"melebihi kuota foto"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"perayauan"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"menunggu WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"ditunda sehingga mengecas"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"menunggu sambungan"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"mencuba semula dalam %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Tunjukkan Muat Naik Yang Belum Selesai"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Tunjukkan Muat Naik Yang Telah Selesai"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Lihat Dalam Talian"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Tunjukkan Muat Naik Yang Belum Selesai"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Sembunyikan Muat Naik Yang Belum Selesai"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Tunjukkan Butiran"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Sembunyikan Butiran"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Tetapan"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Dimuat naik %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Akaun"</string>
-    <string name="upload" msgid="2615541458361216022">"Muat naik"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Batal"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Memuat naik ke "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" untuk "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Pemulaan muat naik gagal."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Fail tidak tersedia."</string>
-    <string name="account_error" msgid="1904775271866104941">"Gagal mendapatkan semula maklumat akaun."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Terdapat masalah melog masuk ke dalam akaun anda."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Menunggu untuk mencuba semula"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Menunggu WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Memuat naik"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Gagal"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Selesai"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"memuat naik"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"dijeda secara manual"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"dijeda - bateri lemah"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"dijeda - ditunda sehingga mengecas"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"dijeda - menunggu sambungan"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"dijeda - kehabisan kuota PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"dijeda - menunggu wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"dijeda - merayau"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"menunggu untuk mencuba semula"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minit"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minit"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minit"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Tiada sambungan data"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Akaun kehabisan kuota cakera"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Fail tidak ditemui"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Ralat perkhidmatan"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Ralat rangkaian"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Pengesahan gagal"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Muat naik belum selesai [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Muat naik yang sudah selesai [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Jeda muat naik"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Sambung semula muat naik"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Muat naik sekarang"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Muat naik kemudian"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Jangan muat naik"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Tonton"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Cuba semula"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Muat naik dibatalkan"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Muat naik sudah pun selesai"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Segerakkan semua"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Segerak Terakhir:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Senarai item selesai kosong."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Muat Naik Serta-merta"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Muat naik selesai"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Muat naik dijeda"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Muat Naik Serta-merta belum lagi diaktifkan"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Fail besar akan dimuat naik melalui sambungan WiFi sahaja."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Mengimbas untuk mengesan fail..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Menyediakan <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto dan <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video untuk muat naik..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Tiada foto/video tambahan yang perlu dimuat naik."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Terdapat masalah berkomunikasi dengan pelayan. Sila cuba sebentar lagi."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Segerakkan semua dibatalkan"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Segerakkan Semua"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Lihat Yang Telah Selesai"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Lihat Yang Belum Selesai"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Umum"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Jeda semua muat naik"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Kuasa"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Muat naik hanya apabila telefon sedang dicas."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Muat naik hanya apabila Wi-Fi tersedia."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Foto"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Akaun"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Syarat muat naik"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Saiz foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Video"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Akaun"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Akaun foto akan digunakan untuk muat naik video."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Syarat muat naik"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Tetapan kesambungan foto digunakan buat masa sekarang."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Foto sahaja melalui rangkaian mudah alih"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Foto &amp; video melalui rangkaian mudah alih"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Foto &amp; video melalui Wi-Fi sahaja"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Perihal"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Ver M/Naik Srta-mrta"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Disyorkan: 1600 piksel (untuk perkongsian, cetakan dan pelindung skrin)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Saiz asal (muat naik paling perlahan)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"dijeda - kad SD tidak tersedia"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Kad SD tidak tersedia"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Tetapan Muat Naik Serta-merta"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"M/Naik Serta-merta"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Muat naik foto &amp; video baru ke album web peribadi secara automatik"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Status muat naik"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Terperinci"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Muat naik mudah alih"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Muat naik perayauan"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Muat naik foto &amp; video apabila merayau pada rangkaian data"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Muat naik bateri"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Muat naik foto &amp; video hanya semasa mengecas"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Muat naik foto sedia ada"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Muat naik sebarang foto &amp; video sedia ada dari telefon anda sekarang"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Dilumpuhkan"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Memuat naik (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d daripada %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Dijeda: sentuh untuk menyambung semula muat naik"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Muat naik foto sedia ada"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Memuat naik foto dan video yang belum lagi dimuat naik dari telefon anda ke album peribadi di web boleh mengambil masa yang agak lama tetapi akan dilakukan dalam latar belakang. Adakah anda pasti mahu meneruskan?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ya"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Tidak"</string>
-</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 44941d2..d157c64 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-postmeldinger fra denne kontoen"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrering"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også når nye e-postmeldinger mottas"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun i stillemodus"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldri"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrering"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Velg ringetone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Innstillinger for tjener"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern"</string>
diff --git a/res/values-nb/uploader.xml b/res/values-nb/uploader.xml
deleted file mode 100644
index 0846aff..0000000
--- a/res/values-nb/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Direkteopplasting"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album for direkteopplasting"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Laster opp"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Fullført"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Satt på pause"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d bilder • %3$d videoer"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d bilder • %2$d videoer"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"lavt batteri"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"bildekvote er overskredet"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"venter på Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"forsinket inntil enheten lades"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"venter på tilkobling"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"prøver på nytt om %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Vis ventende opplastinger"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Vis fullførte opplastinger"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Se på nettet"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Vis ventende opplastinger"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Skjul ventende opplastinger"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Vis detaljer"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skjul detaljer"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Innstillinger"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Lastet opp %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Konto"</string>
-    <string name="upload" msgid="2615541458361216022">"Last opp"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Avbryt"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Laster opp til "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" for "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Opplastingsinitialiserign mislyktes."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Filen er ikke tilgjengelig."</string>
-    <string name="account_error" msgid="1904775271866104941">"Kan ikke hente kontoinformasjon."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Det oppsto et problem under pålogging til kontoen din."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Venter på å prøve på nytt"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Venter på Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Laster opp"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Mislyktes"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Fullført"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"laster opp"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"manuelt satt på pause"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"satt på pause – lavt batteri"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"satt på pause – utsatt inntil enheten lades"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"satt på pause – venter på tilkobling"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"satt på pause – PWA-kvote brukt opp"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"satt på pause – venter på Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"satt på pause – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"venter på å prøve på nytt"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"Ett minutt"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"To minutter"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"Fem minutter"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Ingen datatilkobling"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Kontoen har ingen tilgjengelig diskkvote"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Finner ikke filen"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Tjenestefeil"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Nettverksfeil"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Autentisering mislyktes"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Ventende opplastinger [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Fullførte opplastinger [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Stans opplastinger midlertidig"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Gjenoppta opplastinger"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Last opp nå"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Last opp senere"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Ikke last opp"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Se"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Prøv på nytt"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Opplasting avbrutt"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Opplastingen er ferdig"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Synkroniser alle"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Siste synkronisering:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Listen over fullførte elementer er tom."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Direkteopplasting"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Opplastinger er fullført"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Opplastinger satt på pause"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Direkteopplasting er ikke aktivert ennå"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Store filer kan lastes opp bare via Wi-Fi-tilkobling."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Skanner etter filer …"</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Forbereder <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> bilder og <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videoer for opplasting …"</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Ingen flere bilder eller videoer trenger å lastes opp."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Det oppsto et problem under kommunikasjon med tjeneren. Prøv på nytt senere."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Synkronisering av alle er avbrutt"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synkroniser alle"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Se fullførte"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Se ventende"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Generelt"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Stans alle opplastinger midlertidig"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Strøm"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Last opp bare når telefonen lades opp."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Last opp bare når trådløst nettverk er tilgjengelig."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Bilder"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Konto"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Opplastingsforhold"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Bildestørrelse"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videoer"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Konto"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Bildekontoen blir brukt til videoopplastinger."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Opplastingsforhold"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Tilkoblingsinnstillinger for bilder brukes inntil videre."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Bare bilder via mobile nettverk"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Bilder og videoer via mobilnettverk"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Bilder og videoer bare via Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Info"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Direktopplast.-ver."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Anbefalt: 1600 piksler (for deling, utskrift og skjermbeskyttere)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Originalstørrelse (tregeste opplasting)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"midlertidig stoppet – SD-kort er ikke tilgjengelig"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kortet er ikke tilgjengelig"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Innst. for dir.oppl."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Direkteopplasting"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automatisk opplasting av nye bilder og videoer til privat nettalbum"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Opplastingsstatus"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avansert"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Opplastinger fra mobil"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Opplastinger ved roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Last opp bilder og videoer ved roaming på datanettverk"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Batteriopplastinger"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Last opp bilder og videoer bare under lading"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Last opp eksisterende bilder"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Last opp alle eksisterende bilder og videoer fra telefonen din nå"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Deaktivert"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Laster opp (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d av %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Midlertidig stoppet: Trykk for å gjenoppta opplasting"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Last opp eksisterende bilder"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Det kan ta litt tid å laste opp bilder og videoer som ikke allerede har blitt lastet opp fra telefonen din, til et privat album på nettet. Handlingen utføres imidlertid i bakgrunnen. Er du sikker på at du vil fortsette?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ja"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nei"</string>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b7996b9..94b50de 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail synch."</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-mail voor dit account synchroniseren"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Trillen"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Ook trillen wanneer er e-mail binnenkomt"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altijd"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Alleen indien stil"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Trillen"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Beltoon kiezen"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinstellingen"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Account verwijderen"</string>
diff --git a/res/values-nl/uploader.xml b/res/values-nl/uploader.xml
deleted file mode 100644
index f2d6c82..0000000
--- a/res/values-nl/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Automatisch uploaden"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Auto-uploadalbum"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Uploaden"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Voltooid"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Onderbroken"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foto\'s • %3$d video\'s"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foto\'s • %2$d video\'s"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"de accu is bijna leeg"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"fotoquotum overschreden"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"wachten op Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"uitgesteld tot opladen"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"wachten op verbinding"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"opnieuw proberen over %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Uploads in behandeling weergeven"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Voltooide uploads weergeven"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Online bekijken"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Uploads in behandeling weergeven"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Uploads in behandeling verbergen"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Details weergeven"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Details verbergen"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Instellingen"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Geüpload op %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Account"</string>
-    <string name="upload" msgid="2615541458361216022">"Uploaden"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Annuleren"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Uploaden naar "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" voor "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \'%2$s\'"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Het starten van de upload is mislukt."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Het bestand is niet beschikbaar."</string>
-    <string name="account_error" msgid="1904775271866104941">"Ophalen van accountgegevens mislukt."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Er is een probleem opgetreden bij het aanmelden bij uw account."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Wachten op nieuwe poging"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Wachten op Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Uploaden"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Mislukt"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Voltooid"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"uploaden"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"handmatig gepauzeerd"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"onderbroken - de accu is bijna leeg"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"onderbroken - uitgesteld tot opladen"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"onderbroken - wachten op verbinding"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"onderbroken - PWA-quotum overschreden"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"onderbroken - wachten op Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"onderbroken - roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"wachten op nieuwe poging"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuut"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuten"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minuten"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Geen gegevensverbinding"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Schijfquota voor account is bereikt"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Bestand niet gevonden"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Servicefout"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Netwerkfout"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Verificatie mislukt"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Uploads in behandeling [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Voltooide uploads [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Uploads onderbreken"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Uploads hervatten"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Nu uploaden"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Later uploaden"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Niet uploaden"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Weergeven"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Opnieuw proberen"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Upload geannuleerd"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Upload al voltooid"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Alles synchroniseren"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Laatste synchronisatie:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Lijst met voltooide items is leeg."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Automatisch uploaden"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Uploads voltooid"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Uploads onderbroken"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Automatisch uploaden is nog niet geactiveerd"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Grote bestanden worden alleen geüpload via een Wi-Fi-verbinding."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Scannen naar bestanden..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foto\'s en <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video\'s voorbereiden op uploaden..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"U hoeft geen aanvullende foto\'s/video\'s te uploaden."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Er is een fout opgetreden tijdens de communicatie met de server. Probeer het later opnieuw."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Alles synchroniseren is geannuleerd"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Alles synchroniseren"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Voltooide uploads bekijken"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Items in behandeling weergeven"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Algemeen"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Alle uploads onderbreken"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Opladen vereist"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Alleen uploaden wanneer de telefoon wordt opgeladen."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Alleen uploaden wanneer Wi-Fi beschikbaar is."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Foto\'s"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Account"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Uploadvoorwaarden"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Formaat van foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Video\'s"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Account"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Het account voor foto\'s wordt gebruikt voor video-uploads."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Uploadvoorwaarden"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"De verbindingsinstellingen van foto\'s worden momenteel gebruikt."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Alleen foto\'s uploaden via mobiele netwerken"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Foto\'s en video\'s via mobiele netwerken"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Foto\'s en video\'s alleen via Wi-Fi uploaden"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Over"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Auto-uploadversie"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Aanbevolen: 1600 pixels (voor delen, afdrukken en screensavers)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Oorspronkelijk formaat (traagste upload)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"onderbroken - SD-kaart niet beschikbaar"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kaart niet beschikbaar"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Inst. Auto-uploaden"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Automatisch uploaden"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Nieuwe foto\'s en video\'s automatisch uploaden naar een persoonlijk webalbum"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Uploadstatus"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Geavanceerd"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobiele uploads"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Roaming uploads"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Foto\'s en video\'s uploaden bij roaming op gegevensnetwerk"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Accu-uploads"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Foto\'s en video\'s alleen uploaden tijdens het opladen"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Bestaande foto\'s uploaden"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Bestaande foto\'s en video\'s op uw telefoon nu uploaden"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Uitgeschakeld"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Uploaden (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d van %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Onderbroken: raak deze melding aan om het uploaden te hervatten"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Bestaande foto\'s uploaden"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Het kan even duren voordat foto\'s en video\'s zijn geüpload die nog niet van uw telefoon naar een privéalbum op internet zijn geüpload, maar dit vindt plaats op de achtergrond. Weet u zeker dat u wilt doorgaan?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ja"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nee"</string>
-</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c484fbf..9f1ce15 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opcje synchronizacji"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczytane"</string>
     <string name="move_action" msgid="3059189775933985898">"Przenieś"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Nowsze"</string>
+    <string name="older_action" msgid="4504015635360605471">"Starsze"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ DW/UDW"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj DW/UDW"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Załącz plik"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizuj e-maile"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizuj wiadomości e-mail dla tego konta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Wibracje"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Wibracje także po otrzymaniu e-maila"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Zawsze"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tylko po wyciszeniu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nigdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Wibracje"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Wybierz dzwonek"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Ustawienia serwera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Usuń konto"</string>
diff --git a/res/values-pl/uploader.xml b/res/values-pl/uploader.xml
deleted file mode 100644
index c409683..0000000
--- a/res/values-pl/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Autoprzesyłanie"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album autoprzesyłania"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Przesyłanie"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Zakończone"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Wstrzymane"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • Zdjęcia: %2$d • Filmy: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Zdjęcia: %1$d • Filmy: %2$d"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"słaba bateria"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"przekroczono limit miejsca na zdjęcia"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"oczekiwanie na sieć Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"opóźniono do czasu ładowania"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"oczekiwanie na połączenie"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"ponowienie za %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Pokaż oczekujące na przesłanie"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Pokaż przesłane"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Wyświetl online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Pokaż oczekujące na przesłanie"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ukryj oczekujące na przesłanie"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Pokaż szczegóły"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ukryj szczegóły"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Ustawienia"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Przesłano: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Konto"</string>
-    <string name="upload" msgid="2615541458361216022">"Prześlij"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Anuluj"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Przesyłanie do: "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" dla: "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s „%2$s”"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Zainicjowanie przesyłania nie powiodło się."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Plik jest niedostępny."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nie można pobrać informacji o koncie."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Podczas logowania na konto wystąpił problem."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Oczekiwanie na ponowienie"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Oczekiwanie na sieć Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Przesyłanie"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Niepowodzenie"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Ukończono"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"przesyłanie"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"wstrzymano ręcznie"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"wstrzymano – słaba bateria"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"wstrzymano – opóźniono do czasu ładowania"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"wstrzymano – oczekiwanie na połączenie"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"wstrzymano – brak miejsca w PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"wstrzymano – oczekiwanie na sieć Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"wstrzymano – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"oczekiwanie na ponowienie"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 min"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 min"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 min"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Brak połączenia transmisji danych"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Wyczerpano całe miejsce na koncie."</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Nie znaleziono pliku"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Błąd usługi"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Błąd sieci"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Uwierzytelnienie nie powiodło się"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Oczekujące na przesłanie [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Przesłane [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Wstrzymaj przesyłanie"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Wznów przesyłanie"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Prześlij teraz"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Prześlij później"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Nie przesyłaj"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Wyświetl"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Ponów próbę"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Anulowano przesyłanie"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Przesyłanie zostało już zakończone"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Synchronizuj wszystkie"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Ostatnia synchronizacja:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Lista zakończonych elementów jest pusta."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Autoprzesyłanie"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Zakończono przesyłanie"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Wstrzymano przesyłanie"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Nie włączano jeszcze autoprzesyłania."</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Duże pliki będą przesyłane wyłącznie przez sieć Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Skanowanie w poszukiwaniu plików..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Przygotowywanie zdjęć (<xliff:g id="PHOTOCOUNT">%1$d</xliff:g>) i filmów (<xliff:g id="VIDEOCOUNT">%2$d</xliff:g>) do przesłania..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Brak dodatkowych zdjęć i filmów do przesłania."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Podczas komunikacji z serwerem wystąpił problem. Spróbuj ponownie później."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Anulowano synchronizację wszystkich"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synchronizuj wszystkie"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Wyświetl ukończone"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Wyświetl oczekujące"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Ogólne"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Wstrzymaj każde przesyłanie"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Zasilanie"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Przesyłaj tylko podczas ładowania telefonu"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Przesyłaj tylko wówczas, gdy dostępna jest sieć Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Zdjęcia"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Konto"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Warunki przesyłania"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Rozmiar zdjęcia"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Filmy"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Konto"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Do przesyłania filmów zostanie użyte konto zdjęć"</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Warunki przesyłania"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Obecnie używane są ustawienia łączności dotyczące zdjęć"</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Tylko zdjęcia przez sieci komórkowe"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Zdjęcia i filmy przez sieci komórkowe"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Zdjęcia i filmy tylko przez sieć Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Informacje"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Wersja autoprzesyłania"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Zalecane: 1600 pikseli (na potrzeby udostępniania, wydruków i wygaszaczy ekranu)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Rozmiar oryginalny (najwolniejsze przesyłanie)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"wstrzymano – karta SD jest niedostępna"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Karta SD jest niedostępna"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Ustawienia autoprze."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Autoprzesyłanie"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automatycznie przesyłaj nowe zdjęcia i filmy do prywatnego albumu w internecie"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Stan przesyłania"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Zaawansowane"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Przesyłanie z komórki"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Przesyłanie w roamingu"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"W roamingu przesyłaj zdjęcia i filmy przez sieć transmisji danych"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Do naładowania baterii"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Przesyłaj zdjęcia i filmy tylko podczas ładowania"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Prześlij istniejące zdjęcia"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Prześlij teraz wszystkie zdjęcia i filmy z telefonu"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Wyłączone"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Przesyłanie (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d z %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Wstrzymano: dotknij, aby wznowić przesyłanie"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Prześlij istniejące zdjęcia"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Przesyłanie zdjęć i filmów, które nie zostały jeszcze przesłane z telefonu do prywatnego albumu w internecie, może trochę potrwać, ale będzie wykonywane w tle. Czy na pewno chcesz kontynuować?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Tak"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nie"</string>
-</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index afc508b..42242f4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -92,7 +92,7 @@
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Caixa de saída"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Rascunhos"</string>
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Lixo"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviada"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviados"</string>
     <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Correio electrónico não solicitado"</string>
     <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Não lidas"</string>
     <string name="picker_mailbox_name_all_unread" msgid="6392491216581687644">"Caixa de Entrada (não lida(s))"</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chega e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando está em silêncio"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Escolher toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
diff --git a/res/values-pt-rPT/uploader.xml b/res/values-pt-rPT/uploader.xml
deleted file mode 100644
index fe226aa..0000000
--- a/res/values-pt-rPT/uploader.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Carreg. Instantâneo"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Álbum de Carregamento Instantâneo"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"A carregar"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Concluídos"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pausado"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotografias • %3$d vídeos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotografias • %2$d vídeos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"bateria fraca"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"quota de fotografias excedida"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"a aguardar Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"atrasada até carregar"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"a aguardar ligação"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"a tentar novamente em %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Mostrar Carregamentos Pendentes"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Mostrar Carregamentos Concluídos"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Ver On-line"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Mostrar Carregamentos Pendentes"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ocultar Carregamentos Pendentes"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Mostrar Detalhes"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar Detalhes"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Configurações"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Carregados: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Conta"</string>
-    <string name="upload" msgid="2615541458361216022">"fazer upload"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Cancelar"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"A carregar para "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" para "<b>"%s"</b></string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for destination_format (7472552212462849956) -->
-    <skip />
-    <string name="toast_intent_error" msgid="6164928822619692280">"A inicialização do carregamento falhou."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Ficheiro não disponível."</string>
-    <string name="account_error" msgid="1904775271866104941">"Falha na recuperação de informações da conta."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Ocorreu um problema ao iniciar sessão na conta."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"A aguardar nova tentativa"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"A aguardar Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"A carregar"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Falhou"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Concluído"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"a carregar"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"colocada em pausa manualmente"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"em pausa – bateria fraca"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"em pausa – atrasada até carregar"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"em pausa – a aguardar ligação"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"em pausa - fora da quota PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"em pausa – a aguardar Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"em pausa – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"a aguardar nova tentativa"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuto"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minutos"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minutos"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Sem ligação de dados"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"A conta está fora da quota de disco"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Ficheiro não encontrado"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Erro no serviço"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Erro de rede"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Falha na autenticação"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Carregamentos pendentes [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Carregamentos concluídos [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Interromper carregamentos"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Retomar carregamentos"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Carregar agora"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Carregar mais tarde"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Não carregue"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Vista"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Tentar novamente"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Carregamento cancelado"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"O carregamento já terminou"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sincronizar tudo"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Última Sincronização: "\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"A lista de itens concluídos está vazia."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Carreg. Instantâneo"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Carregamentos terminados"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Carregamentos em pausa"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"O Carregamento Instantâneo ainda não foi ativado"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Os ficheiros de grandes dimensões apenas serão carregados através de uma ligação Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"A procurar ficheiros..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"A preparar <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotografias e <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> vídeos para carregamento..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Não é necessário carregar fotografias/vídeos adicionais."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Erro de comunicação com o servidor. Tente novamente mais tarde."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sincronizar todos os cancelados"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sincronizar Tudo"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Ver Concluídos"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Ver Pendentes"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Geral"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Colocar todos os carregamentos em pausa"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Alimentação"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Carregue apenas quando o telemóvel estiver a ser carregado."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Carregar apenas quando a rede Wi-Fi estiver disponível."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotografias"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Conta"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Condições de carregamento"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Tamanho da fotografia"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"# vídeos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Conta"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"A conta de fotografias será utilizada para carregamentos de vídeos."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Condições de carregamento"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"As definições de conetividade de fotografias estão a ser utilizadas agora."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Apenas fotografias através de redes de telemóvel"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotografias e vídeos através de redes de telemóvel"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotografias e vídeos apenas através de Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Sobre"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Versão Carr. Inst."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recomendado: 1600 pixels (para partilha, impressões e proteções de ecrã)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Tamanho original (carregamento mais lento)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"em pausa – cartão SD indisponível"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Cartão SD indisponível"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Def. do Carreg. Inst."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Carreg. Instantâneo"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Carregar automaticamente fotografias e vídeos novos para um álbum Web privado"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Estado do carregamento"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avançado"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Carregamentos móveis"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Carregamentos em roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Carregar fotografias e vídeos em roaming na rede de dados"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Uploads de bateria"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Carregar fotografias e vídeos apenas quando está a carregar"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Carregar fotos existentes"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Carregar todas as fotografias e vídeos existentes no seu telemóvel agora"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Desativada"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
-    <skip />
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"A carregar (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d de %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Em pausa: toque para retomar o carregamento"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Carregar fotografias existentes"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"O carregamento de fotografias e vídeos que ainda não foram carregados do seu telemóvel para um álbum privado na Web pode demorar um bocado, mas será efetuado em segundo plano. Tem a certeza de que pretende continuar?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Sim"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Não"</string>
-</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e6c7814..bf28ec3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chegar e-mails"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando estiver no silencioso"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Selecionar toque"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Configurações do servidor"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
diff --git a/res/values-pt/uploader.xml b/res/values-pt/uploader.xml
deleted file mode 100644
index bf9b379..0000000
--- a/res/values-pt/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Instant Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Álbum do Instant Upload"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Fazendo upload"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Concluído"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pausado"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotos • %3$d vídeos"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotos e %2$d vídeos"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"pouca bateria"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"cota de fotos excedida"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"em roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"aguardando Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"adiado até o carregamento"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"aguardando conexão"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"tentando novamente em %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Mostrar envios pendentes"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Mostrar envios concluídos"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Visualizar on-line"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Mostrar envios pendentes"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ocultar envios pendentes"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Mostrar detalhes"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ocultar detalhes"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Configurações"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Enviado %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Conta"</string>
-    <string name="upload" msgid="2615541458361216022">"Enviar"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Cancelar"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Enviando para "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" para "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Falha na inicialização do envio."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Arquivo não disponível."</string>
-    <string name="account_error" msgid="1904775271866104941">"Falha ao recuperar as informações da conta."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Ocorreu um problema ao fazer login em sua conta."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Aguardando para tentar novamente"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Aguardando Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Fazendo upload"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Falhou"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Concluído"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"fazendo upload"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"pausado manualmente"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"pausado - pouca bateria"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"pausado - adiado até o carregamento"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"pausado - aguardando conexão"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pausado - fora da cota PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"pausado - aguardando Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pausado - roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"aguardando para tentar novamente"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"Um minuto"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"Dois minutos"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"Cinco minutos"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Nenhuma conexão de dados"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"A conta está sem cota de disco"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Arquivo não encontrado"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Erro de serviço"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Erro na rede"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"A autenticação falhou"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Envios pendentes [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Envios concluídos [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pausar envios"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Retomar envios"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Enviar agora"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Enviar mais tarde"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Não enviar"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Visualizar"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Tentar novamente"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Envio cancelado"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Envio já concluído"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sincronizar tudo"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Última sincronização:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"A lista de itens concluídos está vazia."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Instant Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Envios concluídos"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Envios pausados"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"O Instant Upload ainda não foi ativado"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Arquivos grandes serão enviados apenas por uma conexão Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Verificando arquivos..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Preparando <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotos e <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> vídeos para enviar..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Não é necessário enviar fotos ou vídeos adicionais."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Ocorreu um problema ao se conectar ao servidor. Tente novamente mais tarde."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sincronizações canceladas"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sincronizar tudo"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Visualizar itens concluídos"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Visualizar pendentes"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Geral"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pausar todos os envios"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Energia"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Enviar somente quando o telefone estiver carregando."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Enviar somente quando houver Wi-Fi disponível."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotos"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Conta"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Condições de envio"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Tamanho da foto"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Vídeos"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Conta"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"A conta de fotos será usada para envio de vídeos."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Condições de envio"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"As configurações de conectividade de fotos estão sendo utilizadas."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Somente fotos através de redes móveis"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotos e vídeos por redes móveis"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotos e vídeos somente por Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Sobre"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Vers. Instant Upload"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recomendado: 1.600 pixels (para compartilhamento, impressões e protetores de tela)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Tamanho original (envio mais lento)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"pausado - cartão SD indisponível"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Cartão SD indisponível"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Conf. Instant Upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Enviar novas fotos e vídeos automaticamente para um álbum privado na web"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Status de upload"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avançado"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Envios do celular"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Envios de roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Enviar fotos e vídeos quando estiver em roaming na rede de dados"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Uploads de bateria"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Enviar fotos e vídeos apenas quando estiver carregando"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Enviar fotos existentes"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Enviar agora todas as fotos e vídeos existentes em seu telefone"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Desativado"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Enviando (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d de %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pausado: toque para retomar o envio"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Enviar fotos existentes"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"O envio de fotos e vídeos que ainda não tenham sido enviados de seu telefone para um álbum privado na web pode demorar um pouco, mas será feito em segundo plano. Tem certeza de que deseja continuar?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Sim"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Não"</string>
-</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 428d07c..84a7d99 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -558,11 +558,6 @@
     <skip />
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Era vibrar sch\'in e-mail arriva"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Adina"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Mo sche silenzius"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
     <!-- no translation found for account_settings_ringtone (8229878374785575207) -->
     <skip />
     <string name="account_settings_servers" msgid="4925493817981624242">"Parameters dal server"</string>
diff --git a/res/values-rm/uploader.xml b/res/values-rm/uploader.xml
deleted file mode 100644
index 1faf9ef..0000000
--- a/res/values-rm/uploader.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for application_name (7812006268714926951) -->
-    <skip />
-    <!-- no translation found for picasa_default_destination (2052406684123992574) -->
-    <skip />
-    <!-- no translation found for summary_title_uploading (3357617474017589370) -->
-    <skip />
-    <!-- no translation found for summary_title_finished (7775292294989807025) -->
-    <skip />
-    <!-- no translation found for summary_title_paused (8936561302881926595) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_uploading_format (8787409179557302869) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_counts_format (7867903205999702138) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_low_battery (7030423720574078362) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_photos_quota (3057279018089658614) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_roaming (974863046888934062) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_need_wifi (2264018871872109546) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_need_charger (3256171133661659691) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_need_network (1922651711990030201) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_retry_format (3851931944505090119) -->
-    <skip />
-    <!-- no translation found for summary_menu_show_pending (658361192495996) -->
-    <skip />
-    <!-- no translation found for summary_menu_show_finished (8544099132633066086) -->
-    <skip />
-    <!-- no translation found for menu_view_online (6546633605818509942) -->
-    <skip />
-    <!-- no translation found for menu_show_pending_items (8798191388238604213) -->
-    <skip />
-    <!-- no translation found for menu_hide_pending_items (9216079748638469160) -->
-    <skip />
-    <!-- no translation found for menu_show_completed_items (4380487776635859783) -->
-    <skip />
-    <!-- no translation found for menu_hide_completed_items (6126007571523662799) -->
-    <skip />
-    <!-- no translation found for menu_settings (5088116127086866634) -->
-    <skip />
-    <!-- no translation found for format_date_uploaded (803752037646090928) -->
-    <skip />
-    <!-- no translation found for format_progress_percent (1420459750508777491) -->
-    <skip />
-    <!-- no translation found for account (5199161365824352613) -->
-    <skip />
-    <!-- no translation found for upload (2615541458361216022) -->
-    <skip />
-    <!-- no translation found for ok (2516349681897895312) -->
-    <skip />
-    <!-- no translation found for cancel (1207103189404543868) -->
-    <skip />
-    <!-- no translation found for uploading_to (3986362895940069510) -->
-    <skip />
-    <!-- no translation found for uploading_for (1735961974624867111) -->
-    <skip />
-    <!-- no translation found for destination_format (7472552212462849956) -->
-    <skip />
-    <!-- no translation found for toast_intent_error (6164928822619692280) -->
-    <skip />
-    <!-- no translation found for toast_file_error (1315722681020841350) -->
-    <skip />
-    <!-- no translation found for account_error (1904775271866104941) -->
-    <skip />
-    <!-- no translation found for toast_failed_auth (2196450105656960566) -->
-    <skip />
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <!-- no translation found for upload_state_waiting_retry (471790705731784779) -->
-    <skip />
-    <!-- no translation found for upload_state_waiting_wifi (234662717256366625) -->
-    <skip />
-    <!-- no translation found for upload_state_uploading (82854465974176047) -->
-    <skip />
-    <!-- no translation found for upload_state_failed (3799932718800848294) -->
-    <skip />
-    <!-- no translation found for upload_state_completed (5638163990418071018) -->
-    <skip />
-    <!-- no translation found for pause_state_running (711411177620353982) -->
-    <skip />
-    <!-- no translation found for pause_state_manually_paused (4837627990158796573) -->
-    <skip />
-    <!-- no translation found for pause_state_low_battery (3154677586511229063) -->
-    <skip />
-    <!-- no translation found for pause_state_need_charger (5014741655713255815) -->
-    <skip />
-    <!-- no translation found for pause_state_need_connectivity (338696137467815955) -->
-    <skip />
-    <!-- no translation found for pause_state_need_photos_quota (4026149712680343993) -->
-    <skip />
-    <!-- no translation found for pause_state_need_wifi (231858819136516913) -->
-    <skip />
-    <!-- no translation found for pause_state_roaming (1811348200068311099) -->
-    <skip />
-    <!-- no translation found for pause_state_retrying (3734440128828177639) -->
-    <skip />
-    <!-- no translation found for retry_in_1min (2242454935194420914) -->
-    <skip />
-    <!-- no translation found for retry_in_2min (5845688527405283031) -->
-    <skip />
-    <!-- no translation found for retry_in_5min (3153220715959570358) -->
-    <skip />
-    <!-- no translation found for retry_no_data (630347885498641534) -->
-    <skip />
-    <!-- no translation found for account_out_of_quota (1849612079678906607) -->
-    <skip />
-    <!-- no translation found for completed_no_file (6719715000947601844) -->
-    <skip />
-    <!-- no translation found for failed_bad_response (8357723053952213242) -->
-    <skip />
-    <!-- no translation found for failed_network_error (2531660472217573602) -->
-    <skip />
-    <!-- no translation found for failed_server_auth (2428208784689362254) -->
-    <skip />
-    <!-- no translation found for manager_list_switcher_pending_format (3517166351274747172) -->
-    <skip />
-    <!-- no translation found for manager_list_switcher_completed_format (4700366545949687846) -->
-    <skip />
-    <!-- no translation found for manager_pause (7046645023617816964) -->
-    <skip />
-    <!-- no translation found for manager_resume (1608630525599824933) -->
-    <skip />
-    <!-- no translation found for manager_upload_now (2284408578936376342) -->
-    <skip />
-    <!-- no translation found for manager_upload_later (5453932124711705632) -->
-    <skip />
-    <!-- no translation found for manager_do_not_upload (1934417351195364210) -->
-    <skip />
-    <!-- no translation found for manager_view_media (3714544539986850549) -->
-    <skip />
-    <!-- no translation found for manager_retry (939534318469518843) -->
-    <skip />
-    <!-- no translation found for manager_toast_canceled (2331820022556147571) -->
-    <skip />
-    <!-- no translation found for manager_toast_not_canceled (4274246237708259185) -->
-    <skip />
-    <!-- no translation found for manager_sync_all (5207146576940014345) -->
-    <skip />
-    <!-- no translation found for manager_activity_last_sync_format (3521722786363963155) -->
-    <skip />
-    <!-- no translation found for finished_empty (689924777356099393) -->
-    <skip />
-    <!-- no translation found for notify_uploads (8593982942665493037) -->
-    <skip />
-    <!-- no translation found for notify_resolved (8111194870485485674) -->
-    <skip />
-    <!-- no translation found for notify_paused (3999817913227671338) -->
-    <skip />
-    <!-- no translation found for notify_activation_reminder (1639234651193843030) -->
-    <skip />
-    <!-- no translation found for dialog_first_wifi (4318047428346248089) -->
-    <skip />
-    <!-- no translation found for dialog_sync_all_scanning (3175935645776839524) -->
-    <skip />
-    <!-- no translation found for dialog_sync_all_preparing (1666557491871126684) -->
-    <skip />
-    <!-- no translation found for dialog_sync_all_found_none (4066988191364416995) -->
-    <skip />
-    <!-- no translation found for dialog_sync_all_server_error (2177063494820815086) -->
-    <skip />
-    <!-- no translation found for dialog_sync_all_canceled (2595386304244274687) -->
-    <skip />
-    <!-- no translation found for dialog_sync_all_error_title (6227689508729774372) -->
-    <skip />
-    <!-- no translation found for manager_view_completed (5119780300858727185) -->
-    <skip />
-    <!-- no translation found for manager_view_pending (4403346072556950609) -->
-    <skip />
-    <!-- no translation found for preference_category_title_general (330919434495694575) -->
-    <skip />
-    <!-- no translation found for preference_title_pause_all_uploads (4188909974244266321) -->
-    <skip />
-    <!-- no translation found for preference_title_need_power (9165152026296632685) -->
-    <skip />
-    <!-- no translation found for preference_summary_need_power (1829578224249216151) -->
-    <skip />
-    <!-- no translation found for preference_title_need_wifi (2398468701949227352) -->
-    <skip />
-    <!-- no translation found for preference_summary_need_wifi (4627730244549568487) -->
-    <skip />
-    <!-- no translation found for preference_category_title_photos (8558221017057440259) -->
-    <skip />
-    <!-- no translation found for preference_title_photos_account (1235191190019405102) -->
-    <skip />
-    <!-- no translation found for preference_title_photos_upload_connectivity (8026800699913042033) -->
-    <skip />
-    <!-- no translation found for preference_title_photo_size (2291608017215972660) -->
-    <skip />
-    <!-- no translation found for preference_category_title_videos (8962400910793075570) -->
-    <skip />
-    <!-- no translation found for preference_title_videos_account (6675545508568161301) -->
-    <skip />
-    <!-- no translation found for preference_title_videos_account_summary (2925385281151195648) -->
-    <skip />
-    <!-- no translation found for preference_title_videos_upload_connectivity (4029897303763182477) -->
-    <skip />
-    <!-- no translation found for preference_title_videos_upload_connectivity_summary (2228943790654186152) -->
-    <skip />
-    <!-- no translation found for preference_mobile_data_usage_for_photos_only (8047534381344601018) -->
-    <skip />
-    <!-- no translation found for preference_mobile_data_usage_for_all_media (4228623171763750182) -->
-    <skip />
-    <!-- no translation found for preference_mobile_data_usage_never (4887062654163669480) -->
-    <skip />
-    <!-- no translation found for preference_category_title_about (3001183168471659844) -->
-    <skip />
-    <!-- no translation found for preference_title_camera_sync_version (1590760570503808392) -->
-    <skip />
-    <!-- no translation found for photos_upload_dimension_1600 (2261848079760937674) -->
-    <skip />
-    <!-- no translation found for photos_upload_dimension_original (6807552546029109517) -->
-    <skip />
-    <!-- no translation found for pause_state_need_media (3849758767808306320) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_paused_need_media (8674787576306211689) -->
-    <skip />
-    <!-- no translation found for preference_plus_title (8505499389432915393) -->
-    <skip />
-    <!-- no translation found for preference_plus_enable_cs (8946492352805623630) -->
-    <skip />
-    <!-- no translation found for preference_plus_enable_cs_summary (8412139973136041010) -->
-    <skip />
-    <!-- no translation found for preference_plus_upload_status (7925576302519589779) -->
-    <skip />
-    <!-- no translation found for preference_plus_category_advanced (1159923217131890712) -->
-    <skip />
-    <!-- no translation found for preference_plus_mobile_data_connection (5368391437581896915) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_while_roaming (137428136220746649) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_while_roaming_summary (358436280727344717) -->
-    <skip />
-    <!-- no translation found for preference_plus_delay_sync_until_charging (2327042451671101467) -->
-    <skip />
-    <!-- no translation found for preference_plus_delay_sync_until_charging_summary (8613924819421248445) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_all (2563137874388611459) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_all_description (2789041515679642463) -->
-    <skip />
-    <!-- no translation found for summary_subtitle_disabled (8964378166312900703) -->
-    <skip />
-    <!-- no translation found for preference_summary_header_format (8850267704647137239) -->
-    <skip />
-    <!-- no translation found for preference_summary_uploading_percent (3266958005329832043) -->
-    <skip />
-    <!-- no translation found for preference_summary_uploading_format (6092575579212954671) -->
-    <skip />
-    <!-- no translation found for preference_summary_uploading_paused (2413016492323452882) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_all_prompt_title (7677605572146032195) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_all_prompt_text (2215794846784161524) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_all_prompt_yes (4844977073896196919) -->
-    <skip />
-    <!-- no translation found for preference_plus_sync_all_prompt_no (4216190537695947368) -->
-    <skip />
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 107c1a3..b3307de 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Opţiuni de sincronizare"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
     <string name="move_action" msgid="3059189775933985898">"Mutaţi"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Mai noi"</string>
+    <string name="older_action" msgid="4504015635360605471">"Mai vechi"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adăugaţi Cc/Bcc"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Ataşaţi un fişier"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincroniz. e-mailul"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincron. e-mail pt. acest cont"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrare"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrare şi la sosirea mesajelor de e-mail"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Întotdeauna"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Numai când profilul este Silenţios"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niciodată"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrare"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Alegeţi un ton de sonerie"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Setări server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminaţi contul"</string>
diff --git a/res/values-ro/uploader.xml b/res/values-ro/uploader.xml
deleted file mode 100644
index b06fe41..0000000
--- a/res/values-ro/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Încărcare instant"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Albumul de încărcare instant"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Se încarcă"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Finalizate"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Întreruptă"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d (de) fotografii • %3$d (de) videoclipuri"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d (de) fotografii • %2$d (de) videoclipuri"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"baterie descărcată"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"s-a depăşit cota de fotografii"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"se aşteaptă reţeaua Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"amânată până la încărcare"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"se aşteaptă realizarea conexiunii"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"se încearcă din nou în %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Afişaţi încărcările în aşteptare"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Afişaţi încărcările finalizate"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Afişaţi online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Afişaţi încărcările în aşteptare"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ascundeţi încărcările în aşteptare"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Afişaţi detaliile"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ascundeţi detaliile"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Setări"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Încărcat pe %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Cont"</string>
-    <string name="upload" msgid="2615541458361216022">"Încărcaţi"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Anulaţi"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Se încarcă la "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" pentru "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s „%2$s”"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Iniţializarea încărcării nu a reuşit."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Fişierul nu este disponibil."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nu s-au putut prelua informaţiile despre cont."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"A apărut o problemă la conectarea la cont."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Se aşteaptă reîncercarea"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Se aşteaptă reţeaua Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Se încarcă"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Eşuat"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Terminat"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"se încarcă"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"întreruptă manual"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"întreruptă – baterie descărcată"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"întreruptă – amânată până la încărcare"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"întreruptă – se aşteaptă realizarea conexiunii"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"întreruptă - s-a depăşit cota pentru PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"întreruptă – se aşteaptă conectarea Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"întreruptă – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"se aşteaptă reîncercarea"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minut"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minute"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minute"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Nu există o conexiune de date"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Contul dvs. a depăşit spaţiul de stocare pe disc"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Fişierul nu a fost găsit"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Eroare de serviciu"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Eroare de reţea"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Autentificarea nu a reuşit"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Încărcări în aşteptare [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Încărcări finalizate [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Întrerupeţi încărcările"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Reluaţi încărcările"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Încărcaţi acum"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Încărcaţi mai târziu"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Nu încărcaţi"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Afişaţi"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Reîncercaţi"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Încărcarea a fost anulată"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Încărcarea s-a finalizat deja"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sincronizaţi-le pe toate"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Ultima sincronizare:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Lista cu elemente finalizate este goală."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Încărcare instant"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Încărcări finalizate"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Încărcări întrerupte"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Încărcarea instant nu a fost activată încă"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Fişierele mari vor fi încărcate numai printr-o conexiune Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Se scanează pentru fişiere..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Se pregătesc de încărcare <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> (de) fotografii şi <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> (de) videoclipuri..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Nu este necesară încărcarea unor fotografii/videoclipuri suplimentare."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"A apărut o problemă la comunicarea cu serverul. Încercaţi din nou mai târziu."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sincronizarea pentru toate este anulată"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sincronizaţi-le pe toate"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Afişaţi încărcările finalizate"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Afişaţi încărcările în aşteptare"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Generalităţi"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Întrerupeţi toate încărcările"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Reîncărcaţi bateria"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Încărcaţi numai când se încarcă bateria telefonului."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Încărcaţi numai când este disponibilă conexiunea Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotografii"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Cont"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Condiţii de încărcare"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Dimensiunea fotografiei"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videoclipuri"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Cont"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Contul pentru fotografii va fi utilizat pentru încărcările video."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Condiţii de încărcare"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Acum sunt utilizate setările de conectivitate pentru fotografii."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Încărcaţi numai fotografii prin intermediul reţelelor mobile"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotografii şi videoclipuri prin intermediul reţelelor mobile"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotografii şi video numai prin Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Despre"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Vers. încăr. instant"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Recomandat: 1600 pixeli (pentru distribuire, printări şi screensavere)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Dimensiune iniţială (viteză de încărcare minimă)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"întreruptă – card SD indisponibil"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Card SD indisponibil"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Setări încăr. inst."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Încărcare instant"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Încărcaţi în mod automat fotografiile şi videoclipurile noi într-un album web privat"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Starea încărcării"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avansate"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Încărcări mobile"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Încărcări în roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Încărcaţi fotografii şi videoclipuri la utilizarea în roaming în reţeaua de date"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Încărcări pe baterie"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Încărcaţi fotografii şi videoclipuri numai în timpul încărcării bateriei"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Încărcaţi fotografiile existente"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Încărcaţi acum de pe telefon toate fotografiile şi videoclipurile existente"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Dezactivată"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Se încarcă (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d din %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Întreruptă: atingeţi pentru a relua încărcarea"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Încărcaţi fotografiile existente"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Încărcarea fotografiilor şi a videoclipurilor care nu au fost deja încărcate de pe telefon într-un album web privat poate dura un timp, dar se efectuează în fundal. Sigur doriţi să continuaţi?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Da"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nu"</string>
-</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5072dad..17c7eec 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхр. почту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизировать почту этого аккаунта"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибросигнал"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибросигнал при получении сообщения"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Всегда"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Только в режиме без звука"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никогда"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибросигнал"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Выбрать рингтон"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Настройки сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Удалить аккаунт"</string>
diff --git a/res/values-ru/uploader.xml b/res/values-ru/uploader.xml
deleted file mode 100644
index 08dbd9e..0000000
--- a/res/values-ru/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Загрузка с телефона"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Альбом для загрузки с телефона"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Загрузка"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Завершенные"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Приостановлено"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d фото • %3$d видео"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фото • %2$d видео"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"низкий уровень заряда батареи"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"превышена квота на фотографии"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роуминг"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"ожидание подключения Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"приостановлено до зарядки"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"ожидание подключения"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"повторная попытка через %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Показать незавершенные загрузки"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Показать завершенные загрузки"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Просмотреть в Интернете"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Показать незавершенные загрузки"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Скрыть незавершенные загрузки"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Показать подробности"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Скрыть подробности"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Настройки"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Загружено %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Аккаунт"</string>
-    <string name="upload" msgid="2615541458361216022">"Загрузить"</string>
-    <string name="ok" msgid="2516349681897895312">"ОК"</string>
-    <string name="cancel" msgid="1207103189404543868">"Отмена"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Загрузка в "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" для пользователя "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Не удалось начать загрузку."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Файл недоступен."</string>
-    <string name="account_error" msgid="1904775271866104941">"Не удалось получить данные аккаунта."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Не удалось войти в аккаунт."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Ожидание повторной попытки"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Ожидание подключения Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Загрузка"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Сбой"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Завершено"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"загрузка"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"приостановлено вручную"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"приостановлено – низкий уровень заряда батареи"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"приостановлено – до окончания зарядки"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"приостановлено – ожидание подключения"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"приостановлено – превышена квота для Веб-альбомов Picasa"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"приостановлено – ожидание подключения Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"приостановлено – роуминг"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"ожидание повторной попытки"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 минута"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 минуты"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 минут"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Подключение для передачи данных отсутствует"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Превышена дисковая квота для аккаунта"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Файл не найден"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Ошибка службы"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Ошибка сети"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Не удалось выполнить аутентификацию"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Незавершенные загрузки [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Завершенные загрузки (%d)"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Приостановить загрузки"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Продолжить загрузку"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Загрузить"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Загрузить позже"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Не загружать"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Просмотр"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Повторить попытку"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Загрузка отменена"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Загрузка уже завершена"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Синхронизировать все"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Последняя синхронизация: "\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Список завершенных загрузок пуст."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Загрузка с телефона"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Загрузки завершены"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Загрузки приостановлены"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Функция загрузки с телефона еще не активирована"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Большие файлы будут загружаться только через соединение Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Поиск файлов..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Подготовка <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> фото и <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> видео к загрузке..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Дополнительных фотографий или видеороликов не найдено."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Не удалось связаться с сервером. Повторите попытку позже."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Команда \"Синхронизировать все\" отменена"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Синхронизировать все"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Просмотреть завершенные"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Просмотреть незавершенные"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Общие"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Приостановить все загрузки"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Зарядка"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Загружать только во время зарядки телефона."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Загружать только при наличии соединения Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Фото"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Аккаунт"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Условия загрузки"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Размер фото"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Видео"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Аккаунт"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Аккаунт для фотографий будет использоваться для загрузки видео."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Условия загрузки"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Настройки соединения для фотографий в данный момент заняты."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Только фото по мобильной сети"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Фото и видео по мобильной сети"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Фото и видео только по Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Сведения"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Загрузка с телефона"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Рекомендуется: 1600 пикселей (для публикации, распечатки и заставок)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Исходный размер файла (минимальная скорость загрузки)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"приостановлено – отсутствует SD-карта"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-карта недоступна"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Настройки загрузки"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Загрузка с телефона"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Автоматически загружать фотографии и видео в личный веб-альбом"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Статус загрузки"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Дополнительно"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Загрузка с мобильного устройства"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Загрузки в роуминге"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Загружать фото и видео в роуминге по каналу передачи данных"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Загрузка при зарядке"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Загружать фотографии и видео только во время зарядки"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Загрузить имеющиеся фото"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Загрузить все имеющиеся на телефоне фотографии и видеоролики"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Отключено"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Загрузка (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d из %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Приостановлено: нажмите, чтобы продолжить загрузку"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Загрузить существующие фотографии"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Добавление фотографий и видеороликов, не загруженных из телефона в личный веб-альбом, может занять некоторое время. Этот процесс будет выполняться в фоновом режиме. Продолжить?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Да"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Нет"</string>
-</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 06abbd9..f94e592 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -390,12 +390,7 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrovať aj pri príchode e-mailu"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Iba v tichom režime"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrovať"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť vyzváňací tón"</string>
+    <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť tón zvonenia"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrániť účet"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude odstránený z aplikácie E-mail."</string>
diff --git a/res/values-sk/uploader.xml b/res/values-sk/uploader.xml
deleted file mode 100644
index ffbdfd6..0000000
--- a/res/values-sk/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Okamžité odovzdanie"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album Okamžitého odovzdania"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Odovzdáva sa"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Dokončené"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pozastavené"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"Počet fotografií: %1$d%% • %2$d • Počet videí: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Počet fotografií: %1$d • Počet videí: %2$d"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"slabá batéria"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"kvóta pre fotografie bola prekročená"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"čakanie na sieť Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"odložené až do nabitia"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"čaká sa na pripojenie"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"opakovanie o %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Zobraziť čakajúce odovzdania"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Zobraziť dokončené odovzdania"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Zobraziť v režime online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Zobraziť čakajúce odovzdania"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Skryť čakajúce odovzdania"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Zobraziť podrobnosti"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skryť podrobnosti"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Nastavenia"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Odovzdané: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Účet"</string>
-    <string name="upload" msgid="2615541458361216022">"Odovzdať"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Zrušiť"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Odovzdávanie do "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" pre používateľa "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Inicializácia odovzdávania zlyhala."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Súbor nie je k dispozícii."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nepodarilo sa načítať informácie o účte."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Pri prihlasovaní do vášho účtu sa vyskytla chyba."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Čakanie na opakovanie"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Čakanie na sieť Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Prebieha odovzdávanie"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Zlyhanie"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Dokončené"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"odovzdáva sa"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"ručne pozastavené"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"pozastavené – slabá batéria"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"pozastavené – odložené až do nabitia"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"pozastavené – čakanie na pripojenie"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pozastavené - kvóta Webových albumov programu Picasa bola prekročená"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"pozastavené – čakanie na sieť Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pozastavené – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"čaká sa na opakovanie pokusu"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 min."</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 min."</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 min."</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Žiadne dátové pripojenie"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Účet prekročil kvótu priestoru na disku"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Súbor sa nenašiel"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Chyba služby"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Chyba siete"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Overenie zlyhalo"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Čakajúce odovzdávania [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Dokončené odovzdávania [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pozastaviť odovzdávania"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Obnoviť odovzdávania"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Odovzdať"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Odovzdať neskôr"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Neodovzdať"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Zobraziť"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Znova"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Odovzdávanie bolo zrušené"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Odovzdávanie už bolo dokončené"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Synchronizovať všetky"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Posledná synchronizácia:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Zoznam dokončených položiek je prázdny."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Okamžité odovzdanie"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Odovzdávania boli dokončené"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Odovzdávania boli pozastavené"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Okamžité odovzdanie ešte nebolo aktivované"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Veľké súbory budú odovzdané iba prostredníctvom pripojenia Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Prebieha vyhľadávanie súborov..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Prebieha príprava fotografií (počet: <xliff:g id="PHOTOCOUNT">%1$d</xliff:g>) a videí (počet: <xliff:g id="VIDEOCOUNT">%2$d</xliff:g>) na odovzdanie..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Nie je potrebné odovzdať žiadne ďalšie fotografie ani videá."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Pri komunikácii so serverom sa vyskytol problém. Skúste to znova neskôr."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Synchronizácia bola zrušená"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synchronizovať všetky"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Zobraziť dokončené"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Zobraziť čakajúce"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Všeobecné"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pozastaviť všetky odovzdávania"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Napájanie"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Odovzdávať len počas nabíjania telefónu."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Odovzdať, len ak je k dispozícii sieť Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotografie"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Účet"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Podmienky odovzdávania"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Veľkosť fotografie"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videá"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Účet"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Na odovzdanie videí sa použije účet pre fotografie."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Podmienky odovzdávania"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Momentálne sa používajú nastavenia pripojenia pre fotografie."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Pomocou mobilných sietí odovzdávať len fotografie"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotografie a videá cez mobilné siete"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotografie a videá len cez sieť Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"O aplikácii"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Ver. Okamž. odovzd."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Odporúčaná veľkosť: 1 600 pixlov (na zdieľanie, tlač a šetriče obrazovky)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Pôvodná veľkosť (najpomalšie odovzdávanie)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"pozastavené – karta SD nie je k dispozícii"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Karta SD nie je k dispozícii"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Nastavenia funkcie Okamžité odovzdanie"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Okamžité odovzdanie"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Automaticky odovzdávať nové fotografie a videá do súkromného webového albumu"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Stav odovzdania"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Rozšírené"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Odovzdávanie pomocou mobilného dátového pripojenia"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Odovzdávanie pri roamingu"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Odovzdávať fotografie a videá v roamingu v dátovej sieti"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Odovzd. podľa batérie"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Odovzdávať fotografie a videá len počas nabíjania"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Odovzdať fotografie"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Odovzdanie všetkých fotografií a videí z telefónu"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Zakázané"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Prebieha odovzdávanie (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d z %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pozastavené: odovzdávanie obnovíte dotykom"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Odovzdať fotografie"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Odovzdanie neodovzdaných fotografií a videí z telefónu do súkromného albumu na webe môže chvíľu trvať, ale akcia prebehne na pozadí. Chcete pokračovať?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Áno"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nie"</string>
-</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e986652..2f9542d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhroniz. e-pošte"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhroniziraj e-pošto za ta račun"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibriranje"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibriraj tudi, ko prejmem e-pošto"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vedno"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo v tihem načinu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikoli"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibriranje"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Izberite melodijo zvonjenja"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Nastavitve strežnika"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrani račun"</string>
diff --git a/res/values-sl/uploader.xml b/res/values-sl/uploader.xml
deleted file mode 100644
index d7b6591..0000000
--- a/res/values-sl/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Takojšnji prenos"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album za takojšnji prenos"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Prenos"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Končano"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Začasno ustavljeno"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • št. fotografij: %2$d • št. videoposnetkov: %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"št. fotografij: %1$d • št. videoposnetkov: %2$d"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"baterija je skoraj prazna"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"presežena količinska omejitev fotografij"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"gostovanje"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"čakanje na Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"odloženo do polnjenja"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"čakanje na povezavo"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"vnovični poskus čez %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Pokaži čakajoče prenose"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Pokaži končane prenose"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Prikaži v spletu"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Pokaži čakajoče prenose"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Skrij čakajoče prenose"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Pokaži podrobnosti"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Skrij podrobnosti"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Nastavitve"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Preneseno: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Račun"</string>
-    <string name="upload" msgid="2615541458361216022">"Prenesi"</string>
-    <string name="ok" msgid="2516349681897895312">"V redu"</string>
-    <string name="cancel" msgid="1207103189404543868">"Prekliči"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Prenos v "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" za "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Inicializacija prenosa ni uspela."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Datoteka ni na voljo."</string>
-    <string name="account_error" msgid="1904775271866104941">"Podatkov računa ni bilo mogoče prenesti."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Težava pri prijavi v račun."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Čakanje na vnovičen prenos"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Čakanje na povezavo Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Prenos"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Ni uspelo"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Končano"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"prenos"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"ročno ustavljeno"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"začasno ustavljeno – baterija je skoraj prazna"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"začasno ustavljeno – odloženo do polnjenja"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"začasno ustavljeno – čakanje na povezavo"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"začasno ustavljeno - presežena količinska omejitev PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"začasno ustavljeno – čakanje na Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"začasno ustavljeno – gostovanje"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"čakanje na vnovični poskus"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuta"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuti"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minut"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Ni podatkovne povezave"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Račun presega količinsko omejitev diska"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Datoteke ni mogoče najti"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Napaka storitve"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Napaka v omrežju"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Preverjanje pristnosti ni uspelo"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Čakajoči prenosi [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Končani prenosi [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Začasno ustavi prenos"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Nadaljuj prenose"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Prenesi zdaj"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Prenesi pozneje"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Ne prenesi"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Prikaži"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Poskusi znova"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Prenos je bil preklican"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Prenos se je že končal"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sinhroniziraj vse"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Zadnja sinhronizacija:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Seznam končanih elementov je prazen."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Takojšnji prenos"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Prenosi končani"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Prenosi začasno ustavljeni"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Takojšnji prenos še ni aktiviran"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Večje datoteke bodo prenesene le prek povezave Wi-Fi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Iskanje datotek ..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Priprava fotografij (<xliff:g id="PHOTOCOUNT">%1$d</xliff:g>) in videoposnetkov (<xliff:g id="VIDEOCOUNT">%2$d</xliff:g>) za prenos ..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Ni treba prenesti dodatnih fotografij ali videoposnetkov."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Težava pri komunikaciji s strežnikom. Poskusite znova pozneje."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Preklicana sinhroniziracija vsega"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sinhroniziraj vse"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Ogled dokončanih"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Ogled čakajočih"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Splošno"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Začasno ustavi vse prenose"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Polnjenje"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Prenesi samo, ko se baterija telefona polni."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Prenesi samo, ko je na voljo Wi-Fi"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotografije"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Račun"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Pogoji prenosa"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Velikost fotografije"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videoposnetki"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Račun"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Račun za fotografije se bo uporabljal za prenose videoposnetkov."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Pogoji prenosa"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Zdaj se uporabljajo nastavitve povezljivosti fotografij."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Samo fotografije prek mobilnih omrežij"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Prenos fotografij in videoposnetkov po mobilnih omrežjih"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Prenos slik in videov samo prek Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Vizitka"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Razl. takoj. prenosa"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Priporočeno: 1600 slikovnih pik (za deljenje z drugimi, tiskanje in ohranjevalnike zaslona)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Izvirna velikost (najpočasnejši prenos)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"začasno ustavljeno – kartica SD ni na voljo"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Kartica SD ni na voljo"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Nast. takoj. prenosa"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Takojšnji prenos"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Samodejni prenos novih fotografij in videoposnetkov v zasebni spletni album"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Stanje prenosa"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Dodatno"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Prenosi iz mobilne naprave"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Prenosi med gostovanjem"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Prenos fotografij in videoposnetkov med gostovanjem v podatkovnem omrežju"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Prenosi med polnjenjem baterije"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Prenos fotografij in videoposnetkov samo med polnjenjem"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Prenos obstoječih fotografij"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Prenos vseh obstoječih fotografij in videoposnetkov iz telefona"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Onemogočeno"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Prenos (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d od %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Začasno ustavljeno: dotaknite se, da nadaljujete"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Prenos obstoječih fotografij"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Prenos fotografij in videoposnetkov, ki še niso preneseni iz telefona v zasebni spletni album, lahko traja nekaj časa, vendar bo potekal v ozadju. Ali ste prepričani, da želite nadaljevati?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Da"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Ne"</string>
-</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e60095f..70e9124 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхронизуј е-пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизуј е-пошту за овај налог"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибрација"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибрирај и када стигне порука е-поште"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Увек"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само у нечујном режиму"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никад"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибрација"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Изабери мелодију звона"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Подешавања сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Уклони налог"</string>
diff --git a/res/values-sr/uploader.xml b/res/values-sr/uploader.xml
deleted file mode 100644
index 43f162d..0000000
--- a/res/values-sr/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Инстант отпремање"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Албум за Инстант отпремање"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Отпремање"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Завршено"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Паузирано"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d фотографије(а) • %3$d видео сним(а)ка"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фотографије(а) • %2$d видео сним(а)ка"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"слаба батерија"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"премашена је квота за фотографије"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роминг"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"чека се WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"одложено до пуњења"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"чека се веза"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"поновни покушај за %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Прикажи отпремања на чекању"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Прикажи довршена отпремања"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Прикажи на мрежи"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Прикажи отпремања на чекању"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Сакриј отпремања на чекању"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Прикажи детаље"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Сакриј детаље"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Подешавања"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Отпремљено %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Налог"</string>
-    <string name="upload" msgid="2615541458361216022">"Отпреми"</string>
-    <string name="ok" msgid="2516349681897895312">"Потврди"</string>
-    <string name="cancel" msgid="1207103189404543868">"Откажи"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Отпремање на "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" за корисника "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s „%2$s“"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Покретање отпремања није успело."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Датотека није доступна."</string>
-    <string name="account_error" msgid="1904775271866104941">"Преузимање информација о налогу није успело."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Дошло је до проблема приликом пријављивања на налог."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Чека се поновни покушај"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Чека се WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Отпремање"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Није успело"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Завршено"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"отпремање"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"ручно паузирано"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"паузирано – слаба батерија"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"паузирано – одложено до пуњења"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"паузирано – чека се веза"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"паузирано – премашена је квота Picasa веб албума"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"паузирано – чека се wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"паузирано – роминг"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"чека се поновни покушај"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 минут"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 минута"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 минута"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Није успостављена веза за пренос података"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Налог је премашио квоту за диск"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Датотека није пронађена"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Грешка у услузи"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Грешка на мрежи"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Потврда аутентичности није успела"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Отпремања на чекању [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Довршена отпремања [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Паузирај отпремања"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Настави отпремања"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Отпреми одмах"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Отпреми касније"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Не отпремај"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Прикажи"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Покушај поново"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Отпремање је отказано"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Отпремање је већ завршено"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Синхронизуј све"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Последња синхронизација:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Листа довршених ставки је празна."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Инстант отпремање"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Отпремања су завршена"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Отпремања су паузирана"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Инстант отпремањe још увек није активирано"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Велике датотеке ће се отпремати само преко WiFi везе."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Скенирање у потрази за датотекама..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Припрема <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> фотографије(а) и <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> видео сним(а)ка за отпремање..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Није потребно отпремање додатних фотографија/видео снимака."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Дошло је до проблема у комуникацији са сервером. Покушајте поново касније."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Синхронизуј све отказано"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Синхронизација свих ставки"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Приказ је довршен"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Приказ на чекању"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Опште информације"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Паузирање свих отпремања"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Напајање"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Отпремај само када се телефон пуни."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Отпреми само када је Wi-Fi мрежа доступна."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Фотографије"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Налог"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Услови отпремања"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Величина фотографије"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Видео снимци"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Налог"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Налог за фотографије ће користити видео отпремања."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Услови отпремања"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"За сада се користе подешавања веза са фотографијама."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Само фотографије преко мобилних мрежа"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Фотографије и видео снимци преко мобилних мрежа"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Слике и видео само преко Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Основни подаци"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Са Инстант отпремањем"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Препоручено: 1600 пиксела (за дељење, штампање и позадине)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Оригинална величина (најспорије отпремање)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"паузирано – SD картица је недоступна"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD картица је недоступна"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Подешавања Инстант отпремања"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Инстант отпремање"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Аутоматско отпремање нових фотографија и видео снимака у приватни веб албум"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Статус отпремања"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Напредна подешавања"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Отпремања са мобилног уређаја"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Отпремања у ромингу"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Отпремање фотографија и видео снимака када сте у ромингу преко мреже за пренос података"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Отпремања током пуњења батерије"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Отпремање фотографија и видео снимака само током пуњења"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Отпремање постојећих фотографија"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Отпремање свих постојећих фотографија и видео снимака са телефона"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Онемогућено"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Отпремање (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d од %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Паузирано: додирните да бисте наставили отпремање"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Отпремање постојећих фотографија"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Отпремање фотографија и видео снимака који нису до сада отпремљени са телефона у приватни албум на Вебу може мало да потраје, али ће се обавити у позадини. Да ли заиста желите да наставите?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Да"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Не"</string>
-</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f755b38..278cbfc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -31,7 +31,7 @@
     <string name="reply_action" msgid="4262472229221507619">"Svara"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Svara alla"</string>
     <string name="delete_action" msgid="8421026208288857155">"Ta bort"</string>
-    <string name="forward_action" msgid="669174181042344116">"Framåt"</string>
+    <string name="forward_action" msgid="669174181042344116">"Vidarebefordra"</string>
     <string name="favorite_action" msgid="4664259801498253756">"Stjärnmärk"</string>
     <string name="done_action" msgid="7497990549515580249">"Klar"</string>
     <string name="create_action" msgid="3062715563215392251">"Skapa nytt"</string>
@@ -158,7 +158,7 @@
     <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Det gick inte att spara bilagan."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Obs! En eller flera bilagor i det vidarebefordrade meddelandet hämtas innan de skickas."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Meddelande"</string>
-    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Bjud in"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inbjudan"</string>
   <plurals name="message_view_show_attachments_action">
     <item quantity="one" msgid="7594476368958824007">"Bilaga <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
     <item quantity="other" msgid="974463163535515223">"Bilagor <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronisera e-post"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronisera e-post för det här kontot"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrera"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrerar även vid inkommande e-post"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Bara vid tyst"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrera"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Välj ringsignal"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Serverinställningar"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ta bort konto"</string>
diff --git a/res/values-sv/uploader.xml b/res/values-sv/uploader.xml
deleted file mode 100644
index af8cfcb..0000000
--- a/res/values-sv/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Direktöverföring"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album för direktöverföring"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Överför"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Slutförda"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Pausad"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foton • %3$d videor"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foton • %2$d videor"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"svagt batteri"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"bildkvoten har överskridits"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"väntar på Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"fördröjs tills laddaren ansluts"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"väntar på anslutning"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"försöker igen om %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Visa väntande överföringar"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Visa slutförda överföringar"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Visa online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Visa väntande överföringar"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Dölj väntande överföringar"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Visa detaljer"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Dölj detaljer"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Inställningar"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Överförde %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Konto"</string>
-    <string name="upload" msgid="2615541458361216022">"Överför"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Avbryt"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Överför till "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" för "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Det gick inte att initiera överföringen."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Filen är inte tillgänglig."</string>
-    <string name="account_error" msgid="1904775271866104941">"Det gick inte att ta emot kontoinformation."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Ett problem uppstod när du skulle logga in på ditt konto."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Väntar på nytt försök"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Väntar på Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Överförs"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Misslyckades"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Slutförd"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"överför"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"manuellt pausad"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"pausad – svagt batteri"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"pausad – fördröjs tills laddaren ansluts"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"pausad – väntar på anslutning"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pausad - utanför PWA-kvot"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"pausad – väntar på Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"pausad – roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"väntar på nytt försök"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minut"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuter"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minuter"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Ingen dataanslutning"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Kontots diskkvot är slut"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Filen hittades inte"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Fel på tjänsten"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Nätverksfel"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Autentiseringen misslyckades"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Väntande överföringar [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Slutförda överföringar [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Pausa överföringar"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Återuppta överföring"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Överför nu"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Överför senare"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Överför inte"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Visa"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Försök igen"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Överföringen har avbrutits"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Överföringen är redan slutförd"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Synka alla"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Senaste synkroniseringen:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Listan över slutförda objekt är tom."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Direktöverföring"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Överföring slutförd"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Paus i överföringen"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Direktöverföring har inte aktiverats än"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Stora videoklipp överförs bara via en Wi-Fi-anslutning."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Söker efter filer ..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foton och <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videor förbereds för överföring ..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Inga fler foton/videoklipp behöver överföras."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Det gick inte att kontakta servern. Försök igen senare."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Synka alla avbröts"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synka alla"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Visa slutförda"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Visa väntande"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Allmänt"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pausa alla överföringar"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Ladda"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Överför endast när telefonen laddas."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Överför endast när Wi-Fi är tillgängligt."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Foton"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Konto"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Villkor för överföring"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Fotostorlek"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videor"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Konto"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Kontot för foton används vid överföring av videoklipp."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Villkor för överföring"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Anslutningsinställningarna för foton används för närvarande."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Foton endast via mobila nätverk"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Överför bilder och videor via mobila nätverk"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Bilder och videor endast via Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Om"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Direktöverföring, v."</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Rekommenderas: 1600 pixlar (för delning, utskrifter och skärmsläckare)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Ursprunglig storlek (långsam överföring)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"pausad – SD-kortet är inte tillgängligt"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kortet är inte tillgängligt"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Direktöverf.inst."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Direktöverföring"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Överför nya bilder och videor till ett privat webbalbum automatiskt"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Överföringsstatus"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avancerat"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobilöverföringar"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Överföring vid roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Överför bilder och videor under roaming"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Batteriladdning"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Överför bilder och videor endast när batteriet laddas"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Överför befintliga foton"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Överför alla befintliga bilder och videor från telefonen nu"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Inaktiverad"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Överför (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d av %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pausad: Tryck om du vill återuppta överföringen."</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Överför befintliga foton"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Det kan ta en stund att överföra foton och videor som inte redan har överförts från mobilen till ett privat album på webben, men det sker i bakgrunden. Vill du fortsätta?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ja"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nej"</string>
-</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6515cc0..63c2fc4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -337,7 +337,7 @@
     <string name="account_setup_failed_security" msgid="925820957665764964">"Haiwezi kufungua muunganisho kwa seva kwa sababu ya hitilafu ya kiusalama."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Haiwezi kufungua muunganisho kwa seva."</string>
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Uliingiza anwani ya seva isiyo sahihi au seva inahitaji toleo la itifaki ambalo haiauniwi na Barua pepe."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Hauna idhini ya kulandanisha kwa seva hii. Tafadhali wasiliana na msimamizi wako wa seva kwa maelezo zaidi."</string>
+    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Hauna idhini ya kusawazisha kwa seva hii. Tafadhali wasiliana na msimamizi wako wa seva kwa maelezo zaidi."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Udhibiti wa usalama kutoka mbali"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Seva <xliff:g id="SERVER">%s</xliff:g> inahitaji uiruhusu kudhibiti kwa umbali baadhi ya vipengele vya usalama vya simu yako. Ungependa kumaliza kuweka mipangilio ya akaunti hii?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Seva hii inahitaji vipengele vya usalama ambavyo kifaa chako cha Android haiauni, ikijumlisha: <xliff:g id="ERROR">%s</xliff:g>"</string>
@@ -387,14 +387,9 @@
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sawazisha anwani za akaunti hii"</string>
     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sawazisha Kalenda"</string>
     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sawazisha kalenda ya akaunti hii"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Landanisha barua pepe"</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sawazisha barua pepe"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sawazisha barua pepe za akaunti hii"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tetema"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Pia tetema barua pepe inapofika"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Kila wakati"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kukiwa kimya tu"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Katu"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Tetema"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Chagua toni ya mlio"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Mipangilio ya seva"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ondoa akaunti"</string>
diff --git a/res/values-sw/uploader.xml b/res/values-sw/uploader.xml
deleted file mode 100644
index 9544b3e..0000000
--- a/res/values-sw/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Upakiaji wa Papo Hapo"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Albamu ya Kupakia Papo Hapo"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Inapakia"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Imemaliza"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Imepumzishwa"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • picha %2$d • video %3$d"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"Picha %1$d • video %2$d"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"betri iko chini"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"inazidi nafasi ya picha"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"urandaji"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"inasubiri mtandao-hewa"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"imecheleweshwa hadi itakapochaji"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"inasubiri muunganisho"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"inajaribu upya katika %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Onyesha Vipakizi Vinavyosubiri"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Onyesha Vipakuzi Vilivyokamilishwa"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Tazama kwenye wavuti"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Onyesha Vipakuzi Vinavyosubiri"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ficha Vipakiaji Vinavyosubiri"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Onyesha Maelezo"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ficha Maelezo"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Mipangilio"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Imepakia %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"Kishika nafasi<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Akaunti"</string>
-    <string name="upload" msgid="2615541458361216022">"Pakia"</string>
-    <string name="ok" msgid="2516349681897895312">"Sawa"</string>
-    <string name="cancel" msgid="1207103189404543868">"Ghairi"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Inapakia kwa "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" kwa "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Imeshindwa kuanzisha upakiaji."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Faili haipatikani."</string>
-    <string name="account_error" msgid="1904775271866104941">"Imeshindwa kuepua maelezo ya akaunti"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Kulikuwa na tatizo la kuingia kwenye akaunti yako."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Inasubiri kujaribu tena"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Inasubiri Mtandao-hewa"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Inapakia"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Imeshindwa"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Imekamilika"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"inapakia"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"imepumzishwa kwa mikono"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"imepumzishwa - betri iko chini"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"imepumzishwa - imecheleweshwa hadi itakapochaji"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"imepumzishwa - inasubiri muunganisho"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"imepumzishwa - nafasi ya PWA imekwisha"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"iimepumzishwa - inasubiri mtandao-hewa"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"imepumzishwa - urandaji"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"inasubiri kujaribu upya"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"Dakika 1"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"Dakika 2"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"Dakika 5"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Hakuna muunganisho wa data"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Nafasi ya diski ya akaunti imeisha"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Faili haikupatikana"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Hitilafu ya huduma"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Hitilafu ya mtandao"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Imeshindwa kuhalalisha"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Imeshikilia vipakia [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Imemaliza kupakia [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Sitisha upakiaji"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Endelea kupakia"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Pakiza sasa"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Pakia baadaye"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Usipakie"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Tazama"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Jaribu tena"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Upakiaji umeghairiwa"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Upakiaji umekamilika tayari"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Sawazisha zote"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Usawazishaji wa Mwisho:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Orodha ya vipengee vilivyokamilika iko tupu."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Upakiaji wa Papo hapo"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Upakiaji umekamilika"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Upakiaji umepumzishwa"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Upakiaji wa papo hapo bado haujawashwa"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Faili kubwa zitapakia kupitia kwa muunganisho wa Wi-Fi pekee."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Inatafuta faili..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Inaandaa kupakia picha<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> na video  za kupakiwa <xliff:g id="VIDEOCOUNT">%2$d</xliff:g>..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Hakuna picha/video za ziada zinazphitaji kupakiwa."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Kulikuwa na tatizo la kuwasiliana na seva. Tafadhali jaribu tena baadaye."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Sawazisha zote zilizoghairiwa"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Sawazisha Zote"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Mwonekano umekamilika"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Tazama zinazosubiri"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Kawaida"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Sitisha vipakizi vyote"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Nishati"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Pakia wakati simu yako inapochajiwa tu."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Mtandao-hewa"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Pakia tu wakati Mtandao-hewa unapatikana."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Picha"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Akaunti"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Masharti ya kupakia"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Ukubwa wa picha"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Video"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Akaunti"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Akaunti ya picha itatumiwa kwa upakiaji wa video."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Masharti ya kupakia"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Mipangilio ya uunganishaji wa picha inatumiwa kwa sasa."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Picha kupitia mitandao ya simu pekee"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Picha na video &amp; kupitia mitandao ya simu ya mkononi"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Picha na video &amp; kupitia Mtandao hewa pekee"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Kuhusu"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Toleo la Kupakia Papo Hapo"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Inapendekezwa: Pikseli 1600 (ya kushiriki, kuchapisha na taswira za skrini)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Ukubwa asilia (upakizi wa pole)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"imepumzishwa - Kadi ya SD haipatikani"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Kadi ya SD haipatikani"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Mipangilio ya Kupakiza moja kwa moja"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Kupakia Moja kwa moja"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Pakiza otomatiki picha mpya na video &amp; kwa albamu faragha ya wavuti"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Hali ya kupakia"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Mahiri"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Vipakizi vya simu ya mkononi"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Vipakizi vya urandaji"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Pakia picha na video za na; wakati  wa urandaji katika mtandao wa data"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Vipakizi vya betri"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Pakia picha na video na; viedo pekee unapochaji"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Pakia picha zilizopo"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Pakia picha zozote zilizopo na video kutoka kwenye simu yako sasa"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Imelemazwa"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Inapakia (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d kati ya %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pumzishwa: gusa ili kuendelea na upakiaji"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Pakia picha zilizopo"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Kupakia picha na video ambazo tayari hazijapakiwa kutoka kwenye simu yako kwa albamu faragha ya wavuti kunaweza kuchukua muda, lakini kutafanyika katika usuli. Una hakika unataka kuendelea?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ndiyo"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"La"</string>
-</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d9d659b..0b6e1e7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ซิงค์อีเมล"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ซิงค์อีเมลสำหรับบัญชีนี้"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"สั่น"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"สั่นเมื่อมีอีเมลเข้า"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ทุกครั้ง"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"เฉพาะเมื่อปิดเสียง"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"ไม่ต้องเลย"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"สั่น"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"เลือกเสียงเรียกเข้า"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"การตั้งค่าเซิร์ฟเวอร์"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"ลบบัญชี"</string>
diff --git a/res/values-th/uploader.xml b/res/values-th/uploader.xml
deleted file mode 100644
index 3c4cd2d..0000000
--- a/res/values-th/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"อัปโหลดทันใจ"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"อัลบั้มอัปโหลดทันใจ"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"กำลังอัปโหลด"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"เสร็จสิ้น"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"หยุดชั่วคราว"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d ภาพ • %3$d วิดีโอ"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d ภาพ • %2$d วิดีโอ"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"แบตเตอรี่อ่อน"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"รูปภาพเกินโควต้าแล้ว"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"โรมมิ่ง"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"กำลังรอ WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"ล่าช้าจนกว่าจะมีการชาร์จ"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"กำลังรอการเชื่อมต่อ"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"กำลังลองใหม่ใน %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"แสดงการอัปโหลดที่ค้างอยู่"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"แสดงการอัปโหลดที่เสร็จสิ้น"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"ดูออนไลน์"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"แสดงการอัปโหลดที่ค้างอยู่"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"ซ่อนการอัปโหลดที่ค้างอยู่"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"แสดงรายละเอียด"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"ซ่อนรายละเอียด"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"การตั้งค่า"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"อัปโหลดแล้ว %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"บัญชี"</string>
-    <string name="upload" msgid="2615541458361216022">"อัปโหลด"</string>
-    <string name="ok" msgid="2516349681897895312">"ตกลง"</string>
-    <string name="cancel" msgid="1207103189404543868">"ยกเลิก"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"กำลังอัปโหลดไปยัง "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" สำหรับ "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"การเริ่มต้นอัปโหลดล้มเหลว"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"ไฟล์ใช้งานไม่ได้"</string>
-    <string name="account_error" msgid="1904775271866104941">"เรียกดูข้อมูลบัญชีไม่สำเร็จ"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"พบปัญหาในการลงชื่อเข้าใช้บัญชีของคุณ"</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"กำลังรอที่จะลองอีกครั้ง"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"กำลังรอ WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"กำลังอัปโหลด"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"ล้มเหลว"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"เสร็จสิ้น"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"กำลังอัปโหลด"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"หยุดชั่วคราวด้วยตนเอง"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"หยุดชั่วคราว - แบตเตอรี่อ่อน"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"หยุดชั่วคราว - ล่าช้าจนกว่าจะมีการชาร์จ"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"หยุดชั่วคราว - กำลังรอการเชื่อมต่อ"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"หยุดชั่วคราว - หมดโควต้า PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"หยุดชั่วคราว - กำลังรอ WiFi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"หยุดชั่วคราว - โรมมิ่ง"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"กำลังรอที่จะลองอีกครั้ง"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 นาที"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 นาที"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 นาที"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"ไม่มีการเชื่อมต่อข้อมูล"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"ไม่มีโควต้าดิสก์สำหรับบัญชีแล้ว"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"ไม่พบไฟล์"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"ข้อผิดพลาดของบริการ"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"ข้อผิดพลาดของเครือข่าย"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"การตรวจสอบสิทธิ์ล้มเหลว"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"อัปโหลดที่ค้างอยู่ [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"อัปโหลดเสร็จสมบูรณ์ [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"หยุดการอัปโหลดชั่วคราว"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"อัปโหลดต่อ"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"อัปโหลดเดี๋ยวนี้"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"อัปโหลดภายหลัง"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"ไม่อัปโหลด"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"ดู"</string>
-    <string name="manager_retry" msgid="939534318469518843">"ลองอีกครั้ง"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"ยกเลิกการอัปโหลดแล้ว"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"การอัปโหลดเสร็จแล้ว"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"ซิงค์ทั้งหมด"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"ซิงค์ครั้งล่าสุด:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"ไม่มีรายการใดที่เสร็จสิ้น"</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"อัปโหลดทันใจ"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"การอัปโหลดเสร็จแล้ว"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"หยุดการอัปโหลดไว้ชั่วคราว"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"ยังไม่ได้เปิดใช้งานการอัปโหลดทันใจ"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"ไฟล์ขนาดใหญ่จะได้รับการอัปโหลดผ่านการเชื่อมต่อ WiFi เท่านั้น"</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"กำลังสแกนหาไฟล์..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"กำลังเตรียมภาพ <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> ภาพและวิดีโอ <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> รายการสำหรับอัปโหลด..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"ไม่มีรูปภาพ/วิดีโอใดที่จำเป็นต้องอัปโหลดเพิ่มเติม"</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"เกิดปัญหาในการสื่อสารกับเซิร์ฟเวอร์ โปรดลองอีกครั้งในภายหลัง"</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"ยกเลิกการซิงค์ทั้งหมดแล้ว"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"ซิงค์ทั้งหมด"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"ดูรายการที่เสร็จสมบูรณ์"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"ดูรายการที่ค้างอยู่"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"ทั่วไป"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"หยุดการอัปโหลดทั้งหมดชั่วคราว"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"พลังงาน"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"อัปโหลดเฉพาะเมื่อชาร์จโทรศัพท์อยู่"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"อัปโหลดเฉพาะเมื่อ Wi-Fi ใช้งานได้"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"รูปภาพ"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"บัญชี"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"เงื่อนไขการอัปโหลด"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"ขนาดภาพ"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"วิดีโอ"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"บัญชี"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"บัญชี Photos จะถูกใช้ในการอัปโหลดวิดีโอ"</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"เงื่อนไขการอัปโหลด"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"ใช้การตั้งค่าการเชื่อมต่อภาพอยู่ในปัจจุบัน"</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"เฉพาะภาพผ่านทางเครือข่ายมือถือเท่านั้น"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"รูปภาพและวิดีโอผ่านทางเครือข่ายมือถือ"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"รูปภาพและวิดีโอผ่าน Wi-Fi เท่านั้น"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"เกี่ยวกับ"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"รุ่นอัปโหลดทันใจ"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"ขอแนะนำ: 1600 พิกเซล (สำหรับการแบ่งปัน การพิมพ์ และโปรแกรมรักษาหน้าจอ)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"ขนาดดั้งเดิม (อัปโหลดช้าที่สุด)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"หยุดชั่วคราว - ไม่มีการ์ด SD"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"ไม่มีการ์ด SD"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"ตั้งค่าอัปโหลดทันใจ"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"อัปโหลดทันใจ"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"อัปโหลดรูปภาพและวิดีโอใหม่ไปยังอัลบั้มส่วนตัวบนเว็บโดยอัตโนมัติ"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"สถานะการอัปโหลด"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"ขั้นสูง"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"การอัปโหลดทางมือถือ"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"การอัปโหลดขณะโรมมิ่ง"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"อัปโหลดรูปภาพและวิดีโอเมื่อโรมมิ่งบนเครือข่ายข้อมูล"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"อัปโหลดขณะชาร์จแบต"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"อัปโหลดรูปภาพและวิดีโอเมื่อชาร์จเท่านั้น"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"อัปโหลดรูปภาพที่มีอยู่"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"อัปโหลดรูปภาพและวิดีโอที่มีอยู่จากโทรศัพท์ของคุณเดี๋ยวนี้"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"ปิดใช้งานแล้ว"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"กำลังอัปโหลด (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d จาก %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"หยุดชั่วคราว: แตะเพื่ออัปโหลดต่อ"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"อัปโหลดรูปภาพที่มีอยู่"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"การอัปโหลดรูปภาพและวิดีโอซึ่งยังไม่ได้รับการอัปโหลดจากโทรศัพท์ของคุณไปยังอัลบั้มส่วนตัวบนเว็บอาจใช้เวลานาน แต่จะดำเนินการในเบื้องหลัง คุณต้องการดำเนินการต่อหรือไม่"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"ใช่"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"ไม่"</string>
-</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6a1ec3b..47766ec 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"I-sync ang email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"I-sync ang email sa account na ito"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"I-vibrate"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"I-vibrate rin kapag dumating ang email"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Palagi"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kapag tahimik lang"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hindi kailanman"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"I-vibrate"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Pumili ng ringtone"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Mga setting ng server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alisin ang account"</string>
diff --git a/res/values-tl/uploader.xml b/res/values-tl/uploader.xml
deleted file mode 100644
index 157de85..0000000
--- a/res/values-tl/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Instant na Upload"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album sa Instant na Upload"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Ina-upload"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Tapos na"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Naka-pause"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d (na) larawan • %3$d (na) video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d (na) larawan • %2$d (na) video"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"mahinang baterya"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"lumampas sa quota ng mga larawan"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"naghihintay ng WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"nakaantala hanggang sa pag-charge"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"naghihintay ng koneksyon"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"muling sinusubukan sa %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Ipakita ang Mga Nakabinbing Pag-upload"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Ipakita ang Mga Tapos nang Pag-upload"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Tingnan Online"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Ipakita ang Mga Nakabinbing Pag-upload"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Itago ang Mga Nakabinbing Pag-upload"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Ipakita ang Mga Detalye"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Itago ang Mga Detalye"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Mga Setting"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Na-upload %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Account"</string>
-    <string name="upload" msgid="2615541458361216022">"I-upload"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Kanselahin"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Ina-upload sa "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" para sa "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Nabigo ang pagsisimula ng pag-upload."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Hindi available ang file."</string>
-    <string name="account_error" msgid="1904775271866104941">"Nabigong bawiin ang impormasyon ng account."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Nagkaroon ng problema sa pag-sign in sa iyong account."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Naghihintay na muling subukan"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Naghihintay ng WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Nag-a-upload"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Nabigo"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Nakumpleto"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"ina-upload"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"manu-manong na-pause"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"naka-pause - mahinang baterya"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"naka-pause - nakaantala hanggang sa pag-charge"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"naka-pause - naghihintay ng koneksyon"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"naka-pause - wala na sa quota ng PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"naka-pause - naghihintay ng wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"naka-pause - roaming"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"naghihintay na muling subukan"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 minuto"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 minuto"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 minuto"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Walang koneksyon sa data"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Ang account ay wala na sa quota ng disk"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Hindi nakita ang file"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Error sa serbisyo"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Error sa network"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Nabigo ang pagpapatotoo"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Mga nakabinbing pag-upload [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Mga nakumpletong pag-upload [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"I-pause ang mga pag-upload"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Ipagpatuloy ang mga pag-upload"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"I-upload ngayon"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"I-upload sa ibang pagkakataon"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Huwag i-upload"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Tingnan"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Subukang Muli"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Kinansela ang pag-upload"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Tapos na ang pag-upload"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"I-sync ang lahat"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Huling Pa-sync:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Walang laman ang listahan ng mga tapos nang item."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Instant na Upload"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Tapos na ang mga pag-upload"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Naka-pause ang mga pag-upload"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Hindi pa naa-activate ang Instant na Upload"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Maa-upload ang mga malalaking file sa koneksyon ng Wi-Fi lamang."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Nag-i-i-scan ng mga file..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Ihinahanda ang <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> (na) larawan at <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> (na) video para sa pag-upload..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Walang mga karagdagang larawan/video ang kailangang i-upload."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Nagkaroon ng problema sa pakikipag-ugnayan sa server. Pakisubukang muli sa ibang pagkakataon."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Kinansela ang pag-sync sa lahat"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"I-sync ang Lahat"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Nakumpleto ang Pagtingin"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Tingnan ang Nakabinbin"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Pangkalahatan"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"I-pause ang lahat ng pag-upload"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Power"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Mag-upload lamang kapag naka-charge ang telepono."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Mag-upload lamang kapag available ang Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Mga Larawan"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Account"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Mga kondisyon sa pag-upload"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Laki ng larawan"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Mga Video"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Account"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Ang account ng mga larawan ay magiging mga gamit nang pag-upload ng video."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Mga kondisyon sa pag-upload"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Ginagamit sa ngayon ang mga setting ng pagkakakonekta ng mga larawan."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Mga larawan lamang sa pamamagitan ng mga mobile network"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Mga larawan &amp; video sa pamamagitan ng mga mobile network"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Mga larawan &amp; video sa pamamagitan lamang ng Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Tungkol sa"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Bersyon ng Instant na Upload"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Inirerekomenda: 1600 pixel (para sa pagbabahagi, pag-print at mga screensaver)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Orihinal na laki (pinakamabagal na pag-upload)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"naka-pause - hindi available ang SD card"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Hindi available ang SD card"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Mga setting ng Instant na Upload"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Instant na Upload"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Awtomatikong mag-upload ng mga bagong larawan &amp; video sa isang pribadong album sa web"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Katayuan ng pag-upload"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Advanced"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mga upload sa mobile"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Mga upload sa roaming"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Mag-upload ng mga larawan &amp; video kapag nagro-roam sa network ng data"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Mga upload sa baterya"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Mag-upload ng mga larawan &amp; video kapag naka-charge lamang"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"I-upload ang mga umiiral nang larawan"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Mag-upload ngayon ng anumang mga umiiral nang larawan &amp; video mula sa iyong telepono"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Hindi Pinapagana"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Ina-upload (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">"%1$d ng %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Naka-pause: pindutin upang ipagpatuloy ang pag-upload"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"I-upload ang mga umiiral nang larawan"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Ang pag-upload ng mga larawan at video na hindi pa naa-upload mula sa iyong telepono sa isang pribadong album sa web ay maaaring tumagal nang ilang sandali, ngunit gagawin sa background. Sigurado ka bang nais mong magpatuloy?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Oo"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Hindi"</string>
-</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8d75772..6a575bd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-postayı senk. et"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Bu hesaba ilişkin e-postaları senkronize et"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Titreşim"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"E-posta geldiğinde aynı zamanda titret"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Her zaman"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Yalnızca sessizken"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hiçbir zaman"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Titreşim"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Zil sesi seçin"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Sunucu ayarları"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hesabı kaldır"</string>
diff --git a/res/values-tr/uploader.xml b/res/values-tr/uploader.xml
deleted file mode 100644
index 1c367db..0000000
--- a/res/values-tr/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Hızlı Yükleme"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Hızlı Yükleme Albümü"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Yükleniyor"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Tamamlandı"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Duraklatıldı"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d fotoğraf %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d fotoğraf • %2$d video"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"düşük pil"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"fotoğraf kotası aşıldı"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"dolaşımda"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"Kablosuz bekleniyor"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"şarj edilene kadar ertelendi"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"bağlantı bekleniyor"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"%s içinde yeniden deneniyor"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Bekleyen Yüklemeleri göster"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Tamamlanan Yüklemeleri göster"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Çevrimiçi Görüntüle"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Bekleyen Yüklemeleri göster"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Bekleyen Yüklemeleri gizle"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Ayrıntıları Göster"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ayrıntıları Gizle"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Ayarlar"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Yükleme tarihi: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Hesap"</string>
-    <string name="upload" msgid="2615541458361216022">"Yükle"</string>
-    <string name="ok" msgid="2516349681897895312">"TAMAM"</string>
-    <string name="cancel" msgid="1207103189404543868">"İptal"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Şuraya yükleniyor: "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" "<b>"%s"</b>" için"</string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Yükleme başlatılamadı."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Dosya kullanılamıyor."</string>
-    <string name="account_error" msgid="1904775271866104941">"Hesap bilgileri alınamadı."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Hesabınızda oturum açılırken bir sorun oluştu."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Tekrar denemek için bekliyor"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Kablosuz bekleniyor"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Yükleniyor"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Başarısız"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Tamamlandı"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"yükleniyor"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"el ile durduruldu"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"duraklatıldı - düşük pil"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"duraklatıldı - şarj edilene kadar ertelendi"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"duraklatıldı - bağlantı bekleniyor"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"duraklatıldı - PWA kotası doldu"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"duraklatıldı - kablosuz bekleniyor"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"duraklatıldı - dolaşımda"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"tekrar denemek için bekleniyor"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 dakika"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 dakika"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 dakika"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Veri bağlantısı yok"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Hesabın disk kotası doldu"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Dosya bulunamadı"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Hizmet hatası"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Ağ hatası"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Kimlik doğrulaması başarısız oldu"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Bekleyen yüklemeler [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Tamamlanan yüklemeler [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Yüklemeleri duraklat"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Yüklemeleri devam ettir"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Şimdi yükle"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Daha sonra yükle"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Yükleme"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Görüntüle"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Tekrar dene"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Yükleme iptal edildi"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Yükleme zaten tamamlandı"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Tümünü senkronize et"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Son Senkronizasyon:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Tamamlanmış öğeler listesi boş."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Hızlı Yükleme"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Yüklemeler tamamlandı"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Yüklemeler duraklatıldı"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Hızlı Yükleme henüz etkinleştirilmedi"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Büyük boyutlu dosyalar yalnızca Kablosuz bağlantı kullanılarak yüklenecektir."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Dosyalar taranıyor..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> fotoğraf ve <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video yüklenmek üzere hazırlanıyor..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Yüklenmesi gereken başka fotoğraf/video yok."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Sunucuyla iletişimde bir sorun oluştu. Lütfen daha sonra tekrar deneyin."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Tümünü senkronize etme işlemi iptal edildi"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Tümünü Senkronize Et"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Tamamlananları Görüntüle"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Bekleyenleri Göster"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Genel"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Tüm yüklemeleri duraklat"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Güç"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Yalnızca telefon şarj olurken yükle."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Kablosuz"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Yalnızca Kablosuz müsait olduğunda yükle."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Fotoğraflar"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Hesap"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Yükleme koşulları"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Fotoğraf boyutu"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Videolar"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Hesap"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Video yüklemelerinde Google Foto hesabı kullanılacak."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Yükleme koşulları"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Şu an Google Foto bağlantı ayarları kullanılıyor."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Yalnızca mobil ağlar üzerinden fotoğraflar"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Fotoğraflar ve videolar mobil ağlar üzerinden"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Fotoğraflar ve videolar yalnızca Kablosuz üzerinden"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Hakkında"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Hızlı Yükleme Sürümü"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Önerilen: 1600 piksel (paylaşım, yazdırma ve ekran koruyucular için)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Orijinal boyut (en yavaş yükleme)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"duraklatıldı - SD kart kullanılamıyor"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD kart kullanılamıyor"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Hızlı Yükleme ayrlrı"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Hızlı Yükleme"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Yeni fotoğrafları ve videoları kişisel web albümüne otomatik olarak yükle"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Yükleme durumu"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"İleri Düzey"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobil yüklemeler"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Dolaşımda yüklemeler"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Fotoğrafları ve videoları veri ağında dolaşımdayken yükle"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Pildeyken yüklemeler"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Fotoğrafları ve videoları yalnızca şarj olurken yükle"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Mevcut fotoğrafları yükle"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Telefonunuzdaki tüm mevcut fotoğrafları ve videoları şimdi yükleyin"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Devre dışı"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Yükleniyor (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">":%1$d / %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Duraklatıldı: yüklemeyi devam ettirmek için dokunun"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Mevcut fotoğrafları yükle"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Telefonunuzdaki daha önce yüklenmemiş fotoğrafların ve videoların web üzerindeki kişisel albüme yüklenmesi zaman alabilir, ancak bu işlem arka planda yapılacaktır. Devam etmek istediğinizden emin misiniz?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Evet"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Hayır"</string>
-</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f2973e7..a35be39 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Параметри синхронізації"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
     <string name="move_action" msgid="3059189775933985898">"Переміст."</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Новіші"</string>
+    <string name="older_action" msgid="4504015635360605471">"Старіші"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+Копія/прихована"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Копія/прихов. копія"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхроніз. ел.пошту"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхрон. ел. пошту для обл. запису"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібросигнал"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Також вібрув., коли надійде лист"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Завжди"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Лише в беззвуч. реж."</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколи"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібросигнал"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Вибрати сигнал дзвінка"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Налашт-ня сервера"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Видал. обл. зап."</string>
diff --git a/res/values-uk/uploader.xml b/res/values-uk/uploader.xml
deleted file mode 100644
index f894c08..0000000
--- a/res/values-uk/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Мобільне завантаження"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Альбом мобільного завантаження"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Завантаження"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Завершено"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Призупинено"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d фото • %3$d відео"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d фото • %2$d відео"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"розряджена батарея"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"перевищено квоту на фотографії"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"роумінг"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"очікування на WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"відкладено до зарядження"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"очікування з’єднання"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"повтор через %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Показати завантаження, які очікують"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Показати завершені завантаження"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Переглянути в режимі онлайн"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Показати завантаження, які очікують"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Сховати завантаження, які очікують"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Показати деталі"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Сховати деталі"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Налаштування"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Завантажено: %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Обліковий запис"</string>
-    <string name="upload" msgid="2615541458361216022">"Завантажити"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Скасувати"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Завантаження на "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" для "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Помилка ініціалізації завантаження."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Файл недоступний."</string>
-    <string name="account_error" msgid="1904775271866104941">"Помилка отримання інформації облікового запису."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Виникла проблема з входом у ваш обліковий запис."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Очікування на повтор"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Очікування на WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Завантаження"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Помилка"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Завершено"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"завантаження"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"призупинено вручну"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"призупинено – розряджена батарея"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"призупинено – відкладено до зарядження"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"призупинено – очікування з’єднання"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"призупинено – вичерпано квоту на PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"призупинено – очікування на WiFi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"призупинено – роумінг"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"очікування на повтор"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 хвилина"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 хвилини"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 хвилин"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Немає передавання даних"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Розмір облікового запису перевищує квоту на диску"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Файл не знайдено"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Помилка служби"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Помилка мережі"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Помилка автентифікації"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Завантаження, які очікують [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Завершені завантаження [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Призупинити завантаження"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Відновити завантаження"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Завантажити зараз"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Завантажити пізніше"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Не завантажувати"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Переглянути"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Повторити"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Завантаження скасовано"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Завантаження вже завершено"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Синхронізувати все"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Востаннє синхронізовано:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Список завершених елементів порожній."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Мобільне завантаження"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Завантаження завершено"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Завантаження призупинено"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Миттєве завантаження ще не активовано"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Великі файли буде завантажено лише через з’єднання WiFi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Сканування на наявність файлів..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Підготовка <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> фото та <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> відео для завантаження..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Не потрібно завантажувати додаткові фото чи відео."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Під час обміну даними із сервером виникла проблема. Повторіть спробу пізніше."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Синхронізувати все – скасовано"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Синхронізувати все"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Переглянути завершені"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Переглянути завантаження, які очікують"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Загальне"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Призупинити всі завантаження"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Живлення"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Завантажувати лише коли телефон заряджається."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Завантажувати, лише коли є доступ до Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Фото"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Обліковий запис"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Умови завантаження"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Розмір фото"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Відео"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Обліковий запис"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Обліковий запис фото буде використано для завантаження відео."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Умови завантаження"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Наразі використовуються налаштування з’єднання для фото."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Лише фото через мобільні мережі"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Фото та відео через мобільні мережі"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Фото та відео лише через Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Відомості"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Версія Моб. завантаження"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Рекомендовано: 1600 пікселів (для надсилання, друку та заставок)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Оригінальний розмір (найповільніше завантаження)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"призупинено – карта SD недоступна"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Карта SD недоступна"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Налашт. моб. завантаж."</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Мобільне завантаж."</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Автоматично завантажувати нові фото та відео в приватний веб-альбом"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Статус завантаження"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Розширені"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Завантаження в мобільних мережах"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Завантаження в роумінгу"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Завантажувати фото та відео в роумінгу в мережі передавання даних"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Завантаж. при зарядж."</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Завантажувати фото та відео лише під час заряджання"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Завантажити існуючі фото"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Завантажити будь-які існуючі фото та відео з телефону зараз"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Вимкнено"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Завантаження (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d з %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Призупинено: торкніться, щоб відновити завантаження"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Завантажити існуючі фото"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Завантаження фото та відео, ще не завантажених із вашого телефону в приватний альбом в Інтернеті, може тривати якийсь час, однак це відбуватиметься у фоновому режимі. Дійсно продовжити?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Так"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Ні"</string>
-</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8ae405e..1e778bb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"Tùy chọn đồng bộ hóa"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
     <string name="move_action" msgid="3059189775933985898">"Di chuyển"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"Mới hơn"</string>
+    <string name="older_action" msgid="4504015635360605471">"Cũ hơn"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Thêm Cc/Bcc"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"Đính kèm tệp"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Đồng bộ hóa email"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Đồng bộ hóa email cho tài khoản này"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rung"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Cũng rung khi email đến"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Luôn luôn"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Chỉ khi ở chế độ im lặng"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Chưa bao giờ"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rung"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Chọn nhạc chuông"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Cài đặt máy chủ"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Xóa tài khoản"</string>
diff --git a/res/values-vi/uploader.xml b/res/values-vi/uploader.xml
deleted file mode 100644
index f8ad2a0..0000000
--- a/res/values-vi/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Tải lên tức thì"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Album tải lên tức thì"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Đang tải lên"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Đã hoàn tất"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Đã tạm dừng"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d ảnh • %3$d video"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d ảnh • %2$d video"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"pin yếu"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"đã vượt quá dung lượng ảnh quy định"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"Đang chuyển vùng"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"đang đợi WiFi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"hoãn đến khi sạc"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"đang đợi kết nối"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"đang thử lại sau %s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Hiển thị các nội dung tải lên đang chờ xử lý"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Hiển thị các nội dung tải lên đã hoàn tất"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Xem trực tuyến"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Hiển thị các nội dung tải lên đang chờ xử lý"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Ẩn các nội dung tải lên đang chờ xử lý"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Hiển thị chi tiết"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Ẩn chi tiết"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Cài đặt"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Đã tải lên %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"Tài khoản"</string>
-    <string name="upload" msgid="2615541458361216022">"Tải lên"</string>
-    <string name="ok" msgid="2516349681897895312">"OK"</string>
-    <string name="cancel" msgid="1207103189404543868">"Hủy"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Đang tải lên "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" cho "<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Khởi chạy tải lên không thành công."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Tệp không sẵn có."</string>
-    <string name="account_error" msgid="1904775271866104941">"Không thể truy xuất thông tin tài khoản."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Đã xảy ra sự cố khi đăng nhập vào tài khoản của bạn."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Đang đợi thử lại"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Đang đợi WiFi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Đang tải lên"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Không thành công"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Ðã hoàn tất"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"đang tải lên"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"đã tạm dừng theo cách thủ công"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"đã tạm dừng - pin yếu"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"đã tạm dừng - hoãn đến khi sạc"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"đã tạm dừng - đang đợi kết nối"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"đã tạm dừng - vượt quá dung lượng PWA quy định"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"đã tạm dừng - đang đợi wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"đã tạm dừng - đang chuyển vùng"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"đang đợi thử lại"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 phút"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 phút"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 phút"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Không có kết nối dữ liệu"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"Tài khoản hết dung lượng đĩa cho phép"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Không tìm thấy tệp"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Lỗi dịch vụ"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Lỗi mạng"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Xác thực không thành công"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Nội dung tải lên đang chờ xử lý [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Các nội dung tải lên đã hoàn tất [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Tạm dừng tải lên"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Tiếp tục tải lên"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Tải lên ngay bây giờ"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Tải lên sau"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Không tải lên"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Xem"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Thử lại"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Đã hủy tải lên"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Tải lên đã hoàn tất"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Đồng bộ hóa tất cả"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Đồng bộ hóa lần cuối:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Danh sách các mục đã hoàn tất trống."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Tải lên tức thì"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Tải lên hoàn tất"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Dịch vụ tải lên bị tạm dừng"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Tải lên tức thì chưa được kích hoạt"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Các tệp lớn sẽ chỉ được tải lên qua kết nối WiFi."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Đang quét tìm tệp..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Đang chuẩn bị <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> ảnh và <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> video để tải lên..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Không cần tải thêm ảnh/video nào lên."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Đã xảy ra sự cố khi liên lạc với máy chủ. Vui lòng thử lại sau."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Quá trình đồng bộ hóa tất cả bị hủy"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Đồng bộ hóa tất cả"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Xem nội dung tải lên đã hoàn tất"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Xem nội dung tải lên đang chờ xử lý"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Chung"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Tạm dừng tất cả hoạt động tải lên"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Nguồn điện"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Chỉ tải lên khi điện thoại đang được sạc."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Chỉ tải lên khi có Wi-Fi."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Ảnh"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"Tài khoản"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Điều kiện tải lên"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Kích thước ảnh"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Video"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"Tài khoản"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Tài khoản ảnh sẽ sử dụng các nội dung tải lên video."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Điều kiện tải lên"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Cài đặt kết nối ảnh hiện được sử dụng."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Chỉ các ảnh qua mạng di động"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Ảnh &amp; video qua mạng di động"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Chỉ ảnh &amp; video qua Wi-Fi"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Giới thiệu"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"P.bản tải lên t.thì"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Được đề xuất: 1600 pixel (dành cho tính năng chia sẻ, in và trình bảo vệ màn hình)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Kích thước gốc (tốc độ tải lên chậm nhất)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"đã tạm dừng - thẻ SD không khả dụng"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Thẻ SD không khả dụng"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"C.đặt Tải lên t.thì"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Tải lên tức thì"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Tự động tải ảnh &amp; video mới lên album web riêng tư"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Trạng thái tải lên"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Nâng cao"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Nội dung tải lên qua di động"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Nội dung tải lên khi chuyển vùng"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Tải lên ảnh &amp; video khi chuyển vùng dữ liệu trên mạng dữ liệu"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Tải lên khi sạc pin"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Chỉ tải ảnh &amp; video lên khi đang sạc"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Tải lên ảnh hiện có"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Tải lên mọi ảnh &amp; video hiện có từ điện thoại của bạn ngay bây giờ"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Bị vô hiệu"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Đang tải lên (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d trong tổng số %2$d"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Tạm dừng: chạm để tiếp tục tải lên"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Tải lên ảnh hiện có"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Tải lên ảnh và video chưa được tải lên từ điện thoại của bạn lên album riêng tư trên web có thể mất một khoảng thời gian, nhưng sẽ được hoàn thành trong nền. Bạn có chắc chắn muốn tiếp tục không?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Có"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Không"</string>
-</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1417747..053fd32 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -53,8 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"同步选项"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"标记为未读"</string>
     <string name="move_action" msgid="3059189775933985898">"移动"</string>
-    <string name="newer_action" msgid="8950909456802330593">"更晚"</string>
-    <string name="older_action" msgid="4504015635360605471">"更早"</string>
+    <string name="newer_action" msgid="8950909456802330593">"后一封邮件"</string>
+    <string name="older_action" msgid="4504015635360605471">"前一封邮件"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"+抄送/密送"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"添加抄送/密送地址"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"添加附件"</string>
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步电子邮件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步此帐户的电子邮件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"振动"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到电子邮件时也振动"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"始终"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"仅在静音时"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永不"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"振动"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"选择铃声"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"删除帐户"</string>
diff --git a/res/values-zh-rCN/uploader.xml b/res/values-zh-rCN/uploader.xml
deleted file mode 100644
index e227885..0000000
--- a/res/values-zh-rCN/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"即时上传"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"“即时上传”相册"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"正在上传"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"已完成"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"已暂停"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d 张照片 • %3$d 段视频"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d 张照片 • %2$d 段视频"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"电量不足"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"超出照片配额"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"正在漫游"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"正在等待建立 WiFi 连接"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"充电时继续"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"正在等待建立连接"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"将于 %s后重新尝试"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"显示待处理的上传内容"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"显示已上传完毕的内容"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"在线查看"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"显示待处理的上传内容"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"隐藏待处理的上传内容"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"显示详情"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"隐藏详情"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"设置"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"上传时间:%s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"帐户"</string>
-    <string name="upload" msgid="2615541458361216022">"上传"</string>
-    <string name="ok" msgid="2516349681897895312">"确定"</string>
-    <string name="cancel" msgid="1207103189404543868">"取消"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"正在上传到 "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" (用户:"<b>"%s"</b>")"</string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"上传初始化失败。"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"文件不可用。"</string>
-    <string name="account_error" msgid="1904775271866104941">"无法检索帐户信息。"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"登录帐户时出现问题。"</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"正在等待重新尝试"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"正在等待建立 WiFi 连接"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"正在上传"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"失败"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"已完成"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"正在上传"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"已手动暂停"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"已暂停 - 电量不足"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"已暂停 - 充电时继续"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"已暂停 - 正在等待建立连接"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"已暂停 - Picasa 网络相册配额不足"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"已暂停 - 正在等待建立 WiFi 连接"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"已暂停 - 正在漫游"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"正在等待重新尝试"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 分钟"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 分钟"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 分钟"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"没有数据连接"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"帐户服务器空间不足"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"未找到文件"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"服务错误"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"网络错误"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"身份验证失败"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"待处理的上传内容 [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"已完成的上传内容 [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"暂停上传"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"继续上传"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"立即上传"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"稍后上传"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"不上传"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"查看"</string>
-    <string name="manager_retry" msgid="939534318469518843">"重新尝试"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"上传已取消"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"已上传完毕"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"全部同步"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"最后同步时间:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"已完成项列表为空。"</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"即时上传"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"已上传完毕"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"上传已暂停"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"尚未激活“即时上传”"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"大文件只能通过 WiFi 连接上传。"</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"正在扫描文件..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"正在准备上传 <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> 张照片和 <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> 段视频..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"没有需要上传的其他照片/视频。"</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"与服务器通信时出现问题,请稍后重试。"</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"“全部同步”已取消"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"全部同步"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"查看已完成的上传内容"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"查看待处理的上传内容"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"常规"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"暂停所有上传"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"充电"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"仅在手机充电时上传。"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"仅在建立 Wi-Fi 连接时上传。"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"照片"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"帐户"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"上传条件"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"照片尺寸"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"视频"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"帐户"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"将用于上传视频的相册帐户。"</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"上传条件"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"目前采用照片的连接设置。"</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"通过移动网络上传的内容仅限照片"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"通过移动网络上传照片和视频"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"仅通过 Wi-Fi 上传照片和视频"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"关于"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"“即时上传”版本"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"推荐:1600 像素(用于分享、打印和屏幕保护程序)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"原始尺寸(上传速度最慢)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"已暂停 - 无法读取 SD 卡"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"无法读取 SD 卡"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"“即时上传”设置"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"即时上传"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"自动将新照片和视频上传到私人网络相册"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"上传状态"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"高级"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"使用移动网络时的上传设置"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"漫游时的上传设置"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"在数据网络中漫游时上传照片和视频"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"充电时上传"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"仅在充电时上传照片和视频"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"上传现有照片"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"立即上传手机中现有的全部照片和视频"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"已停用"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s:%2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"正在上传 (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">":第 %1$d 个,共 %2$d 个"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"已暂停:触摸即可继续上传"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"上传现有照片"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"对于还未从手机中上传到私人网络相册的照片和视频,上传过程可能需要一段时间,但会在后台进行。确定要继续吗?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"是"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"否"</string>
-</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bc693f9..f8392bc 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -53,10 +53,8 @@
     <string name="mailbox_settings_action" msgid="8008375875310554776">"同步處理選項"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"標示為未讀取"</string>
     <string name="move_action" msgid="3059189775933985898">"移動"</string>
-    <!-- no translation found for newer_action (8950909456802330593) -->
-    <skip />
-    <!-- no translation found for older_action (4504015635360605471) -->
-    <skip />
+    <string name="newer_action" msgid="8950909456802330593">"較新"</string>
+    <string name="older_action" msgid="4504015635360605471">"較舊"</string>
     <string name="plus_cc_label" msgid="3365150001259912183">"新增副本/密件副本"</string>
     <string name="add_cc_bcc_menu" msgid="4757145078498200242">"新增副本/密件副本"</string>
     <string name="add_file_attachment" msgid="2203398371671979481">"附加檔案"</string>
@@ -392,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"同步處理電子郵件"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"同步處理此帳戶的電子郵件"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"震動"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"收到電子郵件時震動提醒"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"一律"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"靜音時才啟用"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永遠不要"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"震動"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"選擇鈴聲"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"伺服器設定"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"移除帳戶"</string>
@@ -455,7 +448,7 @@
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"「顯示圖片」已清除。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封,共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步處理"</string>
-    <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"您的電子郵件即將顯示。"</string>
+    <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"即將顯示您的電子郵件。"</string>
     <string name="widget_other_views" msgid="4988574907386539499">"輕觸圖示即可變更。"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"整合式收件匣"</string>
     <string name="widget_unread" msgid="4404711399009077833">"未讀取"</string>
diff --git a/res/values-zh-rTW/uploader.xml b/res/values-zh-rTW/uploader.xml
deleted file mode 100644
index 4b32be3..0000000
--- a/res/values-zh-rTW/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"即時上傳"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"即時上傳相簿"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"上傳中"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"已完成"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"已暫停"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d 張相片 • %3$d 部影片"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d 張相片 • %2$d 部影片"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"低電量"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"超出相片配額"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"漫遊中"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"正在等待 WiFi 連線"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"充電時繼續執行"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"正在等待連線"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"%s 內重試"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"顯示待處理的上傳項目"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"顯示已完成的上傳項目"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"線上查看"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"顯示待處理的上傳項目"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"隱藏待處理的上傳項目"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"顯示詳細資料"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"隱藏詳細資料"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"設定"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"上傳日期:%s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"帳戶"</string>
-    <string name="upload" msgid="2615541458361216022">"上傳"</string>
-    <string name="ok" msgid="2516349681897895312">"確定"</string>
-    <string name="cancel" msgid="1207103189404543868">"取消"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"正在上傳至 "<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" 使用者:"<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s「%2$s」"</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"上傳初始化失敗。"</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"檔案無法使用。"</string>
-    <string name="account_error" msgid="1904775271866104941">"無法擷取帳戶資訊。"</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"登入您的帳戶時發生問題。"</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"正在等待重試"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"正在等待 WiFi 連線"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"上傳中"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"失敗"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"已完成"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"上傳中"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"已手動暫停"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"已暫停 - 低電量"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"已暫停 - 充電時繼續執行"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"已暫停 - 正在等待連線"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"已暫停 - 超出 Picasa 網路相簿配額"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"已暫停 - 正在等待 WiFi 連線"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"已暫停 - 漫遊中"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"正在等待重試"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 分鐘"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 分鐘"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 分鐘"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"沒有數據連線"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"帳戶的磁碟空間配額不足"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"找不到檔案"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"服務錯誤"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"網路錯誤"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"驗證失敗"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"待處理的上傳項目 [%d]"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"已完成上傳 [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"暫停上傳"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"繼續上傳"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"立即上傳"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"稍後上傳"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"不要上傳"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"查看"</string>
-    <string name="manager_retry" msgid="939534318469518843">"重試"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"上傳已取消"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"上傳已完成"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"全部同步處理"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"上次同步處理時間:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"已完成項目清單中沒有任何內容。"</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"即時上傳"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"上傳已完成"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"上傳已暫停"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"尚未啟用即時上傳程式"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"大型檔案只能透過 WiFi 連線上傳。"</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"正在掃描檔案..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"正在準備要上傳的 <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> 張相片和 <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> 部影片..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"沒有其他相片/影片需要上傳。"</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"與伺服器通訊時發生錯誤,請稍後再試。"</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"全部同步處理已取消"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"全部同步處理"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"查看已完成的上傳項目"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"查看待處理項目"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"一般"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"暫停上傳所有項目"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"充電"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"手機充電時才上傳。"</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"可連上 Wi-Fi 時才上傳。"</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"相片"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"帳戶"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"上傳所用的網路"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"相片大小"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"影片"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"帳戶"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"相片帳戶將用來上傳影片。"</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"上傳所用的網路"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"目前暫時使用相片網路連線設定。"</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"行動網路僅用於上傳相片"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"透過行動網路上傳相片和影片"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"僅透過 Wi-Fi 上傳相片和影片"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"關於"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"即時上傳版本"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"建議:1600 像素 (適用於分享、列印、螢幕保護程式)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"原始大小 (上傳速度最慢)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"已暫停 - 未使用 SD 卡"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"未使用 SD 卡"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"即時上傳設定"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"即時上傳"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"自動將新的相片和影片上傳至私人網路相簿"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"上傳狀態"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"進階"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"使用行動網路時上傳"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"漫遊時上傳"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"透過數據網路漫遊時上傳相片和影片"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"使用電池電源時上傳"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"僅於充電時上傳相片和影片"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"上傳現有的相片"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"立即上傳手機中現存的所有相片和影片"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"已停用"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s:%2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"上傳中 (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">":第 %1$d 個,共 %2$d 個"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"已暫停:輕觸即可繼續上傳"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"上傳現有的相片"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"雖然將手機中未上傳的相片和影片上傳至網路上的私人相簿需要一段時間,但系統會在背景完成上傳作業,您確定要繼續嗎?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"是"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"否"</string>
-</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2fbd9df..cff871e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -390,11 +390,6 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Vumelanisa i-imeyli"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Iyadlidliza futhi lapho i-imeyli ifika"</string>
-    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Njalo"</string>
-    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kuphela uma ithulile"</string>
-    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Akusoze"</string>
-    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Dlidliza"</string>
     <string name="account_settings_ringtone" msgid="8229878374785575207">"Khetha ithoni yokukhala"</string>
     <string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo Zeseva"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Khipha i-akhawunti"</string>
diff --git a/res/values-zu/uploader.xml b/res/values-zu/uploader.xml
deleted file mode 100644
index 47750de..0000000
--- a/res/values-zu/uploader.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright 2009 Google Inc. All Rights Reserved.  -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="7812006268714926951">"Ukulayisha oku-Instant"</string>
-    <string name="picasa_default_destination" msgid="2052406684123992574">"Ama-albhamu okulayisha a-Instant"</string>
-    <string name="summary_title_uploading" msgid="3357617474017589370">"Iyalayisha"</string>
-    <string name="summary_title_finished" msgid="7775292294989807025">"Kuqedile"</string>
-    <string name="summary_title_paused" msgid="8936561302881926595">"Kumisiwe okwesikhashana"</string>
-    <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d izithombe • %3$d amavidiyo"</string>
-    <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d izithombe • %2$d amavidiyo"</string>
-    <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"ibhetri iphansi"</string>
-    <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"isilinganiso sezithombe sidluliwe"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"Iyazulazula"</string>
-    <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"ilinde i-Wi-Fi"</string>
-    <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"imisiwe ize ishaje"</string>
-    <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"ilinde uxhumano"</string>
-    <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"iyazama futhi e-%s"</string>
-    <string name="summary_menu_show_pending" msgid="658361192495996">"Bonisa Ukulayisha Okusalindile"</string>
-    <string name="summary_menu_show_finished" msgid="8544099132633066086">"Bonisa Ukulayisha Okuqedile"</string>
-    <string name="menu_view_online" msgid="6546633605818509942">"Buka Uxhumekile kwi-Inthanethi"</string>
-    <string name="menu_show_pending_items" msgid="8798191388238604213">"Bonisa Ukulayisha Okusalindile"</string>
-    <string name="menu_hide_pending_items" msgid="9216079748638469160">"Fihla Ukulayisha Okulindile"</string>
-    <string name="menu_show_completed_items" msgid="4380487776635859783">"Bonisa Imininingwane"</string>
-    <string name="menu_hide_completed_items" msgid="6126007571523662799">"Fihla imininingwane"</string>
-    <string name="menu_settings" msgid="5088116127086866634">"Izilungiselelo"</string>
-    <string name="format_date_uploaded" msgid="803752037646090928">"Kulayishiwe %s"</string>
-    <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
-    <string name="account" msgid="5199161365824352613">"I-akhawunti"</string>
-    <string name="upload" msgid="2615541458361216022">"Layisha"</string>
-    <string name="ok" msgid="2516349681897895312">"KULUNGILE"</string>
-    <string name="cancel" msgid="1207103189404543868">"Khansela"</string>
-    <string name="uploading_to" msgid="3986362895940069510">"Ilayisha kwi-"<b>"%s"</b></string>
-    <string name="uploading_for" msgid="1735961974624867111">" ye-"<b>"%s"</b></string>
-    <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string>
-    <string name="toast_intent_error" msgid="6164928822619692280">"Ukuqalisa ukulayisha kwehlulekile."</string>
-    <string name="toast_file_error" msgid="1315722681020841350">"Ifayela ayitholakali."</string>
-    <string name="account_error" msgid="1904775271866104941">"Yehlulekile ukuthola ukwaziswa kwe-akhawunti."</string>
-    <string name="toast_failed_auth" msgid="2196450105656960566">"Kube khona inkinga yokungena ngemvume kwi-akhawunti yakho."</string>
-    <string name="upload_state_queued" msgid="3990598443227105526"></string>
-    <string name="upload_state_waiting_retry" msgid="471790705731784779">"Ilinde ukuzama futhi"</string>
-    <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Ilinde i-Wi-Fi"</string>
-    <string name="upload_state_uploading" msgid="82854465974176047">"Iyalayisha"</string>
-    <string name="upload_state_failed" msgid="3799932718800848294">"Kwehlulekile"</string>
-    <string name="upload_state_completed" msgid="5638163990418071018">"Kuqediwe"</string>
-    <string name="pause_state_running" msgid="711411177620353982">"iyalayisha"</string>
-    <string name="pause_state_manually_paused" msgid="4837627990158796573">"kumiswe okwesikhashana ngesandla"</string>
-    <string name="pause_state_low_battery" msgid="3154677586511229063">"kumiswe okwesikhashana - ibhetri iphansi"</string>
-    <string name="pause_state_need_charger" msgid="5014741655713255815">"imiswe okwesikhashana - imisiwe ize ishaje"</string>
-    <string name="pause_state_need_connectivity" msgid="338696137467815955">"kumiswe okwesikhshana - kulinde uxhumano"</string>
-    <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"imisiwe okwesikhashana - ingaphezu kwesilinganiso se-PWA"</string>
-    <string name="pause_state_need_wifi" msgid="231858819136516913">"kumiswe okwesikhashana - kwe-wifi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"kumiswe okwesikhashana - kuyazulazula"</string>
-    <string name="pause_state_retrying" msgid="3734440128828177639">"ilinde ukuzama futhi"</string>
-    <string name="retry_in_1min" msgid="2242454935194420914">"1 iminithi"</string>
-    <string name="retry_in_2min" msgid="5845688527405283031">"2 amaminithi"</string>
-    <string name="retry_in_5min" msgid="3153220715959570358">"5 amaminithi"</string>
-    <string name="retry_no_data" msgid="630347885498641534">"Alukho uxhumano lwedatha"</string>
-    <string name="account_out_of_quota" msgid="1849612079678906607">"I-akhawunti ingaphandle kwesilinganiso sediski"</string>
-    <string name="completed_no_file" msgid="6719715000947601844">"Ifayela ayitholakalanga"</string>
-    <string name="failed_bad_response" msgid="8357723053952213242">"Iphutha lensizakalo"</string>
-    <string name="failed_network_error" msgid="2531660472217573602">"Iphutha lenethiwekhi"</string>
-    <string name="failed_server_auth" msgid="2428208784689362254">"Ukuqinisekisa kwehlulekile"</string>
-    <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Ukulayisha okulindile [%d}"</string>
-    <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Iqede okulayishwayo [%d]"</string>
-    <string name="manager_pause" msgid="7046645023617816964">"Misi okwesikhashana ukulayisha"</string>
-    <string name="manager_resume" msgid="1608630525599824933">"Qalisa ukulayisha"</string>
-    <string name="manager_upload_now" msgid="2284408578936376342">"Layisha manje"</string>
-    <string name="manager_upload_later" msgid="5453932124711705632">"Layisha emva kwesikhathi"</string>
-    <string name="manager_do_not_upload" msgid="1934417351195364210">"Ungalayishi"</string>
-    <string name="manager_view_media" msgid="3714544539986850549">"Buka"</string>
-    <string name="manager_retry" msgid="939534318469518843">"Zama futhi"</string>
-    <string name="manager_toast_canceled" msgid="2331820022556147571">"Ukulayisha kukhanseliwe"</string>
-    <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Ukulayisha kakade kuqedile"</string>
-    <string name="manager_sync_all" msgid="5207146576940014345">"Vumelanisa konke"</string>
-    <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Ukuvumelanisa Kokugcina:"\n"%1$s"\n"%2$s"</string>
-    <string name="finished_empty" msgid="689924777356099393">"Uhlu lwezintwana eziqedile alunalutho."</string>
-    <string name="notify_uploads" msgid="8593982942665493037">"Ukulayisha oku-Instant"</string>
-    <string name="notify_resolved" msgid="8111194870485485674">"Ukulayisha kuqedile"</string>
-    <string name="notify_paused" msgid="3999817913227671338">"Ukulayisha kumiswe isikhashana"</string>
-    <string name="notify_activation_reminder" msgid="1639234651193843030">"Ukulayisha oku-Instant akukakaqaliswa"</string>
-    <string name="dialog_first_wifi" msgid="4318047428346248089">"Amafayela amakhulu kakhulu azolayishwa ngoxhumano lwe-Wi-Fi kuphela."</string>
-    <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Iskena amafayili..."</string>
-    <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"Ilungiselela <xliff:g id="PHOTOCOUNT">%1$d</xliff:g> izithombe na <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> mavidiyo ukuze alayishwe..."</string>
-    <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Azikho izithombe/amavidiyo angeziwe adingwa ukulayishwa."</string>
-    <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Kube khona inkinga yokuxhumana neseva. Sicela uzame futhi emva kwesikhathi."</string>
-    <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Ukuvumelanisa konke kukhanseliwe"</string>
-    <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Vumelanisa konke"</string>
-    <string name="manager_view_completed" msgid="5119780300858727185">"Ukubuka Kuqedile"</string>
-    <string name="manager_view_pending" msgid="4403346072556950609">"Buka Okusalindile"</string>
-    <string name="preference_category_title_general" msgid="330919434495694575">"Okuvamile"</string>
-    <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Misa okwesikhashana konke ukulayisha"</string>
-    <string name="preference_title_need_power" msgid="9165152026296632685">"Amandla"</string>
-    <string name="preference_summary_need_power" msgid="1829578224249216151">"Layisha kuphela lapho ifini ishajwa."</string>
-    <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string>
-    <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Layisha kuphela lapho i-Wi-Fi itholakala."</string>
-    <string name="preference_category_title_photos" msgid="8558221017057440259">"Izithombe"</string>
-    <string name="preference_title_photos_account" msgid="1235191190019405102">"I-akhawunti"</string>
-    <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Imibandela yokulayisha"</string>
-    <string name="preference_title_photo_size" msgid="2291608017215972660">"Usayizi wesithombe"</string>
-    <string name="preference_category_title_videos" msgid="8962400910793075570">"Amavidiyo"</string>
-    <string name="preference_title_videos_account" msgid="6675545508568161301">"I-akhawunti"</string>
-    <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"I-akhawunti yezithombe izosetshenziselwa ukulayisha amavidiyo."</string>
-    <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Imibandela yokulayisha"</string>
-    <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Izilungiselelo zoxhumano lwezithombe ziyasebenzisa okwamanje."</string>
-    <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Izithombe kuphela ngezinhleloxhumano zeselula"</string>
-    <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Izithombe namavidiyo ngezinhleloxhumano zeselula"</string>
-    <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Izithombe namavidiyo nge-Wi-Fi kuphela"</string>
-    <string name="preference_category_title_about" msgid="3001183168471659844">"Mayelana"</string>
-    <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Inguqulo yokulayisha e-Instant"</string>
-    <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Okunconywayo: amaphikseli angu-1600 (okwabelana, ukuphrinta nesilondolozi sihenqo)"</string>
-    <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Usayizi wasekuqaleni (ukulayisha okulengayo)"</string>
-    <string name="pause_state_need_media" msgid="3849758767808306320">"Kumisiwe okwesikhashana - ikhadi le-SD alitholakali"</string>
-    <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"Ikhadi le-SD alitholakali"</string>
-    <string name="preference_plus_title" msgid="8505499389432915393">"Izilungiselelo zokulayisha ezi-Instant"</string>
-    <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Ukulayisha oku-Instant"</string>
-    <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Layisha izithombe ezinstha ngokuzenzakalelayo izithombe namavidiyo ku-albhamu yewebhu yangasese"</string>
-    <string name="preference_plus_upload_status" msgid="7925576302519589779">"Layisha isimo"</string>
-    <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Okuthuthukisiwe"</string>
-    <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Ukulayisha kweselula"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Uluzulazula kokulayisha"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Layisha izithombe &amp; namavidiyo uma uzulazula kuhleloxhumano lwedatha"</string>
-    <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Okulayishiwe Kubhetri"</string>
-    <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Layisha izithombe &amp; namavidiyo uma ushaja kuphela"</string>
-    <string name="preference_plus_sync_all" msgid="2563137874388611459">"Layisha izithombe ezikhona kakade"</string>
-    <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Layisha izithombe ezikhona kakade &amp; namavidiyo ocingweni lakho"</string>
-    <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Akusebenzi"</string>
-    <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s \"%2$s"</string>
-    <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Iyalayisha (%1$d%%)"</string>
-    <string name="preference_summary_uploading_format" msgid="6092575579212954671">":%1$d kwezingu-%2$d:"</string>
-    <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Kumisiwe okwesikhashana: thinta ukuqhuba ukulayisha futhi"</string>
-    <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Layisha izithombe ezikhona kakade"</string>
-    <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Ilayisha izithombe namavidiyo angakalayishwa kusuka efonini yakho kuya kwi-albhamu yangasese kuwebhu kungathatha isikhashana, kodwa izoqedwa esizindeni. Uyaqiniseka ukuthi ufuna ukuqhubeka?"</string>
-    <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Yebo"</string>
-    <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Cha"</string>
-</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c881e6e..33a1928 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -109,23 +109,6 @@
         <item>6</item>
     </string-array>
 
-    <!-- The vibrate notification modes -->
-    <string-array name="account_settings_vibrate_when_entries">
-        <!-- Always -->
-        <item>@string/account_settings_vibrate_when_always</item>
-        <!-- Only when the phone is in Silent mode -->
-        <item>@string/account_settings_vibrate_when_silent</item>
-        <!-- Never -->
-        <item>@string/account_settings_vibrate_when_never</item>
-    </string-array>
-
-    <!-- The vibrate notification values -->
-    <string-array translatable="false" name="account_settings_vibrate_when_values">
-        <item>always</item>
-        <item>silent</item>
-        <item>never</item>
-    </string-array>
-
     <!-- Auto-advance options (DO NOT change the order.  Code assumes this order)-->
     <string-array name="general_preference_auto_advance_entries">
         <!-- Move to newer -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 74280a4..c39ee4a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -988,17 +988,6 @@
 
     <!-- On Settings screen, vibrate pop-up menu label -->
     <string name="account_settings_vibrate_when_label">Vibrate</string>
-    <!-- On Settings screen, vibrate pop-up menu summary text -->
-    <string name="account_settings_vibrate_when_summary">Also vibrate when email arrives</string>
-    <!-- On Settings screen, vibrate pop-up menu option "always" text -->
-    <string name="account_settings_vibrate_when_always">Always</string>
-    <!-- On Settings screen, vibrate pop-up menu option "silent" text -->
-    <string name="account_settings_vibrate_when_silent">Only when silent</string>
-    <!-- On Settings screen, vibrate pop-up menu option "never" text -->
-    <string name="account_settings_vibrate_when_never">Never</string>
-
-    <!-- Dialog title for the Vibrate dialog -->
-    <string name="account_settings_vibrate_when_dlg_title">Vibrate</string>
 
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_ringtone">Choose ringtone</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 009924e..3156219 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -138,6 +138,11 @@
         <item name="android:layout_height">match_parent</item>
     </style>
 
+    <style name="subject_action_bar_title_text" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+        <item name="android:textColor">#323232</item>
+        <item name="android:textSize">16dp</item>
+    </style>
+
     <style name="message_view_text">
         <item name="android:textSize">14dip</item>
         <item name="android:textColor">@color/text_secondary_color</item>
diff --git a/res/values/uploader.xml b/res/values/uploader.xml
deleted file mode 100644
index 232b544..0000000
--- a/res/values/uploader.xml
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright 2009 Google Inc. All Rights Reserved. -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-  <!-- Application's title (for title bars, the application manager, etc.) [CHAR LIMIT=20] -->
-  <string name="application_name">Instant Upload</string>
-
-  <!-- Default Picasa upload destination: the CameraSync album  [CHAR LIMIT=NONE]-->
-  <string name="picasa_default_destination">Instant Upload Album</string>
-  
-  <!-- Summary screen: title when uploading -->
-  <string name="summary_title_uploading">Uploading</string>
-  
-  <!-- Summary screen: title when displaying finished uploads -->
-  <string name="summary_title_finished">Finished</string>
-  
-  <!-- Summary screen: title when displaying finished uploads -->
-  <string name="summary_title_paused">Paused</string>
-  
-  <!-- Summary screen: subtitle showing the # of photos and videos to be uploaded -->
-  <string name="summary_subtitle_uploading_format">%1$d%% • %2$d photos • %3$d videos</string>
-  
-  <!-- Summary screen: subtitle showing the # of photos and videos that have finished uploading -->
-  <string name="summary_subtitle_counts_format">%1$d photos • %2$d videos</string>
-  
-  <!-- Summary screen: subtitle for when the app is paused due to low battery -->
-  <string name="summary_subtitle_paused_low_battery">low battery</string>
-  
-  <!-- Summary screen: subtitle for when the app is paused due out of photos quota condition -->
-  <string name="summary_subtitle_paused_photos_quota">exceeded photos quota</string>
-  
-  <!-- Summary screen: subtitle for when the app is paused due to Data Roaming -->
-  <string name="summary_subtitle_paused_roaming">roaming</string>
-  
-  <!-- Summary screen: subtitle for when the app is paused due to needing WiFi for this item -->
-  <string name="summary_subtitle_paused_need_wifi">waiting for WiFi</string>
-  
-  <!-- Summary screen: subtitle for when the app is paused due to needing the charger -->
-  <string name="summary_subtitle_paused_need_charger">delayed until charging</string>
-  
-  <!-- Summary screen: subtitle for when the app is paused due to needing a data connection -->
-  <string name="summary_subtitle_paused_need_network">waiting for connection</string>
-  
-  <!-- Summary screen: subtitle for when the app is paused due to needing a data connection -->
-  <string name="summary_subtitle_paused_retry_format">retrying in %s</string>
-  
-  <!-- Summary screen menu: label button to switch to pending uploads view -->
-  <string name="summary_menu_show_pending">Show Pending Uploads</string>
-  
-  <!-- Summary screen menu: label button to switch to finished uploads view -->
-  <string name="summary_menu_show_finished">Show Finished Uploads</string>
-  
-  <!-- Menu label button to launch the browser to view Picasa Web Albums -->
-  <string name="menu_view_online">View Online</string>
-
-  <string name="menu_show_pending_items">Show Pending Uploads</string>
-  <string name="menu_hide_pending_items">Hide Pending Uploads</string>
-
-  <string name="menu_show_completed_items">Show Details</string>
-  <string name="menu_hide_completed_items">Hide Details</string>
-  
-  <!-- Settings menu item title -->
-  <string name="menu_settings">Settings</string>
-  
-  <!-- Finished uploads per-item upload date formatting -->
-  <string name="format_date_uploaded">Uploaded %s</string>
-  
-  <!-- Format a percentage value for use in a progress bar -->
-  <string name="format_progress_percent"><xliff:g id="number" example="50">%d</xliff:g><xliff:g id="percentsign" example="%">%%</xliff:g></string>
-
-  <!-- Label for the account selection spinner. -->
-  <string name="account">Account</string>
-
-  <!-- Button to start an upload (on the upload settings page) -->
-  <string name="upload">Upload</string>
-  <!-- Button to confirm the settings on the initial launch -->
-  <string name="ok">OK</string>
-  <!-- Button to cancel the starting of an upload (on the upload settings page) -->
-  <string name="cancel">Cancel</string>
-
-  <!-- First half of the dialog message shown while an upload is starting - 'Uploading to [destination]' -->
-  <string name="uploading_to">Uploading to <b>%s</b></string>
-  <!-- Second half of the dialog message shown while an upload is starting.
-       In some cases, this is omitted - ' for [username]' -->
-  <string name="uploading_for"> for <b>%s</b></string>
-  <!-- Format for the destination string of an upload - '[Picasa] "[Photo Title]"'. -->
-  <string name="destination_format">%1$s \"%2$s\"</string>
-
-  <!-- Toast shown when the application is started in an incorrect way (by another application). -->
-  <string name="toast_intent_error">Upload initialization failed.</string>
-  <!-- Toast shown when we fail to access a file to upload. -->
-  <string name="toast_file_error">File not available.</string>
-  <!-- Toast shown when we there's a problem retrieving the user account information. -->
-  <string name="account_error">Failed to retrieve account information.</string>
-  <!-- Dialog shown after we failed to log into the user's account -->
-  <string name="toast_failed_auth">There was a problem signing into your account.</string>
-
-  <!-- State of a file while its waiting for its turn to be uploaded: intentionally blank -->
-  <string name="upload_state_queued"></string>
-  <!-- State of an upload while it's waiting to retry after some kind of problem -->
-  <string name="upload_state_waiting_retry">Waiting to retry</string>
-  <!-- State of a large upload while it's waiting for a WiFi connection -->
-  <string name="upload_state_waiting_wifi">Waiting for WiFi</string>
-  <!-- State of a file while it's being uploaded -->
-  <string name="upload_state_uploading">Uploading</string>
-  <!-- State of a file after it failed to be uploaded -->
-  <string name="upload_state_failed">Failed</string>
-  <!-- State of a file after it was uploaded successfully -->
-  <string name="upload_state_completed">Completed</string>
-
-  <!-- Human-readable name of PAUSE_STATE_RUNNING -->
-  <string name="pause_state_running">uploading</string>
-  <!-- Human-readable name of PAUSE_STATE_MANUALLY_PAUSED -->
-  <string name="pause_state_manually_paused">manually paused</string>
-  <!-- Human-readable name of PAUSE_STATE_LOW_BATTERY -->
-  <string name="pause_state_low_battery">paused - low battery</string>
-  <!-- Human-readable name of PAUSE_STATE_NEED_CHARGER -->
-  <string name="pause_state_need_charger">paused - delayed until charging</string>
-  <!-- Human-readable name of PAUSE_STATE_NEED_CONNECTIVITY -->
-  <string name="pause_state_need_connectivity">paused - waiting for connection</string>
-  <!-- Human-readable name of pause_state_need_photos_quota -->
-  <string name="pause_state_need_photos_quota">paused - out of PWA quota</string>
-  <!-- Human-readable name of PAUSE_STATE_NEED_WIFI -->
-  <string name="pause_state_need_wifi">paused - waiting for wifi</string>
-  <!-- Human-readable name of PAUSE_STATE_ROAMING -->
-  <string name="pause_state_roaming">paused - roaming</string>
-  <!-- Human-readable name of PAUSE_STATE_RETRYING -->
-  <string name="pause_state_retrying">waiting to retry</string>
-
-  <!-- State detail for "Waiting to retry", when waiting to retry in 1 minute after a network failure -->
-  <string name="retry_in_1min">1 minute</string>
-  <!-- State detail for "Waiting to retry", when waiting to retry in 2 minutes after a network failure -->
-  <string name="retry_in_2min">2 minutes</string>
-  <!-- State detail for "Waiting to retry", when waiting to retry in 5 minutes after a network failure -->
-  <string name="retry_in_5min">5 minutes</string>
-  <!-- State detail for "Waiting to retry", when waiting for the data connection to come back -->
-  <string name="retry_no_data">No data connection</string>
-  <!-- Toast text for "Out of quota", when waiting for account server space to free up -->
-  <string name="account_out_of_quota">Account is out of disk quota</string>
-
-  <!-- State detail for "Failed", when we couldn't find the file to upload -->
-  <string name="completed_no_file">File not found</string>
-  <!-- State detail for "Failed", when the server responded in an unexpected way -->
-  <string name="failed_bad_response">Service error</string>
-  <!-- State detail for "Failed", when we bail out after several network failures -->
-  <string name="failed_network_error">Network error</string>
-  <!-- State detail for "Failed", when the server failed to authorize the user -->
-  <string name="failed_server_auth">Authentication failed</string>
-
-  <!-- Format for the list switcher button when the pending list is being displayed -->
-  <string name="manager_list_switcher_pending_format">Pending uploads [%d]</string>
-  <!-- Format for the list switcher button when the completed uploads list is being displayed -->
-  <string name="manager_list_switcher_completed_format">Completed uploads [%d]</string>
-
-  <!-- Label for the button to pause the upload service -->
-  <string name="manager_pause">Pause uploads</string>
-  <!-- Label for the button to resume the upload service -->
-  <string name="manager_resume">Resume uploads</string>
-  <!-- Label for the button to mark a photo for immediate upload -->
-  <string name="manager_upload_now">Upload now</string>
-  <!-- Label for the button to change when a photo is to be uploaded -->
-  <string name="manager_upload_later">Upload later</string>
-  <!-- Label for the button to mark a photo as do not upload -->
-  <string name="manager_do_not_upload">Do not upload</string>
-  <!-- Label for the button to view the photo or video -->
-  <string name="manager_view_media">View</string>
-  <!-- Label for the button to retry one failed upload -->
-  <string name="manager_retry">Retry</string>
-  <!-- Toast confirming the canceling of one pending upload -->
-  <string name="manager_toast_canceled">Upload canceled</string>
-  <!-- Toast shown when the user tries to cancel an already finished (completed or failed) upload -->
-  <string name="manager_toast_not_canceled">Upload already finished</string>
-  <!--  Label for the button to resync all photos with the server -->
-  <string name="manager_sync_all">Sync all</string>
-  <!-- Text shown when the uploads list is empty. 1=date; 2=time -->
-  <string name="manager_activity_last_sync_format">Last Sync:\n%1$s\n%2$s</string>
-
-  <!-- Text shown when the finished items list is empty -->
-  <string name="finished_empty">Finished items list is empty.</string>
-
-  <!-- Notification label used in all notifications [CHAR LIMIT=25] -->
-  <string name="notify_uploads">Instant Upload</string>
-  <!-- Notification when all uploads are finished (completed or failed, so this should be neutral) -->
-  <string name="notify_resolved">Uploads finished</string>
-  <!-- Notification when the upload service is paused -->
-  <string name="notify_paused">Uploads paused</string>
-  <!-- Notification when the upload application was not initialized -->
-  <string name="notify_activation_reminder">Instant Upload hasn\'t been activated yet</string>
-
-  <!-- Toast explaining that large files are only uploaded when there is an active WiFi connection (shown on first large upload) -->
-  <!-- TODO: Probably remove this, rename ID if not. -->
-  <string name="dialog_first_wifi">Large files will be uploaded over a WiFi connection only.</string>
-
-  <!-- Sync All progress dialog message when scanning locally and querying the server -->
-  <string name="dialog_sync_all_scanning">Scanning for files...</string>
-
-  <!-- Sync All progress dialog message when enqueueing requests -->
-  <string name="dialog_sync_all_preparing">Preparing <xliff:g id="photocount" example="5">%1$d</xliff:g> photos and <xliff:g id="videocount" example="4">%2$d</xliff:g> videos for upload...</string>
-
-  <!-- Toast displayed when Sync All found nothing to do -->
-  <string name="dialog_sync_all_found_none">No additional photos/videos need to be uploaded.</string>
-
-  <!-- Sync All dialog message when a server error occurs -->
-  <string name="dialog_sync_all_server_error">There was a problem communicating with the server. Please try again later.</string>
-
-  <!-- Sync All toast when the process canceled -->
-  <string name="dialog_sync_all_canceled">Sync all canceled</string>
-
-  <!-- Sync All dialog title for any errors -->
-  <string name="dialog_sync_all_error_title">Sync All</string>
-
-  <!-- ManagerActivity view completed uploads menu title -->
-  <string name="manager_view_completed">View Completed</string>
-
-  <!-- ManagerActivity view pending uploads menu title -->
-  <string name="manager_view_pending">View Pending</string>
-
-  <!-- Preferences category title: general category -->
-  <string name="preference_category_title_general">General</string>
-
-  <!-- Preference title: Pause all uploads -->
-  <string name="preference_title_pause_all_uploads">Pause all uploads</string>
-
-  <!-- Preference title: select if battery recharging is required before uploading -->
-  <string name="preference_title_need_power">Power</string>
-
-  <!-- Preference summary: checkbox to determine if battery recharging is required before uploading  -->
-  <string name="preference_summary_need_power">Upload only when the phone is being charged.</string>
-
-  <!-- Preference title: select if battery recharging is required before uploading -->
-  <string name="preference_title_need_wifi">Wi-Fi</string>
-
-  <!-- Preference summary: checkbox to determine if WiFi/WiMAX must be available  -->
-  <string name="preference_summary_need_wifi">Upload only when Wi-Fi is available.</string>
-
-  <!-- Preferences category title: photos -->
-  <string name="preference_category_title_photos">Photos</string>
-
-  <!-- Preference title: Photos Account -->
-  <string name="preference_title_photos_account">Account</string>
-
-  <!-- Preference title: select the networks to upload photos -->
-  <string name="preference_title_photos_upload_connectivity">Upload conditions</string>
-
-  <!-- Preference title: Photo size -->
-  <string name="preference_title_photo_size">Photo size</string>
-
-  <!-- Preferences category title: videos -->
-  <string name="preference_category_title_videos">Videos</string>
-
-  <!-- Preference title: Photos Account -->
-  <string name="preference_title_videos_account">Account</string>
-  
-  <!-- Preference title: Photos Account -->
-  <string name="preference_title_videos_account_summary">The photos account will be used video uploads.</string>
-
-  <!-- Preference title: select the networks to upload videos -->
-  <string name="preference_title_videos_upload_connectivity">Upload conditions</string>
-
-  <!-- Preference title: select the networks to upload videos -->
-  <string name="preference_title_videos_upload_connectivity_summary">Photos connectivity settings are used for now.</string>
-
-  <!-- Preference mobile data usage: for photos only -->
-  <string name="preference_mobile_data_usage_for_photos_only">Only photos via mobile networks</string>
-
-  <!-- Preference mobile data usage: for all media -->
-  <string name="preference_mobile_data_usage_for_all_media">Photos &amp; videos via mobile networks</string>
-
-  <!-- Preference mobile data usage: never -->
-  <string name="preference_mobile_data_usage_never">Photos &amp; videos via Wi-Fi only</string>
-
-  <!-- Preference category title: "About" -->
-  <string name="preference_category_title_about">About</string>
-
-  <!-- Preference title: CameraSync Version [CHAR LIMIT=20]-->
-  <string name="preference_title_camera_sync_version">Instant Upload Version</string>
-
-  <!-- Preference photos upload dimensions label: 1600px max -->
-  <string name="photos_upload_dimension_1600">Recommended: 1600 pixels (for sharing, prints and screensavers)</string>
-
-  <!-- Preference photos upload dimensions label: original size -->
-  <string name="photos_upload_dimension_original">Original size (slowest upload)</string>
-
-  <!-- Pause state text that shows the SD card is needed -->
-  <string name="pause_state_need_media">paused - SD card unavailable</string>
-
-  <!-- Subtitle text for the summary view, detailing why we are not uploading -->
-  <string name="summary_subtitle_paused_need_media">SD card unavailable</string>
-
-  <!-- Preference screen title: Instant Upload detailed settings button [CHAR LIMIT=20] -->
-  <string name="preference_plus_title">Instant Upload settings</string>
-
-  <!-- Preference title: Enable CameraSync checkbox description [CHAR LIMIT=19]-->
-  <string name="preference_plus_enable_cs">Instant Upload</string>
-
-  <!-- Preference title: description for Enable CameraSync-->
-  <string name="preference_plus_enable_cs_summary">Automatically upload new photos &amp; videos to a private web album</string>
-
-  <!-- Preference title: CameraSync Upload status-->
-  <string name="preference_plus_upload_status">Upload status</string>
-
-  <!-- Preference category: Advanced settings-->
-  <string name="preference_plus_category_advanced">Advanced</string>
-
-  <!-- Preference title: setting for Use mobile data connection-->
-  <string name="preference_plus_mobile_data_connection">Mobile uploads</string>
-
-  <!-- Preference title: Sync while roaming-->
-  <string name="preference_plus_sync_while_roaming">Roaming uploads</string>
-
-  <!-- Preference summary: Sync while roaming-->
-  <string name="preference_plus_sync_while_roaming_summary">Upload photos &amp; videos when roaming on data network</string>
-
-  <!-- Preference title: Delay Sync until charging phone-->
-  <string name="preference_plus_delay_sync_until_charging">Battery uploads</string>
-
-  <!-- Preference summary: Delay Sync until charging phone-->
-  <string name="preference_plus_delay_sync_until_charging_summary">Upload photos &amp; videos only when charging</string>
-
-  <!-- Preference title: Sync all photos and videos-->
-  <string name="preference_plus_sync_all">Upload existing photos</string>
-
-  <!-- Preference title: description for Sync all photos and videos-->
-  <string name="preference_plus_sync_all_description">Upload any existing photos &amp; videos from your phone now</string>
-
-  <!-- Summary screen: subtitle for when the app is disabled-->
-  <string name="summary_subtitle_disabled">Disabled</string>
-
-  <!-- Preference summary: Summary string header, example "paused: waiting for wifi"-->
-  <string name="preference_summary_header_format">%1$s: %2$s</string>
-
-  <!-- Preference summary: uploading format for Uploading and percent number "Uploading (50%)"-->
-  <string name="preference_summary_uploading_percent">Uploading (%1$d%%)</string>
-
-  <!-- Preference summary: format for uploading "3 of 5"-->
-  <string name="preference_summary_uploading_format">: %1$d of %2$d</string>
-
-  <!-- Preference summary: subtitle for when uploading is paused-->
-  <string name="preference_summary_uploading_paused">Paused: touch to resume uploading</string>
-
-  <!-- Preference summary: title for sync all confirm dialog -->
-  <string name="preference_plus_sync_all_prompt_title">Upload existing photos</string>
-
-  <!-- Preference summary: text for sync all confirm dialog -->
-  <string name="preference_plus_sync_all_prompt_text">Uploading photos and videos that have not already been uploaded from your phone to a private album on the web can take a while, but will be done in the background. Are you sure you want to continue?</string>
-
-  <!-- Preference summary: Yes button text for sync all confirm dialog -->
-  <string name="preference_plus_sync_all_prompt_yes">Yes</string>
-
-  <!-- Preference summary: No button text for sync all confirm dialog -->
-  <string name="preference_plus_sync_all_prompt_no">No</string>
-
-</resources>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 7b6fa9b..66a71f3 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -107,16 +107,11 @@
             android:ringtoneType="notification"
             android:defaultValue="content://settings/system/notification_sound" />
 
-        <ListPreference
-            android:key="account_settings_vibrate_when"
-            android:layout="?android:attr/preferenceLayoutChild"
+        <CheckBoxPreference
+            android:key="account_settings_vibrate"
             android:dependency="account_notify"
-            android:defaultValue="never"
-            android:title="@string/account_settings_vibrate_when_label"
-            android:summary="@string/account_settings_vibrate_when_summary"
-            android:entries="@array/account_settings_vibrate_when_entries"
-            android:entryValues="@array/account_settings_vibrate_when_values"
-            android:dialogTitle="@string/account_settings_vibrate_when_dlg_title" />
+            android:defaultValue="false"
+            android:title="@string/account_settings_vibrate_when_label" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index 66ec79b..c37b94c 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -380,8 +380,8 @@
         <outgoing uri="smtp://smtp.poczta.onet.pl" username="$email" />
     </provider>
     <provider id="wirtualna" label="Wirtualna Polska" domain="wp.pl">
-        <incoming uri="pop3://pop3.wp.pl" username="$user" />
-        <outgoing uri="smtp://smtp.wp.pl" username="$user" />
+        <incoming uri="imap+ssl+://imap.wp.pl" username="$user" />
+        <outgoing uri="smtp+ssl+://smtp.wp.pl" username="$user" />
     </provider>
     <provider id="interia" label="Interia" domain="interia.pl">
         <incoming uri="pop3+ssl://poczta.interia.pl" username="$user" />
diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java
index 6a0f1e1..21d9e59 100644
--- a/src/com/android/email/MessagingController.java
+++ b/src/com/android/email/MessagingController.java
@@ -2070,6 +2070,12 @@
                         nc.showLoginFailedNotification(account.mId);
                     }
                     mListeners.sendPendingMessagesFailed(account.mId, messageId, me);
+                    if (me.getExceptionType() == MessagingException.GENERAL_SECURITY) {
+                        final Object exceptionData = me.getExceptionData();
+                        if (exceptionData != null && exceptionData instanceof Attachment) {
+                            nc.showDownloadForwardFailedNotification((Attachment) exceptionData);
+                        }
+                    }
                     continue;
                 }
                 // 5. move to sent, or delete
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 073e1a4..529d721 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -463,7 +463,7 @@
             intent = Welcome.createOpenAccountInboxIntent(mContext, accountId);
         } else {
             intent = Welcome.createOpenMessageIntent(
-                    mContext, accountId, mailboxId, newestMessageId, false);
+                    mContext, accountId, mailboxId, newestMessageId);
         }
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK |
                 Intent.FLAG_ACTIVITY_TASK_ON_HOME);
@@ -668,16 +668,14 @@
     void setupSoundAndVibration(Notification.Builder builder, Account account) {
         final int flags = account.mFlags;
         final String ringtoneUri = account.mRingtoneUri;
-        final boolean vibrate = (flags & Account.FLAGS_VIBRATE_ALWAYS) != 0;
-        final boolean vibrateWhenSilent = (flags & Account.FLAGS_VIBRATE_WHEN_SILENT) != 0;
-        final boolean isRingerSilent = getRingerMode() != AudioManager.RINGER_MODE_NORMAL;
+        final boolean vibrate = (flags & Account.FLAGS_VIBRATE) != 0;
 
         int defaults = Notification.DEFAULT_LIGHTS;
-        if (vibrate || (vibrateWhenSilent && isRingerSilent)) {
+        if (vibrate) {
             defaults |= Notification.DEFAULT_VIBRATE;
         }
 
-        builder.setSound((ringtoneUri == null) ? null : Uri.parse(ringtoneUri))
+        builder.setSound(TextUtils.isEmpty(ringtoneUri) ? null : Uri.parse(ringtoneUri))
             .setDefaults(defaults);
     }
 
diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java
index 391ddeb..8082adc 100644
--- a/src/com/android/email/SecurityPolicy.java
+++ b/src/com/android/email/SecurityPolicy.java
@@ -498,10 +498,14 @@
     /**
      * Convenience method; see javadoc below
      */
-    public static void setAccountHoldFlag(Context context, long accountId, boolean newState) {
+    public static void setAccountHoldFlag(Context context, long accountId, boolean holdEnabled) {
         Account account = Account.restoreAccountWithId(context, accountId);
         if (account != null) {
-            setAccountHoldFlag(context, account, newState);
+            setAccountHoldFlag(context, account, holdEnabled);
+            if (holdEnabled) {
+                // Make sure there's a notification up
+                NotificationController.getInstance(context).showSecurityNeededNotification(account);
+            }
         }
     }
 
diff --git a/src/com/android/email/activity/AccountSelectorAdapter.java b/src/com/android/email/activity/AccountSelectorAdapter.java
index 231c270..12aa06a 100644
--- a/src/com/android/email/activity/AccountSelectorAdapter.java
+++ b/src/com/android/email/activity/AccountSelectorAdapter.java
@@ -114,6 +114,7 @@
         mResourceHelper = ResourceHelper.getInstance(context);
     }
 
+    @Override
     /**
      * {@inheritDoc}
      *
@@ -131,32 +132,36 @@
      * if a particular row is "show all folders" verify that a) it's not an account row and
      * b) it's ID is {@link Mailbox#NO_MAILBOX}.
      *
-     * TODO Use recycled views.  ({@link #getViewTypeCount} and {@link #getItemViewType})
      */
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        Cursor c = getCursor();
-        c.moveToPosition(position);
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
         View view;
-        if (c.getInt(c.getColumnIndex(ROW_TYPE)) == ROW_TYPE_HEADER) {
+        if (cursor.getInt(cursor.getColumnIndex(ROW_TYPE)) == ROW_TYPE_HEADER) {
             view = mInflater.inflate(R.layout.action_bar_spinner_dropdown_header, parent, false);
-            final TextView displayNameView = (TextView) view.findViewById(R.id.display_name);
-            final String displayName = getDisplayName(c);
-            displayNameView.setText(displayName);
         } else {
             view = mInflater.inflate(R.layout.action_bar_spinner_dropdown, parent, false);
+        }
+        return view;
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        if (cursor.getInt(cursor.getColumnIndex(ROW_TYPE)) == ROW_TYPE_HEADER) {
+            final TextView displayNameView = (TextView) view.findViewById(R.id.display_name);
+            final String displayName = getDisplayName(cursor);
+            displayNameView.setText(displayName);
+        } else {
             final TextView displayNameView = (TextView) view.findViewById(R.id.display_name);
             final TextView emailAddressView = (TextView) view.findViewById(R.id.email_address);
             final TextView unreadCountView = (TextView) view.findViewById(R.id.unread_count);
             final View chipView = view.findViewById(R.id.color_chip);
 
-            final String displayName = getDisplayName(c);
-            final String emailAddress = getAccountEmailAddress(c);
+            final String displayName = getDisplayName(cursor);
+            final String emailAddress = getAccountEmailAddress(cursor);
 
             displayNameView.setText(displayName);
 
             // Show the email address only when it's different from the display name.
-            boolean isAccount = isAccountItem(c);
+            boolean isAccount = isAccountItem(cursor);
             if (displayName.equals(emailAddress) || !isAccount) {
                 emailAddressView.setVisibility(View.GONE);
             } else {
@@ -164,16 +169,16 @@
                 emailAddressView.setText(emailAddress);
             }
 
-            long id = getId(c);
+            long id = getId(cursor);
             if (isAccount || id != Mailbox.NO_MAILBOX) {
                 unreadCountView.setVisibility(View.VISIBLE);
                 unreadCountView.setText(UiUtilities.getMessageCountForUi(mContext,
-                        getAccountUnreadCount(c), true));
+                        getAccountUnreadCount(cursor), true));
 
                 // If we're on a combined account, show the color chip indicators for all real
                 // accounts so it can be used as a legend.
                 boolean isCombinedActive =
-                        ((CursorWithExtras) c).getAccountId() == Account.ACCOUNT_ID_COMBINED_VIEW;
+                        ((CursorWithExtras) cursor).getAccountId() == Account.ACCOUNT_ID_COMBINED_VIEW;
 
                 if (isCombinedActive && Account.isNormalAccount(id)) {
                     chipView.setBackgroundColor(mResourceHelper.getAccountColor(id));
@@ -185,19 +190,7 @@
                 unreadCountView.setVisibility(View.INVISIBLE);
                 chipView.setVisibility(View.GONE);
             }
-
         }
-        return view;
-    }
-
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return null; // we don't reuse views.  This method never gets called.
-    }
-
-    @Override
-    public void bindView(View view, Context context, Cursor cursor) {
-        // we don't reuse views.  This method never gets called.
     }
 
     @Override
diff --git a/src/com/android/email/activity/ActionBarController.java b/src/com/android/email/activity/ActionBarController.java
index 4a5df7c..adb1b1b 100644
--- a/src/com/android/email/activity/ActionBarController.java
+++ b/src/com/android/email/activity/ActionBarController.java
@@ -24,7 +24,10 @@
 import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -62,6 +65,13 @@
     private static final int LOADER_ID_ACCOUNT_LIST
             = EmailActivity.ACTION_BAR_CONTROLLER_LOADER_ID_BASE + 0;
 
+    private static final int DISPLAY_TITLE_MULTIPLE_LINES = 0x20;
+    private static final int ACTION_BAR_MASK =
+            ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM
+                    | ActionBar.DISPLAY_SHOW_TITLE | DISPLAY_TITLE_MULTIPLE_LINES;
+    private static final int CUSTOM_ACTION_BAR_OPTIONS =
+            ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM;
+
     private final Context mContext;
     private final LoaderManager mLoaderManager;
     private final ActionBar mActionBar;
@@ -194,6 +204,8 @@
          * Called when the search box is closed.
          */
         public void onSearchExit();
+
+        public void onUpPressed();
     }
 
     public ActionBarController(Context context, LoaderManager loaderManager,
@@ -208,7 +220,7 @@
         mAccountsSelectorAdapter = new AccountSelectorAdapter(mContext);
 
         // Configure action bar.
-        mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM);
+        enterCustomActionBarMode();
 
         // Prepare the custom view
         mActionBar.setCustomView(R.layout.action_bar_custom_view);
@@ -235,6 +247,16 @@
                 }
             }
         });
+        // this other click listener handles clicks that ought to be aliased to "up"
+        // only one or the other listener should be active at any time
+        mActionBarCustomView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallback.onUpPressed();
+            }
+        });
+        // pick a sane default. later enabled in updateTitle().
+        mActionBarCustomView.setClickable(false);
     }
 
     private void initSearchViews() {
@@ -410,6 +432,7 @@
     private void updateTitle() {
         mAccountsSelectorAdapter.swapCursor(mCursor);
 
+        enterCustomActionBarMode();
         if (mCursor == null) {
             // Initial load not finished.
             mActionBarCustomView.setVisibility(View.GONE);
@@ -449,19 +472,27 @@
         UiUtilities.setVisibilitySafe(mSearchContainer, View.GONE);
 
         if (mTitleMode == Callback.TITLE_MODE_MESSAGE_SUBJECT) {
-            mAccountSpinnerLine1View.setSingleLine(false);
-            mAccountSpinnerLine1View.setMaxLines(2);
-            mAccountSpinnerLine1View.setText(mCallback.getMessageSubject());
-            mAccountSpinnerLine2View.setVisibility(View.GONE);
-
-            mAccountSpinnerCountView.setVisibility(View.GONE);
-
+            // Use two line title action bar mode
+            enterMultiLineTitleActionBarMode();
+            String subject = mCallback.getMessageSubject();
+            if (subject == null) {
+                subject = "";
+            }
+            final SpannableString title = new SpannableString(subject);
+            final SpannableStringBuilder builder = new SpannableStringBuilder();
+            title.setSpan(new TextAppearanceSpan(mContext, R.style.subject_action_bar_title_text),
+                    0, subject.length(), 0);
+            builder.append(title);
+            mActionBar.setTitle(builder);
+            mActionBar.setSubtitle(null);
+        } else if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_ALL_FOLDERS_LABEL) {
+            enterSingleLineTitleActionBarMode();
+            mActionBar.setTitle(mAllFoldersLabel);
+            mActionBar.setSubtitle(mCursor.getAccountDisplayName());
         } else {
             // Get mailbox name
             final String mailboxName;
-            if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_ALL_FOLDERS_LABEL) {
-                mailboxName = mAllFoldersLabel;
-            } else if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_MAILBOX) {
+            if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_MAILBOX) {
                 mailboxName = mCursor.getMailboxDisplayName();
             } else {
                 mailboxName = null;
@@ -490,16 +521,31 @@
         boolean spinnerEnabled =
             ((mTitleMode & TITLE_MODE_SPINNER_ENABLED) != 0) && mCursor.shouldEnableSpinner();
 
-
         setSpinnerEnabled(spinnerEnabled);
     }
 
+    private void enterCustomActionBarMode() {
+        mActionBar.setDisplayOptions(CUSTOM_ACTION_BAR_OPTIONS, ACTION_BAR_MASK);
+    }
+
+    private void enterMultiLineTitleActionBarMode() {
+        mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE
+                | DISPLAY_TITLE_MULTIPLE_LINES, ACTION_BAR_MASK);
+    }
+
+    private void enterSingleLineTitleActionBarMode() {
+        mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE,
+                ACTION_BAR_MASK);
+    }
+
     private void setSpinnerEnabled(boolean enabled) {
         if (enabled == mAccountSpinner.isEnabled()) {
             return;
         }
 
         mAccountSpinner.setEnabled(enabled);
+        mAccountSpinner.setClickable(enabled);
+        mActionBarCustomView.setClickable(!enabled);
         if (enabled) {
             mAccountSpinner.setBackgroundDrawable(mAccountSpinnerDefaultBackground);
         } else {
diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java
index ebb3abd..f823b4b 100644
--- a/src/com/android/email/activity/EmailActivity.java
+++ b/src/com/android/email/activity/EmailActivity.java
@@ -57,7 +57,6 @@
     public static final String EXTRA_ACCOUNT_ID = "ACCOUNT_ID";
     public static final String EXTRA_MAILBOX_ID = "MAILBOX_ID";
     public static final String EXTRA_MESSAGE_ID = "MESSAGE_ID";
-    public static final String EXTRA_FROM_KEYGUARD = "FROM_KEYGUARD";
     public static final String EXTRA_QUERY_STRING = "QUERY_STRING";
 
     /** Loader IDs starting with this is safe to use from UIControllers. */
@@ -85,12 +84,10 @@
      *
      * @param accountId If -1, default account will be used.
      */
-    public static Intent createOpenAccountIntent(Activity fromActivity, long accountId,
-            boolean fromKeyguard) {
+    public static Intent createOpenAccountIntent(Activity fromActivity, long accountId) {
         Intent i = IntentUtilities.createRestartAppIntent(fromActivity, EmailActivity.class);
         if (accountId != -1) {
             i.putExtra(EXTRA_ACCOUNT_ID, accountId);
-            i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
         }
         return i;
     }
@@ -103,14 +100,13 @@
      * {@link Mailbox#QUERY_ALL_INBOXES}) don't work.
      */
     public static Intent createOpenMailboxIntent(Activity fromActivity, long accountId,
-            long mailboxId, boolean fromKeyguard) {
+            long mailboxId) {
         if (accountId == -1 || mailboxId == -1) {
             throw new IllegalArgumentException();
         }
         Intent i = IntentUtilities.createRestartAppIntent(fromActivity, EmailActivity.class);
         i.putExtra(EXTRA_ACCOUNT_ID, accountId);
         i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
-        i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
         return i;
     }
 
@@ -123,7 +119,7 @@
      * @param messageId must not be -1.
      */
     public static Intent createOpenMessageIntent(Activity fromActivity, long accountId,
-            long mailboxId, long messageId, boolean fromKeyguard) {
+            long mailboxId, long messageId) {
         if (accountId == -1 || mailboxId == -1 || messageId == -1) {
             throw new IllegalArgumentException();
         }
@@ -131,7 +127,6 @@
         i.putExtra(EXTRA_ACCOUNT_ID, accountId);
         i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
         i.putExtra(EXTRA_MESSAGE_ID, messageId);
-        i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
         return i;
     }
 
@@ -194,16 +189,6 @@
 
         super.onCreate(savedInstanceState);
         ActivityHelper.debugSetWindowFlags(this);
-
-        final Intent intent = getIntent();
-        boolean fromKeyguard = intent.getBooleanExtra(EXTRA_FROM_KEYGUARD, false);
-        if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
-            Log.d(Logging.LOG_TAG, "FLAG_DISMISS_KEYGUARD " + fromKeyguard);
-        }
-        if (fromKeyguard) {
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-        }
-
         setContentView(mUIController.getLayoutId());
 
         mUIController.onActivityViewReady();
@@ -224,6 +209,7 @@
         if (savedInstanceState != null) {
             mUIController.onRestoreInstanceState(savedInstanceState);
         } else {
+            final Intent intent = getIntent();
             final MessageListContext viewContext = MessageListContext.forIntent(this, intent);
             if (viewContext == null) {
                 // This might happen if accounts were deleted on another thread, and there aren't
@@ -329,16 +315,6 @@
         }
     }
 
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus) {
-        if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
-            Log.d(Logging.LOG_TAG, "FLAG_DISMISS_KEYGUARD onWindowFocusChanged " + hasFocus);
-        }
-        if (hasFocus) {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-        }
-    }
-
     /**
      * Force dismiss the error banner.
      */
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 487f7f5..6a3877f 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -371,7 +371,9 @@
 
     private void setAccount(Account account) {
         if (account == null) {
-            throw new IllegalArgumentException();
+            Utility.showToast(this, R.string.widget_no_accounts);
+            Log.d(Logging.LOG_TAG, "The account has been deleted, force finish it");
+            finish();
         }
         mAccount = account;
         mFromView.setText(account.mEmailAddress);
diff --git a/src/com/android/email/activity/ShortcutPicker.java b/src/com/android/email/activity/ShortcutPicker.java
index d80ecf1..94d6f05 100644
--- a/src/com/android/email/activity/ShortcutPicker.java
+++ b/src/com/android/email/activity/ShortcutPicker.java
@@ -143,7 +143,7 @@
             // TODO if we add meta-mailboxes/accounts to the database, remove this special case
             if (account.mId == Account.ACCOUNT_ID_COMBINED_VIEW) {
                 shortcutIntent = Welcome.createOpenMessageIntent(
-                        myActivity, account.mId, mailboxId, Message.NO_MESSAGE, false);
+                        myActivity, account.mId, mailboxId, Message.NO_MESSAGE);
             } else {
                 String uuid = account.mCompatibilityUuid;
                 shortcutIntent = Welcome.createAccountShortcutIntent(myActivity, uuid, mailboxId);
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 2ce9357..05f8e53 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -253,6 +253,11 @@
         public void onSearchExit() {
             UIControllerOnePane.this.onSearchExit();
         }
+
+        @Override
+        public void onUpPressed() {
+            onBackPressed(false);
+        }
     }
 
     public UIControllerOnePane(EmailActivity activity) {
diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index b73229f..58914e7 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -739,5 +739,10 @@
         public void onSearchExit() {
             UIControllerTwoPane.this.onSearchExit();
         }
+
+        @Override
+        public void onUpPressed() {
+            onBackPressed(false);
+        }
     }
 }
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index a2a0fa1..062ca22 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -86,7 +86,7 @@
      */
     private static final String EXTRA_DEBUG_PANE_MODE = "DEBUG_PANE_MODE";
 
-    private static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
+    public static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
 
     private final EmailAsyncTask.Tracker mTaskTracker = new EmailAsyncTask.Tracker();
 
@@ -95,7 +95,6 @@
     private long mAccountId;
     private long mMailboxId;
     private long mMessageId;
-    private boolean mFromKeyguard;
     private String mAccountUuid;
 
     private MailboxFinder mInboxFinder;
@@ -125,15 +124,13 @@
      * Create an Intent to open a message.
      */
     public static Intent createOpenMessageIntent(Context context, long accountId,
-            long mailboxId, long messageId, boolean fromKeyguard) {
+            long mailboxId, long messageId) {
         final Uri.Builder b = IntentUtilities.createActivityIntentUrlBuilder(
                 VIEW_MAILBOX_INTENT_URL_PATH);
         IntentUtilities.setAccountId(b, accountId);
         IntentUtilities.setMailboxId(b, mailboxId);
         IntentUtilities.setMessageId(b, messageId);
-        Intent i = IntentUtilities.createRestartAppIntent(b.build());
-        i.putExtra(EmailActivity.EXTRA_FROM_KEYGUARD, fromKeyguard);
-        return i;
+        return IntentUtilities.createRestartAppIntent(b.build());
     }
 
     /**
@@ -192,7 +189,6 @@
         mAccountId = IntentUtilities.getAccountIdFromIntent(intent);
         mMailboxId = IntentUtilities.getMailboxIdFromIntent(intent);
         mMessageId = IntentUtilities.getMessageIdFromIntent(intent);
-        mFromKeyguard = intent.getBooleanExtra(EmailActivity.EXTRA_FROM_KEYGUARD, false);
         mAccountUuid = IntentUtilities.getAccountUuidFromIntent(intent);
         UiUtilities.setDebugPaneMode(getDebugPaneMode(intent));
 
@@ -380,12 +376,11 @@
     private void startEmailActivity() {
         final Intent i;
         if (mMessageId != Message.NO_MESSAGE) {
-            i = EmailActivity.createOpenMessageIntent(this, mAccountId, mMailboxId, mMessageId,
-                mFromKeyguard);
+            i = EmailActivity.createOpenMessageIntent(this, mAccountId, mMailboxId, mMessageId);
         } else if (mMailboxId != Mailbox.NO_MAILBOX) {
-            i = EmailActivity.createOpenMailboxIntent(this, mAccountId, mMailboxId, mFromKeyguard);
+            i = EmailActivity.createOpenMailboxIntent(this, mAccountId, mMailboxId);
         } else {
-            i = EmailActivity.createOpenAccountIntent(this, mAccountId, mFromKeyguard);
+            i = EmailActivity.createOpenAccountIntent(this, mAccountId);
         }
         startActivity(i);
         finish();
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index 7e19076..02ef74c 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -78,7 +78,8 @@
     private static final String PREFERENCE_CATEGORY_DATA_USAGE = "data_usage";
     private static final String PREFERENCE_CATEGORY_NOTIFICATIONS = "account_notifications";
     private static final String PREFERENCE_NOTIFY = "account_notify";
-    private static final String PREFERENCE_VIBRATE_WHEN = "account_settings_vibrate_when";
+    private static final String PREFERENCE_VIBRATE = "account_settings_vibrate";
+    private static final String PREFERENCE_VIBRATE_OLD = "account_settings_vibrate_when";
     private static final String PREFERENCE_RINGTONE = "account_ringtone";
     private static final String PREFERENCE_CATEGORY_SERVER = "account_servers";
     private static final String PREFERENCE_INCOMING = "incoming";
@@ -88,11 +89,6 @@
     private static final String PREFERENCE_SYNC_EMAIL = "account_sync_email";
     private static final String PREFERENCE_DELETE_ACCOUNT = "delete_account";
 
-    // These strings must match account_settings_vibrate_when_* strings in strings.xml
-    private static final String PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS = "always";
-    private static final String PREFERENCE_VALUE_VIBRATE_WHEN_SILENT = "silent";
-    private static final String PREFERENCE_VALUE_VIBRATE_WHEN_NEVER = "never";
-
     private EditTextPreference mAccountDescription;
     private EditTextPreference mAccountName;
     private EditTextPreference mAccountSignature;
@@ -101,7 +97,7 @@
     private CheckBoxPreference mAccountBackgroundAttachments;
     private CheckBoxPreference mAccountDefault;
     private CheckBoxPreference mAccountNotify;
-    private ListPreference mAccountVibrateWhen;
+    private CheckBoxPreference mAccountVibrate;
     private RingtonePreference mAccountRingtone;
     private CheckBoxPreference mSyncContacts;
     private CheckBoxPreference mSyncCalendar;
@@ -175,6 +171,8 @@
         }
         super.onCreate(savedInstanceState);
 
+        upgradeVibrateSetting();
+
         // Load the preferences from an XML resource
         addPreferencesFromResource(R.xml.account_settings_preferences);
 
@@ -192,6 +190,20 @@
         mAccountDirty = false;
     }
 
+    /**
+     * Upgrades the old tri-state vibrate setting to the new boolean value.
+     */
+    private void upgradeVibrateSetting() {
+        final SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences();
+
+        if (!sharedPreferences.contains(PREFERENCE_VIBRATE)) {
+            // Try to migrate the old one
+            final boolean vibrate =
+                    "always".equals(sharedPreferences.getString(PREFERENCE_VIBRATE_OLD, ""));
+            sharedPreferences.edit().putBoolean(PREFERENCE_VIBRATE, vibrate);
+        }
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
@@ -502,33 +514,21 @@
         prefs.edit().putString(PREFERENCE_RINGTONE, mAccount.getRingtone()).apply();
 
         // Set the vibrator value, or hide it on devices w/o a vibrator
-        mAccountVibrateWhen = (ListPreference) findPreference(PREFERENCE_VIBRATE_WHEN);
+        mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE);
         Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
         if (vibrator.hasVibrator()) {
             // Calculate the value to set based on the choices, and set the value.
-            final boolean vibrateAlways = 0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE_ALWAYS);
-            final boolean vibrateWhenSilent =
-                    0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE_WHEN_SILENT);
-            final String vibrateSetting =
-                    vibrateAlways ? PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS :
-                        vibrateWhenSilent ? PREFERENCE_VALUE_VIBRATE_WHEN_SILENT :
-                            PREFERENCE_VALUE_VIBRATE_WHEN_NEVER;
-            mAccountVibrateWhen.setValue(vibrateSetting);
+            final boolean vibrate = 0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE);
+            mAccountVibrate.setChecked(vibrate);
 
-            // Update the summary string.
-            final int index = mAccountVibrateWhen.findIndexOfValue(vibrateSetting);
-            mAccountVibrateWhen.setSummary(mAccountVibrateWhen.getEntries()[index]);
-
-            // When the value is changed, update the summary in addition to the setting.
-            mAccountVibrateWhen.setOnPreferenceChangeListener(
+            // When the value is changed, update the setting.
+            mAccountVibrate.setOnPreferenceChangeListener(
                     new Preference.OnPreferenceChangeListener() {
                         @Override
                         public boolean onPreferenceChange(Preference preference, Object newValue) {
-                            final String vibrateSetting = newValue.toString();
-                            final int index = mAccountVibrateWhen.findIndexOfValue(vibrateSetting);
-                            mAccountVibrateWhen.setSummary(mAccountVibrateWhen.getEntries()[index]);
-                            mAccountVibrateWhen.setValue(vibrateSetting);
-                            onPreferenceChanged(PREFERENCE_VIBRATE_WHEN, newValue);
+                            final boolean vibrateSetting = (Boolean) newValue;
+                            mAccountVibrate.setChecked(vibrateSetting);
+                            onPreferenceChanged(PREFERENCE_VIBRATE, newValue);
                             return false;
                         }
                     });
@@ -536,7 +536,7 @@
             // No vibrator present. Remove the preference altogether.
             PreferenceCategory notificationsCategory = (PreferenceCategory)
                     findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS);
-            notificationsCategory.removePreference(mAccountVibrateWhen);
+            notificationsCategory.removePreference(mAccountVibrate);
         }
 
         findPreference(PREFERENCE_INCOMING).setOnPreferenceClickListener(
@@ -639,7 +639,7 @@
         // Turn off all controlled flags - will turn them back on while checking UI elements
         int newFlags = mAccount.getFlags() &
                 ~(Account.FLAGS_NOTIFY_NEW_MAIL |
-                        Account.FLAGS_VIBRATE_ALWAYS | Account.FLAGS_VIBRATE_WHEN_SILENT |
+                        Account.FLAGS_VIBRATE |
                         Account.FLAGS_BACKGROUND_ATTACHMENTS);
 
         newFlags |= mAccountBackgroundAttachments.isChecked() ?
@@ -655,10 +655,8 @@
         if (mSyncWindow != null) {
             mAccount.setSyncLookback(Integer.parseInt(mSyncWindow.getValue()));
         }
-        if (mAccountVibrateWhen.getValue().equals(PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS)) {
-            newFlags |= Account.FLAGS_VIBRATE_ALWAYS;
-        } else if (mAccountVibrateWhen.getValue().equals(PREFERENCE_VALUE_VIBRATE_WHEN_SILENT)) {
-            newFlags |= Account.FLAGS_VIBRATE_WHEN_SILENT;
+        if (mAccountVibrate.isChecked()) {
+            newFlags |= Account.FLAGS_VIBRATE;
         }
         SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();
         mAccount.setRingtone(prefs.getString(PREFERENCE_RINGTONE, null));
diff --git a/src/com/android/email/mail/store/ImapFolder.java b/src/com/android/email/mail/store/ImapFolder.java
index bd194be..5d49b01 100644
--- a/src/com/android/email/mail/store/ImapFolder.java
+++ b/src/com/android/email/mail/store/ImapFolder.java
@@ -57,6 +57,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Locale;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -186,7 +187,7 @@
             }
         }
         try {
-            connection.executeSimpleCommand(String.format(
+            connection.executeSimpleCommand(String.format(Locale.US,
                     ImapConstants.STATUS + " \"%s\" (" + ImapConstants.UIDVALIDITY + ")",
                     ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
             mExists = true;
@@ -232,7 +233,8 @@
             }
         }
         try {
-            connection.executeSimpleCommand(String.format(ImapConstants.CREATE + " \"%s\"",
+            connection.executeSimpleCommand(String.format(Locale.US,
+                    ImapConstants.CREATE + " \"%s\"",
                     ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
             return true;
 
@@ -256,7 +258,7 @@
         checkOpen();
         try {
             List<ImapResponse> responseList = mConnection.executeSimpleCommand(
-                    String.format(ImapConstants.UID_COPY + " %s \"%s\"",
+                    String.format(Locale.US, ImapConstants.UID_COPY + " %s \"%s\"",
                             ImapStore.joinMessageUids(messages),
                             ImapStore.encodeFolderName(folder.getName(), mStore.mPathPrefix)));
             // Build a message map for faster UID matching
@@ -305,14 +307,15 @@
             }
             // If the server doesn't support UIDPLUS, try a different way to get the new UID(s)
             if (callbacks != null && !handledUidPlus) {
-                ImapFolder newFolder = (ImapFolder)folder;
+                final ImapFolder newFolder = (ImapFolder)folder;
                 try {
                     // Temporarily select the destination folder
                     newFolder.open(OpenMode.READ_WRITE);
                     // Do the search(es) ...
                     for (Message m : messages) {
-                        String searchString = "HEADER Message-Id \"" + m.getMessageId() + "\"";
-                        String[] newIdArray = newFolder.searchForUids(searchString);
+                        final String searchString =
+                                "HEADER Message-Id \"" + m.getMessageId() + "\"";
+                        final String[] newIdArray = newFolder.searchForUids(searchString);
                         if (newIdArray.length == 1) {
                             callbacks.onMessageUidChange(m, newIdArray[0]);
                         }
@@ -343,9 +346,10 @@
         checkOpen();
         try {
             int unreadMessageCount = 0;
-            List<ImapResponse> responses = mConnection.executeSimpleCommand(String.format(
-                    ImapConstants.STATUS + " \"%s\" (" + ImapConstants.UNSEEN + ")",
-                    ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
+            final List<ImapResponse> responses = mConnection.executeSimpleCommand(
+                    String.format(Locale.US,
+                            ImapConstants.STATUS + " \"%s\" (" + ImapConstants.UNSEEN + ")",
+                            ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
             // S: * STATUS mboxname (MESSAGES 231 UIDNEXT 44292)
             for (ImapResponse response : responses) {
                 if (response.isDataResponse(0, ImapConstants.STATUS)) {
@@ -407,7 +411,7 @@
     public Message getMessage(String uid) throws MessagingException {
         checkOpen();
 
-        String[] uids = searchForUids(ImapConstants.UID + " " + uid);
+        final String[] uids = searchForUids(ImapConstants.UID + " " + uid);
         for (int i = 0; i < uids.length; i++) {
             if (uids[i].equals(uid)) {
                 return new ImapMessage(uid, this);
@@ -436,7 +440,7 @@
     public Message[] getMessages(SearchParams params, MessageRetrievalListener listener)
             throws MessagingException {
         List<String> commands = new ArrayList<String>();
-        String filter = params.mFilter;
+        final String filter = params.mFilter;
         // All servers MUST accept US-ASCII, so we'll send this as the CHARSET unless we're really
         // dealing with a string that contains non-ascii characters
         String charset = "US-ASCII";
@@ -444,7 +448,7 @@
             charset = "UTF-8";
         }
         // This is the length of the string in octets (bytes), formatted as a string literal {n}
-        String octetLength = "{" + filter.getBytes().length + "}";
+        final String octetLength = "{" + filter.getBytes().length + "}";
         // Break the command up into pieces ending with the string literal length
         commands.add(ImapConstants.UID_SEARCH + " CHARSET " + charset + " OR FROM " + octetLength);
         commands.add(filter + " (OR TO " + octetLength);
@@ -478,7 +482,7 @@
             throw new MessagingException(String.format("Invalid range: %d %d", start, end));
         }
         return getMessagesInternal(
-                searchForUids(String.format("%d:%d NOT DELETED", start, end)), listener);
+                searchForUids(String.format(Locale.US, "%d:%d NOT DELETED", start, end)), listener);
     }
 
     @Override
@@ -564,7 +568,7 @@
 
         final Part fetchPart = fp.getFirstPart();
         if (fetchPart != null) {
-            String[] partIds =
+            final String[] partIds =
                     fetchPart.getHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA);
             if (partIds != null) {
                 fetchFields.add(ImapConstants.FETCH_FIELD_BODY_PEEK_BARE
@@ -573,7 +577,7 @@
         }
 
         try {
-            mConnection.sendCommand(String.format(
+            mConnection.sendCommand(String.format(Locale.US,
                     ImapConstants.UID_FETCH + " %s (%s)", ImapStore.joinMessageUids(messages),
                     Utility.combine(fetchFields.toArray(new String[fetchFields.size()]), ' ')
                     ), false);
@@ -753,7 +757,7 @@
 
                 } else {
                     if (e.isString()) {
-                        mp.setSubType(bs.getStringOrEmpty(i).getString().toLowerCase());
+                        mp.setSubType(bs.getStringOrEmpty(i).getString().toLowerCase(Locale.US));
                     }
                     break; // Ignore the rest of the list.
                 }
@@ -778,7 +782,7 @@
             final ImapString type = bs.getStringOrEmpty(0);
             final ImapString subType = bs.getStringOrEmpty(1);
             final String mimeType =
-                    (type.getString() + "/" + subType.getString()).toLowerCase();
+                    (type.getString() + "/" + subType.getString()).toLowerCase(Locale.US);
 
             final ImapList bodyParams = bs.getListOrEmpty(2);
             final ImapString cid = bs.getStringOrEmpty(3);
@@ -836,7 +840,7 @@
 
             if (bodyDisposition.size() > 0) {
                 final String bodyDisposition0Str =
-                        bodyDisposition.getStringOrEmpty(0).getString().toLowerCase();
+                        bodyDisposition.getStringOrEmpty(0).getString().toLowerCase(Locale.US);
                 if (!TextUtils.isEmpty(bodyDisposition0Str)) {
                     contentDisposition.append(bodyDisposition0Str);
                 }
@@ -850,9 +854,9 @@
                     for (int i = 1, count = bodyDispositionParams.size(); i < count; i += 2) {
 
                         // TODO We need to convert " into %22.  See above.
-                        contentDisposition.append(String.format(";\n %s=\"%s\"",
+                        contentDisposition.append(String.format(Locale.US, ";\n %s=\"%s\"",
                                 bodyDispositionParams.getStringOrEmpty(i - 1)
-                                        .getString().toLowerCase(),
+                                        .getString().toLowerCase(Locale.US),
                                 bodyDispositionParams.getStringOrEmpty(i).getString()));
                     }
                 }
@@ -861,7 +865,7 @@
             if ((size > 0)
                     && (MimeUtility.getHeaderParameter(contentDisposition.toString(), "size")
                             == null)) {
-                contentDisposition.append(String.format(";\n size=%d", size));
+                contentDisposition.append(String.format(Locale.US, ";\n size=%d", size));
             }
 
             if (contentDisposition.length() > 0) {
@@ -937,7 +941,7 @@
                 }
 
                 mConnection.sendCommand(
-                        String.format(ImapConstants.APPEND + " \"%s\" (%s) {%d}",
+                        String.format(Locale.US, ImapConstants.APPEND + " \"%s\" (%s) {%d}",
                                 ImapStore.encodeFolderName(mName, mStore.mPathPrefix),
                                 flagList,
                                 out.getCount()), false);
@@ -976,19 +980,20 @@
                  * Message-ID header.  If there are more than one response, take the
                  * last one, as it's most likely the newest (the one we just uploaded).
                  */
-                String messageId = message.getMessageId();
+                final String messageId = message.getMessageId();
                 if (messageId == null || messageId.length() == 0) {
                     continue;
                 }
                 // Most servers don't care about parenthesis in the search query [and, some
                 // fail to work if they are used]
-                String[] uids = searchForUids(String.format("HEADER MESSAGE-ID %s", messageId));
+                String[] uids = searchForUids(
+                        String.format(Locale.US, "HEADER MESSAGE-ID %s", messageId));
                 if (uids.length > 0) {
                     message.setUid(uids[0]);
                 }
                 // However, there's at least one server [AOL] that fails to work unless there
                 // are parenthesis, so, try this as a last resort
-                uids = searchForUids(String.format("(HEADER MESSAGE-ID %s)", messageId));
+                uids = searchForUids(String.format(Locale.US, "(HEADER MESSAGE-ID %s)", messageId));
                 if (uids.length > 0) {
                     message.setUid(uids[0]);
                 }
@@ -1036,7 +1041,7 @@
             allFlags = flagList.substring(1);
         }
         try {
-            mConnection.executeSimpleCommand(String.format(
+            mConnection.executeSimpleCommand(String.format(Locale.US,
                     ImapConstants.UID_STORE + " %s %s" + ImapConstants.FLAGS_SILENT + " (%s)",
                     ImapStore.joinMessageUids(messages),
                     value ? "+" : "-",
@@ -1073,8 +1078,8 @@
      * must be selected.
      */
     private void doSelect() throws IOException, MessagingException {
-        List<ImapResponse> responses = mConnection.executeSimpleCommand(
-                String.format(ImapConstants.SELECT + " \"%s\"",
+        final List<ImapResponse> responses = mConnection.executeSimpleCommand(
+                String.format(Locale.US, ImapConstants.SELECT + " \"%s\"",
                         ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
 
         // Assume the folder is opened read-write; unless we are notified otherwise
diff --git a/src/com/android/email/mail/store/Pop3Store.java b/src/com/android/email/mail/store/Pop3Store.java
index b3ee420..407d47e 100644
--- a/src/com/android/email/mail/store/Pop3Store.java
+++ b/src/com/android/email/mail/store/Pop3Store.java
@@ -48,6 +48,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 
 public class Pop3Store extends Store {
     // All flags defining debug or development code settings must be FALSE
@@ -786,13 +787,19 @@
             int messageId = mUidToMsgNumMap.get(message.getUid());
             if (lines == -1) {
                 // Fetch entire message
-                response = executeSimpleCommand(String.format("RETR %d", messageId));
+                response = executeSimpleCommand(String.format(Locale.US, "RETR %d", messageId));
             } else {
                 // Fetch partial message.  Try "TOP", and fall back to slower "RETR" if necessary
                 try {
-                    response = executeSimpleCommand(String.format("TOP %d %d", messageId,  lines));
+                    response = executeSimpleCommand(
+                            String.format(Locale.US, "TOP %d %d", messageId,  lines));
                 } catch (MessagingException me) {
-                    response = executeSimpleCommand(String.format("RETR %d", messageId));
+                    try {
+                        response = executeSimpleCommand(
+                                String.format(Locale.US, "RETR %d", messageId));
+                    } catch (MessagingException e) {
+                        Log.w(Logging.LOG_TAG, "Can't read message " + messageId);
+                    }
                 }
             }
             if (response != null)  {
@@ -846,8 +853,16 @@
             }
             try {
                 for (Message message : messages) {
-                    executeSimpleCommand(String.format("DELE %s",
-                            mUidToMsgNumMap.get(message.getUid())));
+                    try {
+                        final String uid = message.getUid();
+                        final int msgNum = mUidToMsgNumMap.get(uid);
+                        executeSimpleCommand(String.format(Locale.US, "DELE %s", msgNum));
+                        // Remove from the maps
+                        mMsgNumToMsgMap.remove(msgNum);
+                        mUidToMsgNumMap.remove(uid);
+                    } catch (MessagingException e) {
+                        // A failed deletion isn't a problem
+                    }
                 }
             }
             catch (IOException ioe) {
diff --git a/src/com/android/email/mail/transport/MailTransport.java b/src/com/android/email/mail/transport/MailTransport.java
index 751be50..3f4d7bc 100644
--- a/src/com/android/email/mail/transport/MailTransport.java
+++ b/src/com/android/email/mail/transport/MailTransport.java
@@ -167,7 +167,8 @@
         try {
             SocketAddress socketAddress = new InetSocketAddress(getHost(), getPort());
             if (canTrySslSecurity()) {
-                mSocket = SSLUtils.getSSLSocketFactory(canTrustAllCertificates()).createSocket();
+                mSocket = SSLUtils.getSSLSocketFactory(
+                        canTrustAllCertificates(), SOCKET_CONNECT_TIMEOUT).createSocket();
             } else {
                 mSocket = new Socket();
             }
@@ -203,8 +204,9 @@
     @Override
     public void reopenTls() throws MessagingException {
         try {
-            mSocket = SSLUtils.getSSLSocketFactory(canTrustAllCertificates())
-                    .createSocket(mSocket, getHost(), getPort(), true);
+            mSocket =
+                    SSLUtils.getSSLSocketFactory(canTrustAllCertificates(), SOCKET_CONNECT_TIMEOUT)
+                            .createSocket(mSocket, getHost(), getPort(), true);
             mSocket.setSoTimeout(SOCKET_READ_TIMEOUT);
             mIn = new BufferedInputStream(mSocket.getInputStream(), 1024);
             mOut = new BufferedOutputStream(mSocket.getOutputStream(), 512);
@@ -281,20 +283,34 @@
      */
     @Override
     public void close() {
+        if (Email.DEBUG) {
+            Log.d(Logging.LOG_TAG, "*** " + mDebugLabel + " close " +
+                    getHost() + ":" + String.valueOf(getPort()));
+        }
+
         try {
             mIn.close();
         } catch (Exception e) {
             // May fail if the connection is already closed.
+            if (Email.DEBUG) {
+                Log.d(Logging.LOG_TAG, e.toString());
+            }
         }
         try {
             mOut.close();
         } catch (Exception e) {
             // May fail if the connection is already closed.
+            if (Email.DEBUG) {
+                Log.d(Logging.LOG_TAG, e.toString());
+            }
         }
         try {
             mSocket.close();
         } catch (Exception e) {
             // May fail if the connection is already closed.
+            if (Email.DEBUG) {
+                Log.d(Logging.LOG_TAG, e.toString());
+            }
         }
         mIn = null;
         mOut = null;
diff --git a/src/com/android/email/mail/transport/SmtpSender.java b/src/com/android/email/mail/transport/SmtpSender.java
index a9b13a6..1f87922 100644
--- a/src/com/android/email/mail/transport/SmtpSender.java
+++ b/src/com/android/email/mail/transport/SmtpSender.java
@@ -202,15 +202,15 @@
         Address[] bcc = Address.unpack(message.mBcc);
 
         try {
-            executeSimpleCommand("MAIL FROM: " + "<" + from.getAddress() + ">");
+            executeSimpleCommand("MAIL FROM:" + "<" + from.getAddress() + ">");
             for (Address address : to) {
-                executeSimpleCommand("RCPT TO: " + "<" + address.getAddress() + ">");
+                executeSimpleCommand("RCPT TO:" + "<" + address.getAddress() + ">");
             }
             for (Address address : cc) {
-                executeSimpleCommand("RCPT TO: " + "<" + address.getAddress() + ">");
+                executeSimpleCommand("RCPT TO:" + "<" + address.getAddress() + ">");
             }
             for (Address address : bcc) {
-                executeSimpleCommand("RCPT TO: " + "<" + address.getAddress() + ">");
+                executeSimpleCommand("RCPT TO:" + "<" + address.getAddress() + ">");
             }
             executeSimpleCommand("DATA");
             // TODO byte stuffing
diff --git a/src/com/android/email/provider/DBHelper.java b/src/com/android/email/provider/DBHelper.java
index 6721569..872948c 100644
--- a/src/com/android/email/provider/DBHelper.java
+++ b/src/com/android/email/provider/DBHelper.java
@@ -942,16 +942,20 @@
         Cursor c = db.query(Account.TABLE_NAME,
                 new String[] {EmailContent.RECORD_ID /*0*/, AccountColumns.SECURITY_FLAGS /*1*/},
                 AccountColumns.SECURITY_FLAGS + ">0", null, null, null, null);
-        ContentValues cv = new ContentValues();
-        String[] args = new String[1];
-        while (c.moveToNext()) {
-            long securityFlags = c.getLong(1 /*SECURITY_FLAGS*/);
-            Policy policy = LegacyPolicySet.flagsToPolicy(securityFlags);
-            long policyId = db.insert(Policy.TABLE_NAME, null, policy.toContentValues());
-            cv.put(AccountColumns.POLICY_KEY, policyId);
-            cv.putNull(AccountColumns.SECURITY_FLAGS);
-            args[0] = Long.toString(c.getLong(0 /*RECORD_ID*/));
-            db.update(Account.TABLE_NAME, cv, EmailContent.RECORD_ID + "=?", args);
+        try {
+            ContentValues cv = new ContentValues();
+            String[] args = new String[1];
+            while (c.moveToNext()) {
+                long securityFlags = c.getLong(1 /*SECURITY_FLAGS*/);
+                Policy policy = LegacyPolicySet.flagsToPolicy(securityFlags);
+                long policyId = db.insert(Policy.TABLE_NAME, null, policy.toContentValues());
+                cv.put(AccountColumns.POLICY_KEY, policyId);
+                cv.putNull(AccountColumns.SECURITY_FLAGS);
+                args[0] = Long.toString(c.getLong(0 /*RECORD_ID*/));
+                db.update(Account.TABLE_NAME, cv, EmailContent.RECORD_ID + "=?", args);
+            }
+        } finally {
+            c.close();
         }
     }
 
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 4891b08..6614aa8 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -31,6 +31,7 @@
 import android.database.MatrixCursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
+import android.database.DatabaseUtils;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
@@ -610,17 +611,13 @@
         }
 
         // If we have accounts, we're done
-        Cursor c = mainDatabase.query(Account.TABLE_NAME, EmailContent.ID_PROJECTION, null, null,
-                null, null, null);
-        try {
-            if (c.moveToFirst()) {
-                if (Email.DEBUG) {
-                    Log.w(TAG, "restoreIfNeeded: Account exists.");
-                }
-                return; // At least one account exists.
-            }
-        } finally {
-            c.close();
+        if(DatabaseUtils.longForQuery(mainDatabase,
+                                      "SELECT EXISTS (SELECT ? FROM " + Account.TABLE_NAME + " )", 
+                                      EmailContent.ID_PROJECTION) > 0) {
+          if (Email.DEBUG) {
+            Log.w(TAG, "restoreIfNeeded: Account exists.");
+          }
+          return;
         }
 
         restoreAccounts(context, mainDatabase);
@@ -1024,8 +1021,8 @@
 
     @Override
     public boolean onCreate() {
-        Email.setServicesEnabledAsync(getContext());
         checkDatabases();
+        Email.setServicesEnabledAsync(getContext());
         return false;
     }
 
@@ -1035,7 +1032,7 @@
      * any "orphan" database, so that both will be created together.  Note that an "orphan" database
      * will exist after either of the individual databases is deleted due to data corruption.
      */
-    public void checkDatabases() {
+    public synchronized void checkDatabases() {
         // Uncache the databases
         if (mDatabase != null) {
             mDatabase = null;
@@ -1050,10 +1047,10 @@
         // TODO Make sure attachments are deleted
         if (databaseFile.exists() && !bodyFile.exists()) {
             Log.w(TAG, "Deleting orphaned EmailProvider database...");
-            databaseFile.delete();
+            getContext().deleteDatabase(DATABASE_NAME);
         } else if (bodyFile.exists() && !databaseFile.exists()) {
             Log.w(TAG, "Deleting orphaned EmailProviderBody database...");
-            bodyFile.delete();
+            getContext().deleteDatabase(BODY_DATABASE_NAME);
         }
     }
     @Override
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 0f6731b..7ac09c7 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -110,10 +110,6 @@
 
         @Override
         public int onStartCommand(Intent intent, int flags, int startId) {
-            if (intent.getData() != null) {
-                // EmailWidget creates intents, so it knows how to handle them.
-                EmailWidget.processIntent(this, intent);
-            }
             return Service.START_NOT_STICKY;
         }
 
diff --git a/src/com/android/email/service/PopImapSyncAdapterService.java b/src/com/android/email/service/PopImapSyncAdapterService.java
index ac47bba..ddb610b 100644
--- a/src/com/android/email/service/PopImapSyncAdapterService.java
+++ b/src/com/android/email/service/PopImapSyncAdapterService.java
@@ -36,7 +36,7 @@
 import com.android.emailcommon.provider.Mailbox;
 
 public class PopImapSyncAdapterService extends Service {
-    private static final String TAG = "PopImapSyncAdapterService";
+    private static final String TAG = "PopImapSyncService";
     private static SyncAdapterImpl sSyncAdapter = null;
     private static final Object sSyncAdapterLock = new Object();
 
@@ -87,18 +87,25 @@
         if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, false)) {
             String emailAddress = account.name;
             // Find an EmailProvider account with the Account's email address
-            Cursor c = context.getContentResolver().query(
-                    com.android.emailcommon.provider.Account.CONTENT_URI,
-                    EmailContent.ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?",
-                    new String[] {emailAddress}, null);
-            if (c.moveToNext()) {
-                // If we have one, find the inbox and start it syncing
-                long accountId = c.getLong(EmailContent.ID_PROJECTION_COLUMN);
-                long mailboxId = Mailbox.findMailboxOfType(context, accountId,
-                        Mailbox.TYPE_INBOX);
-                if (mailboxId > 0) {
-                    Log.d(TAG, "Starting manual sync for account " + emailAddress);
-                    Controller.getInstance(context).updateMailbox(accountId, mailboxId, false);
+            Cursor c = null;
+            try {
+                c = context.getContentResolver().query(
+                        com.android.emailcommon.provider.Account.CONTENT_URI,
+                        EmailContent.ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?",
+                        new String[] {emailAddress}, null);
+                if (c != null && c.moveToNext()) {
+                    // If we have one, find the inbox and start it syncing
+                    long accountId = c.getLong(EmailContent.ID_PROJECTION_COLUMN);
+                    long mailboxId = Mailbox.findMailboxOfType(context, accountId,
+                            Mailbox.TYPE_INBOX);
+                    if (mailboxId > 0) {
+                        Log.d(TAG, "Starting manual sync for account " + emailAddress);
+                        Controller.getInstance(context).updateMailbox(accountId, mailboxId, false);
+                    }
+                }
+            } finally {
+                if ( c != null) {
+                    c.close();
                 }
             }
         }
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index 4856305..476f884 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -221,57 +221,26 @@
      * @param baseUri the base uri for the command
      * @param args any arguments to the command
      */
-    private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String ... args) {
-        Intent intent = new Intent();
-        Builder builder = baseUri.buildUpon();
-        for (String arg: args) {
-            builder.appendPath(arg);
+    private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String messageId,
+            String mailboxId) {
+        Intent intent = null;
+        try {
+            intent = getOpenMessageIntent(mContext, Long.parseLong(messageId),
+                Long.parseLong(mailboxId));
+        } catch (NumberFormatException e) {
+            if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
+                Log.d(TAG, "#setFillInIntent(); invalid messageId: " + messageId +
+                    " or mailboxId: " + mailboxId);
+            }
         }
-        intent.setDataAndType(builder.build(), WIDGET_DATA_MIME_TYPE);
         views.setOnClickFillInIntent(viewId, intent);
     }
 
-    /**
-     * Called back by {@link com.android.email.provider.WidgetProvider.WidgetService} to
-     * handle intents created by remote views.
-     */
-    public static boolean processIntent(Context context, Intent intent) {
-        final Uri data = intent.getData();
-        if (data == null) {
-            return false;
-        }
-        List<String> pathSegments = data.getPathSegments();
-        // Our path segments are <command>, <arg1> [, <arg2>]
-        // First, a quick check of Uri validity
-        if (pathSegments.size() < 2) {
-            throw new IllegalArgumentException();
-        }
-        String command = pathSegments.get(0);
-        // Ignore unknown action names
-        try {
-            final long arg1 = Long.parseLong(pathSegments.get(1));
-            if (EmailWidget.COMMAND_NAME_VIEW_MESSAGE.equals(command)) {
-                // "view", <message id>, <mailbox id>
-                openMessage(context, Long.parseLong(pathSegments.get(2)), arg1);
-            }
-        } catch (NumberFormatException e) {
-            // Shouldn't happen as we construct all of the Uri's
-            return false;
-        }
-        return true;
-    }
-
-    private static void openMessage(final Context context, final long mailboxId,
-            final long messageId) {
-        EmailAsyncTask.runAsyncParallel(new Runnable() {
-            @Override
-            public void run() {
-                Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
-                if (mailbox == null) return;
-                context.startActivity(Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
-                        mailboxId, messageId, true));
-            }
-        });
+    private Intent getOpenMessageIntent(final Context context, final long messageId,
+            final long mailboxId) {
+        Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
+        return (mailbox == null) ? null : Welcome.createOpenMessageIntent(context,
+                mailbox.mAccountKey, mailboxId, messageId);
     }
 
     private void setTextViewTextAndDesc(RemoteViews views, final int id, String text) {
@@ -317,7 +286,8 @@
 
         if (isCursorValid()) {
             // Show compose icon & message list
-            if (mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
+            if (mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW
+                || Account.restoreAccountWithId(mContext, mAccountId) == null) {
                 // Don't allow compose for "combined" view
                 views.setViewVisibility(R.id.widget_compose, View.INVISIBLE);
             } else {
@@ -344,8 +314,8 @@
         }
 
         // Use a bare intent for our template; we need to fill everything in
-        intent = new Intent(mContext, WidgetService.class);
-        PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, intent,
+        intent = new Intent(mContext, Welcome.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
                 PendingIntent.FLAG_UPDATE_CURRENT);
         views.setPendingIntentTemplate(R.id.message_list, pendingIntent);
 
diff --git a/src/com/android/email/widget/EmailWidgetLoader.java b/src/com/android/email/widget/EmailWidgetLoader.java
index 71e3608..6d30fe2 100644
--- a/src/com/android/email/widget/EmailWidgetLoader.java
+++ b/src/com/android/email/widget/EmailWidgetLoader.java
@@ -192,7 +192,7 @@
                 // Simple mailbox selection
                 setSelection(
                     MessageColumns.ACCOUNT_KEY + "=? AND " +
-                    MessageColumns.MAILBOX_KEY + "=?");
+                    MessageColumns.MAILBOX_KEY + "=? AND " + Message.FLAG_LOADED_SELECTION);
                 setSelectionArgs(
                         new String[] { Long.toString(mAccountId), Long.toString(mMailboxId) });
             } else {
diff --git a/src/org/apache/james/mime4j/util/CharsetUtil.java b/src/org/apache/james/mime4j/util/CharsetUtil.java
index 0fc267d..f26b44f 100644
--- a/src/org/apache/james/mime4j/util/CharsetUtil.java
+++ b/src/org/apache/james/mime4j/util/CharsetUtil.java
@@ -23,6 +23,7 @@
 import java.nio.charset.IllegalCharsetNameException;

 import java.nio.charset.UnsupportedCharsetException;

 import java.util.HashMap;

+import java.util.Locale;

 import java.util.TreeSet;

 

 //BEGIN android-changed: Stubbing out logging

@@ -1023,13 +1024,13 @@
         for (int i = 0; i < JAVA_CHARSETS.length; i++) {

             try {

                 String s = new String(dummy, JAVA_CHARSETS[i].canonical);

-                decodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase());

+                decodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase(Locale.US));

             } catch (UnsupportedOperationException e) {

             } catch (UnsupportedEncodingException e) {

             }

             try {

                 "dummy".getBytes(JAVA_CHARSETS[i].canonical);

-                encodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase());

+                encodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase(Locale.US));

             } catch (UnsupportedOperationException e) {

             } catch (UnsupportedEncodingException e) {

             }

@@ -1038,13 +1039,13 @@
         charsetMap = new HashMap<String, Charset>();

         for (int i = 0; i < JAVA_CHARSETS.length; i++) {

             Charset c = JAVA_CHARSETS[i];

-            charsetMap.put(c.canonical.toLowerCase(), c);

+            charsetMap.put(c.canonical.toLowerCase(Locale.US), c);

             if (c.mime != null) {

-                charsetMap.put(c.mime.toLowerCase(), c);

+                charsetMap.put(c.mime.toLowerCase(Locale.US), c);

             }

             if (c.aliases != null) {

                 for (int j = 0; j < c.aliases.length; j++) {

-                    charsetMap.put(c.aliases[j].toLowerCase(), c);

+                    charsetMap.put(c.aliases[j].toLowerCase(Locale.US), c);

                 }

             }

         }

@@ -1136,7 +1137,7 @@
      *         otherwise.

      */

     public static boolean isEncodingSupported(String charsetName) {

-        return encodingSupported.contains(charsetName.toLowerCase());

+        return encodingSupported.contains(charsetName.toLowerCase(Locale.US));

     }

 

     /**

@@ -1151,7 +1152,7 @@
      *         otherwise.

      */

     public static boolean isDecodingSupported(String charsetName) {

-        return decodingSupported.contains(charsetName.toLowerCase());

+        return decodingSupported.contains(charsetName.toLowerCase(Locale.US));

     }

 

     /**

@@ -1162,7 +1163,7 @@
      * @return the MIME preferred name or <code>null</code> if not known.

      */

     public static String toMimeCharset(String charsetName) {

-        Charset c = charsetMap.get(charsetName.toLowerCase());

+        Charset c = charsetMap.get(charsetName.toLowerCase(Locale.US));

         if (c != null) {

             return c.mime;

         }

@@ -1181,7 +1182,7 @@
      * @return the canonical Java name or <code>null</code> if not known.

      */

     public static String toJavaCharset(String charsetName) {

-        Charset c = charsetMap.get(charsetName.toLowerCase());

+        Charset c = charsetMap.get(charsetName.toLowerCase(Locale.US));

         if (c != null) {

             return c.canonical;

         }

diff --git a/tests/src/com/android/email/NotificationControllerTest.java b/tests/src/com/android/email/NotificationControllerTest.java
index 8f36300..8ce1823 100644
--- a/tests/src/com/android/email/NotificationControllerTest.java
+++ b/tests/src/com/android/email/NotificationControllerTest.java
@@ -70,8 +70,8 @@
         // === Ringer mode change ===
         mRingerMode = AudioManager.RINGER_MODE_NORMAL;
 
-        // VIBRATE_ALWAYS, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
+        // VIBRATE, with a ringer tone
+        a1.mFlags = Account.FLAGS_VIBRATE;
 
         nb.setDefaults(0);
         nb.setSound(null);
@@ -83,19 +83,6 @@
         assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
         assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
 
-        // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
-
-        nb.setDefaults(0);
-        nb.setSound(null);
-        mTarget.setupSoundAndVibration(nb, a1);
-        n = nb.getNotification();
-
-        assertEquals(expectedRingtone, n.sound);
-        assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe
-        assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
-        assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
         // No VIBRATE flags, with a ringer tone
         a1.mFlags = 0;
 
@@ -112,21 +99,8 @@
         // === Ringer mode change ===
         mRingerMode = AudioManager.RINGER_MODE_VIBRATE;
 
-        // VIBRATE_ALWAYS, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
-
-        nb.setDefaults(0);
-        nb.setSound(null);
-        mTarget.setupSoundAndVibration(nb, a1);
-        n = nb.getNotification();
-
-        assertEquals(expectedRingtone, n.sound);
-        assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
-        assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
-        assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
-        // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
+        // VIBRATE, with a ringer tone
+        a1.mFlags = Account.FLAGS_VIBRATE;
 
         nb.setDefaults(0);
         nb.setSound(null);
@@ -154,21 +128,8 @@
         // === Ringer mode change ===
         mRingerMode = AudioManager.RINGER_MODE_SILENT;
 
-        // VIBRATE_ALWAYS, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
-
-        nb.setDefaults(0);
-        nb.setSound(null);
-        mTarget.setupSoundAndVibration(nb, a1);
-        n = nb.getNotification();
-
-        assertEquals(expectedRingtone, n.sound);
-        assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
-        assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
-        assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
-        // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
-        a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
+        // VIBRATE, with a ringer tone
+        a1.mFlags = Account.FLAGS_VIBRATE;
 
         nb.setDefaults(0);
         nb.setSound(null);
diff --git a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
index 0f320b6..8e9ab75 100644
--- a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
+++ b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
@@ -174,9 +174,9 @@
      * Prepare to receive a simple message (see setupSimpleMessage)
      */
     private void expectSimpleMessage(MockTransport mockTransport) {
-        mockTransport.expect("MAIL FROM: <Jones@Registry.Org>",
+        mockTransport.expect("MAIL FROM:<Jones@Registry.Org>",
                 "250 2.1.0 <Jones@Registry.Org> sender ok");
-        mockTransport.expect("RCPT TO: <Smith@Registry.Org>",
+        mockTransport.expect("RCPT TO:<Smith@Registry.Org>",
                 "250 2.1.5 <Smith@Registry.Org> recipient ok");
         mockTransport.expect("DATA", "354 enter mail, end with . on a line by itself");
         mockTransport.expect("Date: .*");