diff options
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter')
3 files changed, 11 insertions, 11 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java index 3d6435cf3..2f55f4fe7 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java @@ -79,11 +79,11 @@ 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.unknownUserId); + mainUserId.setText(R.string.unknown_user_id); TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); mainUserIdRest.setText(""); TextView keyId = (TextView) view.findViewById(R.id.keyId); - keyId.setText(R.string.noKey); + keyId.setText(R.string.no_key); TextView fingerprint = (TextView) view.findViewById(R.id.fingerprint); TextView algorithm = (TextView) view.findViewById(R.id.algorithm); algorithm.setText(""); @@ -98,7 +98,7 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> { mainUserIdRest.setText("<" + chunks[1]); } if (entry.secretKey) { - userId = mActivity.getString(R.string.secretKey) + " " + userId; + userId = mActivity.getString(R.string.secret_key) + " " + userId; mainUserId.setTextColor(Color.RED); } mainUserId.setText(userId); diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java index 4f06a2014..e94934008 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapter.java @@ -72,7 +72,7 @@ public class KeyListAdapter extends CursorTreeAdapter { int userIdIndex = cursor.getColumnIndex(UserIds.USER_ID); TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId); - mainUserId.setText(R.string.unknownUserId); + mainUserId.setText(R.string.unknown_user_id); TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); mainUserIdRest.setText(""); @@ -87,7 +87,7 @@ public class KeyListAdapter extends CursorTreeAdapter { } if (mainUserId.getText().length() == 0) { - mainUserId.setText(R.string.unknownUserId); + mainUserId.setText(R.string.unknown_user_id); } if (mainUserIdRest.getText().length() == 0) { diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java index b1e226384..ebb7261be 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java @@ -68,13 +68,13 @@ public class SelectKeyCursorAdapter extends CursorAdapter { boolean valid = cursor.getInt(cursor.getColumnIndex(PROJECTION_ROW_VALID)) > 0; TextView mainUserId = (TextView) view.findViewById(R.id.mainUserId); - mainUserId.setText(R.string.unknownUserId); + mainUserId.setText(R.string.unknown_user_id); TextView mainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); mainUserIdRest.setText(""); TextView keyId = (TextView) view.findViewById(R.id.keyId); - keyId.setText(R.string.noKey); + keyId.setText(R.string.no_key); TextView status = (TextView) view.findViewById(R.id.status); - status.setText(R.string.unknownStatus); + status.setText(R.string.unknown_status); String userId = cursor.getString(cursor.getColumnIndex(UserIds.USER_ID)); if (userId != null) { @@ -95,9 +95,9 @@ public class SelectKeyCursorAdapter extends CursorAdapter { if (valid) { if (mKeyType == Id.type.public_key) { - status.setText(R.string.canEncrypt); + status.setText(R.string.can_encrypt); } else { - status.setText(R.string.canSign); + status.setText(R.string.can_sign); } } else { if (cursor.getInt(cursor.getColumnIndex(PROJECTION_ROW_AVAILABLE)) > 0) { @@ -105,7 +105,7 @@ public class SelectKeyCursorAdapter extends CursorAdapter { // expired status.setText(R.string.expired); } else { - status.setText(R.string.noKey); + status.setText(R.string.no_key); } } |