cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

affirmation -> linked identity

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-01-15 16:59:11 +01:00
parent c03bcc2799
commit 92b8d874ed
29 changed files with 177 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step1.xml → OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step1.xml
View File

@@ -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"

2
OpenKeychain/src/main/res/layout/affirmation_create_dns_fragment_step2.xml → OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
View File

@@ -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"

10
OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step1.xml → OpenKeychain/src/main/res/layout/linked_create_https_fragment_step1.xml
View File

@@ -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>

10
OpenKeychain/src/main/res/layout/affirmation_create_https_fragment_step2.xml → OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml
View File

@@ -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>

0
OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step1.xml → OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step1.xml
View File

0
OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step2.xml → OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step2.xml
View File

0
OpenKeychain/src/main/res/layout/affirmation_create_twitter_fragment_step3.xml → OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml
View File

10
OpenKeychain/src/main/res/layout/affirmation_select_fragment.xml → OpenKeychain/src/main/res/layout/linked_select_fragment.xml
View File

@@ -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"