Skip to content

Commit c0964d3

Browse files
naveensinghnaveensingh
authored
Merge branch 'SimpleMobileTools:master' into fix_ime_inset
2 parents b0133bb + a39dca5 commit c0964d3

File tree

11 files changed

+145
-60
lines changed

11 files changed

+145
-60
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:303493a688'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:94b616f462'
6767
implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
6868
implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
6969
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
android:appCategory="social"
3434
android:icon="@mipmap/ic_launcher"
3535
android:label="@string/app_launcher_name"
36+
android:localeConfig="@xml/locale_config"
3637
android:roundIcon="@mipmap/ic_launcher"
3738
android:supportsRtl="true"
3839
android:theme="@style/AppTheme">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
7474
checkWhatsNewDialog()
7575

7676
if (isPackageInstalled("com.simplemobiletools.contacts")) {
77-
val dialogText = getString(R.string.upgraded_to_pro_contacts, getString(R.string.phone_storage_hidden))
77+
val dialogText = getString(R.string.upgraded_from_free_contacts, getString(R.string.phone_storage_hidden))
7878
ConfirmationDialog(this, dialogText, 0, R.string.ok, 0, false) {}
7979
}
8080
}

‎app/src/main/res/values-eu/strings.xml‎

Lines changed: 24 additions & 36 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">Kontaktu sinpleak</string>
34
<string name="app_launcher_name">Kontaktuak</string>
@@ -12,18 +13,15 @@
1213
<string name="send_email_to_contacts">Bidali emaila kontaktuei</string>
1314
<string name="send_sms_to_group">Bidali SMSa taldera</string>
1415
<string name="send_email_to_group">Bidali emaila taldeari</string>
15-
<string name="fields_empty">At least 1 field has to be filled out</string>
16+
<string name="fields_empty">Gutxienez eremu bat bete behar da</string>
1617
<string name="must_be_at_edit">Kontaktu bat aldatzeko edizio pantailan egon behar zara</string>
17-
1818
<!-- Placeholders -->
19-
<string name="no_contacts_with_emails">No contacts with emails have been found</string>
20-
<string name="no_contacts_with_phone_numbers">No contacts with phone numbers have been found</string>
21-
19+
<string name="no_contacts_with_emails">Ez da aurkitu posta elektronikoa duen kontakturik</string>
20+
<string name="no_contacts_with_phone_numbers">Ez da telefono zenbakia duen kontakturik aurkitu</string>
2221
<string name="new_contact">Kontaktu berria</string>
2322
<string name="edit_contact">Editatu taldea</string>
2423
<string name="select_contact">Hautatu kontaktuak</string>
25-
<string name="nickname">Nickname</string>
26-
24+
<string name="nickname">Ezizena</string>
2725
<!-- Groups -->
2826
<string name="no_groups">Talderik ez</string>
2927
<string name="create_new_group">Sortu talde berria</string>
@@ -34,47 +32,40 @@
3432
<string name="create_group">Sortu taldea</string>
3533
<string name="add_to_group">Gehitu taldera</string>
3634
<string name="create_group_under_account">Kontu honetarako taldea sortu</string>
37-
3835
<!-- Photo -->
3936
<string name="remove_photo">Kendu argazkia</string>
40-
<string name="change_photo">Change photo</string>
41-
37+
<string name="change_photo">Aldatu argazkia</string>
4238
<!-- Settings -->
43-
<string name="show_phone_numbers">Erakutsi telefono zenbakiak pantaila nagusian</string>
44-
<string name="show_contact_thumbnails">Show contact thumbnails</string>
45-
<string name="show_dialpad_button">Show a dialpad button on the main screen</string>
39+
<string name="show_phone_numbers">Erakutsi telefono zenbakiak</string>
40+
<string name="show_contact_thumbnails">Kontaktuen miniaturak erakutsi</string>
41+
<string name="show_dialpad_button">Erakutsi teklatuaren botoia pantaila nagusian</string>
4642
<string name="on_contact_click">Kontaktu sakatzean</string>
4743
<string name="call_contact">Kontaktua deitu</string>
4844
<string name="view_contact">Ikusi kontaktu detaileak</string>
4945
<string name="manage_shown_contact_fields">Kudeatu erakutsitako kontaktu eremuak</string>
5046
<string name="contacts">Kontaktuak</string>
51-
<string name="show_only_contacts_with_numbers">Show only contacts with phone numbers</string>
52-
<string name="show_private_contacts">Show private contacts to Simple Dialer, Simple SMS Messenger and Simple Calendar Pro</string>
53-
<string name="merge_duplicate_contacts">Merge duplicate contacts</string>
54-
47+
<string name="show_only_contacts_with_numbers">Erakutsi telefono zenbakia duten kontaktuak soilik</string>
48+
<string name="show_private_contacts">Erakutsi kontaktu pribatuak Simple Dialer, Simple SMS Messenger eta Simple Calendar Pro-ri</string>
49+
<string name="merge_duplicate_contacts">Batu bikoiztutako kontaktuak</string>
5550
<!-- Favorites -->
5651
<string name="no_favorites">Ez duzu oraindik gogokorik gehitu.</string>
57-
<string name="toggle_favorite">Toggle favorite</string>
58-
52+
<string name="toggle_favorite">Aldatu gogokoa</string>
5953
<!-- Search -->
6054
<string name="search_contacts">Bilatu kontaktuak</string>
6155
<string name="search_favorites">Bilatu gogokoak</string>
62-
<string name="search_groups">Search groups</string>
63-
56+
<string name="search_groups">Bilatu taldeak</string>
6457
<!-- Export / Import -->
6558
<string name="import_contacts">Inportatu kontaktuak</string>
6659
<string name="export_contacts">Esportatu kontaktuak</string>
6760
<string name="import_contacts_from_vcf">Inportatu .vcf fitxategiko kontaktuak</string>
6861
<string name="import_contacts_from_vcf_pro">Inportatu .vcf fitxategiko kontaktuak (Pro)</string>
6962
<string name="export_contacts_to_vcf">Esportatu kontaktua .vcf fitxategi batera</string>
70-
<string name="target_contact_source">Target contact source</string>
71-
<string name="include_contact_sources">Include contact sources</string>
63+
<string name="target_contact_source">Hautatu kontaktuaren iturria</string>
64+
<string name="include_contact_sources">Sartu kontaktuen iturriak</string>
7265
<string name="filename_without_vcf">Fitxategi izena (.vcf gabe)</string>
73-
7466
<!-- Dialpad -->
75-
<string name="dialpad">Dialpad</string>
67+
<string name="dialpad">Markagailua</string>
7668
<string name="add_number_to_contact">Add number to contact</string>
77-
7869
<!-- Visible fields -->
7970
<string name="prefix">Aurrizkia</string>
8071
<string name="suffix">Atzizkia</string>
@@ -86,22 +77,19 @@
8677
<string name="websites">Webguneak</string>
8778
<string name="groups">Taldeak</string>
8879
<string name="contact_source">Kontaktu jatorria</string>
89-
<string name="instant_messaging">Instant messaging (IM)</string>
90-
<string name="ringtone">Ringtone</string>
91-
80+
<string name="instant_messaging">Berehalako mezularitza (IM)</string>
81+
<string name="ringtone">Dei-tonua</string>
9282
<!-- Confirmation dialog -->
93-
<string name="delete_from_all_sources">The contact will be removed from all contact sources.</string>
94-
83+
<string name="delete_from_all_sources">Kontaktua kontaktu iturri guztietatik kenduko da.</string>
9584
<plurals name="delete_groups">
96-
<item quantity="one">%d group</item>
97-
<item quantity="other">%d groups</item>
85+
<item quantity="one">talde %d</item>
86+
<item quantity="other">%d talde</item>
9887
</plurals>
99-
10088
<!-- FAQ -->
10189
<string name="faq_1_title">Aldatu ditzaket kontaktuetan ikusgarri dauden eremuak?</string>
102-
<string name="faq_1_text">Bai, joan hona: Ezarpenak -> Kudeatu erakutsitako kontaktu eremuan. Hor hautatu dezakezu zein eremu nahi duzun ikusgarri izatea. Batzuk desaktibatuta daude era lehenetsian, berri batzuk aurkitu ditzakezu.</string>
90+
<string name="faq_1_text">Bai, joan hona: Ezarpenak -&gt; Kudeatu erakutsitako kontaktu eremuan. Hor hautatu dezakezu zein eremu nahi duzun ikusgarri izatea. Batzuk desaktibatuta daude era lehenetsian, berri batzuk aurkitu ditzakezu.</string>
10391
<!--
10492
Haven't found some strings? There's more at
10593
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
10694
-->
107-
</resources>
95+
</resources>

‎app/src/main/res/values-hr/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<string name="filename_without_vcf">ime datoteke (bez .vcf)</string>
6666
<!-- Dialpad -->
6767
<string name="dialpad">Brojčanik</string>
68-
<string name="add_number_to_contact">Dodaj broj u kontakt</string>
68+
<string name="add_number_to_contact">Dodaj broj kontaktu</string>
6969
<!-- Visible fields -->
7070
<string name="prefix">Prefiks</string>
7171
<string name="suffix">Sufiks</string>

‎app/src/main/res/values-lv/strings.xml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name">Simple Contacts</string>
4+
<string name="app_launcher_name">Contacts</string>
5+
<string name="address">Address</string>
6+
<string name="inserting">Inserting…</string>
7+
<string name="updating">Updating…</string>
8+
<string name="phone_storage">Phone storage</string>
9+
<string name="phone_storage_hidden">Phone storage (not visible by other apps)</string>
10+
<string name="company">Company</string>
11+
<string name="job_position">Job position</string>
12+
<string name="send_sms_to_contacts">Send SMS to contacts</string>
13+
<string name="send_email_to_contacts">Send email to contacts</string>
14+
<string name="send_sms_to_group">Send SMS to group</string>
15+
<string name="send_email_to_group">Send email to group</string>
16+
<string name="fields_empty">At least 1 field has to be filled out</string>
17+
<string name="must_be_at_edit">You must be at the Edit screen to modify a contact</string>
18+
<!-- Placeholders -->
19+
<string name="no_contacts_with_emails">No contacts with emails have been found</string>
20+
<string name="no_contacts_with_phone_numbers">No contacts with phone numbers have been found</string>
21+
<string name="new_contact">New contact</string>
22+
<string name="edit_contact">Edit contact</string>
23+
<string name="select_contact">Select contact</string>
24+
<string name="nickname">Nickname</string>
25+
<!-- Groups -->
26+
<string name="no_groups">No groups</string>
27+
<string name="create_new_group">Create a new group</string>
28+
<string name="remove_from_group">Remove from group</string>
29+
<string name="no_group_participants">This group is empty</string>
30+
<string name="add_contacts">Add contacts</string>
31+
<string name="no_group_created">There are no contact groups on the device</string>
32+
<string name="create_group">Create group</string>
33+
<string name="add_to_group">Add to group</string>
34+
<string name="create_group_under_account">Create group under account</string>
35+
<!-- Photo -->
36+
<string name="remove_photo">Remove photo</string>
37+
<string name="change_photo">Change photo</string>
38+
<!-- Settings -->
39+
<string name="show_phone_numbers">Show phone numbers</string>
40+
<string name="show_contact_thumbnails">Show contact thumbnails</string>
41+
<string name="show_dialpad_button">Show a dialpad button on the main screen</string>
42+
<string name="on_contact_click">On contact click</string>
43+
<string name="call_contact">Call contact</string>
44+
<string name="view_contact">View contact details</string>
45+
<string name="manage_shown_contact_fields">Manage shown contact fields</string>
46+
<string name="contacts">Contacts</string>
47+
<string name="show_only_contacts_with_numbers">Show only contacts with phone numbers</string>
48+
<string name="show_private_contacts">Show private contacts to Simple Dialer, Simple SMS Messenger and Simple Calendar Pro</string>
49+
<string name="merge_duplicate_contacts">Merge duplicate contacts</string>
50+
<!-- Favorites -->
51+
<string name="no_favorites">Seems like you haven\'t added any favorite contacts yet.</string>
52+
<string name="toggle_favorite">Toggle favorite</string>
53+
<!-- Search -->
54+
<string name="search_contacts">Search contacts</string>
55+
<string name="search_favorites">Search favorites</string>
56+
<string name="search_groups">Search groups</string>
57+
<!-- Export / Import -->
58+
<string name="import_contacts">Import contacts</string>
59+
<string name="export_contacts">Export contacts</string>
60+
<string name="import_contacts_from_vcf">Import contacts from a .vcf file</string>
61+
<string name="import_contacts_from_vcf_pro">Import contacts from a .vcf file (Pro)</string>
62+
<string name="export_contacts_to_vcf">Export contacts to a .vcf file</string>
63+
<string name="target_contact_source">Target contact source</string>
64+
<string name="include_contact_sources">Include contact sources</string>
65+
<string name="filename_without_vcf">Filename (without .vcf)</string>
66+
<!-- Dialpad -->
67+
<string name="dialpad">Dialpad</string>
68+
<string name="add_number_to_contact">Add number to contact</string>
69+
<!-- Visible fields -->
70+
<string name="prefix">Prefix</string>
71+
<string name="suffix">Suffix</string>
72+
<string name="phone_numbers">Phone numbers</string>
73+
<string name="emails">Emails</string>
74+
<string name="addresses">Addresses</string>
75+
<string name="events">Events (birthdays, anniversaries)</string>
76+
<string name="organization">Organization</string>
77+
<string name="websites">Websites</string>
78+
<string name="groups">Groups</string>
79+
<string name="contact_source">Contact source</string>
80+
<string name="instant_messaging">Instant messaging (IM)</string>
81+
<string name="ringtone">Ringtone</string>
82+
<!-- Confirmation dialog -->
83+
<string name="delete_from_all_sources">The contact will be removed from all contact sources.</string>
84+
<plurals name="delete_groups">
85+
<item quantity="zero">%d group</item>
86+
<item quantity="one">%d groups</item>
87+
<item quantity="other">%d groups</item>
88+
</plurals>
89+
<!-- FAQ -->
90+
<string name="faq_1_title">I want to change what fields are visible at contacts. Can I do it?</string>
91+
<string name="faq_1_text">Yes, all you have to do is go in Settings -&gt; Manage shown contact fields. There you can select what fields should be visible. Some of them are even disabled by default, so you might find some new ones there.</string>
92+
<!--
93+
Haven't found some strings? There's more at
94+
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
95+
-->
96+
</resources>

‎app/src/main/res/values-sl/strings.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
<string name="no_favorites">Videti je, da še niste dodali nobenega priljubljenega stika.</string>
5252
<string name="toggle_favorite">Preklopi priljubljene</string>
5353
<!-- Search -->
54-
<string name="search_contacts">Iskanje stikov</string>
55-
<string name="search_favorites">Iskanje priljubljenih</string>
56-
<string name="search_groups">Iskanje skupin</string>
54+
<string name="search_contacts">Poišči stike</string>
55+
<string name="search_favorites">Išči priljubljene</string>
56+
<string name="search_groups">Išči skupine</string>
5757
<!-- Export / Import -->
5858
<string name="import_contacts">Uvoz stikov</string>
5959
<string name="export_contacts">Izvoz stikov</string>
@@ -65,7 +65,7 @@
6565
<string name="filename_without_vcf">Ime datoteke (brez .ics)</string>
6666
<!-- Dialpad -->
6767
<string name="dialpad">Številčnica</string>
68-
<string name="add_number_to_contact">Dodaj številko stiku</string>
68+
<string name="add_number_to_contact">Dodaj številko k stiku</string>
6969
<!-- Visible fields -->
7070
<string name="prefix">Predpona</string>
7171
<string name="suffix">Pripona</string>
@@ -90,4 +90,4 @@
9090
<!-- FAQ -->
9191
<string name="faq_1_title">Spremeniti želim katera polja so vidna pri stikih. Lahko to storim\?</string>
9292
<string name="faq_1_text">Da, vse kar morate storiti je, da greste v Nastavitve -&gt; Upravljanje prikazanih polj stika. Tam lahko izberete katera polja naj bodo vidna. Nekatera od njih so celo privzeto onemogočena, zato boste tam morda našli nekaj novih.</string>
93-
</resources>
93+
</resources>

0 commit comments

Comments
 (0)