am c160e27c: (-s ours) am 2b38acc0: Import revised translations. DO NOT MERGE
* commit 'c160e27c3c36bced882ab69bf42cba77f1d8f6a2':
Import revised translations. DO NOT MERGE
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 61bde37..9e86242 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -27,7 +27,7 @@
<string name="provider_label" msgid="2306513350843464739">"Kalender"</string>
<string name="debug_tool_delete_button" msgid="5052706251268452090">"Vee nou uit"</string>
<string name="debug_tool_start_button" msgid="5384780896342913563">"Begin"</string>
- <string name="debug_tool_message" msgid="4414152820946316089">"Jy gaan nou 1) \'n kopie van jou kalenderdatabasis na die SD-kaart/USB-berging maak, wat deur enige toestel leesbaar is en 2) dit e-pos. Onthou om dit uit te vee sodra jy dit suksesvol van die toestel gekopieer het of sodra die e-pos ontvang is."</string>
+ <string name="debug_tool_message" msgid="4414152820946316089">"Jy gaan nou 1) \'n kopie van jou kalenderdatabasis na die SD-kaart/USB-geheue maak, wat deur enige toestel leesbaar is en 2) dit e-pos. Onthou om dit uit te vee sodra jy dit suksesvol van die toestel gekopieer het of sodra die e-pos ontvang is."</string>
<string name="debug_tool_email_sender_picker" msgid="4418621476577347562">"Kies \'n program om jou lêer te stuur"</string>
<string name="debug_tool_email_subject" msgid="2403590332256471194">"Kalenderdatabasis aangeheg"</string>
<string name="debug_tool_email_body" msgid="740309162644398319">"Hierby aangeheg is my kalenderdatabasis met al my afsprake en persoonlike inligting. Hanteer asseblief versigtig."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5770528..3c812d6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,7 +18,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="calendar_storage" msgid="5387668002987562770">"कैलेंडर संग्रहण"</string>
<string name="upgrade_msg" msgid="2792831029435070926">"कैलेंडर डेटाबेस अपग्रेड हो रहा है."</string>
- <string name="calendar_default_name" msgid="6924293766625167275">"डिफ़ॉल्ट"</string>
+ <string name="calendar_default_name" msgid="6924293766625167275">"डिफ़ॉल्ट"</string>
<string name="calendar_info" msgid="6687678621418059281">"कैलेंडर जानकारी"</string>
<string name="calendar_info_error" msgid="5575162446528419982">"त्रुटि"</string>
<string name="calendar_info_no_calendars" msgid="4287534468186704433">"कोई कैलेंडर नहीं"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6619f8e..7646cc6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -50,14 +50,14 @@
<string name="debug_tool_start_button">Start</string>
<!-- Debug tool - Main message shown to the user when starting up the debug tool [CHAR LIMIT=NONE] -->
- <string name="debug_tool_message">You are about to 1) make a copy of your calendar database to the sd card/usb storage which is readable by any app and 2) email it. Remember to delete it as soon as you have successfully copied it off the device or the email is received.</string>
+ <string name="debug_tool_message">You are about to 1) make a copy of your calendar database to the SD card/USB storage, which is readable by any app, and 2) email it. Remember to delete the copy as soon as you have successfully copied it off the device or the email is received.</string>
<!-- Debug tool - email subject [CHAR LIMIT=NONE] -->
- <string name="debug_tool_email_sender_picker">Select a program to send your file</string>
+ <string name="debug_tool_email_sender_picker">Choose a program to send your file</string>
<!-- Debug tool - email subject [CHAR LIMIT=NONE] -->
<string name="debug_tool_email_subject">Calendar Db attached</string>
<!-- Debug tool - email body [CHAR LIMIT=NONE] -->
- <string name="debug_tool_email_body">Attached is my calendar database with all my appointments and personal information. Please handle with care.</string>
+ <string name="debug_tool_email_body">Attached is my Calendar database with all my appointments and personal information. Handle with care.</string>
</resources>
diff --git a/src/com/android/providers/calendar/CalendarDatabaseHelper.java b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
index d609bdf..4fed7da 100644
--- a/src/com/android/providers/calendar/CalendarDatabaseHelper.java
+++ b/src/com/android/providers/calendar/CalendarDatabaseHelper.java
@@ -16,6 +16,9 @@
package com.android.providers.calendar;
+import com.android.common.content.SyncStateContentProviderHelper;
+import com.google.common.annotations.VisibleForTesting;
+
import android.accounts.Account;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -36,8 +39,6 @@
import android.text.TextUtils;
import android.text.format.Time;
import android.util.Log;
-import com.android.common.content.SyncStateContentProviderHelper;
-import com.google.common.annotations.VisibleForTesting;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -2957,7 +2958,6 @@
}
if (url != null) {
extras.putString("feed", url);
- extras.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
}
ContentResolver.requestSync(account, CalendarContract.Calendars.CONTENT_URI.getAuthority(),
extras);
