From 7de86a09bc3bae47c44b9dcb65bbda1298ccf843 Mon Sep 17 00:00:00 2001
From: Tim Bray <timbray@gmail.com>
Date: Sat, 13 Sep 2014 09:39:10 -0700
Subject: Change shuffle to rotate, and when merging ImportKeysList entries, if
 either side is revoked/expired, the merge reflects that

---
 OpenKeychain/src/main/res/layout/key_server_preference.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res')

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"
-- 
cgit v1.2.3