commit 78bd04e183a9d8d8c031cc4d1c9b66f718da7bce
author The Android Open Source Project <initial-contribution@android.com> Tue Oct 02 14:57:30 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 02 14:57:30 2012 -0700
tree d1838ab8efb6f2b3cc78a2b13734faab77f8a57d
parent 80c9f359cd4024e47888562f2de2138cac823f0b
parent 65dd538630d0961b7d732a27da02817186eb7d26

am 65dd5386: (-s ours) am 1687164a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '65dd538630d0961b7d732a27da02817186eb7d26':
  Fix event color query (which fixes the failing CTS test).

res/values-ca/strings.xml

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2c41d6d..0ef5769 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -26,7 +26,7 @@
     <string name="calendar_info_events_dirty" msgid="8879392112564499515">"Esdeveniments: <xliff:g id="EVENTS_0">%1$d</xliff:g>, no desats: <xliff:g id="DIRTY_EVENTS">%2$d</xliff:g>"</string>
     <string name="provider_label" msgid="2306513350843464739">"Calendari"</string>
     <string name="debug_tool_delete_button" msgid="5052706251268452090">"Suprimeix ara"</string>
-    <string name="debug_tool_start_button" msgid="5384780896342913563">"Inici"</string>
+    <string name="debug_tool_start_button" msgid="5384780896342913563">"Inicia"</string>
     <string name="debug_tool_message" msgid="4862486669932821937">"Estàs a punt de 1) fer una còpia de la base de dades del teu calendari a l\'emmagatzematge USB/targeta SD, llegible per qualsevol aplicació, i 2) d\'enviar-la per correu electrònic. Recorda suprimir-la tan bon punt l\'hagis copiat correctament al dispositiu o s\'hagi rebut el correu electrònic."</string>
     <string name="debug_tool_email_sender_picker" msgid="2000311987477419397">"Selecciona un programa per enviar el fitxer"</string>
     <string name="debug_tool_email_subject" msgid="2403590332256471194">"Calendari Db adjunt"</string>