Rename "armour" to "armor"

2014-04-02 15:36:32 +02:00
parent 6ac13d9f69
commit c4c9713da4
6 changed files with 20 additions and 20 deletions
--- a/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml
@@ -54,10 +54,10 @@
            android:orientation="horizontal">

        <CheckBox
-                android:id="@+id/asciiArmour"
+                android:id="@+id/asciiArmor"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_vertical"
                android:text="@string/label_ascii_armor"/>
    </LinearLayout>
-</merge>
+</merge>