diff options
Diffstat (limited to 'APG/res')
| -rw-r--r-- | APG/res/layout/import_keys.xml | 22 | ||||
| -rw-r--r-- | APG/res/raw/help_nfc_beam.html | 4 | ||||
| -rw-r--r-- | APG/res/values/strings.xml | 6 |
3 files changed, 19 insertions, 13 deletions
diff --git a/APG/res/layout/import_keys.xml b/APG/res/layout/import_keys.xml index 8e107cd96..1c2dbd0c7 100644 --- a/APG/res/layout/import_keys.xml +++ b/APG/res/layout/import_keys.xml @@ -6,7 +6,7 @@ <LinearLayout android:id="@+id/import_from_qr_code_footer" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:orientation="vertical" @@ -36,23 +36,27 @@ </LinearLayout> <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layout_above="@id/import_from_qr_code_footer" android:fillViewport="true" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingLeft="10dp" - android:paddingRight="10dp" > + android:paddingLeft="12dp" + android:paddingRight="12dp" > - <TextView - android:id="@+id/import_from_qr_code_content" + <LinearLayout + android:id="@+id/import_keys_list_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="" /> + android:layout_marginTop="16dp" + android:orientation="vertical" + android:paddingLeft="4dp" + android:paddingRight="4dp" > + </LinearLayout> </LinearLayout> </ScrollView> diff --git a/APG/res/raw/help_nfc_beam.html b/APG/res/raw/help_nfc_beam.html index 31abb7ddb..80c79c4a3 100644 --- a/APG/res/raw/help_nfc_beam.html +++ b/APG/res/raw/help_nfc_beam.html @@ -8,8 +8,8 @@ And don't add newlines before or after p tags because of transifex --> <ol> <li>Go to your partners 'Manage Public Keyrings' and long press on the keyring you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> -<li>Tap the card and the content will then load on the other person’s device.</li> +<li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Tap the card and the content will then load on the your device.</li> </ol> </body> </html>
\ No newline at end of file diff --git a/APG/res/values/strings.xml b/APG/res/values/strings.xml index 531e1cd68..b5f55cdd3 100644 --- a/APG/res/values/strings.xml +++ b/APG/res/values/strings.xml @@ -93,7 +93,7 @@ <string name="menu_importFromQrCode">Import from QR Code</string> <string name="menu_importFromNfc">Import from NFC</string> <string name="menu_exportKeys">Export All Keyrings</string> - <string name="menu_exportKey">Export Keyring</string> + <string name="menu_exportKey">Export To File</string> <string name="menu_deleteKey">Delete Keyring</string> <string name="menu_createKey">Create Keyring</string> <string name="menu_editKey">Edit Keyring</string> @@ -154,7 +154,7 @@ <string name="expired">expired</string> <string name="notValid">not valid</string> <string name="nKeyServers">%s key server(s)</string> - <string name="fingerprint">fingerprint</string> + <string name="fingerprint">Fingerprint:</string> <!-- choice_lowerCase: capitalized first word, no punctuation --> <string name="choice_none">None</string> @@ -232,6 +232,7 @@ <string name="qrScanImportSuccess">Successfully validated and imported keyring</string> <string name="listInformation">Long press one entry in this list to show more options!</string> <string name="listEmpty">This list is empty!</string> + <string name="nfcSuccessfull">Successfully sent keyring with NFC Beam!</string> <!-- error_lowerCase: phrases, no punctuation, all lowercase, @@ -266,6 +267,7 @@ <string name="error_onlyFilesAreSupported">Direct binary data without actual file in filesystem is not supported. This is only supported by ACTION_ENCRYPT_STREAM_AND_RETURN.</string> <string name="error_jellyBeanNeeded">You need Android 4.1 alias Jelly Bean to use Androids NFC Beam feature!</string> <string name="error_nfcNeeded">NFC is not available on your device!</string> + <string name="error_nothingImport">Nothing to import!</string> <!-- progress_lowerCase: lowercase, phrases, usually ending in '…' --> <string name="progress_done">done.</string> |