From ff88d7582cce36addeb403de8574956af284a18c Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Thu, 20 Nov 2014 11:16:02 -0800
Subject: ContactsCommon: Don't insert contact locally after exporting to sim

Change-Id: Iabe64752c1b7f7e4ccaa385b610aee45324e6ba2
---
 src/com/android/contacts/common/MoreContactUtils.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index f72507a3..99608640 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -400,13 +400,7 @@ public class MoreContactUtils {
         SimContactsOperation mSimContactsOperation = new SimContactsOperation(context);
         result = mSimContactsOperation.insert(mValues, subscription);
 
-        if (result != null) {
-            // we should import the contact to the sim account at the same time.
-            String[] value = new String[] {
-                    name, number, emails, anrNumber
-            };
-            insertToPhone(value, context.getContentResolver(),subscription);
-        } else {
+        if (result == null) {
             Log.e(TAG, "export contact: [" + name + ", " + number + ", " + emails + "] to slot "
                     + subscription + " failed");
         }
-- 
cgit v1.2.3


From b9279fe29af110c360086ca222c20e080f7f90c8 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Thu, 27 Nov 2014 14:14:01 +0200
Subject: Automatic translation import

Change-Id: I590d49ffaacaa1c1abb387b05602807beaf84431
---
 res/values-az/cm_strings.xml | 14 ++++++++++++++
 res/values-ro/cm_strings.xml | 40 ++++++++++++++++++++++++++++++++++++++++
 res/values-sv/cm_strings.xml | 16 ++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/res/values-az/cm_strings.xml b/res/values-az/cm_strings.xml
index 4c7127f7..c71b5ce7 100644
--- a/res/values-az/cm_strings.xml
+++ b/res/values-az/cm_strings.xml
@@ -23,6 +23,7 @@
   <string name="name_for_sim">Ad</string>
   <string name="fail_reason_import_vcard">vCard «<xliff:g id="name">%s</xliff:g>» G/Ç xətasına görə alına bilmədi</string>
   <string name="label_groups">Qrup</string>
+  <string name="contact_share_failed_toast"><xliff:g id="count">%d</xliff:g> şəxsdən çoxu paylaşıla bilməz</string>
   <string name="exporting">İxrac edilir\u2026</string>
   <string name="reading_vcard_files"><xliff:g id="current_number">%1$s</xliff:g> / <xliff:g id="total_number">%2$s</xliff:g> fayl</string>
   <string name="export_failed">İxrac uğursuz oldu</string>
@@ -40,4 +41,17 @@
   <string name="deleteConfirmation_title">Şəxs silinsin?</string>
   <string name="deleteConfirmation">Bu şəxs silinəcək.</string>
   <string name="readOnlyContactDeleteConfirmation">Bu şəxs bir çox hesabdan məlumata sahibdir. Yalnız oxuna bilən hesabların məlumatları şəxslər siyahınızdan gizlənəcək, silinməyəcək.</string>
+  <string name="readOnlyContactWarning">Yalnız oxuna bilən hesablardakı şəxsləri silə bilməzsiniz,  ancaq onları şəxslər siyahısından gizlədə bilərsiniz.</string>
+  <string name="multipleContactDeleteConfirmation">Bu şəxsin silinməsi ilə bir çox hesabdakı məlumatlar silinəcək.</string>
+  <string name="copy_done">Şəxs uğurla kopyalandı</string>
+  <string name="copy_failure">Şəxs kopyalanmadı</string>
+  <string name="card_no_space">Şəxs kopyalanmadı, SIM doludur</string>
+  <string name="ip_call_by_slot"><xliff:g id="subName">%s</xliff:g> ilə IP zəngi</string>
+  <string name="no_ip_number">IP nömrəsi yoxdur</string>
+  <string name="no_ip_number_on_sim_card">SIM kartda IP nömrəsi yoxdur</string>
+  <string name="set_ip_number">IP nömrəsi tənzimlə</string>
+  <string name="ipcall_dialog_title">IP zəng tənzimləməsi</string>
+  <string name="sd_card">SD kart</string>
+  <string name="phone_storage">Telefon yaddaşı</string>
+  <string name="sim_contacts_not_loaded">SIM şəxslər tam olaraq yüklənmədi</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index a59c9421..e4634275 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -18,4 +18,44 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="local_storage_account" product="tablet">Cont local tabletă</string>
   <string name="local_storage_account" product="default">Cont local telefon</string>
+  <string name="export_to_sim">Export în cartela SIM</string>
+  <string name="select_sim">Selectaţi SIM</string>
+  <string name="account_sim">Cartelă SIM</string>
+  <string name="name_for_sim">Nume</string>
+  <string name="fail_reason_import_vcard">VCard-ul \'<xliff:g id="name">%s</xliff:g>\' nu a putut fi importat din cauza unei erori I/O</string>
+  <string name="label_groups">Grup</string>
+  <string name="contact_share_failed_toast">Nu pot fi partajate mai mult de <xliff:g id="count">%d</xliff:g> persoane de contact</string>
+  <string name="exporting">Se exportă\u2026</string>
+  <string name="reading_vcard_files"><xliff:g id="current_number">%1$s</xliff:g> din <xliff:g id="total_number">%2$s</xliff:g> fişiere</string>
+  <string name="export_failed">Exportul a eșuat</string>
+  <string name="sim_card_full">Cartela SIM este plină</string>
+  <string name="export_finished">Exportul s-a terminat</string>
+  <string name="tag_too_long">Numele persoanei de contact este prea lung</string>
+  <plurals name="export_cancelled">
+    <item quantity="one">Exportul a fost anulat, %d element a fost exportat</item>
+    <item quantity="few">Exportul a fost anulat, %d elemente au fost exportate</item>
+    <item quantity="other">Exportul a fost anulat, %d elemente au fost exportate</item>
+  </plurals>
+  <string name="export_no_phone_or_email"><xliff:g id="name">%s</xliff:g> nu are un număr de telefon sau adresă de email</string>
+  <string name="import_from_sim_select">Alege cardul ce se va importa</string>
+  <string name="no_sdcard_title" product="nosdcard">Stocare indisponibilă</string>
+  <string name="no_sdcard_title" product="default">Nu există card SD</string>
+  <string name="deleteConfirmation_title">Ştergeţi persoana de contact?</string>
+  <string name="deleteConfirmation">Acest contact va fi şters.</string>
+  <string name="readOnlyContactDeleteConfirmation">Acest contact conţine informaţii de la mai multe conturi. Informaţiile din conturile doar-în-citire vor fi ascunse în lista de contacte, nu eliminate.</string>
+  <string name="readOnlyContactWarning">Imposibil de şters contacte din conturi doar-în-citire, dar le puteţi ascunde în lista dumneavoastră de contacte.</string>
+  <string name="multipleContactDeleteConfirmation">Ştergerea acestei persoane de contact va şterge informaţii din mai multe conturi.</string>
+  <string name="copy_done">Persoana de contact a fost copiată cu succes</string>
+  <string name="copy_failure">Copierea contactului a eșuat</string>
+  <string name="card_no_space">Copierea contactului a eşuat, cartela SIM este plină</string>
+  <string name="ip_call_by_slot">Apel IP prin <xliff:g id="subName">%s</xliff:g></string>
+  <string name="no_ip_number">Niciun număr de IP</string>
+  <string name="no_ip_number_on_sim_card">Niciun număr de IP pe cartela SIM</string>
+  <string name="set_ip_number">Setarea numărul de IP</string>
+  <string name="ipcall_dialog_title">Setările de apel IP</string>
+  <string name="ipcall_dialog_edit_hint">Introduceți prefixul IP</string>
+  <string name="select_path">Selectaţi calea</string>
+  <string name="sd_card">Card SD</string>
+  <string name="phone_storage">Stocare pe telefon</string>
+  <string name="sim_contacts_not_loaded">Contactele SIM nu au putut fi încărcate complet</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 38429251..896e072f 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -18,6 +18,22 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="local_storage_account" product="tablet">Lokalt surfplattekonto</string>
   <string name="local_storage_account" product="default">Lokalt telefonkonto</string>
+  <string name="export_to_sim">Exportera till SIM-kort</string>
   <string name="select_sim">Välj SIM</string>
+  <string name="account_sim">SIM-kort</string>
+  <string name="name_for_sim">Namn</string>
+  <string name="label_groups">Grupp</string>
+  <string name="contact_share_failed_toast">Maximalt <xliff:g id="count">%d</xliff:g> kontakter kan delas</string>
+  <string name="exporting">Exporterar\u2026</string>
+  <string name="reading_vcard_files"><xliff:g id="current_number">%1$s</xliff:g> av <xliff:g id="total_number">%2$s</xliff:g> filer</string>
+  <string name="sim_card_full">SIM-kortet är fullt</string>
+  <string name="export_finished">Export slutförd</string>
+  <string name="tag_too_long">Kontaktnamnet är för långt</string>
+  <string name="export_no_phone_or_email"><xliff:g id="name">%s</xliff:g> har inte ett telefonnummer eller e-postadress</string>
+  <string name="no_sdcard_title" product="default">Inget SD-kort</string>
+  <string name="deleteConfirmation_title">Ta bort kontakt?</string>
+  <string name="deleteConfirmation">Denna kontakt kommer tas bort.</string>
+  <string name="ip_call_by_slot">IP-samtal med <xliff:g id="subName">%s</xliff:g></string>
   <string name="sd_card">SD-kort</string>
+  <string name="phone_storage">Telefonlagring</string>
 </resources>
-- 
cgit v1.2.3


From 8e41852c3659320bcd20ea61fb71639ae4c61160 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Wed, 26 Nov 2014 11:52:52 -0800
Subject: ContactsCommon: remove ticker text on importing contacts

This gets pretty spammy and ends up clogging down the status bar.

Change-Id: I1b6284243c5f281284c8203adcd0d015f5bde42b
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 .../contacts/common/vcard/NotificationImportExportListener.java    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java b/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
index 42876b58..538f1394 100644
--- a/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/common/vcard/NotificationImportExportListener.java
@@ -97,16 +97,11 @@ public class NotificationImportExportListener implements VCardImportExportListen
         }
 
         final String totalCountString = String.valueOf(totalCount);
-        final String tickerText =
-                mContext.getString(R.string.progress_notifier_message,
-                        String.valueOf(currentCount),
-                        totalCountString,
-                        entry.getDisplayName());
         final String description = mContext.getString(R.string.importing_vcard_description,
                 entry.getDisplayName());
 
         final Notification notification = constructProgressNotification(
-                mContext.getApplicationContext(), VCardService.TYPE_IMPORT, description, tickerText,
+                mContext.getApplicationContext(), VCardService.TYPE_IMPORT, description, null,
                 jobId, request.displayName, totalCount, currentCount);
         mNotificationManager.notify(DEFAULT_NOTIFICATION_TAG, jobId, notification);
     }
-- 
cgit v1.2.3


From cb1ff7c0da0e728cd70af94e1f8dd872f13cf912 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Sat, 20 Dec 2014 04:21:10 +0200
Subject: Automatic translation import

Change-Id: Ic7e9ed225b79ac94b3d6241a24e1015c6f3b25aa
---
 res/values-lb/strings.xml    | 1 -
 res/values-tr/cm_strings.xml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index d77d4505..6c45c7fb 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -240,5 +240,4 @@
   <string name="description_dial_phone_number">Dem <xliff:g id="name">%1$s</xliff:g> uruffen</string>
   <string name="contact_status_update_attribution">iwwer <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>
   <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> iwwer <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>
-  <string name="letter_tile_letter_font_family">sans-serif-thin</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index a5e454ff..4e120945 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -32,6 +32,7 @@
   <string name="export_finished">Dışa aktarım bitti</string>
   <string name="tag_too_long">Kişi ismi çok uzun</string>
   <plurals name="export_cancelled">
+    <item quantity="one">Aktarma işlemi iptal edildi, %d öge aktarıldı</item>
     <item quantity="other">Aktarma işlemi iptal edildi, %d öge aktarıldı</item>
   </plurals>
   <string name="export_no_phone_or_email"><xliff:g id="name">%s</xliff:g> telefon numarası ya da e-posta adresine sahip değil</string>
-- 
cgit v1.2.3