am f1e8069b: UI tweaks to meet Jeff\'s spec.

Merge commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0' into eclair-mr2

* commit 'f1e8069bcd1755d9ef2322b705d8d9d6b83728f0':
  UI tweaks to meet Jeff's spec.

diff --cc res/values-cs/strings.xml
Simple merge

diff --cc res/values-da/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
Simple merge

diff --cc res/values-es-rUS/strings.xml
Simple merge

diff --cc res/values-es/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
index 2017030,202006e..e32ba49
--- 1/res/values-fr/strings.xml
--- 2/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@@ -15,11 -15,11 +15,10 @@@
  -->
  <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="6674495003718166674">"Horloge"</string>
 -    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmes"</string>
 +    <string name="app_label" msgid="6642875149600019623">"Réveil"</string>
      <string name="add_alarm" msgid="5976616107390962899">"Ajouter alarme"</string>
 -    <string name="delete_alarm" msgid="3457780990646206817">"Supprimer l\'alarme"</string>
 +    <string name="delete_alarm" msgid="3457780990646206817">"Désactiver l\'alarme"</string>
      <string name="enable_alarm" msgid="7442658245797418741">"Activer l\'alarme"</string>
-     <string name="disable_alarm" msgid="6665528499886549648">"Désactiver l\'alarme"</string>
      <string name="delete_alarm_confirm" msgid="4237696873219106907">"Cette alarme va être supprimée."</string>
      <string name="show_clock" msgid="8358759982675616915">"Afficher l\'horloge"</string>
      <string name="hide_clock" msgid="3217727306480505694">"Masquer l\'horloge"</string>

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-ja/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
Simple merge

diff --cc res/values-nb/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc res/values-pt/strings.xml
Simple merge

diff --cc res/values-ru/strings.xml
Simple merge

diff --cc res/values-sv/strings.xml
Simple merge

diff --cc res/values-tr/strings.xml
Simple merge

diff --cc res/values-zh-rCN/strings.xml
Simple merge

diff --cc res/values-zh-rTW/strings.xml
Simple merge

diff --cc src/com/android/deskclock/AlarmClock.java
Simple merge