commit c2c76fb8a09cd9f846f938cc9053b26810d99785
parent e891d289067e5c289ca41937440d63a3171d02bc
Author: Iván Ávalos <avalos@disroot.org>
Date: Tue, 22 Sep 2026 14:53:56 +0200
[wallet] undo newline and reorganize strings
Diffstat:
3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
@@ -6,6 +6,7 @@
<GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleJvm" value="jbr-17" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -219,4 +219,4 @@ protobuf {
}
}
}
-}
+}
+\ No newline at end of file
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
@@ -92,27 +92,6 @@ GNU Taler is immune to many types of fraud such as credit card data theft, phish
<string name="selection_count">%1$d selected</string>
<string name="share_payment">Share payment link</string>
<string name="uri_invalid">Not a valid Taler link</string>
- <string name="contact_add_title">Add Contact</string>
- <string name="contact_add_intro">Do you want to add this contact to your wallet?</string>
- <string name="contact_petname">Petname</string>
- <string name="contact_alias">Alias</string>
- <string name="contact_mailbox_address">Mailbox Address</string>
- <string name="contact_mailbox_base_uri">Mailbox Base URI</string>
- <string name="contact_add_button">Add Contact</string>
- <string name="contacts_title">Contacts</string>
- <string name="alias_registration_title">Alias Registration</string>
- <string name="alias_registration_alias_type">Alias Type</string>
- <string name="alias_registration_alias">Alias</string>
- <string name="alias_registration_alias_email">email</string>
- <string name="alias_registration_alias_phone">phone</string>
- <string name="alias_registration_alias_hint_email">user@example.com</string>
- <string name="alias_registration_alias_hint_phone">+1234567890</string>
- <string name="alias_registration_duration">Duration (months)</string>
- <string name="alias_registration_button">Register Alias</string>
- <string name="alias_registration_exists">Registration already exists.</string>
- <string name="alias_registration_solution">Challenge Solution</string>
- <string name="alias_registration_success">Registration successful!</string>
- <string name="alias_registration_error">Registration failed: %1$s</string>
<string name="wallet">Wallet</string>
<string name="warning">Warning</string>
<string name="wire_transfer">Wire transfer</string>
@@ -513,6 +492,29 @@ GNU Taler is immune to many types of fraud such as credit card data theft, phish
<string name="performance_stats_wallet_request">Wallet-Core requests</string>
<string name="performance_stats_wallet_task">Wallet-Core tasks</string>
+ <!-- Contacts/Mailbox -->
+ <string name="alias_registration_alias">Alias</string>
+ <string name="alias_registration_alias_email">email</string>
+ <string name="alias_registration_alias_hint_email">user@example.com</string>
+ <string name="alias_registration_alias_hint_phone">+1234567890</string>
+ <string name="alias_registration_alias_phone">phone</string>
+ <string name="alias_registration_alias_type">Alias Type</string>
+ <string name="alias_registration_button">Register Alias</string>
+ <string name="alias_registration_duration">Duration (months)</string>
+ <string name="alias_registration_error">Registration failed: %1$s</string>
+ <string name="alias_registration_exists">Registration already exists.</string>
+ <string name="alias_registration_solution">Challenge Solution</string>
+ <string name="alias_registration_success">Registration successful!</string>
+ <string name="alias_registration_title">Alias Registration</string>
+ <string name="contact_add_button">Add Contact</string>
+ <string name="contact_add_intro">Do you want to add this contact to your wallet?</string>
+ <string name="contact_add_title">Add Contact</string>
+ <string name="contact_alias">Alias</string>
+ <string name="contact_mailbox_address">Mailbox Address</string>
+ <string name="contact_mailbox_base_uri">Mailbox Base URI</string>
+ <string name="contact_petname">Petname</string>
+ <string name="contacts_title">Contacts</string>
+
<!-- Settings -->
<string name="menu_settings">Settings</string>