Merge change Icb5606e3 into eclair
* changes:
Upgrade Home db to upgrade contacts shortcut to the quick contact action
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a557f67..c065777 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,7 +46,7 @@
<string name="title_select_shortcut" msgid="2858897527672831763">"Sélectionner un raccourci"</string>
<string name="title_select_live_folder" msgid="3753447798805166749">"Sélectionner le dossier"</string>
<string name="all_apps_button_label" msgid="3953036962111614813">"Toutes les applications"</string>
- <string name="all_apps_home_button_label" msgid="1022222300329398558">"Page d\'accueil"</string>
+ <string name="all_apps_home_button_label" msgid="1022222300329398558">"Domicile"</string>
<string name="menu_add" msgid="3065046628354640854">"Ajouter"</string>
<string name="menu_wallpaper" msgid="5837429080911269832">"Fond d\'écran"</string>
<string name="menu_search" msgid="4826514464423239041">"Rechercher"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6b8d3bb..04fc175 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -45,10 +45,8 @@
<string name="shortcut_duplicate" msgid="4757756326465060694">"「<xliff:g id="NAME">%s</xliff:g>」捷徑已經存在。"</string>
<string name="title_select_shortcut" msgid="2858897527672831763">"選取捷徑"</string>
<string name="title_select_live_folder" msgid="3753447798805166749">"選取資料夾"</string>
- <!-- no translation found for all_apps_button_label (3953036962111614813) -->
- <skip />
- <!-- no translation found for all_apps_home_button_label (1022222300329398558) -->
- <skip />
+ <string name="all_apps_button_label" msgid="3953036962111614813">"所有應用程式"</string>
+ <string name="all_apps_home_button_label" msgid="1022222300329398558">"主螢幕"</string>
<string name="menu_add" msgid="3065046628354640854">"新增"</string>
<string name="menu_wallpaper" msgid="5837429080911269832">"桌布"</string>
<string name="menu_search" msgid="4826514464423239041">"搜尋"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b642ead..38f27c7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,7 +31,7 @@
<!-- Button label on Wallpaper Gallery screen; user selects this button to set a specific wallpaper -->
<string name="wallpaper_instructions">Set wallpaper</string>
<!-- Option in "Select wallpaper from" dialog box -->
- <string name="pick_wallpaper">Wallpaper gallery</string>
+ <string name="pick_wallpaper">Wallpapers</string>
<!-- Displayed when user selects a shortcut for an app that was uninstalled -->
<string name="activity_not_found">Application is not installed on your phone.</string>
<!-- List item for configuring the current wallpaper -->