From c71cdc143238e46a10cbf6a2619801e1b4af6d29 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Thu, 31 Jul 2014 23:36:37 +0200
Subject: Fix string resources

---
 .../java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | 2 +-
 OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml | 2 +-
 OpenKeychain/src/main/res/values/strings.xml                     | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
index e804d76a6..609ac8ab7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
@@ -429,7 +429,7 @@ public class EncryptActivity extends DrawerActivity implements EncryptActivityIn
         mTabsAdapterContent.addTab(EncryptMessageFragment.class,
                 mMessageFragmentBundle, getString(R.string.label_message));
         mTabsAdapterContent.addTab(EncryptFileFragment.class,
-                mFileFragmentBundle, getString(R.string.label_file));
+                mFileFragmentBundle, getString(R.string.label_files));
         mViewPagerContent.setCurrentItem(mSwitchToContent);
 
         mUseArmor = Preferences.getPreferences(this).getDefaultAsciiArmor();
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 74d723d69..e9e439d65 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -23,7 +23,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/from"/>
+                android:text="@string/label_asymmetric_from"/>
         <Spinner
                 android:id="@+id/sign"
                 android:layout_width="match_parent"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 101a9fa0a..1fd4fc848 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -106,6 +106,7 @@
     <string name="label_sign">Sign</string>
     <string name="label_message">Message</string>
     <string name="label_file">File</string>
+    <string name="label_files">File(s)</string>
     <string name="label_file_colon">File:</string>
     <string name="label_no_passphrase">No Passphrase</string>
     <string name="label_passphrase">Passphrase</string>
@@ -115,14 +116,15 @@
     <string name="label_conceal_pgp_application">Let others know that you\'re using OpenKeychain</string>
     <string name="label_conceal_pgp_application_summary">Writes \'OpenKeychain v2.7\' to OpenPGP signatures, ciphertext, and exported keys</string>
     <string name="label_select_public_keys">Recipients</string>
+    <string name="label_asymmetric_from">From:</string>
     <string name="label_to">To</string>
     <string name="label_delete_after_encryption">Delete After Encryption</string>
     <string name="label_delete_after_decryption">Delete After Decryption</string>
     <string name="label_share_after_encryption">Share After Encryption</string>
     <string name="label_encryption_algorithm">Encryption Algorithm</string>
     <string name="label_hash_algorithm">Hash Algorithm</string>
-    <string name="label_asymmetric">with Public Key</string>
-    <string name="label_symmetric">with Passphrase</string>
+    <string name="label_asymmetric">With Public Key</string>
+    <string name="label_symmetric">With Passphrase</string>
     <string name="label_passphrase_cache_ttl">Passphrase Cache</string>
     <string name="label_message_compression">Message Compression</string>
     <string name="label_file_compression">File Compression</string>
@@ -168,7 +170,6 @@
     </plurals>
 
     <string name="secret_key">Secret Key:</string>
-    <string name="from">From:</string>
 
     <!-- choice -->
     <string name="choice_none">None</string>
@@ -202,7 +203,7 @@
     <string name="wrong_passphrase">Wrong passphrase.</string>
     <string name="set_a_passphrase">Set a passphrase first.</string>
     <string name="no_filemanager_installed">No compatible file manager installed.</string>
-    <string name="filemanager_no_write">The file manager does not support saving.</string>
+    <string name="filemanager_no_write">The file manager does not support saving files.</string>
     <string name="passphrases_do_not_match">The passphrases didn\'t match.</string>
     <string name="passphrase_must_not_be_empty">Please enter a passphrase.</string>
     <string name="passphrase_for_symmetric_encryption">Symmetric encryption.</string>
-- 
cgit v1.2.3