diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml) | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step2.xml) | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml) | 10 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml) | 10 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/linked_select_fragment.xml (renamed from OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml) | 10 |
8 files changed, 17 insertions, 17 deletions
diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml index 4c8697b0a..606f56abe 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml @@ -52,7 +52,7 @@ android:text="@string/linked_create_dns_1_3" /> <EditText - android:id="@+id/affirmation_create_dns_domain" + android:id="@+id/linked_create_dns_domain" android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionNext" diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml index 2f5630f88..c416588d7 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml @@ -24,7 +24,7 @@ android:text="@string/linked_create_dns_2_1" /> <EditText - android:id="@+id/affirmation_create_dns_text" + android:id="@+id/linked_create_dns_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionNext" diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml index 9793ee21c..f94090f16 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml @@ -34,7 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_1_1" /> + android:text="@string/linked_create_https_1_1" /> </LinearLayout> @@ -43,10 +43,10 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_1_2" /> + android:text="@string/linked_create_https_1_2" /> <org.sufficientlysecure.keychain.ui.widget.HttpsPrefixedText - android:id="@+id/affirmation_create_https_uri" + android:id="@+id/linked_create_https_uri" android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionNext" @@ -61,14 +61,14 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_1_3" /> + android:text="@string/linked_create_https_1_3" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_1_4" /> + android:text="@string/linked_create_https_1_4" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml index 1938cb93a..7c9e26187 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml @@ -21,10 +21,10 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_2_1" /> + android:text="@string/linked_create_https_2_1" /> <EditText - android:id="@+id/affirmation_create_https_uri" + android:id="@+id/linked_create_https_uri" android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionNext" @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_2_2" /> + android:text="@string/linked_create_https_2_2" /> <LinearLayout android:layout_width="wrap_content" @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_2_3" /> + android:text="@string/linked_create_https_2_3" /> <LinearLayout android:layout_width="match_parent" @@ -120,7 +120,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/aff_create_https_2_4" /> + android:text="@string/linked_create_https_2_4" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml index a20e0d7ee..a20e0d7ee 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml index c81144029..c81144029 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml diff --git a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml index efa810be3..efa810be3 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml diff --git a/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml index 37757ce64..deaa9098d 100644 --- a/OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_select_fragment.xml @@ -18,7 +18,7 @@ android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="An 'affirmation' connects your pgp key to a resource on the web." + android:text="@string/linked_select_1" android:id="@+id/textView" android:layout_weight="1" /> @@ -29,7 +29,7 @@ android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Please select a type:" + android:text="@string/linked_select_2" android:layout_weight="1" /> <org.sufficientlysecure.keychain.ui.widget.FixedListView @@ -44,7 +44,7 @@ android:background="?android:attr/listDivider" /> <LinearLayout - android:id="@+id/affirmation_create_https_button" + android:id="@+id/linked_create_https_button" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" @@ -79,7 +79,7 @@ android:background="?android:attr/listDivider" /> <LinearLayout - android:id="@+id/affirmation_create_dns_button" + android:id="@+id/linked_create_dns_button" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" @@ -114,7 +114,7 @@ android:background="?android:attr/listDivider" /> <LinearLayout - android:id="@+id/affirmation_create_twitter_button" + android:id="@+id/linked_create_twitter_button" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:clickable="true" |