auto import from //branches/cupcake/...@131421

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
deleted file mode 100644 (file)
index 5141fd7..0000000
--- a/res/values-en-rGB/strings.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label">"Calendar"</string>
-    <!-- no translation found for calendar_plug (4048572330264956957) -->
-    <skip />
-    <string name="what_label">"What"</string>
-    <string name="when_label">"When"</string>
-    <string name="where_label">"Where"</string>
-    <string name="repeats_label">"Repeats"</string>
-    <string name="no_title_label">"(No subject)"</string>
-    <!-- no translation found for Nminutes:one (6081118741858086532) -->
-    <!-- no translation found for Nminutes:other (1264594317967322630) -->
-    <!-- no translation found for Nmins:one (4614567358157302948) -->
-    <!-- no translation found for Nmins:other (486965688561269531) -->
-    <!-- no translation found for Nhours:one (4993938150407112728) -->
-    <!-- no translation found for Nhours:other (600521157331446471) -->
-    <!-- no translation found for Ndays:one (3245393674146438398) -->
-    <!-- no translation found for Ndays:other (3502645058844566354) -->
-    <string name="agenda_view">"Agenda"</string>
-    <string name="day_view">"Day"</string>
-    <string name="week_view">"Week"</string>
-    <string name="month_view">"Month"</string>
-    <string name="event_view">"View event"</string>
-    <string name="event_create">"New event"</string>
-    <string name="event_edit">"Edit event"</string>
-    <string name="event_delete">"Delete event"</string>
-    <string name="goto_today">"Today"</string>
-    <string name="menu_select_calendars">"My calendars"</string>
-    <string name="menu_preferences">"Settings"</string>
-    <string name="plus_N_more">"(plus <xliff:g id="MORE_COUNT">%d</xliff:g> more …)"</string>
-    <string name="calendars_title">"My calendars"</string>
-    <string name="add_calendars">"Add calendars"</string>
-    <string name="remove_calendars">"Remove calendars"</string>
-    <string name="event_edit_title">"Event details"</string>
-    <string name="hint_what">"Event name"</string>
-    <string name="hint_where">"Event location"</string>
-    <string name="hint_description">"Event description"</string>
-    <!-- no translation found for creating_event (4830642711192836714) -->
-    <skip />
-    <!-- no translation found for saving_event (2501598127034230955) -->
-    <skip />
-    <!-- no translation found for loading_calendars_title (6145461690011608604) -->
-    <skip />
-    <!-- no translation found for loading_calendars_message (4814002597639099673) -->
-    <skip />
-    <string name="alert_when_label">"When:"</string>
-    <string name="alert_where_label">"Where:"</string>
-    <string name="alert_missed_events_single">"(<xliff:g id="REMINDER_COUNT">%s</xliff:g> more reminder)"</string>
-    <string name="alert_missed_events_multiple">"(<xliff:g id="REMINDER_COUNT">%s</xliff:g> more reminders)"</string>
-    <string name="event_info_title">"View event"</string>
-    <string name="event_info_title_invite">"Meeting invitation"</string>
-    <string name="add_new_reminder">"Add reminder"</string>
-    <string name="edit_event_to_label">"To"</string>
-    <string name="edit_event_from_label">"From"</string>
-    <string name="edit_event_all_day_label">"All day"</string>
-    <string name="edit_event_calendar_label">"Calendar"</string>
-    <string name="edit_event_show_extra_options">"Show extra options"</string>
-    <string name="edit_event_hide_extra_options">"Hide extra options"</string>
-    <string name="description_label">"Description"</string>
-    <string name="presence_label">"Presence"</string>
-    <string name="privacy_label">"Privacy"</string>
-    <string name="reminders_label">"Reminders"</string>
-    <!-- no translation found for no_syncable_calendars (3658601685334109347) -->
-    <skip />
-    <!-- no translation found for no_calendars_found (7802708375572302907) -->
-    <skip />
-    <string name="view_event_calendar_label">"Calendar"</string>
-    <string name="view_event_timezone_label">"Local time zone"</string>
-    <string name="view_event_response_label">"Attending?"</string>
-    <string name="agenda_today">"Today"</string>
-    <string name="num_events">"Num events"</string>
-    <string name="edit_event_label">"Edit event"</string>
-    <string name="delete_label">"Delete"</string>
-    <string name="delete_event_label">"Delete event"</string>
-    <string name="save_label">"Save"</string>
-    <string name="discard_label">"Discard changes"</string>
-    <string name="import_label">"Import"</string>
-    <string name="snooze_all_label">"Snooze all"</string>
-    <string name="dismiss_all_label">"Dismiss all"</string>
-    <string name="does_not_repeat">"Does not repeat"</string>
-    <string name="daily">"Daily"</string>
-    <string name="every_weekday">"Every weekday (Mon–Fri)"</string>
-    <string name="weekly">"Weekly (every <xliff:g id="DAYS_OF_WEEK">%s</xliff:g>)"</string>
-    <string name="monthly_on_day_count">"Monthly (every <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
-    <string name="monthly_on_day">"Monthly (on day <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
-    <string name="yearly">"Yearly (on <xliff:g id="DATES">%s</xliff:g>)"</string>
-    <string name="custom">"Custom… (cannot customise on phone)"</string>
-    <string name="modify_event">"Change only this event."</string>
-    <string name="modify_all">"Change all events in the series."</string>
-    <string name="modify_all_following">"Change this and all future events."</string>
-    <string name="delete_this_event_title">"This event will be deleted."</string>
-    <string name="delete_title">"Delete"</string>
-    <string name="preferences_title">"Settings"</string>
-    <string name="preferences_general_title">"Calendar view setting"</string>
-    <string name="preferences_alerts_title">"Reminder settings"</string>
-    <string name="preferences_hide_declined_title">"Hide declined events"</string>
-    <string name="preferences_alerts_type_title">"Set alerts &amp; notifications"</string>
-    <string name="preferences_alerts_type_dialog">"Set reminder"</string>
-    <string name="preferences_alerts_vibrate_title">"Vibrate"</string>
-    <string name="preferences_alerts_ringtone_title">"Select ringtone"</string>
-    <string name="preferences_default_reminder_title">"Set default reminder"</string>
-    <string name="preferences_default_reminder_dialog">"Set default reminder"</string>
-    <string name="preferences_default_reminder_default">"10"</string>
-</resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f5a1ab7..ceeee31 100644 (file)
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -38,10 +38,8 @@
     <item quantity="one">"En dag"</item>
     <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> dager"</item>
   </plurals>
-    <!-- no translation found for show_agenda_view (7971854300981408347) -->
-    <skip />
-    <!-- no translation found for show_day_view (5782512782605466016) -->
-    <skip />
+    <string name="show_agenda_view">"Vis agenda"</string>
+    <string name="show_day_view">"Vis dag"</string>
     <string name="agenda_view">"Agenda"</string>
     <string name="day_view">"Dag"</string>
     <string name="week_view">"Uke"</string>
@@ -111,8 +109,7 @@
     <string name="modify_all_following">"Endre denne og alle framtidige hendelser."</string>
     <string name="delete_this_event_title">"Denne hendelsen vil bli slettet."</string>
     <string name="delete_title">"Slett"</string>
-    <!-- no translation found for change_response_title (7704714776070974984) -->
-    <skip />
+    <string name="change_response_title">"Endre svar"</string>
     <string name="preferences_title">"Innstillinger"</string>
     <string name="preferences_general_title">"Kalender visningsinnstilling"</string>
     <string name="preferences_alerts_title">"Innstillinger for påminnelser"</string>
@@ -124,16 +121,13 @@
     <string name="preferences_default_reminder_title">"Sett standard påminnelse"</string>
     <string name="preferences_default_reminder_dialog">"Standard påminnelsestid"</string>
     <string name="preferences_default_reminder_default">"10"</string>
-    <!-- no translation found for gadget_calendar (6529838309554174909) -->
-    <skip />
-    <!-- no translation found for gadget_now_event (2227001785989034221) -->
-    <skip />
-    <!-- no translation found for gadget_next_event (6212660541888750636) -->
-    <skip />
-    <!-- no translation found for gadget_later_event (8082518131045578444) -->
-    <skip />
-    <!-- no translation found for gadget_more_events:one (1813062802420615657) -->
-    <!-- no translation found for gadget_more_events:other (7993512762778431065) -->
-    <!-- no translation found for gadget_no_events (5209110911088302855) -->
-    <skip />
+    <string name="gadget_calendar">"Kalender:"</string>
+    <string name="gadget_now_event">"Nå: <xliff:g id="TIME_DATE">%s</xliff:g>"</string>
+    <string name="gadget_next_event">"Neste: <xliff:g id="TIME_DATE">%s</xliff:g>"</string>
+    <string name="gadget_later_event">"Senere: <xliff:g id="TIME_DATE">%s</xliff:g>"</string>
+  <plurals name="gadget_more_events">
+    <item quantity="one">"En hendelse til"</item>
+    <item quantity="other">"<xliff:g id="NUMBER">%d</xliff:g> hendelser til"</item>
+  </plurals>
+    <string name="gadget_no_events">"Ingen kommende kalenderhendelser"</string>
 </resources>

diff --git a/src/com/android/calendar/CalendarGadgetProvider.java b/src/com/android/calendar/CalendarGadgetProvider.java
index 86213fe..efe939b 100644 (file)
--- a/src/com/android/calendar/CalendarGadgetProvider.java
+++ b/src/com/android/calendar/CalendarGadgetProvider.java
@@ -92,12 +92,12 @@ public class CalendarGadgetProvider extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         
-        if (GadgetManager.GADGET_ENABLED_ACTION.equals(action)) {
+        if (GadgetManager.ACTION_GADGET_ENABLED.equals(action)) {
             if (LOGD) Log.d(TAG, "ENABLED");
-        } else if (GadgetManager.GADGET_DISABLED_ACTION.equals(action)) {
+        } else if (GadgetManager.ACTION_GADGET_DISABLED.equals(action)) {
             if (LOGD) Log.d(TAG, "DISABLED");
             // TODO: remove all alarmmanager subscriptions?
-        } else if (GadgetManager.GADGET_UPDATE_ACTION.equals(action)) {
+        } else if (GadgetManager.ACTION_GADGET_UPDATE.equals(action)) {
             if (LOGD) Log.d(TAG, "UPDATE");
 
             // Update specific gadgets
@@ -169,7 +169,7 @@ public class CalendarGadgetProvider extends BroadcastReceiver {
         // Schedule an alarm to wake ourselves up for the next update.  We also cancel
         // all existing wake-ups because PendingIntents don't match against extras.
         
-        Intent updateIntent = new Intent(GadgetManager.GADGET_UPDATE_ACTION);
+        Intent updateIntent = new Intent(GadgetManager.ACTION_GADGET_UPDATE);
         PendingIntent pendingUpdate = PendingIntent.getBroadcast(context,
                 0 /* no requestCode */, updateIntent, 0 /* no flags */);