merge in klp-release history after reset to klp-dev
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7c5b8c2..2592c49 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -36,7 +36,7 @@
     <string name="rename_folder_label" msgid="5646236631298452787">"አቃፊ ስም"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"አቃፊ እንደገና ሰይም"</string>
     <string name="rename_action" msgid="6016003384693240896">"እሺ"</string>
-    <string name="cancel_action" msgid="3811860427489435048">"ይቅር"</string>
+    <string name="cancel_action" msgid="3811860427489435048">"ሰርዝ"</string>
     <string name="menu_item_add_item" msgid="6233177331075781114">"ወደ መነሻ ማያ አክል"</string>
     <string name="group_applications" msgid="2103752818818161976">"መተግበሪያዎች"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"አቋራጮች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 63752fd..b9a1546 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -67,7 +67,7 @@
     <string name="menu_manage_apps" msgid="2308685199463588895">"إدارة التطبيقات"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"خلفية"</string>
     <string name="menu_search" msgid="4826514464423239041">"بحث"</string>
-    <string name="menu_notifications" msgid="6424587053194766192">"التنبيهات"</string>
+    <string name="menu_notifications" msgid="6424587053194766192">"الإشعارات"</string>
     <string name="menu_settings" msgid="3946232973327980394">"إعدادات النظام"</string>
     <string name="menu_help" msgid="4901160661634590633">"مساعدة"</string>
     <string name="cab_menu_delete_app" msgid="4089398025537640349">"إزالة التطبيق"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 50d56bd..b8a8add 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Menú d\'aplicacions"</string>
+    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Casa"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplicacions principals d\'Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
@@ -86,7 +86,7 @@
     <string name="permdesc_write_settings" msgid="8530105489115785531">"Permet que una aplicació canviï la configuració i les dreceres de la pàgina d\'inici."</string>
     <string name="gadget_error_text" msgid="8359351016167075858">"S\'ha produït un problema en carregar el widget"</string>
     <string name="uninstall_system_app_text" msgid="6429814133777046491">"Això és una aplicació del sistema i no es pot desinstal·lar."</string>
-    <string name="dream_name" msgid="2847171357608437154">"Llançamíssils"</string>
+    <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
     <string name="folder_hint_text" msgid="8633351560105748141">"Carpeta sense nom"</string>
     <string name="workspace_description_format" msgid="2968608205939373034">"Pantalla d\'inici %1$d"</string>
     <string name="default_scroll_format" msgid="4057140866420001240">"Pàgina %1$d de %2$d"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 75714ab..4f2e7cc 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,7 +20,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
-    <string name="home" msgid="5921706419368316758">"Startside"</string>
+    <string name="home" msgid="5921706419368316758">"Startskærm"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android-kerneprogrammer"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
     <string name="chooser_wallpaper" msgid="6063168087625352235">"Vælg baggrund fra"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f496006..c5551c1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -93,7 +93,7 @@
     <string name="workspace_scroll_format" msgid="1704767047951143301">"Pantalla principal %1$d de %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Página de aplicaciones %1$d de %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Página de widgets %1$d de %2$d"</string>
-    <string name="workspace_cling_title" msgid="738396473989890567">"Personaliza tu escritorio"</string>
+    <string name="workspace_cling_title" msgid="738396473989890567">"Personaliza tu pantalla de inicio"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"Aquí puedes poner tus aplicaciones favoritas."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Para ver todas las aplicaciones, toca el círculo."</string>
     <string name="all_apps_cling_title" msgid="2559734712581447107">"Selecciona algunas aplicaciones"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 52edfdf..c664e9c 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -93,11 +93,11 @@
     <string name="workspace_scroll_format" msgid="1704767047951143301">"អេក្រង់​ដើម %1$d នៃ %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"ទំព័រ​កម្មវិធី %1$d នៃ %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"ទំព័រ​ធាតុ​ក្រាហ្វិក ​%1$d នៃ %2$d"</string>
-    <string name="workspace_cling_title" msgid="738396473989890567">"ធ្វើ​ដោយ​ខ្លួន​ឯង​នៅ​ផ្ទះ"</string>
+    <string name="workspace_cling_title" msgid="738396473989890567">"ចាត់ទុកនេះជា​ផ្ទះរបស់អ្នក"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"អ្នក​អាច​ដាក់​កម្មវិធី​ដែល​អ្នក​ពេញ​ចិត្ត​នៅ​ទីនេះ។"</string>
-    <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"ដើម្បី​មើល​​កម្មវិធី​របស់​អ្នក​ទាំងអស់ ប៉ះ​រង្វង់។"</string>
+    <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"ប៉ះ​រង្វង់ ដើម្បី​មើល​​កម្មវិធី​របស់​អ្នក​ទាំងអស់។"</string>
     <string name="all_apps_cling_title" msgid="2559734712581447107">"ជ្រើស​កម្មវិធី​មួយ​ចំនួន"</string>
-    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"ដើម្បី​បន្ថែម​កម្មវិធី​ទៅ​​​អេក្រង់​ដើម​របស់​អ្នក, ប៉ះ​ &amp; សង្កត់​វា"</string>
+    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"ប៉ះ​ &amp; សង្កត់​វា ដើម្បី​បន្ថែម​កម្មវិធី​ទៅ​​​អេក្រង់​ដើម​របស់​អ្នក"</string>
     <string name="folder_cling_title" msgid="4308949882377840953">"រៀបចំ​កម្មវិធី​របស់​អ្នក​ដាក់​ក្នុង​​​ថត"</string>
     <string name="folder_cling_move_item" msgid="270598675060435169">"ដើម្បី​ផ្លាស់ទី​កម្មវិធី ប៉ះ &amp; សង្កត់​វា។"</string>
     <string name="folder_cling_create_folder" msgid="8352867485656129478">"ដើម្បី​បង្កើត​ថត​ថ្មី​លើ​អេក្រង់​ដើម​របស់​អ្នក ដាក់​កម្មវិធី​មួយ​​ត្រួត​លើ​កម្មវិធី​ផ្សេង​ទៀត។"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7d01e00..ed95d57 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Program uruchamiający"</string>
+    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Strona główna"</string>
     <string name="uid_name" msgid="3371120195364560632">"Aplikacje główne systemu Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 74b79c3..565c6d5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Spúšťač"</string>
+    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"Plocha"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android Core Apps"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
@@ -93,7 +93,7 @@
     <string name="workspace_scroll_format" msgid="1704767047951143301">"Plocha %1$d z %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Stránka aplikácií %1$d z %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Stránka miniaplikácií %1$d z %2$d"</string>
-    <string name="workspace_cling_title" msgid="738396473989890567">"Cíťte sa ako doma"</string>
+    <string name="workspace_cling_title" msgid="738396473989890567">"Cíťte sa tu ako doma"</string>
     <string name="workspace_cling_move_item" msgid="791013895761065070">"Tu môžete umiestniť svoje obľúbené aplikácie."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Ak chcete zobraziť všetky aplikácie, dotknite sa kruhu."</string>
     <string name="all_apps_cling_title" msgid="2559734712581447107">"Vyberte niektoré aplikácie"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3ae5ea7..749c6f8 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"Kizinduzi"</string>
+    <string name="application_name" msgid="8424725141379931883">"Kifungua Programu"</string>
     <string name="home" msgid="5921706419368316758">"Nyumbani"</string>
     <string name="uid_name" msgid="3371120195364560632">"Programu Kuu za Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
@@ -96,13 +96,13 @@
     <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Ukurasa wa programu %1$d ya %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Ukurasa wa wijeti %1$d ya %2$d"</string>
     <string name="workspace_cling_title" msgid="738396473989890567">"Jisikie huru"</string>
-    <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka programu zako uzipendazo hapa."</string>
+    <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka programu unazozipenda hapa."</string>
     <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Kutazama programu zako zote, gusa mduara."</string>
     <string name="all_apps_cling_title" msgid="2559734712581447107">"Chagua programu kadhaa"</string>
-    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ili kuongeza programu kwenye skrini yako ya Kuu, iguse na uishikilie."</string>
-    <string name="folder_cling_title" msgid="4308949882377840953">"Panga programu zako na folda"</string>
+    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ili kuongeza programu kwenye skrini yako Kuu, iguse na uishikilie."</string>
+    <string name="folder_cling_title" msgid="4308949882377840953">"Panga programu zako ukitumia folda"</string>
     <string name="folder_cling_move_item" msgid="270598675060435169">"Kuhamisha programu, gusa na; uishikilie."</string>
-    <string name="folder_cling_create_folder" msgid="8352867485656129478">"Kuunda folda mpya katika skrini yako ya nyumbani, rundika programu moja juu ya nyingine."</string>
+    <string name="folder_cling_create_folder" msgid="8352867485656129478">"Kuunda folda mpya katika skrini yako Kuu, rundika programu moja juu ya nyingine."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"Sawa"</string>
     <string name="folder_opened" msgid="1262064100943801533">"Folda imefunguliwa, <xliff:g id="WIDTH">%1$d</xliff:g> kwa <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="folder_tap_to_close" msgid="1335478160661137579">"Gusa ili ufunge folda"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 39f24cb..0084f7e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"ตัวเรียกใช้งาน"</string>
+    <string name="application_name" msgid="8424725141379931883">"Launcher"</string>
     <string name="home" msgid="5921706419368316758">"หน้าแรก"</string>
     <string name="uid_name" msgid="3371120195364560632">"แอปหลัก Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8dba79e..696855f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="application_name" msgid="8424725141379931883">"啟動器"</string>
+    <string name="application_name" msgid="8424725141379931883">"應用程式啟動器"</string>
     <string name="home" msgid="5921706419368316758">"住家"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android 核心應用程式"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>