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

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-31 20:26:12 +02:00
parent 5e7eed239f e9a2f256b9
commit bdf0436c94
21 changed files with 259 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/res/layout/decrypt_activity.xml
View File

@@ -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>
</android.support.v4.widget.FixedDrawerLayout>

1
OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml
View File

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

2
OpenKeychain/src/main/res/values-de/strings.xml
View File

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

2
OpenKeychain/src/main/res/values-es/strings.xml
View File

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

2
OpenKeychain/src/main/res/values-fr/strings.xml
View File

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

2
OpenKeychain/src/main/res/values-it/strings.xml
View File

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

2
OpenKeychain/src/main/res/values-ja/strings.xml
View File

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

2
OpenKeychain/src/main/res/values-uk/strings.xml
View File

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

7
OpenKeychain/src/main/res/values/strings.xml
View File

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