diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-31 20:26:12 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-31 20:26:12 +0200 |
commit | bdf0436c9494f25cd1efaa64b6eb180b6d2673d6 (patch) | |
tree | 5f928c1949c92ee0ee86b60276a5c5c792868e8d /OpenKeychain/src/main/res | |
parent | 5e7eed239ffc26f2d78b29c0f6dd3772f49dc4e9 (diff) | |
parent | e9a2f256b9324cc898061d2a2ebde18446ce1dd1 (diff) | |
download | open-keychain-bdf0436c9494f25cd1efaa64b6eb180b6d2673d6.tar.gz open-keychain-bdf0436c9494f25cd1efaa64b6eb180b6d2673d6.tar.bz2 open-keychain-bdf0436c9494f25cd1efaa64b6eb180b6d2673d6.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
9 files changed, 13 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml index 94d82fe1d..bb0e463b3 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_activity.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -9,4 +8,4 @@ <include layout="@layout/drawer_list" /> -</android.support.v4.widget.FixedDrawerLayout>
\ No newline at end of file +</android.support.v4.widget.FixedDrawerLayout> diff --git a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml index 4ac60620d..3b4eba3ef 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true"> diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index 6c5e12266..19b3c38e4 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -443,7 +443,7 @@ <!--Consolidate--> <!--PassphraseCache--> <!--unsorted--> - <string name="internal_error">Interner Fehler!</string> + <string name="msg_internal_error">Interner Fehler!</string> <string name="section_certifier_id">Beglaubiger</string> <string name="section_cert">Zertifikatdetails</string> <string name="label_user_id">Identität</string> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index bd72a4fed..1bd73f389 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -662,7 +662,7 @@ <string name="passp_cache_notif_clear">Limpiar caché</string> <string name="passp_cache_notif_pwd">Contraseña</string> <!--unsorted--> - <string name="internal_error">¡Error interno!</string> + <string name="msg_internal_error">¡Error interno!</string> <string name="section_certifier_id">Certificador</string> <string name="section_cert">Detalles del certificado</string> <string name="label_user_id">Identidad</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index 3aa0f1f5d..1b0a355d3 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -662,7 +662,7 @@ <string name="passp_cache_notif_clear">Effacer le cache</string> <string name="passp_cache_notif_pwd">Mot de passe</string> <!--unsorted--> - <string name="internal_error">Erreur interne !</string> + <string name="msg_internal_error">Erreur interne !</string> <string name="section_certifier_id">Certificateur</string> <string name="section_cert">Détails du certificat</string> <string name="label_user_id">identité</string> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index b8707ab70..d117b44d8 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -662,7 +662,7 @@ <string name="passp_cache_notif_clear">Pulisci Cache</string> <string name="passp_cache_notif_pwd">Password</string> <!--unsorted--> - <string name="internal_error">Errore interno!</string> + <string name="msg_internal_error">Errore interno!</string> <string name="section_certifier_id">Certificatore</string> <string name="section_cert">Dettagli Certificato</string> <string name="label_user_id">Identit</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 41426cb9b..5859a85ff 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -637,7 +637,7 @@ <string name="passp_cache_notif_clear">キャッシュクリア</string> <string name="passp_cache_notif_pwd">パスワード</string> <!--unsorted--> - <string name="internal_error">内部エラー!</string> + <string name="msg_internal_error">内部エラー!</string> <string name="section_certifier_id">検証者</string> <string name="section_cert">証明の詳細</string> <string name="label_user_id">ユーザID</string> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index b94749ee5..48c180103 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -601,7 +601,7 @@ <string name="passp_cache_notif_clear">Очистити кеш</string> <string name="passp_cache_notif_pwd">Пароль</string> <!--unsorted--> - <string name="internal_error">Внутрішня помилка!</string> + <string name="msg_internal_error">Внутрішня помилка!</string> <string name="section_certifier_id">Ким підписаний</string> <string name="section_cert">Дані сертифікату</string> <string name="label_user_id">Сутність</string> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 16970b4dd..2a2d18c0d 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -262,6 +262,7 @@ <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">Done.</string> <string name="progress_cancel">Cancel</string> + <string name="progress_cancelling">cancelling…</string> <string name="progress_saving">saving…</string> <string name="progress_importing">importing…</string> <string name="progress_exporting">exporting…</string> @@ -381,8 +382,10 @@ </plurals> <string name="view_log">View Log</string> <string name="import_error_nothing">Nothing to import.</string> + <string name="import_error_nothing_cancelled">Import cancelled.</string> <string name="import_error">Error importing keys!</string> <string name="import_with_warnings">, with warnings</string> + <string name="import_with_cancelled">, until cancelled</string> <!-- Intent labels --> <string name="intent_decrypt_file">Decrypt File with OpenKeychain</string> @@ -519,6 +522,9 @@ <!-- LogType log messages. Errors should have _ERROR_ in their name and end with a ! --> + <string name="msg_internal_error">Internal error!</string> + <string name="msg_cancelled">Operation cancelled.</string> + <!-- Import Public log entries --> <string name="msg_ip_apply_batch">Applying insert batch operation.</string> <string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string> @@ -744,7 +750,6 @@ <string name="passp_cache_notif_pwd">Password</string> <!-- unsorted --> - <string name="internal_error">Internal error!</string> <string name="section_certifier_id">Certifier</string> <string name="section_cert">Certificate Details</string> <string name="label_user_id">Identity</string> |