diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-12 23:45:21 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-12 23:45:21 +0100 |
| commit | a9c9b6132c7b122f8155ce9fc6c21c89e5b8c298 (patch) | |
| tree | 78671569d3e84f5ed3db638a194981bc7c053a88 /OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml | |
| parent | edb98c67f4031b8c3c1d43b49bba733171119be2 (diff) | |
| parent | 69f5bf6b577234053e700a43a4a7ba721e827c6a (diff) | |
| download | open-keychain-a9c9b6132c7b122f8155ce9fc6c21c89e5b8c298.tar.gz open-keychain-a9c9b6132c7b122f8155ce9fc6c21c89e5b8c298.tar.bz2 open-keychain-a9c9b6132c7b122f8155ce9fc6c21c89e5b8c298.zip | |
Merge branch 'master' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml index c44835bb0..9e4bc70eb 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="5dip" - android:text="Key ID" + android:text="@string/label_key_id" android:textAppearance="?android:attr/textAppearanceMedium" android:typeface="monospace" /> |