resolved conflicts for merge of 2517f887 to ub-launcher3-master
Change-Id: I4848774da89811dc173a475cb1d958add6d2bfd0
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2d3c633..fc5390b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -173,8 +173,6 @@
<skip />
<!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
- <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
- <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<!-- no translation found for first_run_cling_create_screens_hint (6950729526680114157) -->
<skip />
<!-- no translation found for workspace_cling_title (5626202359865825661) -->
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index a4955ce..bc95206 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -21,69 +21,31 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="8424725141379931883">"Käivitaja"</string>
<string name="home" msgid="5921706419368316758">"Kodu"</string>
- <string name="uid_name" msgid="3371120195364560632">"Androidi tuumrakendused"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Määra taustapilt"</string>
<string name="pick_wallpaper" msgid="5630222540525626723">"Taustapildid"</string>
<string name="activity_not_found" msgid="217823393239365967">"Rakendus pole installitud."</string>
- <string name="widgets_tab_label" msgid="9145860100000983599">"Vidinad"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Vidina valimiseks puudutage seda pikalt."</string>
<string name="widget_dims_format" msgid="1386418557719032947">"%1$d × %2$d"</string>
- <string name="external_drop_widget_error" msgid="2285187188524172774">"Üksust ei saa sellele avaekraanile tuua."</string>
- <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Valige loomiseks vidin"</string>
- <string name="rename_folder_label" msgid="5646236631298452787">"Kausta nimi"</string>
- <string name="rename_folder_title" msgid="4544573104191526550">"Nimeta kaust ümber"</string>
- <string name="rename_action" msgid="6016003384693240896">"OK"</string>
- <string name="cancel_action" msgid="3811860427489435048">"Tühista"</string>
- <string name="menu_item_add_item" msgid="6233177331075781114">"Lisa avamenüüsse"</string>
- <string name="group_applications" msgid="2103752818818161976">"Rakendused"</string>
- <string name="group_shortcuts" msgid="9133529424900391877">"Otseteed"</string>
- <string name="group_widgets" msgid="6704978494073105844">"Vidinad"</string>
- <string name="completely_out_of_space" msgid="1759078539443491182">"Teie avakuvadel ei ole enam ruumi."</string>
<string name="out_of_space" msgid="8365249326091984698">"Sellel avalehel pole enam ruumi."</string>
<string name="hotseat_out_of_space" msgid="6304886797358479361">"Kohandataval dokialal pole rohkem ruumi."</string>
- <string name="invalid_hotseat_item" msgid="6545340627805449250">"See vidin on tööpunkti jaoks liiga suur."</string>
- <string name="shortcut_installed" msgid="7071557296331322355">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” loodud."</string>
- <string name="shortcut_uninstalled" msgid="2129499669449749995">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” eemaldatud."</string>
- <string name="shortcut_duplicate" msgid="4757756326465060694">"Otsetee „<xliff:g id="NAME">%s</xliff:g>” on juba olemas."</string>
- <string name="title_select_shortcut" msgid="1873670208166882222">"Otsetee valimine"</string>
- <string name="title_select_application" msgid="1793455815754848652">"Rakenduse valimine"</string>
<string name="all_apps_button_label" msgid="2578400570124163469">"Rakendused"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Kodu"</string>
- <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalli"</string>
<string name="delete_target_label" msgid="665300185123139530">"Eemalda"</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalli"</string>
<string name="info_target_label" msgid="4019495079517426980">"Rakenduse teave"</string>
- <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Rakendused"</string>
- <string name="accessibility_delete_button" msgid="3628162007991023603">"Eemalda"</string>
- <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Desinstalli värskendus"</string>
- <string name="cab_menu_delete_app" msgid="4089398025537640349">"Rakenduse desinstallimine"</string>
- <string name="cab_menu_app_info" msgid="914548323652698884">"Rakenduse üksikasjad"</string>
- <string name="cab_app_selection_text" msgid="6378522164293415735">"Valitud on 1 rakendus"</string>
- <string name="cab_widget_selection_text" msgid="962527270506951955">"1 vidin on valitud"</string>
- <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 kaust on valitud"</string>
- <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 otsetee on valitud"</string>
<string name="permlab_install_shortcut" msgid="1201690825493376489">"otseteede installimine"</string>
<string name="permdesc_install_shortcut" msgid="8634424803272077038">"Võimaldab rakendusel lisada otseteid kasutaja sekkumiseta."</string>
- <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"otseteede desinstallimine"</string>
- <string name="permdesc_uninstall_shortcut" msgid="274355570620220977">"Võimaldab rakendusel eemaldada otseteid kasutaja sekkumiseta."</string>
<string name="permlab_read_settings" msgid="3452408290738106747">"avalehe seadete ja otseteede lugemine"</string>
<string name="permdesc_read_settings" msgid="5788109303585403679">"Võimaldab rakendusel lugeda avalehe seadeid ja otseteid."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"avalehe seadete ja otseteede kirjutamine"</string>
<string name="permdesc_write_settings" msgid="8530105489115785531">"Võimaldab rakendusel muuta avalehel seadeid ja otseteid."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Probleem vidina laadimisel"</string>
<string name="uninstall_system_app_text" msgid="6429814133777046491">"See on süsteemirakendus ja seda ei saa desinstallida."</string>
- <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Nimeta kaust"</string>
<string name="workspace_description_format" msgid="2968608205939373034">"Avakuva %1$d"</string>
<string name="default_scroll_format" msgid="4057140866420001240">"Leht %1$d/%2$d"</string>
<string name="workspace_scroll_format" msgid="1704767047951143301">"Avakuva %1$d/%2$d"</string>
- <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Rakenduste leht %1$d/%2$d"</string>
- <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Vidinate leht %1$d/%2$d"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"Tunne end nagu kodus"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Võite panna oma lemmikrakendused siia."</string>
- <string name="folder_cling_title" msgid="4308949882377840953">"Korraldage oma rakendused kaustadesse"</string>
- <string name="folder_cling_create_folder" msgid="8352867485656129478">"Avakuval uue kausta tegemiseks virnastage üks rakendus teisele."</string>
<string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
<string name="folder_opened" msgid="1262064100943801533">"Kaust on avatud, <xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1335478160661137579">"Puudutage kausta sulgemiseks"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 248ca15..de274d7 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -21,69 +21,31 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="application_name" msgid="8424725141379931883">"Pelancar"</string>
<string name="home" msgid="5921706419368316758">"Laman Utama"</string>
- <string name="uid_name" msgid="3371120195364560632">"Apl Teras Android"</string>
<string name="folder_name" msgid="8551881338202938211"></string>
<string name="wallpaper_instructions" msgid="4215640646180727542">"Tetapkan kertas dinding"</string>
<string name="pick_wallpaper" msgid="5630222540525626723">"Kertas dinding"</string>
<string name="activity_not_found" msgid="217823393239365967">"Aplikasi tidak dipasang."</string>
- <string name="widgets_tab_label" msgid="9145860100000983599">"Widget"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"Sentuh & tahan untuk mengambil widget."</string>
<string name="widget_dims_format" msgid="1386418557719032947">"%1$d × %2$d"</string>
- <string name="external_drop_widget_error" msgid="2285187188524172774">"Tidak dapat melepaskan item pada skrin Utama ini."</string>
- <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Pilih widget untuk dibuat"</string>
- <string name="rename_folder_label" msgid="5646236631298452787">"Nama folder"</string>
- <string name="rename_folder_title" msgid="4544573104191526550">"Namakan semula folder"</string>
- <string name="rename_action" msgid="6016003384693240896">"OK"</string>
- <string name="cancel_action" msgid="3811860427489435048">"Batal"</string>
- <string name="menu_item_add_item" msgid="6233177331075781114">"Tambah ke Skrin utama"</string>
- <string name="group_applications" msgid="2103752818818161976">"Aplikasi"</string>
- <string name="group_shortcuts" msgid="9133529424900391877">"Pintasan"</string>
- <string name="group_widgets" msgid="6704978494073105844">"Widget"</string>
- <string name="completely_out_of_space" msgid="1759078539443491182">"Tiada lagi ruang pada skrin Utama anda."</string>
<string name="out_of_space" msgid="8365249326091984698">"Tiada lagi ruang pada skrin Utama ini"</string>
<string name="hotseat_out_of_space" msgid="6304886797358479361">"Tiada lagi ruang pada kerusi panas."</string>
- <string name="invalid_hotseat_item" msgid="6545340627805449250">"Widget ini terlalu besar untuk kerusi panas."</string>
- <string name="shortcut_installed" msgid="7071557296331322355">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" diwujudkan."</string>
- <string name="shortcut_uninstalled" msgid="2129499669449749995">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" telah dialih keluar."</string>
- <string name="shortcut_duplicate" msgid="4757756326465060694">"Pintasan \"<xliff:g id="NAME">%s</xliff:g>\" sudah pun wujud."</string>
- <string name="title_select_shortcut" msgid="1873670208166882222">"Pilih pintasan"</string>
- <string name="title_select_application" msgid="1793455815754848652">"Pilih aplikasi"</string>
<string name="all_apps_button_label" msgid="2578400570124163469">"Apl"</string>
<string name="all_apps_home_button_label" msgid="1022222300329398558">"Laman Utama"</string>
- <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Nyahpasang"</string>
<string name="delete_target_label" msgid="665300185123139530">"Alih keluar"</string>
<string name="delete_target_uninstall_label" msgid="748894921183769150">"Nyahpasang"</string>
<string name="info_target_label" msgid="4019495079517426980">"Maklumat apl"</string>
- <string name="accessibility_all_apps_button" msgid="8803738611398979849">"Aplikasi"</string>
- <string name="accessibility_delete_button" msgid="3628162007991023603">"Alih keluar"</string>
- <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Nyahpasang kemas kini"</string>
- <string name="cab_menu_delete_app" msgid="4089398025537640349">"Nyahpasang aplikasi"</string>
- <string name="cab_menu_app_info" msgid="914548323652698884">"Butiran aplikasi"</string>
- <string name="cab_app_selection_text" msgid="6378522164293415735">"1 aplikasi dipilih"</string>
- <string name="cab_widget_selection_text" msgid="962527270506951955">"1 widget dipilih"</string>
- <string name="cab_folder_selection_text" msgid="8916111874189565067">"1 folder dipilih"</string>
- <string name="cab_shortcut_selection_text" msgid="8115847384500412878">"1 pintasan dipilih"</string>
<string name="permlab_install_shortcut" msgid="1201690825493376489">"pasang pintasan"</string>
<string name="permdesc_install_shortcut" msgid="8634424803272077038">"Membenarkan aplikasi menambah pintasan tanpa campur tangan pengguna."</string>
- <string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"nyahpasang pintasan"</string>
- <string name="permdesc_uninstall_shortcut" msgid="274355570620220977">"Membenarkan apl mengalih keluar pintasan tanpa campur tangan pengguna."</string>
<string name="permlab_read_settings" msgid="3452408290738106747">"membaca tetapan dan pintasan Laman Utama"</string>
<string name="permdesc_read_settings" msgid="5788109303585403679">"Membenarkan apl membaca tetapan dan pintasan di Laman Utama."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"menulis tetapan dan pintasan Laman Utama"</string>
<string name="permdesc_write_settings" msgid="8530105489115785531">"Membenarkan apl menukar tetapan dan pintasan di Laman Utama."</string>
<string name="gadget_error_text" msgid="8359351016167075858">"Masalah memuatkan widget"</string>
<string name="uninstall_system_app_text" msgid="6429814133777046491">"Ini adalah aplikasi sistem dan tidak boleh dinyahpasang."</string>
- <string name="dream_name" msgid="2847171357608437154">"Pelancar Roket"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"Folder Tanpa Nama"</string>
<string name="workspace_description_format" msgid="2968608205939373034">"Skrin utama %1$d"</string>
<string name="default_scroll_format" msgid="4057140866420001240">"Halaman %1$d dari %2$d"</string>
<string name="workspace_scroll_format" msgid="1704767047951143301">"Skrin utama %1$d dari %2$d"</string>
- <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Halaman apl %1$d dari %2$d"</string>
- <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Halaman widget %1$d dari %2$d"</string>
- <string name="workspace_cling_title" msgid="738396473989890567">"Buat diri anda seperti di rumah"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"Anda boleh meletakkan aplikasi kegemaran anda di sini."</string>
- <string name="folder_cling_title" msgid="4308949882377840953">"Susun aplikasi anda dengan folder"</string>
- <string name="folder_cling_create_folder" msgid="8352867485656129478">"Untuk membuat folder baharu pada skrin Utama anda, tindihkan satu aplikasi di atas yang lain."</string>
<string name="cling_dismiss" msgid="2780907108735868381">"OK"</string>
<string name="folder_opened" msgid="1262064100943801533">"Folder dibuka, <xliff:g id="WIDTH">%1$d</xliff:g> kali <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
<string name="folder_tap_to_close" msgid="1335478160661137579">"Sentuh untuk menutup folder"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 1681644..3730e1d 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -53,6 +53,9 @@
<string name="workspace_description_format" msgid="2950174241104043327">"गृह स्क्रिन %1$d"</string>
<string name="default_scroll_format" msgid="7475544710230993317">"पृष्ठ %2$d को %1$d"</string>
<string name="workspace_scroll_format" msgid="8458889198184077399">"गृह स्क्रिन %2$d को %2$d"</string>
+ <!-- String.format failed for translation -->
+ <!-- no translation found for apps_customize_widgets_scroll_format (3106209519974971521) -->
+ <skip />
<string name="first_run_cling_title" msgid="2459738000155917941">"स्वागतम"</string>
<string name="migration_cling_title" msgid="9181776667882933767">"तपाईँको अनुप्रयोग आईकनको प्रतिलिप गर्नुहोस्"</string>
<string name="migration_cling_description" msgid="2752413805582227644">"आफ्नो पुरानो गृह स्क्रीनबाट अाईकन र फोल्डरहरू आयात गर्नुहोस्?"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index be35c6b..0758148 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -152,8 +152,6 @@
<skip />
<!-- no translation found for first_run_cling_description (6447072552696253358) -->
<skip />
- <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string>
- <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string>
<!-- no translation found for first_run_cling_create_screens_hint (6950729526680114157) -->
<skip />
<!-- no translation found for migration_cling_title (9181776667882933767) -->