From 8c52fefb1f323bf1763bfa4c3c2dd41cacd1b36e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 17 Jan 2018 21:00:29 +0100
Subject: [PATCH] replace launcher Delete with Remove to emphasize that it isnt
 uninstall

---
 .../applauncher/adapters/LaunchersAdapter.kt     | 16 ++++++++--------
 app/src/main/res/menu/cab.xml                    |  6 +++---
 app/src/main/res/values-ar/strings.xml           |  2 +-
 app/src/main/res/values-de/strings.xml           |  2 +-
 app/src/main/res/values-es/strings.xml           |  2 +-
 app/src/main/res/values-fr/strings.xml           |  2 +-
 app/src/main/res/values-ja/strings.xml           |  2 +-
 app/src/main/res/values-pl/strings.xml           |  2 +-
 app/src/main/res/values-pt/strings.xml           |  2 +-
 app/src/main/res/values-ru/strings.xml           |  2 +-
 app/src/main/res/values-sk/strings.xml           |  2 +-
 app/src/main/res/values/strings.xml              |  2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
index a8978ae..7d8a539 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/LaunchersAdapter.kt
@@ -51,7 +51,7 @@ class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppL
     override fun actionItemPressed(id: Int) {
         when (id) {
             R.id.cab_edit -> showEditDialog()
-            R.id.cab_delete -> askConfirmDelete()
+            R.id.cab_remove -> askConfirmRemove()
         }
     }
 
@@ -64,23 +64,23 @@ class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppL
         }
     }
 
-    private fun askConfirmDelete() {
-        ConfirmationDialog(activity, "", R.string.delete_explanation, R.string.ok, R.string.cancel) {
-            deleteItems()
+    private fun askConfirmRemove() {
+        ConfirmationDialog(activity, "", R.string.remove_explanation, R.string.ok, R.string.cancel) {
+            removeItems()
         }
     }
 
-    private fun deleteItems() {
-        val deleteIds = ArrayList<String>(selectedPositions.size)
+    private fun removeItems() {
+        val removeIds = ArrayList<String>(selectedPositions.size)
         val removeLaunchers = ArrayList<AppLauncher>(selectedPositions.size)
         selectedPositions.sortedDescending().forEach {
             val launcher = launchers[it]
-            deleteIds.add(launcher.id.toString())
+            removeIds.add(launcher.id.toString())
             removeLaunchers.add(launcher)
         }
 
         launchers.removeAll(removeLaunchers)
-        activity.dbHelper.deleteLaunchers(deleteIds)
+        activity.dbHelper.deleteLaunchers(removeIds)
         removeSelectedItems()
     }
 
diff --git a/app/src/main/res/menu/cab.xml b/app/src/main/res/menu/cab.xml
index 0fcb5cf..57a5c2b 100644
--- a/app/src/main/res/menu/cab.xml
+++ b/app/src/main/res/menu/cab.xml
@@ -7,8 +7,8 @@
         android:title="@string/rename"
         app:showAsAction="ifRoom"/>
     <item
-        android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete"
-        android:title="@string/delete"
+        android:id="@+id/cab_remove"
+        android:icon="@drawable/ic_minus_circle"
+        android:title="@string/remove"
         app:showAsAction="ifRoom"/>
 </menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7275f72..eebde9f 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">درج التطبيقات البسيط</string>
     <string name="app_launcher_name">مشغل التطبيق</string>
     <string name="enter_launcher_name">الرجاء ادراج اسم للإختصار</string>
-    <string name="delete_explanation">هذا سيقوم بحذف الايقونة فقط من الواجهة الحالية,ولن يقوم بإلغاء تثبيت حزمة التطبيق.</string>
+    <string name="remove_explanation">هذا سيقوم بحذف الايقونة فقط من الواجهة الحالية,ولن يقوم بإلغاء تثبيت حزمة التطبيق.</string>
 
     <!-- Apps -->
     <string name="calculator">الحاسبة</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fd179e6..c7bc7d7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Schlichter AppLauncher</string>
     <string name="app_launcher_name">App Launcher</string>
     <string name="enter_launcher_name">Bitte gib einen Namen für die Verknüpfung ein</string>
-    <string name="delete_explanation">Diese Aktion wird das App-Icon nur aus dem Raster löschen, nicht die eigentliche App deinstallieren.</string>
+    <string name="remove_explanation">Diese Aktion wird das App-Icon nur aus dem Raster löschen, nicht die eigentliche App deinstallieren.</string>
 
     <!-- Apps -->
     <string name="calculator">Rechner</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1c9da7a..9f715dc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Simple App Launcher</string>
     <string name="app_launcher_name">Lanzador de aplicaciones</string>
     <string name="enter_launcher_name">Por favor, introduzca un nombre para el lanzador</string>
-    <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
 
     <!-- Apps -->
     <string name="calculator">Calculadora</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f067c30..26434b6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Simple App Launcher</string>
     <string name="app_launcher_name">App Launcher</string>
     <string name="enter_launcher_name">Veuillez entrer un nom de launcher</string>
-    <string name="delete_explanation">Cette action ne fera que supprimer l\'icône du launcher de cette liste et ne désinstallere pas l\'application.</string>
+    <string name="remove_explanation">Cette action ne fera que supprimer l\'icône du launcher de cette liste et ne désinstallere pas l\'application.</string>
 
     <!-- Apps -->
     <string name="calculator">Calculatrice</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ecdcbe0..aee4e67 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">シンプル アプリ ランチャー</string>
     <string name="app_launcher_name">アプリ ランチャー</string>
     <string name="enter_launcher_name">ランチャーの名前を入力してください</string>
-    <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
 
     <!-- Apps -->
     <string name="calculator">電卓</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 326bd7a..0cf18a9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Prosty Launcher Aplikacji</string>
     <string name="app_launcher_name">Launcher Aplikacji</string>
     <string name="enter_launcher_name">Proszę wpisać nazwę launchera</string>
-    <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
 
     <!-- Apps -->
     <string name="calculator">Kalkulator</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 56af530..c74d65a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Simple App Launcher</string>
     <string name="app_launcher_name">Lançador de aplicações</string>
     <string name="enter_launcher_name">Por favor digite um nome para o lançador</string>
-    <string name="delete_explanation">Esta ação remove o ícone da grelha mas não desinstala a aplicação.</string>
+    <string name="remove_explanation">Esta ação remove o ícone da grelha mas não desinstala a aplicação.</string>
 
     <!-- Apps -->
     <string name="calculator">Calculadora</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8f1f1b8..389da42 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Simple App Launcher</string>
     <string name="app_launcher_name">Лаунчер</string>
     <string name="enter_launcher_name">Пожалуйста, введите название лаунчера</string>
-    <string name="delete_explanation">Это только удалит иконку лаунчера с сетки, но не удалит само приложение.</string>
+    <string name="remove_explanation">Это только удалит иконку лаунчера с сетки, но не удалит само приложение.</string>
 
     <!-- Apps -->
     <string name="calculator">Калькулятор</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index cd1f770..94e9ba1 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Jednoduchý spúšťač aplikácií</string>
     <string name="app_launcher_name">Spúšťač aplikácií</string>
     <string name="enter_launcher_name">Prosím zadajte názov pre spúšťač</string>
-    <string name="delete_explanation">Toto iba odstráni spúšťačku z tejto mriežky, neodinštaluje to samotnú apku.</string>
+    <string name="remove_explanation">Toto iba odstráni spúšťačku z tejto mriežky, neodinštaluje to samotnú apku.</string>
 
     <!-- Apps -->
     <string name="calculator">Kalkulačka</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 84448b1..fd6af76 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">Simple App Launcher</string>
     <string name="app_launcher_name">App Launcher</string>
     <string name="enter_launcher_name">Please enter a launcher name</string>
-    <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
 
     <!-- Apps -->
     <string name="calculator">Calculator</string>