diff options
| author | Tim Bray <timbray@gmail.com> | 2014-09-13 09:39:10 -0700 |
|---|---|---|
| committer | Tim Bray <timbray@gmail.com> | 2014-09-13 21:41:03 -0700 |
| commit | 7de86a09bc3bae47c44b9dcb65bbda1298ccf843 (patch) | |
| tree | a4f9a8b24958b500ed52415d1f1584a03b865779 /OpenKeychain/src/main/res | |
| parent | e14cf32264d92c4b0d4ca782d74a1589ee52a396 (diff) | |
| download | open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.tar.gz open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.tar.bz2 open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.zip | |
Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/key_server_preference.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml index 140b5e3d7..5bcb06831 100644 --- a/OpenKeychain/src/main/res/layout/key_server_preference.xml +++ b/OpenKeychain/src/main/res/layout/key_server_preference.xml @@ -39,13 +39,13 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> <Button - android:id="@+id/shuffle" + android:id="@+id/rotate" android:layout_width="wrap_content" android:layout_height="31dp" android:layout_gravity="center_vertical" android:layout_marginLeft="4dip" android:layout_marginRight="6dip" - android:text="shuffle" + android:text="rotate" android:textColor="#ffffffff" android:textStyle="bold" android:paddingTop="2dp" |