PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

tls-psk: move descriptive text, fix typo

Browse source
This commit is contained in:
Vincent Breitmoser 2017-06-13 02:21:42 +02:00
parent 39be6b166d
commit 0aa878d1a9
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OpenKeychain/src/main/res/layout/transfer_fragment.xml
View file

@ -8,7 +8,7 @@
android:id="@+id/transfer_animator"
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
custom:initialView="01">
custom:initialView="0">
<LinearLayout
android:layout_width="match_parent"
@ -17,9 +17,21 @@
android:orientation="vertical"
android:padding="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="@string/transfer_scan_explanation"
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:weightSum="1">
@ -28,7 +40,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.75"
android:layout_marginBottom="16dp"
custom:cardUseCompatPadding="true"
custom:cardCornerRadius="4dp"
>

4
OpenKeychain/src/main/res/values/strings.xml
View file

@ -1890,9 +1890,9 @@
<string name="identity_context_forget">Forget</string>
<string name="button_scan">"Scan"</string>
<string name="transfer_scan_explanation">"Scan with either device to establish a secure connection for device setup."</string>
<string name="transfer_scan_explanation">"To transfer your keys, establish a secure connection by scanning with either device."</string>
<string name="connection_status">"Connection status:"</string>
<string name="section_transfer_keys">"Available keys for fransfer"</string>
<string name="section_transfer_keys">"Available keys for transfer"</string>
<string name="section_received_keys">"Received keys"</string>
<string name="transfer_scan_only_wifi">"This feature can only be used on Wifi."</string>
<string name="button_import">"Import"</string>