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

more language fixes and cleanup

Browse Source
This commit is contained in:
Dominik Schürmann
2014-01-19 16:06:23 +01:00
parent f4a9688bd9
commit 1b1927883b
16 changed files with 84 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenPGP-Keychain/res/values/arrays.xml
View File

@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<string-array name="pass_phrase_cache_ttl_entries">
<string-array name="pass_phrase_cache_ttl_entries" translatable="false">
<item>@string/choice_15secs</item>
<item>@string/choice_1min</item>
<item>@string/choice_3mins</item>
@@ -30,7 +14,7 @@
<item>@string/choice_4hours</item>
<item>@string/choice_8hours</item>
</string-array>
<string-array name="pass_phrase_cache_ttl_values">
<string-array name="pass_phrase_cache_ttl_values" translatable="false">
<item>15</item>
<item>60</item>
<item>180</item>
@@ -43,13 +27,13 @@
<item>14400</item>
<item>28800</item>
</string-array>
<string-array name="key_size_spinner_values">
<string-array name="key_size_spinner_values" translatable="false">
<item>@string/key_size_512</item>
<item>@string/key_size_1024</item>
<item>@string/key_size_2048</item>
<item>@string/key_size_4096</item>
</string-array>
<string-array name="import_action_list">
<string-array name="import_action_list" translatable="false">
<item>@string/menu_key_server</item>
<item>@string/menu_import_from_file</item>
<item>@string/menu_import_from_qr_code</item>

7
OpenPGP-Keychain/res/values/dimens.xml
View File

@@ -1,7 +0,0 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
</resources>

2
OpenPGP-Keychain/res/values/static_strings.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translate="false">OpenPGP Keychain</string>
<string name="app_name" translatable="false">OpenPGP Keychain</string>
</resources>

26
OpenPGP-Keychain/res/values/strings.xml
View File

@@ -29,7 +29,6 @@
<string name="title_sign_key">Sign Key</string>
<string name="title_key_details">Key Details</string>
<string name="title_help">Help</string>
<string name="title_share_by_nfc">Share key with NFC</string>
<!-- section -->
<string name="section_user_ids">User IDs</string>
@@ -69,7 +68,6 @@
<!-- menu -->
<string name="menu_preferences">Settings</string>
<string name="menu_help">Help</string>
<string name="menu_api_app_settings">Registered Apps</string>
<string name="menu_import_from_file">Import from file</string>
<string name="menu_import_from_qr_code">Import from QR Code</string>
<string name="menu_import">Import</string>
@@ -79,7 +77,6 @@
<string name="menu_delete_key">Delete key</string>
<string name="menu_create_key">Create key</string>
<string name="menu_create_key_expert">Create key (expert)</string>
<string name="menu_edit_key">Edit key</string>
<string name="menu_search">Search</string>
<string name="menu_key_server">Import from key server</string>
<string name="menu_update_key">Update from key server</string>
@@ -151,7 +148,6 @@
<string name="fingerprint">Fingerprint:</string>
<string name="secret_key">Secret Key:</string>
<string name="notValid">not valid</string>
<!-- choice -->
<string name="choice_none">None</string>
@@ -211,12 +207,10 @@
<item quantity="one"> and updated %d key.</item>
<item quantity="other"> and updated %d keys.</item>
</plurals>
<plurals name="keys_added">
<item quantity="one">Successfully added %d key.</item>
<item quantity="other">Successfully added %d keys.</item>
</plurals>
<plurals name="keys_updated">
<item quantity="one">Successfully updated %d key.</item>
<item quantity="other">Successfully updated %d keys.</item>
@@ -228,10 +222,12 @@
<string name="no_keys_exported">No keys exported.</string>
<string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string>
<string name="key_not_found">Couldn\'t find key %08X.</string>
<plurals name="keys_found">
<item quantity="one">Found %d key.</item>
<item quantity="other">Found %d keys.</item>
</plurals>
<string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string>
<string name="bad_keys_encountered">%d bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string>
<string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string>
@@ -289,10 +285,14 @@
<string name="progress_certifying_master_key">certifying master key…</string>
<string name="progress_building_master_key">building master ring…</string>
<string name="progress_adding_sub_keys">adding sub keys…</string>
<string name="progress_saving_key_ring">saving key key…</string>
<string name="progress_saving_key_ring">saving key…</string>
<string name="progress_importing_secret_keys">importing secret keys…</string>
<string name="progress_exporting_key">exporting key…</string>
<string name="progress_exporting_keys">exporting keys…</string>
<plurals name="progress_exporting_key">
<item quantity="one">exporting key…</item>
<item quantity="other">exporting keys…</item>
</plurals>
<string name="progress_extracting_signature_key">extracting signature key…</string>
<string name="progress_extracting_key">extracting key…</string>
<string name="progress_preparing_streams">preparing streams…</string>
@@ -325,14 +325,6 @@
<string name="compression_fast">fast</string>
<string name="compression_very_slow">very slow</string>
<!-- Dashboard -->
<string name="dashboard_manage_keys">Contacts</string>
<string name="dashboard_my_keys">My Secret Keys</string>
<string name="dashboard_encrypt">Encrypt</string>
<string name="dashboard_decrypt">Decrypt</string>
<string name="dashboard_help">Help</string>
<string name="dashboard_import_keys">Import Keys</string>
<!-- Help -->
<string name="help_tab_start">Start</string>
<string name="help_tab_nfc_beam">NFC Beam</string>

30
OpenPGP-Keychain/res/values/styles.xml
View File

@@ -1,40 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<style name="DashboardButton">
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:drawablePadding">2dp</item>
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<item name="android:background">@android:color/transparent</item>
</style>
<style name="SectionHeader">
<item name="android:drawableBottom">@drawable/section_header</item>
<item name="android:drawablePadding">4dp</item>
<item name="android:layout_marginTop">8dp</item>
<item name="android:paddingLeft">4dp</item>
<!-- <item name="android:textAllCaps">true</item> -->
<!-- <item name="android:textAllCaps">true</item> -->
<item name="android:textColor">@color/emphasis</item>
<item name="android:textSize">14sp</item>
</style>