language fix

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java

@@ -293,7 +293,7 @@ public class PgpKeyHelper {
     public static String getMainUserIdSafe(Context context, PGPPublicKey key) {
         String userId = getMainUserId(key);
         if (userId == null || userId.equals("")) {
-            userId = context.getString(R.string.unknown_user_id);
+            userId = context.getString(R.string.user_id_no_name);
         }
         return userId;
     }
@@ -301,7 +301,7 @@ public class PgpKeyHelper {
     public static String getMainUserIdSafe(Context context, PGPSecretKey key) {
         String userId = getMainUserId(key);
         if (userId == null || userId.equals("")) {
-            userId = context.getString(R.string.unknown_user_id);
+            userId = context.getString(R.string.user_id_no_name);
         }
         return userId;
     }

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java

@@ -771,7 +771,7 @@ public class DecryptActivity extends DrawerActivity {
                         mUserIdRest.setText("id: "
                                 + PgpKeyHelper.convertKeyIdToHex(mSignatureKeyId));
                         if (userId == null) {
-                            userId = getResources().getString(R.string.unknown_user_id);
+                            userId = getResources().getString(R.string.user_id_no_name);
                         }
                         String chunks[] = userId.split(" <", 2);
                         userId = chunks[0];

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java

@@ -904,7 +904,7 @@ public class EncryptActivity extends DrawerActivity {
             mMainUserId.setText("");
             mMainUserIdRest.setText("");
         } else {
-            String uid = getResources().getString(R.string.unknown_user_id);
+            String uid = getResources().getString(R.string.user_id_no_name);
             String uidExtra = "";
             PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(this,
                     mSecretKeyId);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java

@@ -326,7 +326,7 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
             View view = mInflater.inflate(R.layout.key_server_query_result_item, null);
 
             TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId);
-            mainUserId.setText(R.string.unknown_user_id);
+            mainUserId.setText(R.string.user_id_no_name);
             TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
             mainUserIdRest.setText("");
             TextView keyId = (TextView) view.findViewById(R.id.keyId);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java

@@ -59,7 +59,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment {
             mKeyUserId.setText(R.string.api_settings_no_key);
             mKeyUserIdRest.setText("");
         } else {
-            String uid = getResources().getString(R.string.unknown_user_id);
+            String uid = getResources().getString(R.string.user_id_no_name);
             String uidExtra = "";
             PGPSecretKeyRing keyRing = ProviderHelper.getPGPSecretKeyRingByMasterKeyId(
                     getActivity(), secretKeyId);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

@@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.ui;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Objects;
 
 import org.spongycastle.openpgp.PGPPublicKey;
 import org.spongycastle.openpgp.PGPPublicKeyRing;
@@ -305,8 +304,8 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements
                         setTitle(mainUserId[0]);
                         mName.setText(mainUserId[0]);
                     } else {
-                        setTitle(R.string.unknown_user_id);
+                        setTitle(R.string.user_id_no_name);
-                        mName.setText(R.string.unknown_user_id);
+                        mName.setText(R.string.user_id_no_name);
                     }
                     mEmail.setText(mainUserId[1]);
                     mComment.setText(mainUserId[2]);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java

@@ -80,7 +80,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
         View view = mInflater.inflate(R.layout.import_keys_list_entry, null);
 
         TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId);
-        mainUserId.setText(R.string.unknown_user_id);
+        mainUserId.setText(R.string.user_id_no_name);
         TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
         mainUserIdRest.setText("");
         TextView keyId = (TextView) view.findViewById(R.id.keyId);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java

@@ -84,7 +84,7 @@ public class KeyListPublicAdapter extends CursorAdapter implements StickyListHea
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
         TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId);
-        mainUserId.setText(R.string.unknown_user_id);
+        mainUserId.setText(R.string.user_id_no_name);
         TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
         mainUserIdRest.setText("");
 
@@ -138,7 +138,7 @@ public class KeyListPublicAdapter extends CursorAdapter implements StickyListHea
 
         // set header text as first char in user id
         String userId = mCursor.getString(mSectionColumnIndex);
-        String headerText = convertView.getResources().getString(R.string.unknown_user_id);
+        String headerText = convertView.getResources().getString(R.string.user_id_no_name);
         if (userId != null && userId.length() > 0) {
             headerText = "" + mCursor.getString(mSectionColumnIndex).subSequence(0, 1).charAt(0);
         }

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java

@@ -71,7 +71,7 @@ public class KeyListSecretAdapter extends CursorAdapter {
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
         TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId);
-        mainUserId.setText(R.string.unknown_user_id);
+        mainUserId.setText(R.string.user_id_no_name);
         TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
         mainUserIdRest.setText("");
 

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java

@@ -96,7 +96,7 @@ public class SelectKeyCursorAdapter extends CursorAdapter {
         boolean valid = cursor.getInt(mIndexProjectionValid) > 0;
 
         TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId);
-        mainUserId.setText(R.string.unknown_user_id);
+        mainUserId.setText(R.string.user_id_no_name);
         TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);
         mainUserIdRest.setText("");
         TextView keyId = (TextView) view.findViewById(R.id.keyId);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java

@@ -79,7 +79,7 @@ public class DeleteKeyDialogFragment extends SherlockDialogFragment {
 
         if (keyRingRowIds.length == 1) {
             // TODO: better way to do this?
-            String userId = activity.getString(R.string.unknown_user_id);
+            String userId = activity.getString(R.string.user_id_no_name);
 
             if (keyType == Id.type.public_key) {
                 PGPPublicKeyRing keyRing = ProviderHelper.getPGPPublicKeyRingByRowId(activity,

OpenPGP-Keychain/src/main/res/values-de/strings.xml

@@ -127,7 +127,7 @@
     <item quantity="one">%d ausgewählt</item>
     <item quantity="other">%d ausgewählt</item>
   </plurals>
-  <string name="unknown_user_id">&lt;unbekannt&gt;</string>
+  <string name="user_id_no_name">&lt;unbekannt&gt;</string>
   <string name="none">&lt;keine&gt;</string>
   <string name="no_key">&lt;kein Schlüssel&gt;</string>
   <string name="unknown_status"></string>

OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml

@@ -91,7 +91,7 @@
   <string name="label_name">Nombre</string>
   <string name="label_comment">Comentario</string>
   <string name="label_email">Correo electrónico</string>
-  <string name="unknown_user_id">&lt;desconocido&gt;</string>
+  <string name="user_id_no_name">&lt;desconocido&gt;</string>
   <string name="unknown_status"></string>
   <!--choice-->
   <!--sentences-->

OpenPGP-Keychain/src/main/res/values-fr/strings.xml

@@ -127,7 +127,7 @@
     <item quantity="one">%d choisie</item>
     <item quantity="other">%d choisies</item>
   </plurals>
-  <string name="unknown_user_id">&lt;inconnue&gt;</string>
+  <string name="user_id_no_name">&lt;inconnue&gt;</string>
   <string name="none">&lt;aucune&gt;</string>
   <string name="no_key">&lt;pas de clef&gt;</string>
   <string name="unknown_status"></string>

OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml

@@ -93,7 +93,7 @@
   <string name="label_name">Naam</string>
   <string name="label_comment">Opmerking</string>
   <string name="label_email">E-mailadres</string>
-  <string name="unknown_user_id">&lt;onbekend&gt;</string>
+  <string name="user_id_no_name">&lt;onbekend&gt;</string>
   <string name="none">&lt;geen&gt;</string>
   <string name="no_key">&lt;geen sleutel&gt;</string>
   <string name="unknown_status"></string>

OpenPGP-Keychain/src/main/res/values-ru/strings.xml

@@ -128,7 +128,7 @@
     <item quantity="few">%d выбрано</item>
     <item quantity="other">%d выбрано</item>
   </plurals>
-  <string name="unknown_user_id">&lt;неизв.&gt;</string>
+  <string name="user_id_no_name">&lt;неизв.&gt;</string>
   <string name="none">&lt;нет&gt;</string>
   <string name="no_key">&lt;нет ключа&gt;</string>
   <string name="unknown_status"></string>

OpenPGP-Keychain/src/main/res/values-uk/strings.xml

@@ -128,7 +128,7 @@
     <item quantity="few">%d вибрані</item>
     <item quantity="other">%d вибраних</item>
   </plurals>
-  <string name="unknown_user_id">&lt;невідомий&gt;</string>
+  <string name="user_id_no_name">&lt;невідомий&gt;</string>
   <string name="none">&lt;жоден&gt;</string>
   <string name="no_key">&lt;без ключа&gt;</string>
   <string name="unknown_status"></string>

OpenPGP-Keychain/src/main/res/values/strings.xml

@@ -134,7 +134,7 @@
         <item quantity="other">%d selected</item>
     </plurals>
 
-    <string name="unknown_user_id">&lt;no user id&gt;</string>
+    <string name="user_id_no_name">&lt;no name&gt;</string>
     <string name="none">&lt;none&gt;</string>
     <string name="no_key">&lt;no key&gt;</string>
     <string name="unknown_status"></string>