Skip to content

Commit a2f7494

Browse files
authored
Merge branch 'master' into mala
2 parents 492d995 + 2217384 commit a2f7494

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+268
-141
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ https://t.me/SimpleMobileTools
4444
<a href='https://f-droid.org/packages/com.simplemobiletools.contacts.pro'><img src='https://simplemobiletools.com/images/button-f-droid.png' alt='Get it on F-Droid' height='45' /></a>
4545

4646
<div style="display:flex;">
47-
<img alt="App image" src="fastlane/metadata/android/en-GB/images/phoneScreenshots/1_en-GB.jpeg" width="30%">
48-
<img alt="App image" src="fastlane/metadata/android/en-GB/images/phoneScreenshots/2_en-GB.jpeg" width="30%">
49-
<img alt="App image" src="fastlane/metadata/android/en-GB/images/phoneScreenshots/3_en-GB.jpeg" width="30%">
47+
<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.jpeg" width="30%">
48+
<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.jpeg" width="30%">
49+
<img alt="App image" src="fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.jpeg" width="30%">
5050
</div>

app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,6 @@ class ViewContactActivity : ContactActivity() {
858858
private fun View.copyOnLongClick(value: String) {
859859
setOnLongClickListener {
860860
copyToClipboard(value)
861-
toast(R.string.value_copied_to_clipboard)
862861
true
863862
}
864863
}

app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Context.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import com.simplemobiletools.contacts.pro.models.Organization
2626
import com.simplemobiletools.contacts.pro.models.SocialAction
2727
import java.io.File
2828

29-
3029
val Context.config: Config get() = Config.newInstance(applicationContext)
3130

3231
val Context.contactsDB: ContactsDao get() = ContactsDatabase.getInstance(applicationContext).ContactsDao()

app/src/main/res/values-cy/strings.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<resources>
23
<string name="app_name">Simple Contacts</string>
34
<string name="app_launcher_name">Cysylltiadau</string>
@@ -14,16 +15,13 @@
1415
<string name="send_email_to_group">Anfon ebost at grŵp</string>
1516
<string name="fields_empty">At least 1 field has to be filled out</string>
1617
<string name="must_be_at_edit">Rhaid bod ar y sgrin golygu er mwyn addasu cyswllt</string>
17-
1818
<!-- Placeholders -->
1919
<string name="no_contacts_with_emails">Ni chanfuwyd unrhyw gysylltiadau gydag ebost</string>
2020
<string name="no_contacts_with_phone_numbers">Ni chanfuwyd unrhyw gysylltiadau gyda rhifau ffôn</string>
21-
2221
<string name="new_contact">Cyswllt newydd</string>
2322
<string name="edit_contact">Golygu\'r cyswllt</string>
2423
<string name="select_contact">Dewis cyswllt</string>
2524
<string name="nickname">Llys enw</string>
26-
2725
<!-- Groups -->
2826
<string name="no_groups">Dim grwpiau</string>
2927
<string name="create_new_group">Creu grŵp newydd</string>
@@ -34,11 +32,9 @@
3432
<string name="create_group">Creu grŵp</string>
3533
<string name="add_to_group">Ychwanegu at grŵp</string>
3634
<string name="create_group_under_account">Creu grŵp dan gyfrif</string>
37-
3835
<!-- Photo -->
3936
<string name="remove_photo">Cael gwared â\'r llun</string>
4037
<string name="change_photo">Change photo</string>
41-
4238
<!-- Settings -->
4339
<string name="show_phone_numbers">Dangos rhifau ffôn ar y brif sgrin</string>
4440
<string name="show_contact_thumbnails">Dangos mân luniau cysylltiadau</string>
@@ -51,16 +47,13 @@
5147
<string name="show_only_contacts_with_numbers">Dangos dim ond cysylltiadau gyda rhifau ffôn</string>
5248
<string name="show_private_contacts">Show private contacts to Simple Dialer, Simple SMS Messenger and Simple Calendar Pro</string>
5349
<string name="merge_duplicate_contacts">Merge duplicate contacts</string>
54-
5550
<!-- Favorites -->
5651
<string name="no_favorites">Ymddangosir nad wyt wedi ychwanegu unrhyw ffefrynnau eto.</string>
5752
<string name="toggle_favorite">Toggle favorite</string>
58-
5953
<!-- Search -->
6054
<string name="search_contacts">Chwilio\'r cysylltiadau</string>
6155
<string name="search_favorites">Chwilio\'r ffefrynnau</string>
6256
<string name="search_groups">Search groups</string>
63-
6457
<!-- Export / Import -->
6558
<string name="import_contacts">Mewnforio cysylltiadau</string>
6659
<string name="export_contacts">Allforio cysylltiadau</string>
@@ -70,11 +63,9 @@
7063
<string name="target_contact_source">Ffynhonnell y cyswllt targed</string>
7164
<string name="include_contact_sources">Cynnwys ffynonellau cysylltiadau</string>
7265
<string name="filename_without_vcf">Enw\'r ffeil (heb .vcf)</string>
73-
7466
<!-- Dialpad -->
7567
<string name="dialpad">Pad deialu</string>
7668
<string name="add_number_to_contact">Ychwanegu rhif at gyswllt</string>
77-
7869
<!-- Visible fields -->
7970
<string name="prefix">Rhagddodiad</string>
8071
<string name="suffix">Ôl-ddodiad</string>
@@ -88,20 +79,21 @@
8879
<string name="contact_source">Ffynhonnell gyswllt</string>
8980
<string name="instant_messaging">Negesu ar unwaith (IM)</string>
9081
<string name="ringtone">Ringtone</string>
91-
9282
<!-- Confirmation dialog -->
9383
<string name="delete_from_all_sources">The contact will be removed from all contact sources.</string>
94-
9584
<plurals name="delete_groups">
96-
<item quantity="one">%d group</item>
85+
<item quantity="zero">%d group</item>
86+
<item quantity="one">%d groups</item>
87+
<item quantity="two">%d groups</item>
88+
<item quantity="few">%d groups</item>
89+
<item quantity="many">%d groups</item>
9790
<item quantity="other">%d groups</item>
9891
</plurals>
99-
10092
<!-- FAQ -->
10193
<string name="faq_1_title">Hoffwn newid pa feysydd sydd i\'w gweld ar gyfer cysylltiadau. Ydy hyn yn bosib?</string>
102-
<string name="faq_1_text">Ydy. Y cwbl sy\'n rhaid gwneud ydy mynd i Gosodiadau -> Rheoli pa feysydd cysylltiadau i\'w dangos. Yna, gellir dewis pa feysydd sydd i\'w gweld. Bydd rhai wedi eu gosod i beidio ymddangos fel arfer, felly mae\'n bosib byddi\'n dod o hyd i rai newydd yno.</string>
94+
<string name="faq_1_text">Ydy. Y cwbl sy\'n rhaid gwneud ydy mynd i Gosodiadau -&gt; Rheoli pa feysydd cysylltiadau i\'w dangos. Yna, gellir dewis pa feysydd sydd i\'w gweld. Bydd rhai wedi eu gosod i beidio ymddangos fel arfer, felly mae\'n bosib byddi\'n dod o hyd i rai newydd yno.</string>
10395
<!--
10496
Haven\'t found some strings? There\'s more at
10597
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
10698
-->
107-
</resources>
99+
</resources>

app/src/main/res/values-es/strings.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@
8282
<!-- Confirmation dialog -->
8383
<string name="delete_from_all_sources">El contacto será eliminado de todos los orígenes de contactos.</string>
8484
<plurals name="delete_groups">
85-
<item quantity="one">%d groupo</item>
86-
<item quantity="other">%d groupos</item>
85+
<item quantity="one">%d grupo</item>
86+
<item quantity="many">%d grupos</item>
87+
<item quantity="other">%d grupos</item>
8788
</plurals>
8889
<!-- FAQ -->
8990
<string name="faq_1_title">Quiero cambiar qué campos son visibles en los contactos. ¿Puedo hacerlo?</string>
@@ -92,4 +93,4 @@
9293
Haven't found some strings? There's more at
9394
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
9495
-->
95-
</resources>
96+
</resources>

app/src/main/res/values-et/strings.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<string name="create_new_group">Loo uus rühm</string>
2828
<string name="remove_from_group">Eemalda rühmast</string>
2929
<string name="no_group_participants">See rühm on tühi</string>
30-
<string name="add_contacts">Add contacts</string>
30+
<string name="add_contacts">Kontaktide lisamine</string>
3131
<string name="no_group_created">Selles nutiseadmes puuduvad kontaktide rühmad</string>
3232
<string name="create_group">Loo rühm</string>
3333
<string name="add_to_group">Lisa rühma</string>
@@ -39,11 +39,11 @@
3939
<string name="show_phone_numbers">Näita telefoninumbreid</string>
4040
<string name="show_contact_thumbnails">Näita kontaktide pisipilte</string>
4141
<string name="show_dialpad_button">Näita põhivaates telefoniklahvistikku</string>
42-
<string name="on_contact_click">On contact click</string>
42+
<string name="on_contact_click">Kontaktil klõpsake</string>
4343
<string name="call_contact">Helista</string>
44-
<string name="view_contact">View contact details</string>
44+
<string name="view_contact">Vaata kontaktandmeid</string>
4545
<string name="manage_shown_contact_fields">Halda kuvatavaid kontaktkirje välju</string>
46-
<string name="contacts">Contacts</string>
46+
<string name="contacts">Kontaktid</string>
4747
<string name="show_only_contacts_with_numbers">Näita vaid kontakte, kellel on telefoninumber</string>
4848
<string name="show_private_contacts">Näita privaatseks märgitud kontakte Lihtsas telefonis, Lihtne SMS sõnumikliendis ja Lihtsas kalendris</string>
4949
<string name="merge_duplicate_contacts">Liida topeltkontaktid</string>
@@ -55,8 +55,8 @@
5555
<string name="search_favorites">Otsi lemmikute hulgast</string>
5656
<string name="search_groups">Otsi rühmi</string>
5757
<!-- Export / Import -->
58-
<string name="import_contacts">Import contacts</string>
59-
<string name="export_contacts">Export contacts</string>
58+
<string name="import_contacts">Kontaktide importimine</string>
59+
<string name="export_contacts">Kontaktide eksportimine</string>
6060
<string name="import_contacts_from_vcf">Impordi kontatid .vcf failist</string>
6161
<string name="import_contacts_from_vcf_pro">Impordi kontatid .vcf failist (Pro)</string>
6262
<string name="export_contacts_to_vcf">Ekspordi kontatid .vcf faili</string>
@@ -65,9 +65,9 @@
6565
<string name="filename_without_vcf">Faili nimi (ilma .vcf laiendita)</string>
6666
<!-- Dialpad -->
6767
<string name="dialpad">Numbriklahvid</string>
68-
<string name="add_number_to_contact">Add number to contact</string>
68+
<string name="add_number_to_contact">Lisa kontaktnumber</string>
6969
<!-- Visible fields -->
70-
<string name="prefix">Prefix</string>
70+
<string name="prefix">Eesliide</string>
7171
<string name="suffix">Järelliide</string>
7272
<string name="phone_numbers">Telefoninumbrid</string>
7373
<string name="emails">E-posti aadressid</string>
@@ -92,4 +92,4 @@
9292
Haven't found some strings? There's more at
9393
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
9494
-->
95-
</resources>
95+
</resources>

app/src/main/res/values-fi/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">Simple Contacts</string>
3+
<string name="app_name">Yksinkertaiset yhteystiedot</string>
44
<string name="app_launcher_name">Yhteystiedot</string>
55
<string name="address">Osoite</string>
66
<string name="inserting">Sijoitetaan…</string>
@@ -46,10 +46,10 @@
4646
<string name="contacts">Yhteystiedot</string>
4747
<string name="show_only_contacts_with_numbers">Näytä ainoastaan numerolliset yhteystiedot</string>
4848
<string name="show_private_contacts">Näytä yksityiset yhteystiedot sovelluksissa Simple Dialer, Simple SMS Messenger ja Simple Calendar Pro</string>
49-
<string name="merge_duplicate_contacts">Merge duplicate contacts</string>
49+
<string name="merge_duplicate_contacts">Yhdistä päällekkäiset yhteystiedot</string>
5050
<!-- Favorites -->
5151
<string name="no_favorites">Näyttää siltä, että et ole vielä lisännyt suosikkiyhteystietoja.</string>
52-
<string name="toggle_favorite">Toggle favorite</string>
52+
<string name="toggle_favorite">Vaihda suosikki</string>
5353
<!-- Search -->
5454
<string name="search_contacts">Etsi yhteystietoja</string>
5555
<string name="search_favorites">Etsi suosikkeja</string>
@@ -64,7 +64,7 @@
6464
<string name="include_contact_sources">Sisällytä yhteystiedon lähteet</string>
6565
<string name="filename_without_vcf">Tiedostonimi (ilman .vcf-päätettä)</string>
6666
<!-- Dialpad -->
67-
<string name="dialpad">Numeronvalitsin</string>
67+
<string name="dialpad">Valintanäppäimistö</string>
6868
<string name="add_number_to_contact">Lisää numero yhteystietoihin</string>
6969
<!-- Visible fields -->
7070
<string name="prefix">Etuliite</string>
@@ -92,4 +92,4 @@
9292
Haven't found some strings? There's more at
9393
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
9494
-->
95-
</resources>
95+
</resources>

app/src/main/res/values-fr/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<string name="show_private_contacts">Présenter les contacts privés à Simple composeur, Simple SMS Messenger et Simple Calendar Pro</string>
4949
<string name="merge_duplicate_contacts">Fusionner les contacts en double</string>
5050
<!-- Favorites -->
51-
<string name="no_favorites">Il semble que vous navez pas encore ajouté de contacts favoris.</string>
51+
<string name="no_favorites">Il semble que vous n\'avez pas encore ajouté de contacts favoris.</string>
5252
<string name="toggle_favorite">Activer/désactiver le favori</string>
5353
<!-- Search -->
5454
<string name="search_contacts">Chercher dans les contacts</string>
@@ -83,6 +83,7 @@
8383
<string name="delete_from_all_sources">Le contact sera supprimé de toutes les sources de contacts.</string>
8484
<plurals name="delete_groups">
8585
<item quantity="one">%d groupe</item>
86+
<item quantity="many">%d groupes</item>
8687
<item quantity="other">%d groupes</item>
8788
</plurals>
8889
<!-- FAQ -->

app/src/main/res/values-gl/strings.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<string name="app_name">Simple Contacts</string>
44
<string name="app_launcher_name">Contactos</string>
55
<string name="address">Enderezo</string>
6-
<string name="inserting">A inserir…</string>
6+
<string name="inserting">Engadindo…</string>
77
<string name="updating">Actualizando…</string>
88
<string name="phone_storage">Almacenaxe do móbil</string>
99
<string name="phone_storage_hidden">Almacenaxe do móbil (non visible por outras apps)</string>
@@ -14,16 +14,16 @@
1414
<string name="send_sms_to_group">Enviar SMS ao grupo</string>
1515
<string name="send_email_to_group">Enviar email ao grupo</string>
1616
<string name="fields_empty">Polo menos hai que completar 1 campo</string>
17-
<string name="must_be_at_edit">You must be at the Edit screen to modify a contact</string>
17+
<string name="must_be_at_edit">Debes atoparte na pantalla Editar para modificar un contacto</string>
1818
<!-- Placeholders -->
19-
<string name="no_contacts_with_emails">Non se atopan contactos con email</string>
19+
<string name="no_contacts_with_emails">Non atoparonse contactos con correos electrónicos</string>
2020
<string name="no_contacts_with_phone_numbers">Non se atopan contactos con número de teléfono</string>
2121
<string name="new_contact">Novo contacto</string>
2222
<string name="edit_contact">Editar contacto</string>
2323
<string name="select_contact">Seleccionar contacto</string>
2424
<string name="nickname">Alcume</string>
2525
<!-- Groups -->
26-
<string name="no_groups">Non existen grupos</string>
26+
<string name="no_groups">Non atopouse ningún grupos</string>
2727
<string name="create_new_group">Crear un novo grupo</string>
2828
<string name="remove_from_group">Eliminar do grupo</string>
2929
<string name="no_group_participants">Este grupo está baleiro</string>
@@ -38,18 +38,18 @@
3838
<!-- Settings -->
3939
<string name="show_phone_numbers">Mostrar números de teléfono</string>
4040
<string name="show_contact_thumbnails">Mostrar miniatura do contacto</string>
41-
<string name="show_dialpad_button">Mostrar botón Marcador na pantalla principal</string>
41+
<string name="show_dialpad_button">Amosalo botón do teclado de marcación na pantalla principal</string>
4242
<string name="on_contact_click">Ao tocar no contacto</string>
4343
<string name="call_contact">Chamar</string>
4444
<string name="view_contact">Ver detalles do contacto</string>
4545
<string name="manage_shown_contact_fields">Xestionar campos dos contactos amosados</string>
4646
<string name="contacts">Contactos</string>
4747
<string name="show_only_contacts_with_numbers">Mostrar só contactos con número de teléfono</string>
48-
<string name="show_private_contacts">Mostrar contactos privados en Simple Dialer, Simple SMS Messenger e Simple Calendar Pro</string>
49-
<string name="merge_duplicate_contacts">Fusionar contactos duplicados</string>
48+
<string name="show_private_contacts">Mostrar contactos privados a Marcador sinxelo, Mensaxería sinxela de Sms e Almanaque sinxelo pro</string>
49+
<string name="merge_duplicate_contacts">Combinalos contactos duplicados</string>
5050
<!-- Favorites -->
51-
<string name="no_favorites">Parece que aínda non engadiu contactos aos favoritos.</string>
52-
<string name="toggle_favorite">Marcar como favorito</string>
51+
<string name="no_favorites">Semella que aínda non engadiches ningún contacto favorito.</string>
52+
<string name="toggle_favorite">Engadir como favorito</string>
5353
<!-- Search -->
5454
<string name="search_contacts">Buscar nos contactos</string>
5555
<string name="search_favorites">Buscar nos favoritos</string>
@@ -65,31 +65,31 @@
6565
<string name="filename_without_vcf">Nome do ficheiro (sen .vcf)</string>
6666
<!-- Dialpad -->
6767
<string name="dialpad">Marcador</string>
68-
<string name="add_number_to_contact">Engadir número a un contacto</string>
68+
<string name="add_number_to_contact">Engadir número o contacto</string>
6969
<!-- Visible fields -->
7070
<string name="prefix">Prefixo</string>
7171
<string name="suffix">Sufixo</string>
7272
<string name="phone_numbers">Números de teléfono</string>
73-
<string name="emails">Emails</string>
73+
<string name="emails">Correos electrónicos</string>
7474
<string name="addresses">Enderezos</string>
7575
<string name="events">Eventos (data de nacemento, aniversario)</string>
7676
<string name="organization">Organización</string>
77-
<string name="websites">Webs</string>
77+
<string name="websites">Web</string>
7878
<string name="groups">Grupos</string>
7979
<string name="contact_source">Orixe do contacto</string>
80-
<string name="instant_messaging">Mensaxería (IM)</string>
81-
<string name="ringtone">Tono</string>
80+
<string name="instant_messaging">Mensaxería instantánea (IM)</string>
81+
<string name="ringtone">Ton da chamada</string>
8282
<!-- Confirmation dialog -->
83-
<string name="delete_from_all_sources">O contacto será eliminado de todas as orixes de contactos.</string>
83+
<string name="delete_from_all_sources">O contacto eliminarase de todalas fontes dos contactos.</string>
8484
<plurals name="delete_groups">
8585
<item quantity="one">%d grupo</item>
8686
<item quantity="other">%d grupos</item>
8787
</plurals>
8888
<!-- FAQ -->
89-
<string name="faq_1_title">Quero alterar os campos mostrados nos contactos. É posible?</string>
89+
<string name="faq_1_title">Quero cambialos campos visibles nos contactos. Podo facelo\?</string>
9090
<string name="faq_1_text">Si, chega con acceder a Axustes -&gt; Xestionar campos mostrados. Aquí, pode escoller os campos que serán mostrados. Algúns dos campos xa están agochados e así pode mostrar algúns destes.</string>
9191
<!--
9292
Haven't found some strings? There's more at
9393
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
9494
-->
95-
</resources>
95+
</resources>

0 commit comments

Comments
 (0)