am 8dcd2932: set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
Merge commit '8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b' into eclair-mr2
* commit '8dcd29326bd6e6be91e22b88c422a4d7fc24dd3b':
set the attendee email when changing your own attendance in the attendees table, so some calendar provider code can update the self attendance in the Event.
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7761958..373ade3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_label" msgid="5452708708398908131">"Calendario"</string>
- <string name="calendar_plug" msgid="4861031284038774007"><font fgcolor="#ffffffff">"¡Bienvenido a Google Calendar!"</font>" "\n" Un método de Google para administrar tu programación basado en la idea de que programar los eventos puede ser más intuitivo, eficaz y accesible."</string>
+ <string name="calendar_plug" msgid="8148614847911924208"><font fgcolor="#ffffffff">"¡Bienvenido a Google Calendar!"</font>" "\n" Un método de Google para administrar tu programación basado en la idea de que programar los eventos puede ser más intuitivo, eficaz y accesible."</string>
<string name="what_label" msgid="1933578391985810049">"Qué"</string>
<string name="when_label" msgid="894636567327261599">"Cuándo"</string>
<string name="where_label" msgid="3472482206065595118">"Dónde"</string>
@@ -81,7 +81,8 @@
<string name="edit_event_show_extra_options" msgid="2325854287823989650">"Mostrar opciones adicionales"</string>
<string name="edit_event_hide_extra_options" msgid="4019082307326855513">"Ocultar opciones adicionales"</string>
<string name="description_label" msgid="7193475046717505855">"Descripción"</string>
- <string name="presence_label" msgid="6169724148441175862">"Mostrarme como"</string>
+ <!-- no translation found for presence_label (6169724148441175862) -->
+ <skip />
<string name="privacy_label" msgid="9215031965259597335">"Privacidad"</string>
<string name="reminders_label" msgid="8345054160145333166">"Recordatorios"</string>
<string name="no_syncable_calendars" msgid="7019488867045436129">"No hay calendarios"</string>
@@ -125,7 +126,7 @@
<string name="preferences_alerts_type_dialog" msgid="2195667763429994271">"Alertas y notificaciones"</string>
<string name="preferences_alerts_vibrate_title" msgid="7997122314759645350">"Vibrar"</string>
<string name="preferences_alerts_ringtone_title" msgid="7565118268120729644">"Seleccionar tono de llamada"</string>
- <string name="preferences_default_reminder_title" msgid="5188861433342733905">"Hora predeterminada de recordatorio"</string>
+ <string name="preferences_default_reminder_title" msgid="103964814265989503">"Config. recordatorio predet."</string>
<string name="preferences_default_reminder_dialog" msgid="2490348857239323412">"Hora predeterminada de recordatorio"</string>
<string name="preferences_default_reminder_default" msgid="2903884416749959435">"10"</string>
</resources>