From b77669c263b50598dc34b3df007f5f872a113dc5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 30 May 2020 16:00:05 +0200
Subject: [PATCH 1/3] updating the chinese app title and short desc

---
 fastlane/metadata/android/zh-rCN/short_description.txt | 2 +-
 fastlane/metadata/android/zh-rCN/title.txt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/metadata/android/zh-rCN/short_description.txt b/fastlane/metadata/android/zh-rCN/short_description.txt
index cf703058..ea5f8309 100644
--- a/fastlane/metadata/android/zh-rCN/short_description.txt
+++ b/fastlane/metadata/android/zh-rCN/short_description.txt
@@ -1 +1 @@
-一个没有广告的通讯录应用程序，用来管理联系人，并且尊重您的隐私。
+简单快速无广告的联系人管理，亦可处理群组和收藏。
diff --git a/fastlane/metadata/android/zh-rCN/title.txt b/fastlane/metadata/android/zh-rCN/title.txt
index d7d55d07..c16e947b 100644
--- a/fastlane/metadata/android/zh-rCN/title.txt
+++ b/fastlane/metadata/android/zh-rCN/title.txt
@@ -1 +1 @@
-简约通讯录
+简易通讯录 - 轻松管理你的联系人

From fb34c7a950316de1d23f55fc2302e3b337fc8f17 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 31 May 2020 10:14:31 +0200
Subject: [PATCH 2/3] moving some strings in commons

---
 app/build.gradle                           | 2 +-
 app/src/main/res/values-ar/strings.xml     | 4 ----
 app/src/main/res/values-az/strings.xml     | 4 ----
 app/src/main/res/values-cs/strings.xml     | 4 ----
 app/src/main/res/values-cy/strings.xml     | 4 ----
 app/src/main/res/values-da/strings.xml     | 4 ----
 app/src/main/res/values-de/strings.xml     | 4 ----
 app/src/main/res/values-el/strings.xml     | 4 ----
 app/src/main/res/values-es/strings.xml     | 4 ----
 app/src/main/res/values-eu/strings.xml     | 4 ----
 app/src/main/res/values-fi/strings.xml     | 4 ----
 app/src/main/res/values-fr/strings.xml     | 4 ----
 app/src/main/res/values-hr/strings.xml     | 4 ----
 app/src/main/res/values-hu/strings.xml     | 4 ----
 app/src/main/res/values-id/strings.xml     | 4 ----
 app/src/main/res/values-in/strings.xml     | 4 ----
 app/src/main/res/values-it/strings.xml     | 4 ----
 app/src/main/res/values-ja/strings.xml     | 4 ----
 app/src/main/res/values-ko-rKR/strings.xml | 4 ----
 app/src/main/res/values-lt/strings.xml     | 4 ----
 app/src/main/res/values-nl/strings.xml     | 4 ----
 app/src/main/res/values-pl/strings.xml     | 4 ----
 app/src/main/res/values-pt-rBR/strings.xml | 4 ----
 app/src/main/res/values-pt/strings.xml     | 4 ----
 app/src/main/res/values-ru/strings.xml     | 4 ----
 app/src/main/res/values-sk/strings.xml     | 4 ----
 app/src/main/res/values-sv/strings.xml     | 4 ----
 app/src/main/res/values-tr/strings.xml     | 4 ----
 app/src/main/res/values-uk/strings.xml     | 4 ----
 app/src/main/res/values-zh-rCN/strings.xml | 4 ----
 app/src/main/res/values-zh-rTW/strings.xml | 4 ----
 app/src/main/res/values/strings.xml        | 4 ----
 32 files changed, 1 insertion(+), 125 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 76cc5eb9..f940f4a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.28.23'
+    implementation 'com.simplemobiletools:commons:5.28.26'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
     implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a'
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7b745998..b3f3e344 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">جهة اتصال جديدة</string>
     <string name="edit_contact">تعديل جهة اتصالل</string>
     <string name="select_contact">اختيار جهة اتصال</string>
-    <string name="first_name">الاسم</string>
-    <string name="middle_name">اسم الأب</string>
-    <string name="surname">الشهرة</string>
     <string name="nickname">اللقب</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">ازالة الصورة</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">الاسم يبدأ بالشهرة</string>
     <string name="show_phone_numbers">عرض أرقام الهاتف على الشاشة الرئيسية</string>
     <string name="show_contact_thumbnails">عرض صور مصغرة لجهات الإتصال</string>
     <string name="show_dialpad_button">عرض زر لوحة الإتصال على الشاشةالرئيسية</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index c5361a29..0f528259 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Yeni kontakt</string>
     <string name="edit_contact">Redaktə et</string>
     <string name="select_contact">Kontakt seç</string>
-    <string name="first_name">Ad</string>
-    <string name="middle_name">Orta Ad</string>
-    <string name="surname">Soyad</string>
     <string name="nickname">Nickname</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Şəkli sil</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Ada soyaddan başla</string>
     <string name="show_phone_numbers">Telefon nömrələrini əsas ekranda göstər</string>
     <string name="show_contact_thumbnails">Kontakt görüntülərini göstər</string>
     <string name="show_dialpad_button">Show a dialpad button on the main screen</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 885b837c..9a48e104 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Nový kontakt</string>
     <string name="edit_contact">Upravit kontakt</string>
     <string name="select_contact">Zvolte kontakt</string>
-    <string name="first_name">Křestní jméno</string>
-    <string name="middle_name">Prostřední jméno</string>
-    <string name="surname">Příjmení</string>
     <string name="nickname">Přezdívka</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Odstranit fotku</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Nejprve příjmení</string>
     <string name="show_phone_numbers">Zobrazit telefonní čísla na hlavní obrazovce</string>
     <string name="show_contact_thumbnails">Zobrazit obrázky kontaktů</string>
     <string name="show_dialpad_button">Zobrazit tlačítko číselníku na hlavní obrazovce</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index c1417731..5b481884 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Cyswllt newydd</string>
     <string name="edit_contact">Golygu\'r cyswllt</string>
     <string name="select_contact">Dewis cyswllt</string>
-    <string name="first_name">Enw cyntaf</string>
-    <string name="middle_name">Enw canol</string>
-    <string name="surname">Cyfenw</string>
     <string name="nickname">Llys enw</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Cael gwared â\'r llun</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Dangos enw gyda\'r cyfenw gyntaf</string>
     <string name="show_phone_numbers">Dangos rhifau ffôn ar y brif sgrin</string>
     <string name="show_contact_thumbnails">Dangos mân luniau cysylltiadau</string>
     <string name="show_dialpad_button">Dangos botwm pad deialu ar y brif sgrin</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 52305f1d..288a28e2 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Ny kontakt</string>
     <string name="edit_contact">Redigér kontakt</string>
     <string name="select_contact">Vælg kontakt</string>
-    <string name="first_name">Fornavn</string>
-    <string name="middle_name">Mellemnavn</string>
-    <string name="surname">Efternavn</string>
     <string name="nickname">Kaldenavn</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Fjern foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Start navn med efternavn</string>
     <string name="show_phone_numbers">Vis telefonnumre på hovedskærmen</string>
     <string name="show_contact_thumbnails">Vis kontakt miniature-billede</string>
     <string name="show_dialpad_button">Vis en opkaldstasteknap på hovedskærmen</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e1bcc7a5..720858df 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Neuer Kontakt</string>
     <string name="edit_contact">Kontakt bearbeiten</string>
     <string name="select_contact">Kontakt auswählen</string>
-    <string name="first_name">Vorname</string>
-    <string name="middle_name">Zweiter Vorname</string>
-    <string name="surname">Nachname</string>
     <string name="nickname">Spitzname</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Foto entfernen</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Namen mit Nachnamen beginnen</string>
     <string name="show_phone_numbers">Telefonnummern im Hauptmenü zeigen</string>
     <string name="show_contact_thumbnails">Vorschaubilder der Kontakte zeigen</string>
     <string name="show_dialpad_button">Eine Wahlfeld-Schaltfläche auf dem Hauptbildschirm anzeigen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index b3b81b19..8fd9731f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Νέα επαφή</string>
     <string name="edit_contact">Επεξεργασία επαφής</string>
     <string name="select_contact">Επιλογή επαφής</string>
-    <string name="first_name">Όνομα</string>
-    <string name="middle_name">Μεσαίο όνομα</string>
-    <string name="surname">Επώνυμο</string>
     <string name="nickname">Ψευδώνυμο</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Αφαίρεση φωτογραφίας</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Εμφάνιση πρώτα το επώνυμο</string>
     <string name="show_phone_numbers">Εμφάνιση τηλεφωνικών αριθμών στην κύρια οθόνη</string>
     <string name="show_contact_thumbnails">Εμφάνιση μικρογραφιών επαφής</string>
     <string name="show_dialpad_button">Προβολή ενός κουμπίου πληκτρολογίου στην κύρια οθόνη</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 03199bc5..37aa2280 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Nuevo contacto</string>
     <string name="edit_contact">Editar contacto</string>
     <string name="select_contact">Seleccionar contacto</string>
-    <string name="first_name">Primer nombre</string>
-    <string name="middle_name">Segundo nombre</string>
-    <string name="surname">Apellido</string>
     <string name="nickname">Alias</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Eliminar foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Mostrar nombre por apellido</string>
     <string name="show_phone_numbers">Mostrar números de teléfono en la pantalla principal</string>
     <string name="show_contact_thumbnails">Mostrar minaturas de contactos</string>
     <string name="show_dialpad_button">Mostrar botón de marcación en la pantalla principal</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index b7a8af72..bb20e80b 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Kontaktu berria</string>
     <string name="edit_contact">Editatu taldea</string>
     <string name="select_contact">Hautatu kontaktuak</string>
-    <string name="first_name">Izena</string>
-    <string name="middle_name">Erdiko izena</string>
-    <string name="surname">Abizena</string>
     <string name="nickname">Nickname</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Kendu argazkia</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Abizenaren arabera sailkatu</string>
     <string name="show_phone_numbers">Erakutsi telefono zenbakiak pantaila nagusian</string>
     <string name="show_contact_thumbnails">Show contact thumbnails</string>
     <string name="show_dialpad_button">Show a dialpad button on the main screen</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 21b0040a..ea6993e7 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Uusi kontakti</string>
     <string name="edit_contact">Muokkaa kontaktia</string>
     <string name="select_contact">Valitse kontakti</string>
-    <string name="first_name">Etunimi</string>
-    <string name="middle_name">Toinen nimi</string>
-    <string name="surname">Sukunimi</string>
     <string name="nickname">Kutsumanimi</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Posta kuva</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Aloita sukunimellä</string>
     <string name="show_phone_numbers">Näytä puhelinnumerot</string>
     <string name="show_contact_thumbnails">Näytä kontaktien kuvakkeet</string>
     <string name="show_dialpad_button">Näytä soittimen nappi</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cb3e58e0..357ae017 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Nouveau contact</string>
     <string name="edit_contact">Modifier contact</string>
     <string name="select_contact">Sélectionner un contact</string>
-    <string name="first_name">Prénom</string>
-    <string name="middle_name">Deuxième prénom</string>
-    <string name="surname">Nom</string>
     <string name="nickname">Surnom</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Supprimer la photo</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Trier les contacts par nom de famille</string>
     <string name="show_phone_numbers">Afficher les numéros de téléphone</string>
     <string name="show_contact_thumbnails">Afficher les vignettes des contacts</string>
     <string name="show_dialpad_button">Afficher un bouton \"Clavier téléphonique\" sur l\'écran principal</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index aeeb571e..a1a9188e 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Novi kontakt</string>
     <string name="edit_contact">Uredi kontakt</string>
     <string name="select_contact">Odaberi kontakt</string>
-    <string name="first_name">Ime</string>
-    <string name="middle_name">Srednje ime</string>
-    <string name="surname">Prezime</string>
     <string name="nickname">Nadimak</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Ukloni fotografiju</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Započnite imena s prezimenima</string>
     <string name="show_phone_numbers">Prikaži telefonske brojeve na glavnom zaslonu</string>
     <string name="show_contact_thumbnails">Prikaži sličice kontakata</string>
     <string name="show_dialpad_button">Show a dialpad button on the main screen</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 90f5aba6..278dd6e3 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Új névjegy</string>
     <string name="edit_contact">Névjegy módosítása</string>
     <string name="select_contact">Névjegy kiválasztása</string>
-    <string name="first_name">Keresztnév</string>
-    <string name="middle_name">Középső név</string>
-    <string name="surname">Vezetéknév</string>
     <string name="nickname">Becenév</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Fénykép törlése</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Vezetéknév, keresztnév sorrend</string>
     <string name="show_phone_numbers">Telefonszámok kijelzése a névjegylistán</string>
     <string name="show_contact_thumbnails">Névjegy bélyeg kijelzése</string>
     <string name="show_dialpad_button">Tárcsáző kijelzése a névjegylistán</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 01e1f213..5d15f3c3 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Kontak baru</string>
     <string name="edit_contact">Sunting kontak</string>
     <string name="select_contact">Pilih kontak</string>
-    <string name="first_name">Nama depan</string>
-    <string name="middle_name">Nama tengah</string>
-    <string name="surname">Nama belakang</string>
     <string name="nickname">Nama panggilan</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Buang foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Nama dimulai dengan nama belakang</string>
     <string name="show_phone_numbers">Tampilkan nomor telepon pada layar utama</string>
     <string name="show_contact_thumbnails">Tampilkan foto kontak</string>
     <string name="show_dialpad_button">Tampilkan tombol dial pada layar utama</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 01e1f213..5d15f3c3 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Kontak baru</string>
     <string name="edit_contact">Sunting kontak</string>
     <string name="select_contact">Pilih kontak</string>
-    <string name="first_name">Nama depan</string>
-    <string name="middle_name">Nama tengah</string>
-    <string name="surname">Nama belakang</string>
     <string name="nickname">Nama panggilan</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Buang foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Nama dimulai dengan nama belakang</string>
     <string name="show_phone_numbers">Tampilkan nomor telepon pada layar utama</string>
     <string name="show_contact_thumbnails">Tampilkan foto kontak</string>
     <string name="show_dialpad_button">Tampilkan tombol dial pada layar utama</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 410817db..bf780251 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Nuovo contatto</string>
     <string name="edit_contact">Modifica contatto</string>
     <string name="select_contact">Seleziona contatto</string>
-    <string name="first_name">Nome</string>
-    <string name="middle_name">Secondo nome</string>
-    <string name="surname">Cognome</string>
     <string name="nickname">Soprannome</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Rimuovi la foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Prima il nome poi il cognome</string>
     <string name="show_phone_numbers">Mostra i numeri di telefono nella schermata principale</string>
     <string name="show_contact_thumbnails">Mostra le anteprime dei contatti</string>
     <string name="show_dialpad_button">Mostra il pulante per il tastierino nello schermo principale</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 775157e0..16bf9c8b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">新しい連絡先</string>
     <string name="edit_contact">連絡先を編集</string>
     <string name="select_contact">連絡先を選択</string>
-    <string name="first_name">名</string>
-    <string name="middle_name">ミドルネーム</string>
-    <string name="surname">姓</string>
     <string name="nickname">ニックネーム</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">写真を削除</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">姓を先に表示</string>
     <string name="show_phone_numbers">メイン画面に電話番号を表示</string>
     <string name="show_contact_thumbnails">連絡先のサムネイルを表示</string>
     <string name="show_dialpad_button">メイン画面にダイヤルパッドを表示</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index eac6f277..ac7d2216 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">새로운 연락처</string>
     <string name="edit_contact">연락처 수정</string>
     <string name="select_contact">단건 연락처 선택</string>
-    <string name="first_name">이름</string>
-    <string name="middle_name">중간 이름</string>
-    <string name="surname">성</string>
     <string name="nickname">Nickname</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">사진 삭제</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">성을 먼저 표시</string>
     <string name="show_phone_numbers">메인 스크린에 전화번호 표시</string>
     <string name="show_contact_thumbnails">Show contact thumbnails</string>
     <string name="show_dialpad_button">Show a dialpad button on the main screen</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 083388c8..be78ac8c 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Naujas kontaktas</string>
     <string name="edit_contact">Redaguoti kontaktą</string>
     <string name="select_contact">Pasirinkti kontaktą</string>
-    <string name="first_name">Vardas</string>
-    <string name="middle_name">Antras vardas</string>
-    <string name="surname">Pavardė</string>
     <string name="nickname">Nickname</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Pašalinti nuotrauką</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Pavardė rodoma pirma</string>
     <string name="show_phone_numbers">Rodyti telefono numerius pagrindiniame programos ekrane</string>
     <string name="show_contact_thumbnails">Rodyti kontaktų miniatiūras</string>
     <string name="show_dialpad_button">Show a dialpad button on the main screen</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 55a6fc9f..338afa01 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Nieuw contact</string>
     <string name="edit_contact">Contact bewerken</string>
     <string name="select_contact">Contact kiezen</string>
-    <string name="first_name">Voornaam</string>
-    <string name="middle_name">Tweede voornaam</string>
-    <string name="surname">Achternaam</string>
     <string name="nickname">Bijnaam</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Foto verwijderen</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Beginnen met achternaam</string>
     <string name="show_phone_numbers">Telefoonnummers in hoofdscherm tonen</string>
     <string name="show_contact_thumbnails">Contactafbeelding tonen</string>
     <string name="show_dialpad_button">Knop voor toetsenblok in hoofdscherm tonen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 72382fc9..17fd83aa 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Nowy kontakt</string>
     <string name="edit_contact">Edytuj kontakt</string>
     <string name="select_contact">Wybierz kontakt</string>
-    <string name="first_name">Pierwsze imię</string>
-    <string name="middle_name">Drugie imię</string>
-    <string name="surname">Nazwisko</string>
     <string name="nickname">Pseudonim</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Usuń zdjęcie</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Zacznij nazwę od nazwiska</string>
     <string name="show_phone_numbers">Pokazuj numery telefonów na ekranie głównym</string>
     <string name="show_contact_thumbnails">Pokazuj miniatury kontaktów</string>
     <string name="show_dialpad_button">Pokazuj przycisk panelu wybierania numeru na ekranie głównym</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 48b99196..90c7f6fe 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Novo contato</string>
     <string name="edit_contact">Editar contato</string>
     <string name="select_contact">Selecionar contato</string>
-    <string name="first_name">Primeiro nome</string>
-    <string name="middle_name">Nome do meio</string>
-    <string name="surname">Sobrenome</string>
     <string name="nickname">Apelido</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Remover foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Ordenar por sobrenome</string>
     <string name="show_phone_numbers">Mostrar número de telefone na tela principal</string>
     <string name="show_contact_thumbnails">Mostrar miniatura do contato</string>
     <string name="show_dialpad_button">Mostrar o botão do discador na tela principal</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e17ffcef..c164c43a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Novo contacto</string>
     <string name="edit_contact">Editar contacto</string>
     <string name="select_contact">Selecionar contacto</string>
-    <string name="first_name">Primeiro nome</string>
-    <string name="middle_name">Segundo nome</string>
-    <string name="surname">Apelido</string>
     <string name="nickname">Alcunha</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Remover foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Ordenar por apelido</string>
     <string name="show_phone_numbers">Mostrar número de telefone no ecrã principal</string>
     <string name="show_contact_thumbnails">Mostrar miniatura do contacto</string>
     <string name="show_dialpad_button">Mostrar botão Marcador no ecrã principal</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d54f2919..5027c33d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Новый контакт</string>
     <string name="edit_contact">Редактировать контакт</string>
     <string name="select_contact">Выбрать контакт</string>
-    <string name="first_name">Имя</string>
-    <string name="middle_name">Отчество</string>
-    <string name="surname">Фамилия</string>
     <string name="nickname">Псевдоним</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Удалить фото</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Показывать сначала фамилию</string>
     <string name="show_phone_numbers">Показывать номера телефонов на главном экране</string>
     <string name="show_contact_thumbnails">Показывать фото контакта</string>
     <string name="show_dialpad_button">Показывать кнопку набора номера на главном экране</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9c0f6044..8899dfd8 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Nový kontakt</string>
     <string name="edit_contact">Upraviť kontakt</string>
     <string name="select_contact">Zvoľte kontakt</string>
-    <string name="first_name">Krstné meno</string>
-    <string name="middle_name">Stredné meno</string>
-    <string name="surname">Priezvisko</string>
     <string name="nickname">Prezývka</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Odstrániť foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Začať meno priezviskom</string>
     <string name="show_phone_numbers">Zobraziť telefónne čísla na hlavnej obrazovke</string>
     <string name="show_contact_thumbnails">Zobraziť obrázky kontaktov</string>
     <string name="show_dialpad_button">Zobraziť tlačidlo pre číselník na hlavnej obrazovke</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 80d252d3..70e53cfb 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Ny kontakt</string>
     <string name="edit_contact">Redigera kontakt</string>
     <string name="select_contact">Välj kontakt</string>
-    <string name="first_name">Förnamn</string>
-    <string name="middle_name">Mellannamn</string>
-    <string name="surname">Efternamn</string>
     <string name="nickname">Smeknamn</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Ta bort foto</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Visa efternamn först</string>
     <string name="show_phone_numbers">Visa telefonnummer i huvudvyn</string>
     <string name="show_contact_thumbnails">Visa kontaktminiatyrer</string>
     <string name="show_dialpad_button">Visa en knappsatsknapp i huvudvyn</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2cb12a8b..19e66061 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Yeni kişi</string>
     <string name="edit_contact">Kişiyi düzenle</string>
     <string name="select_contact">Kişi seç</string>
-    <string name="first_name">Adı</string>
-    <string name="middle_name">Göbek adı</string>
-    <string name="surname">Soyadı</string>
     <string name="nickname">Takma adı</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Fotoğrafı kaldır</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Soyadı ile başla</string>
     <string name="show_phone_numbers">Ana ekranda telefon numaralarını göster</string>
     <string name="show_contact_thumbnails">Kişi küçük resimlerini göster</string>
     <string name="show_dialpad_button">Ana ekranda tuş takımı düğmesini göster</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index aaa03f00..4a5461d9 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">Новий контакт</string>
     <string name="edit_contact">Редагувати контакт</string>
     <string name="select_contact">Обрати контакт</string>
-    <string name="first_name">Ім\'я</string>
-    <string name="middle_name">По-батькові</string>
-    <string name="surname">Прізвище</string>
     <string name="nickname">Прізвисько</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Видалити фото</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Показувати спочатку прізвище</string>
     <string name="show_phone_numbers">Показувати телефонні номери у списку контактів</string>
     <string name="show_contact_thumbnails">Показувати фото контакту</string>
     <string name="show_dialpad_button">Показувати панель набору номерів на головному екрані</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f463cfc6..47188204 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">新联系人</string>
     <string name="edit_contact">编辑联系人</string>
     <string name="select_contact">选择联系人</string>
-    <string name="first_name">名字</string>
-    <string name="middle_name">中间名</string>
-    <string name="surname">姓氏</string>
     <string name="nickname">昵称</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">移除照片</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">姓氏在前</string>
     <string name="show_phone_numbers">主页面显示电话号码</string>
     <string name="show_contact_thumbnails">显示联系人缩图</string>
     <string name="show_dialpad_button">在主页面显示拨号按钮</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 03578584..0a78a7f9 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">新聯絡人</string>
     <string name="edit_contact">編輯聯絡人</string>
     <string name="select_contact">選擇聯絡人</string>
-    <string name="first_name">名字</string>
-    <string name="middle_name">中間名</string>
-    <string name="surname">姓氏</string>
     <string name="nickname">暱稱</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">移除相片</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">姓氏在前</string>
     <string name="show_phone_numbers">主畫面顯示電話號碼</string>
     <string name="show_contact_thumbnails">顯示聯絡人縮圖</string>
     <string name="show_dialpad_button">在主畫面顯示撥號按鈕</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 008da7c2..5dbf7326 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,9 +28,6 @@
     <string name="new_contact">New contact</string>
     <string name="edit_contact">Edit contact</string>
     <string name="select_contact">Select contact</string>
-    <string name="first_name">First name</string>
-    <string name="middle_name">Middle name</string>
-    <string name="surname">Surname</string>
     <string name="nickname">Nickname</string>
 
     <!-- Groups -->
@@ -50,7 +47,6 @@
     <string name="remove_photo">Remove photo</string>
 
     <!-- Settings -->
-    <string name="start_name_with_surname">Start name with surname</string>
     <string name="show_phone_numbers">Show phone numbers on the main screen</string>
     <string name="show_contact_thumbnails">Show contact thumbnails</string>
     <string name="show_dialpad_button">Show a dialpad button on the main screen</string>

From 65610e6fd46ac6bb452a74ec0d698d67184e08a8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 31 May 2020 10:31:29 +0200
Subject: [PATCH 3/3] moving the start_name_with_surname config into commons

---
 app/build.gradle                                              | 2 +-
 .../com/simplemobiletools/contacts/pro/helpers/Config.kt      | 4 ----
 .../com/simplemobiletools/contacts/pro/helpers/Constants.kt   | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f940f4a7..98690bbc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.28.26'
+    implementation 'com.simplemobiletools:commons:5.28.27'
     implementation 'joda-time:joda-time:2.10.1'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
     implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a'
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt
index 678cf6ed..c04e5c25 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt
@@ -24,10 +24,6 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(SHOW_ONLY_CONTACTS_WITH_NUMBERS, false)
         set(showOnlyContactsWithNumbers) = prefs.edit().putBoolean(SHOW_ONLY_CONTACTS_WITH_NUMBERS, showOnlyContactsWithNumbers).apply()
 
-    var startNameWithSurname: Boolean
-        get() = prefs.getBoolean(START_NAME_WITH_SURNAME, false)
-        set(startNameWithSurname) = prefs.edit().putBoolean(START_NAME_WITH_SURNAME, startNameWithSurname).apply()
-
     var lastUsedContactSource: String
         get() = prefs.getString(LAST_USED_CONTACT_SOURCE, "")!!
         set(lastUsedContactSource) = prefs.edit().putString(LAST_USED_CONTACT_SOURCE, lastUsedContactSource).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
index ede8642b..921fd0d1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt
@@ -12,7 +12,6 @@ const val SHOW_CONTACT_THUMBNAILS = "show_contact_thumbnails"
 const val SHOW_PHONE_NUMBERS = "show_phone_numbers"
 const val SHOW_ONLY_CONTACTS_WITH_NUMBERS = "show_only_contacts_with_numbers"
 const val IGNORED_CONTACT_SOURCES = "ignored_contact_sources_2"
-const val START_NAME_WITH_SURNAME = "start_name_with_surname"
 const val LAST_USED_CONTACT_SOURCE = "last_used_contact_source"
 const val ON_CONTACT_CLICK = "on_contact_click"
 const val SHOW_CONTACT_FIELDS = "show_contact_fields"