From e72e47d92ec957d42c04bf8b1e0dd8e8b641cd7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Thu, 14 Aug 2014 15:24:37 +0200
Subject: Remove support for v3 sig generation
---
OpenKeychain/src/main/res/values/strings.xml | 1 -
OpenKeychain/src/main/res/xml/adv_preferences.xml | 12 +++---------
2 files changed, 3 insertions(+), 10 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8ccb92854..09a434d5d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -103,7 +103,6 @@
Passphrase Cache
Message Compression
File Compression
- Force old OpenPGPv3 Signatures
Keyservers
Key ID
Creation
diff --git a/OpenKeychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml
index 588a6e62d..49f241ffe 100644
--- a/OpenKeychain/src/main/res/xml/adv_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/adv_preferences.xml
@@ -16,7 +16,7 @@
-->
-
+
-
-
+
+
-
-
-
--
cgit v1.2.3
From 0a1de8deeaa543f3a0658c3927fd632d115e34fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Thu, 14 Aug 2014 15:42:02 +0200
Subject: Do not import v3 keys, they are insecure!
---
OpenKeychain/src/main/res/values/strings.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 09a434d5d..75175212c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -433,7 +433,7 @@
Verified
This identity has been verified.
Not verified
- This identity has not been verified yet. You can not be sure if the identity really corresponds to a specific person.
+ This identity has not been verified yet. You cannot be sure if the identity really corresponds to a specific person.
Invalid
Something is wrong with this identity!
@@ -497,6 +497,7 @@
Applying insert batch operation.
Tried to import secret keyring as public. This is a bug, please file a report!
+ This key is an OpenPGP version 3 key and thus insecure. It has not been imported.
No old key deleted (creating a new one?)
Deleted old key from database
Operation failed due to encoding error
--
cgit v1.2.3
From 62f7bf62150b460ee2dfa14f2c45f6df40d55cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Thu, 14 Aug 2014 15:58:26 +0200
Subject: move v3 key import prevention into canonicalization method
---
OpenKeychain/src/main/res/values/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 75175212c..d491723fd 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -497,7 +497,7 @@
Applying insert batch operation.
Tried to import secret keyring as public. This is a bug, please file a report!
- This key is an OpenPGP version 3 key and thus insecure. It has not been imported.
+ This key is an OpenPGP version 3 key and thus insecure. It has not been imported.
No old key deleted (creating a new one?)
Deleted old key from database
Operation failed due to encoding error
--
cgit v1.2.3
From ef2449917e53e312ebc2eb4bea7e3149ba9db137 Mon Sep 17 00:00:00 2001
From: mar-v-in
Date: Thu, 14 Aug 2014 12:22:02 +0200
Subject: factor KeySpinner out
---
.../res/layout/encrypt_asymmetric_fragment.xml | 2 +-
.../main/res/layout/encrypt_asymmetric_signkey.xml | 31 ----------------------
.../src/main/res/layout/keyspinner_key.xml | 31 ++++++++++++++++++++++
3 files changed, 32 insertions(+), 32 deletions(-)
delete mode 100644 OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml
create mode 100644 OpenKeychain/src/main/res/layout/keyspinner_key.xml
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 4d82477bc..2189a1f34 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -24,7 +24,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/label_asymmetric_from" />
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/keyspinner_key.xml b/OpenKeychain/src/main/res/layout/keyspinner_key.xml
new file mode 100644
index 000000000..703f9133b
--- /dev/null
+++ b/OpenKeychain/src/main/res/layout/keyspinner_key.xml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
\ No newline at end of file
--
cgit v1.2.3
From a6118877ff1b096925c908583985889d30087e24 Mon Sep 17 00:00:00 2001
From: mar-v-in
Date: Thu, 14 Aug 2014 16:00:07 +0200
Subject: Add and use CertifyKeySpinner
---
OpenKeychain/src/main/res/layout/certify_key_activity.xml | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index 34d4dbd57..bce194438 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -26,14 +26,10 @@
android:layout_marginTop="14dp"
android:text="@string/section_certification_key" />
-
+
Date: Thu, 14 Aug 2014 16:12:42 +0200
Subject: Automcomplete names and emails in keyserver tab
---
OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
index 47c354c53..fde90b81f 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
@@ -10,7 +10,7 @@
android:layout_height="?android:attr/listPreferredItemHeight"
android:orientation="horizontal">
-
Date: Thu, 14 Aug 2014 16:20:24 +0200
Subject: change keybase hint following pull request #755
---
OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml | 2 +-
OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml | 2 +-
OpenKeychain/src/main/res/values-cs/strings.xml | 2 +-
OpenKeychain/src/main/res/values-de/strings.xml | 4 ++--
OpenKeychain/src/main/res/values-es/strings.xml | 4 ++--
OpenKeychain/src/main/res/values-fr/strings.xml | 4 ++--
OpenKeychain/src/main/res/values-it/strings.xml | 4 ++--
OpenKeychain/src/main/res/values-ja/strings.xml | 4 ++--
OpenKeychain/src/main/res/values-ru/strings.xml | 2 +-
OpenKeychain/src/main/res/values-sl/strings.xml | 4 ++--
OpenKeychain/src/main/res/values-uk/strings.xml | 2 +-
OpenKeychain/src/main/res/values/strings.xml | 4 ++--
12 files changed, 19 insertions(+), 19 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
index 062289688..c70236e07 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_keybase_fragment.xml
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="top|left"
- android:hint="@string/hint_keybase_search"
+ android:hint="@string/hint_keybase_search_hint"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:singleLine="true"
diff --git a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
index fde90b81f..62e7d740c 100644
--- a/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml
@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="top|left"
- android:hint="@string/hint_public_keys"
+ android:hint="@string/hint_keyserver_search_hint"
android:imeOptions="actionSearch"
android:inputType="textNoSuggestions"
android:singleLine="true"
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index 19e94b4b8..dd4d41650 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -184,7 +184,7 @@
verifikuji integritu...
mažu \'%s\' bezpečně...
- Jméno/Email/ID klíče
+ Jméno/Email/ID klíče
512
768
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index a843a154a..74282fd29 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -270,8 +270,8 @@
Integrität wird überprüft…
\'%s\' wird sicher gelöscht…
- Name/Email/Schlüssel ID...
- Name/Keybase.io Benutzername...
+ Name/Email/Schlüssel ID...
+ Name/Keybase.io Benutzername...
512
768
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 80c2060d1..8b8af788d 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -276,8 +276,8 @@
verificando la integridad...
borrando \'%s\' de forma segura…
- Identidad de Nombre/Correo/Clave...
- Nombre de usuario de Nombre/Keybase.io...
+ Identidad de Nombre/Correo/Clave...
+ Nombre de usuario de Nombre/Keybase.io...
512
768
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index e30ebb883..35e4c5766 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -276,8 +276,8 @@
vérification de l\'intégrité...
suppression sûre de « %s »...
- Nom/courriel/ ID clef...
- Nom/nom d\'utilisateur keybase.io...
+ Nom/courriel/ ID clef...
+ Nom/nom d\'utilisateur keybase.io...
512
768
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 89e09783b..2a5131bcf 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -236,8 +236,8 @@
verifica integrita\'...
eliminazione sicura di \'%s\'...
- Nome/Email/ID Chiave...
- Nome/Keybase.io nome utente...
+ Nome/Email/ID Chiave...
+ Nome/Keybase.io nome utente...
512
768
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index dbb52d208..f0cb9d47b 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -271,8 +271,8 @@
完全性の検証中...
\'%s\' を完全に削除中…
- 名前/メール/鍵ID...
- 名前/Keybase.io名...
+ 名前/メール/鍵ID...
+ 名前/Keybase.io名...
512
768
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index fd2c0312d..4f32bea3a 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -238,7 +238,7 @@
проверка целостности...
безопасное удаление \'%s\'...
- Имя/Email/ID ключа…
+ Имя/Email/ID ключа…
512
768
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 0a7b4713e..0de5e97ea 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -243,8 +243,8 @@
preverjam neokrnjenost...
varno brišem \'%s\'…
- Ime/e-pošta/ID ključa
- Ime/Keybase.io uporabniško ime...
+ Ime/e-pošta/ID ključa
+ Ime/Keybase.io uporabniško ime...
512
768
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 42ac94c32..7a4c79ddb 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -238,7 +238,7 @@
перевірка цілісності…
вилучення безпечно \'%s\'…
- Назва/Ел. пошта/ІД ключа…
+ Назва/Ел. пошта/ІД ключа…
512
768
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index d491723fd..20a149956 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -303,8 +303,8 @@
deleting \'%s\' securely…
- Name/Email/Key ID…
- Name/Keybase.io username…
+ Name/Email/Key ID…
+ Name/Email/Proof/Key…
512
--
cgit v1.2.3
From a19784ed7e930055a6a1d0a537f2f4f1d3ea1f21 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Thu, 14 Aug 2014 16:27:50 +0200
Subject: merge: check fingerprints on merge operation! (this needs a
testcase!)
---
OpenKeychain/src/main/res/values/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 20a149956..0da651b03 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -616,7 +616,7 @@
Merging into public keyring %s
Merging into secret keyring %s
Fatal error encoding signature
- Tried to consolidate heterogeneous keyrings
+ Tried to merge keyrings with differing fingerprints!
Adding new subkey %s
Found %s new certificates in keyring
No new certificates
--
cgit v1.2.3
From bbe986743c9e6c2a22df95e0fbde0de2340bf467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Sat, 16 Aug 2014 05:28:51 +0200
Subject: API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids
extras, fix pre-selection of key ids (no revoked or expired ones, also select
duplicates), refactor text using spannables
---
.../src/main/res/layout/api_remote_select_pub_keys.xml | 10 +++++-----
OpenKeychain/src/main/res/values/strings.xml | 5 +++--
2 files changed, 8 insertions(+), 7 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
index a10592607..bf4d0a70d 100644
--- a/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
+++ b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml
@@ -4,13 +4,13 @@
android:layout_height="fill_parent"
android:orientation="vertical" >
-
Allow access
Disallow access
Please select a key!
- No public keys were found for these identities:
- More than one public key exist for these identities:
+ No keys were found for these identities:
+ More than one key exist for these identities:
Please review the list of recipients!
+ Please select the recipients!
Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app\'s registration in OpenKeychain and then register the app again.
--
cgit v1.2.3
From c54fe21f44f118c59874fe97b662b3faea6ebc48 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Sat, 16 Aug 2014 05:13:09 +0200
Subject: modifySecretKey: err out on revocation of nonexistent user id
---
OpenKeychain/src/main/res/values/strings.xml | 1 +
1 file changed, 1 insertion(+)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 6f77be78f..5eb594163 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -639,6 +639,7 @@
No key ID. This is an internal error, please file a bug report!
Internal error, integrity check failed!
Bad primary user id specified!
+ Bad user id for revocation specified!
Revoked user ids cannot be primary!
PGP internal exception!
Signature exception!
--
cgit v1.2.3
From 1fa77d57d2bb0e82291364a046ddce0e17fa393f Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Sat, 16 Aug 2014 05:15:12 +0200
Subject: modifySecretKey: err out on "use previous" expiry date for (sub)key
creation
---
OpenKeychain/src/main/res/values/strings.xml | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 5eb594163..f603663e8 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -627,6 +627,7 @@
No master key options specified!
Keyrings must be created with at least one user id!
Master key must have certify flag!
+ Expiry time cannot be "same as before" on key creation. This is a programming error, please file a bug report!
Key size must be greater or equal 512!
Internal PGP error!
Bad algorithm choice!
@@ -641,6 +642,7 @@
Bad primary user id specified!
Bad user id for revocation specified!
Revoked user ids cannot be primary!
+ Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!
PGP internal exception!
Signature exception!
Changing passphrase
--
cgit v1.2.3
From a943bebfdf063700c01170ea264e342283e5d6b3 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Sat, 16 Aug 2014 06:24:40 +0200
Subject: support for master key modifications, among other stuff
---
OpenKeychain/src/main/res/values-es/strings.xml | 2 +-
OpenKeychain/src/main/res/values-fr/strings.xml | 2 +-
OpenKeychain/src/main/res/values-it/strings.xml | 2 +-
OpenKeychain/src/main/res/values-ja/strings.xml | 2 +-
OpenKeychain/src/main/res/values-ru/strings.xml | 2 +-
OpenKeychain/src/main/res/values/strings.xml | 4 +++-
6 files changed, 8 insertions(+), 6 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 8b8af788d..0bd3a48c5 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -588,7 +588,7 @@
¡Intentó operar sobre una subclave ausente %s!
Generando nueva subclave %2$s de %1$s bits
Nueva identidad de subclave: %s
- ¡La fecha de expiración no puede ser del pasado!
+ ¡La fecha de expiración no puede ser del pasado!
Revocando subclave %s
Juego de claves modificado con éxito
Añadiendo identidad de usuario %s
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 35e4c5766..3f570d144 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -588,7 +588,7 @@
Une action a été tentée sur la sous-clef manquante %s !
Génération d\'une nouvelle sous-clef %2$s de %1$s bit
ID de la nouvelle sous-clef : %s
- La date d\'expiration ne peut pas être dans le passé !
+ La date d\'expiration ne peut pas être dans le passé !
Révocation de la sous-clef %s
Trousseau modifié avec succès
Ajout de l\'ID d\'utilisateur %s
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 2a5131bcf..590532d4d 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -528,7 +528,7 @@
Tentativo di operare su sottochiave mancante %s!
Generazione nuovi %1$s bit %2$s sottochiave
Nuovo ID sottochiave: %s
- La data di scadenza non può essere passata!
+ La data di scadenza non può essere passata!
Revoca sottochiave %s
Portachiavi modificato con successo
Aggiunta id utente %s
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index f0cb9d47b..6794deba9 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -574,7 +574,7 @@
遺失した副鍵 %s の操作をしようとした!
新しい %1$s ビットの %2$s 副鍵の生成中
新しい副鍵 ID: %s
- 期限切れ日を過去にはできません!
+ 期限切れ日を過去にはできません!
副鍵 %s を破棄中
鍵輪の変更に成功
ユーザID %s を追加中
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 4f32bea3a..2ac766466 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -384,7 +384,7 @@
Внутренняя ошибка PGP!
Ошибка подписи!
Изменение пароля
- Срок годности не может быть в прошлом!
+ Срок годности не может быть в прошлом!
Связка успешно изменена
Добавление id %s
Изменение основного uid на %s
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f603663e8..8aa10943d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -639,12 +639,14 @@
Actual key fingerprint does not match the expected one!
No key ID. This is an internal error, please file a bug report!
Internal error, integrity check failed!
+ No master certificate found to modify!
Bad primary user id specified!
Bad user id for revocation specified!
Revoked user ids cannot be primary!
Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!
PGP internal exception!
Signature exception!
+ Modifying master certifications
Changing passphrase
Replacing certificate of previous primary user id
Generating new certificate for new primary user id
@@ -652,7 +654,7 @@
Tried to operate on missing subkey %s!
Generating new %1$s bit %2$s subkey
New subkey ID: %s
- Expiry date cannot be in the past!
+ Expiry date cannot be in the past!
Revoking subkey %s
Keyring successfully modified
Adding user id %s
--
cgit v1.2.3
From de0d95432e40b9ed436c3509364ba49d2e487723 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Sat, 16 Aug 2014 06:40:03 +0200
Subject: typed expected failures and a couple minor things
---
OpenKeychain/src/main/res/values-cs/strings.xml | 1 -
OpenKeychain/src/main/res/values-de/strings.xml | 1 -
OpenKeychain/src/main/res/values-es/strings.xml | 3 +--
OpenKeychain/src/main/res/values-fr/strings.xml | 3 +--
OpenKeychain/src/main/res/values-it/strings.xml | 3 +--
OpenKeychain/src/main/res/values-ja/strings.xml | 3 +--
OpenKeychain/src/main/res/values-nl/strings.xml | 1 -
OpenKeychain/src/main/res/values-pl/strings.xml | 1 -
OpenKeychain/src/main/res/values-ru/strings.xml | 1 -
OpenKeychain/src/main/res/values-sl/strings.xml | 1 -
OpenKeychain/src/main/res/values-uk/strings.xml | 1 -
OpenKeychain/src/main/res/values/strings.xml | 4 ++--
12 files changed, 6 insertions(+), 17 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values-cs/strings.xml b/OpenKeychain/src/main/res/values-cs/strings.xml
index dd4d41650..c9e7875d8 100644
--- a/OpenKeychain/src/main/res/values-cs/strings.xml
+++ b/OpenKeychain/src/main/res/values-cs/strings.xml
@@ -62,7 +62,6 @@
Cache hesel
Komprimovat zprávu
Komprimovat soubor
- Vynutit staré OpenPGPv3 podpisy
ID klíče
Vytvořeno
Expirace
diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml
index 74282fd29..18e6cf585 100644
--- a/OpenKeychain/src/main/res/values-de/strings.xml
+++ b/OpenKeychain/src/main/res/values-de/strings.xml
@@ -94,7 +94,6 @@
Passwort-Cache
Nachrichten-Komprimierung
Datei-Komprimierung
- Erzwinge alte OpenPGPv3-Signaturen
Schlüsselserver
Schlüssel-ID
Erstellungsdatum
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml
index 0bd3a48c5..1770ec896 100644
--- a/OpenKeychain/src/main/res/values-es/strings.xml
+++ b/OpenKeychain/src/main/res/values-es/strings.xml
@@ -97,7 +97,6 @@
Caché de frase de contraseña
Compresión de mensaje
Compresión de archivo
- Forzar firmas OpenPGPv3 antiguas
Servidores de claves
ID de clave
Creación
@@ -585,7 +584,7 @@
Reemplazando certificado de la anterior identidad de usuario primaria
Generando nuevo certificado para nueva identidad de usuario primaria
Modificando subclave %s
- ¡Intentó operar sobre una subclave ausente %s!
+ ¡Intentó operar sobre una subclave ausente %s!
Generando nueva subclave %2$s de %1$s bits
Nueva identidad de subclave: %s
¡La fecha de expiración no puede ser del pasado!
diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml
index 3f570d144..3b356fd18 100644
--- a/OpenKeychain/src/main/res/values-fr/strings.xml
+++ b/OpenKeychain/src/main/res/values-fr/strings.xml
@@ -97,7 +97,6 @@
Cache de la phrase de passe
Compression des messages
Compression des fichiers
- Forcer les anciennes signatures OpenPGP v3
Serveurs de clefs
ID de le clef
Création
@@ -585,7 +584,7 @@
Remplacement du certificat de l\'ID d\'utilisateur principal précédent
Génération d\'un nouveau certificat pour le nouvel ID d\'utilisateur principal
Modification de la sous-clef %s
- Une action a été tentée sur la sous-clef manquante %s !
+ Une action a été tentée sur la sous-clef manquante %s !
Génération d\'une nouvelle sous-clef %2$s de %1$s bit
ID de la nouvelle sous-clef : %s
La date d\'expiration ne peut pas être dans le passé !
diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml
index 590532d4d..33bb4ce9d 100644
--- a/OpenKeychain/src/main/res/values-it/strings.xml
+++ b/OpenKeychain/src/main/res/values-it/strings.xml
@@ -77,7 +77,6 @@
Cache Frase di Accesso
Compressione Messaggio
Compressione File
- Forza vecchie Firme OpenPGPv3
Server Chiavi
ID Chiave
Creazione
@@ -525,7 +524,7 @@
Sostituzione certificato del ID utente primario precedente
Generazione di un nuovo certificato per il nuovo ID utente primario
Modifica sottochiave %s
- Tentativo di operare su sottochiave mancante %s!
+ Tentativo di operare su sottochiave mancante %s!
Generazione nuovi %1$s bit %2$s sottochiave
Nuovo ID sottochiave: %s
La data di scadenza non può essere passata!
diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml
index 6794deba9..deb7715e1 100644
--- a/OpenKeychain/src/main/res/values-ja/strings.xml
+++ b/OpenKeychain/src/main/res/values-ja/strings.xml
@@ -97,7 +97,6 @@
パスフレーズキャッシュ
メッセージの圧縮
ファイルの圧縮
- 強制的に古いOpenPGPV3形式の署名にする
鍵サーバ
鍵ID
生成
@@ -571,7 +570,7 @@
以前の主ユーザIDで証明を入れ替え中
新しい主ユーザIDで新しい証明を生成中
副鍵 %s を変更中
- 遺失した副鍵 %s の操作をしようとした!
+ 遺失した副鍵 %s の操作をしようとした!
新しい %1$s ビットの %2$s 副鍵の生成中
新しい副鍵 ID: %s
期限切れ日を過去にはできません!
diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml
index f225e204a..a49a51671 100644
--- a/OpenKeychain/src/main/res/values-nl/strings.xml
+++ b/OpenKeychain/src/main/res/values-nl/strings.xml
@@ -71,7 +71,6 @@
Wachtwoordcache
Berichtcompressie
Bestandscompressie
- Forceer oude OpenPGPv3 Handtekeningen
Sleutelservers
Sleutel-id
Aanmaak
diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml
index a4a66e30c..7b12653c6 100644
--- a/OpenKeychain/src/main/res/values-pl/strings.xml
+++ b/OpenKeychain/src/main/res/values-pl/strings.xml
@@ -59,7 +59,6 @@
Bufor haseł
Kompresja wiadomości
Kompresja plików
- Wymuś stare podpisy OpenPGPv3
Serwery kluczy
Identyfikator klucza
Utworzenia
diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml
index 2ac766466..1b2aa7dc6 100644
--- a/OpenKeychain/src/main/res/values-ru/strings.xml
+++ b/OpenKeychain/src/main/res/values-ru/strings.xml
@@ -74,7 +74,6 @@
Помнить пароль
Сжатие сообщения
Сжатие файла
- Использовать OpenPGPv3 подписи (устар.)
Серверы ключей
ID ключа
Создан
diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml
index 0de5e97ea..e98e207b5 100644
--- a/OpenKeychain/src/main/res/values-sl/strings.xml
+++ b/OpenKeychain/src/main/res/values-sl/strings.xml
@@ -74,7 +74,6 @@
Hranjenje gesla v spominu
Stiskanje sporočil
Stiskanje datotek
- Vsili stare podpise OpenPGPv3
Strežniki
ID ključa
Ustvarjanje
diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml
index 7a4c79ddb..401b8ae83 100644
--- a/OpenKeychain/src/main/res/values-uk/strings.xml
+++ b/OpenKeychain/src/main/res/values-uk/strings.xml
@@ -74,7 +74,6 @@
Кеш парольної фрази
Стиснення повідомлення
Стиснення файлу
- Примусово старі підписи OpenPGPv3
Сервери ключів
ІД ключа
Створення
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8aa10943d..f6c208ca0 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -639,7 +639,7 @@
Actual key fingerprint does not match the expected one!
No key ID. This is an internal error, please file a bug report!
Internal error, integrity check failed!
- No master certificate found to modify!
+ No master certificate found to operate on! (All revoked?)
Bad primary user id specified!
Bad user id for revocation specified!
Revoked user ids cannot be primary!
@@ -651,7 +651,7 @@
Replacing certificate of previous primary user id
Generating new certificate for new primary user id
Modifying subkey %s
- Tried to operate on missing subkey %s!
+ Tried to operate on missing subkey %s!
Generating new %1$s bit %2$s subkey
New subkey ID: %s
Expiry date cannot be in the past!
--
cgit v1.2.3
From c00343d516f1afc2d4e062d30eba07689fc3092a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Sat, 16 Aug 2014 21:04:43 +0200
Subject: modify*Key: improve handling of passphrase modification (add tests,
too)
---
OpenKeychain/src/main/res/values/strings.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f6c208ca0..5259336ec 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -644,10 +644,14 @@
Bad user id for revocation specified!
Revoked user ids cannot be primary!
Expiry time cannot be "same as before" on subkey creation. This is a programming error, please file a bug report!
+ Fatal error decrypting master key! This is likely a programming error, please file a bug report!
PGP internal exception!
Signature exception!
Modifying master certifications
- Changing passphrase
+ Changing passphrase for keyring…
+ Changing passphrase for subkey %s
+ Setting new passphrase failed, trying again with empty old passphrase
+ Passphrase for subkey could not be changed! (Does it have a different one from the other keys?)
Replacing certificate of previous primary user id
Generating new certificate for new primary user id
Modifying subkey %s
--
cgit v1.2.3
From 14290c3ce9a1cfcf2b45c47198ba44737bd5d996 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Sun, 17 Aug 2014 03:29:03 +0200
Subject: consolidate: working implementation, lacking ui
---
OpenKeychain/src/main/res/menu/key_list.xml | 6 ++++++
OpenKeychain/src/main/res/values/strings.xml | 15 +++++++++++++++
2 files changed, 21 insertions(+)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml
index 056dd5986..6e571243d 100644
--- a/OpenKeychain/src/main/res/menu/key_list.xml
+++ b/OpenKeychain/src/main/res/menu/key_list.xml
@@ -31,6 +31,12 @@
app:showAsAction="never"
android:title="@string/menu_import_existing_key" />
+
+
- Error unlocking keyring!
Unlocking keyring
+
+ Consolidating database
+ Saving secret keyrings
+ Saving public keyrings
+ Clearing database
+
+
- Reimporting one secret key
+ - Reimporting %d secret keys
+
+
+ - Reimporting one public key
+ - Reimporting %d public keys
+
+ Successfully consolidated database
+
Click to clear cached passphrases
OpenKeychain has cached %d passphrases
--
cgit v1.2.3
From 3cc57a092a7ba59390b2d892db028cc1990cdbd1 Mon Sep 17 00:00:00 2001
From: mar-v-in
Date: Sun, 17 Aug 2014 11:07:34 +0200
Subject: Remove NoSwipeWrapContentViewPager
---
OpenKeychain/src/main/res/layout/encrypt_content.xml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml
index e5edc6657..d029e7b83 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml
@@ -9,13 +9,11 @@
-
-
-
+ android:layout_height="wrap_content"
+ android:orientation="vertical" />
Date: Mon, 18 Aug 2014 11:02:41 +0200
Subject: Fixes for expiry UI
---
OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
index 062f07863..8a713115e 100644
--- a/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml
@@ -4,6 +4,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
Date: Mon, 18 Aug 2014 11:13:52 +0200
Subject: Add subkey: at least one flag should be selected!
---
OpenKeychain/src/main/res/values/strings.xml | 1 +
1 file changed, 1 insertion(+)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 51053754e..7a4f41969 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -457,6 +457,7 @@
- Revoke Subkey
new
+ Please select at least one flag!
Upload key to keyserver
--
cgit v1.2.3
From 638c29792d38dc48581c22ef4f89ef5780dad0dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Tue, 19 Aug 2014 09:52:15 +0200
Subject: Header for certs view
---
.../src/main/res/layout/view_key_activity.xml | 10 ++---
.../main/res/layout/view_key_certs_fragment.xml | 51 ++++++++++++++--------
OpenKeychain/src/main/res/values/strings.xml | 1 +
3 files changed, 39 insertions(+), 23 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index b15a73c0e..451eb30ee 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
+
+ android:layout_height="wrap_content" />
+ android:layout_marginLeft="8dp" />
diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
index 00b3f85c5..0b63abbb1 100644
--- a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
@@ -1,24 +1,39 @@
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ android:text="@string/certs_text" />
+
+
+
+
+
+
+
+
+
+
-
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 7a4f41969..8d57f6f2e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -698,6 +698,7 @@
Identity
<unknown>
No certificates for this key
+ Only certificates created with your keys and self-certificates are displayed here.
Identities to certify
Revocation Reason
Verification Status
--
cgit v1.2.3
From c1a265bfd17c6cb2fdc83403bcda6bb875c70e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Tue, 19 Aug 2014 10:01:31 +0200
Subject: certs header design
---
.../src/main/res/layout/view_key_certs_fragment.xml | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
index 0b63abbb1..1cf826b30 100644
--- a/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml
@@ -4,11 +4,19 @@
android:orientation="vertical">
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:text="@string/certs_text"
+ android:gravity="center_horizontal" />
+
+
Date: Tue, 19 Aug 2014 15:45:42 +0200
Subject: consolidate: split into two steps, can pick up at second step if
anything fails
---
OpenKeychain/src/main/res/values/strings.xml | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 8d57f6f2e..e506bf488 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -302,6 +302,8 @@
verifying integrity…
deleting \'%s\' securely…
+ reimporting database…
+
Name/Email/Key ID…
Name/Email/Proof/Key…
@@ -671,6 +673,7 @@
Consolidating database
+ Consolidation started while no database was cached! This is probably a programming error, please file a bug report.
Saving secret keyrings
Saving public keyrings
Clearing database
--
cgit v1.2.3
From 5f8bbab5694bfe1e1c45205b075481d696f34738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Tue, 19 Aug 2014 16:31:51 +0200
Subject: Scroll fixes for certify activity
---
OpenKeychain/src/main/res/layout/certify_key_activity.xml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
index bce194438..9796a6ddc 100644
--- a/OpenKeychain/src/main/res/layout/certify_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/certify_key_activity.xml
@@ -1,6 +1,5 @@
@@ -8,6 +7,7 @@
@@ -27,9 +27,9 @@
android:text="@string/section_certification_key" />
+ android:id="@+id/certify_key_spinner"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+ android:layout_height="wrap_content" />
-
--
cgit v1.2.3
From 9930ab7f6ff9400d6e3aa36ce06c663ce09be633 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser
Date: Tue, 19 Aug 2014 16:53:44 +0200
Subject: consolidate: a lot more log output, better recovery
---
OpenKeychain/src/main/res/values/strings.xml | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index e506bf488..c00449f8e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -677,15 +677,33 @@
Saving secret keyrings
Saving public keyrings
Clearing database
-
- - Reimporting one secret key
- - Reimporting %d secret keys
+ Successfully consolidated database
+ Entering critical phase
+ Leaving critical phase
+ Deleting public keyring cache file
+ Deleting secret keyring cache file
+ Error opening database!
+ IO error writing public keys to cache!
+ IO error writing secret keys to cache!
+ Error reimporting public keys!
+ Error reimporting secret keys!
+
+ - Recovering consolidation with one secret and %s public keys
+ - Recovering consolidation with %d secret and %s public keys
+ Recovering from unknown state
- Reimporting one public key
- - Reimporting %d public keys
+ - Reimporting %d public keys
- Successfully consolidated database
+ No public keys to reimport, skipping…
+
+ - Reimporting one secret key
+ - Reimporting %d secret keys
+
+ No secret keys to reimport, skipping…
+ Exception deleting public cache file
+ Exception deleting public cache file
Click to clear cached passphrases
--
cgit v1.2.3
From 16ab7610061726110f917533348f4c37a0690321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Tue, 19 Aug 2014 18:12:19 +0200
Subject: Fix strings
---
OpenKeychain/src/main/res/values/strings.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c00449f8e..1bd412d4d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -688,18 +688,18 @@
Error reimporting public keys!
Error reimporting secret keys!
- - Recovering consolidation with one secret and %s public keys
- - Recovering consolidation with %d secret and %s public keys
+ - Recovering consolidation with %1$d secret and %2$d public keys
+ - Recovering consolidation with %1$d secret and %2$d public keys
Recovering from unknown state
- Reimporting one public key
- - Reimporting %d public keys
+ - Reimporting %d public keys
No public keys to reimport, skipping…
- Reimporting one secret key
- - Reimporting %d secret keys
+ - Reimporting %d secret keys
No secret keys to reimport, skipping…
Exception deleting public cache file
--
cgit v1.2.3
From 70426041dfb828c7117b05fd25ae6d077fdd501e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?=
Date: Wed, 20 Aug 2014 11:09:41 +0200
Subject: Pull from transifex
---
.../src/main/res/raw-cs/help_nfc_beam.html | 10 +-
OpenKeychain/src/main/res/raw-cs/help_start.html | 22 +--
OpenKeychain/src/main/res/raw-cs/help_wot.html | 2 +-
.../src/main/res/raw-cs/nfc_beam_share.html | 8 +-
OpenKeychain/src/main/res/raw-de/help_start.html | 6 +-
.../src/main/res/raw-es/help_changelog.html | 140 ++++++-------
.../src/main/res/raw-fr/help_changelog.html | 6 +-
.../src/main/res/raw-it/help_changelog.html | 170 ++++++++--------
.../src/main/res/raw-ja/help_changelog.html | 4 +-
OpenKeychain/src/main/res/raw-pt/help_about.html | 54 +++++
.../src/main/res/raw-pt/help_changelog.html | 170 ++++++++++++++++
.../src/main/res/raw-pt/help_nfc_beam.html | 12 ++
OpenKeychain/src/main/res/raw-pt/help_start.html | 22 +++
OpenKeychain/src/main/res/raw-pt/help_wot.html | 17 ++
.../src/main/res/raw-pt/nfc_beam_share.html | 11 ++
OpenKeychain/src/main/res/raw-uk/help_about.html | 20 +-
.../src/main/res/raw-uk/help_changelog.html | 170 ++++++++--------
OpenKeychain/src/main/res/values-cs/strings.xml | 124 +++++++++++-
OpenKeychain/src/main/res/values-de/strings.xml | 42 +++-
OpenKeychain/src/main/res/values-es/strings.xml | 55 +++++-
OpenKeychain/src/main/res/values-et/strings.xml | 1 +
OpenKeychain/src/main/res/values-fr/strings.xml | 65 ++++--
OpenKeychain/src/main/res/values-it/strings.xml | 84 +++++++-
OpenKeychain/src/main/res/values-ja/strings.xml | 47 ++++-
OpenKeychain/src/main/res/values-nl/strings.xml | 3 +-
OpenKeychain/src/main/res/values-pl/strings.xml | 1 +
OpenKeychain/src/main/res/values-pt/strings.xml | 44 +++++
OpenKeychain/src/main/res/values-ru/strings.xml | 6 +-
OpenKeychain/src/main/res/values-sl/strings.xml | 5 +-
OpenKeychain/src/main/res/values-tr/strings.xml | 1 +
OpenKeychain/src/main/res/values-uk/strings.xml | 218 ++++++++++++++++++++-
OpenKeychain/src/main/res/values-zh/strings.xml | 1 +
32 files changed, 1203 insertions(+), 338 deletions(-)
create mode 100644 OpenKeychain/src/main/res/raw-pt/help_about.html
create mode 100644 OpenKeychain/src/main/res/raw-pt/help_changelog.html
create mode 100644 OpenKeychain/src/main/res/raw-pt/help_nfc_beam.html
create mode 100644 OpenKeychain/src/main/res/raw-pt/help_start.html
create mode 100644 OpenKeychain/src/main/res/raw-pt/help_wot.html
create mode 100644 OpenKeychain/src/main/res/raw-pt/nfc_beam_share.html
create mode 100644 OpenKeychain/src/main/res/values-pt/strings.xml
(limited to 'OpenKeychain/src/main/res')
diff --git a/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
index 88492731c..d691df871 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_nfc_beam.html
@@ -1,12 +1,12 @@
-How to receive keys
+Jak přijmout klíče
-- Go to your partners contacts and open the contact you want to share.
-- Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.
-- 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.
-- Tap the card and the content will then load on the your device.
+- Navigujte na kontakt vašeho partnera a otevřete ten který chcete sdílet.
+- Podržte dvě zařízení zády k sobě (musí se téměř dotýkat) a ucítíte vibraci.
+- Po tom co ucítíte vibraci, uvidíte že se obsah na displeji zařízení vašeho partnera změní na objekt typu karta s animací na pozadí připomínající rychlost warpu ze Star Treku.
+- Tapněte na kartu a obsach se nahraje do zařízení.
diff --git a/OpenKeychain/src/main/res/raw-cs/help_start.html b/OpenKeychain/src/main/res/raw-cs/help_start.html
index 51a76c01e..eaffc2389 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_start.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_start.html
@@ -1,22 +1,22 @@
-Getting started
-First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.
+Začínáme
+Nejprve potřebujete osobní tajný klíč. Vytvořte si ho pomocí volby v menu v sekci "Klíče" nebo importujte existující tajné klíče. Následně můžete stáhnout klíče vašich známých nebo si je vyměnit pomocí QR kódu případně NFC.
-It is recommended that you install OI File Manager for enhanced file selection and Barcode Scanner to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.
+Doporučujeme instalaci OI File Manager pro zlepšení práce se soubory a Barcode Scanner pro skenování generovaných QR kódů. Kliknutí na odkazy otevře Google Play Store nebo F-Droid odkud můžete začít installovat.
-Applications
-Several applications support OpenKeychain to encrypt/sign your private communication:
![](apps_k9)
K-9 Mail: OpenKeychain support available in current alpha build!
![](apps_conversations)
Conversations: Jabber/XMPP client
![](apps_pgpauth)
PGPAuth: App to send a PGP-signed request to a server to open or close something, e.g. a door
+Aplikace
+Několik aplikací umožňuje šifrovat/podepsat privátní komunikaci pomocí OpenKeychain:
![](apps_k9)
K-9 Mail: podpora OpenKeychain v aktualní verzi alpha build!
![](apps_conversations)
Konverzace: Jabber/XMPP client
![](apps_pgpauth)
PGPAuth: Appka sloužící k odesílání požadavků podepsaných PGP na servery pro otevření nebo zavření něčeho, třeba dveří
-I found a bug in OpenKeychain!
-Please report the bug using the issue tracker of OpenKeychain.
+Našel jsem bug v OpenChain!
+Reportujte chyby pomocí issue trackeru OpenKeychain.
-Contribute
-If you want to help us developing OpenKeychain by contributing code follow our small guide on Github.
+Přispět
+Pokud chcete pomoci vyvýjet OpenKeychain tak, že přispějete svými kodérskými schopnostmi přečtěte si naší malou příručku na Githubu.
-Translations
-Help translating OpenKeychain! Everybody can participate at OpenKeychain on Transifex.
+Překlady
+Pomozte s překladem OpenKeychain! Každý může participovat na OpenKeychain na Transifexu
diff --git a/OpenKeychain/src/main/res/raw-cs/help_wot.html b/OpenKeychain/src/main/res/raw-cs/help_wot.html
index 29790139b..30288f2bb 100644
--- a/OpenKeychain/src/main/res/raw-cs/help_wot.html
+++ b/OpenKeychain/src/main/res/raw-cs/help_wot.html
@@ -1,7 +1,7 @@
-Web of Trust
+Síť důvěry
The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.
Support in OpenKeychain
diff --git a/OpenKeychain/src/main/res/raw-cs/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-cs/nfc_beam_share.html
index 083e055c7..09128be62 100644
--- a/OpenKeychain/src/main/res/raw-cs/nfc_beam_share.html
+++ b/OpenKeychain/src/main/res/raw-cs/nfc_beam_share.html
@@ -2,10 +2,10 @@
-- Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.
-- Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.
-- 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.
-- Tap the card and the content will then load on the other person’s device.
+- Ujistěte se, že NFC je zapnuto v Nastavení > Další > NFC a ujistěte se, že Android Beam ve stejné sekci je také zapnutý.
+- Podržte dvě zařízení zády k sobě (musí se téměř dotýkat) a ucítíte vibraci.
+- Po tom co ucítíte vibraci, uvidíte že se obsah na displeji zařízení vašeho partnera změní na objekt typu karta s animací na pozadí připomínající rychlost warpu ze Star Treku.
+- Tapněte na kartu a obsach se nahraje do zařízení.
diff --git a/OpenKeychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html
index dfff2bc03..0764c9ebb 100644
--- a/OpenKeychain/src/main/res/raw-de/help_start.html
+++ b/OpenKeychain/src/main/res/raw-de/help_start.html
@@ -1,7 +1,7 @@
-Los gehts
+Los geht's
Zuerst benötigen Sie einen privaten Schlüssel. Erstellen Sie einen Schlüssel über den Eintrag "Schlüssel" im Menu oder importieren Sie bestehende private Schlüssel. Anschließend können Sie die Schlüssel ihrer Freunde runterladen oder Sie über QR-Codes oder NFC austauschen.
Es wird empfohlen, dass Sie den OI File Manager für ein verbessertes Dateihandling installieren, sowie den Barcode Scanner installieren um erstellte QR-Codes zu scannen. Die Links führen entweder zu Google Play oder zu F-Droid zur Installation.
@@ -13,10 +13,10 @@
Bitte berichten Sie Bugs mithilfe des Issue Trackers der OpenKeychain.
Unterstützen
-Wenn Sie uns bei der Entwickelung von OpenKeychain durch das Beisteuern von Code helfen wollt, schaut euch unsere kurze Anleitung auf Github an.
+Wenn Sie uns bei der Entwickelung von OpenKeychain durch das Beisteuern von Code helfen wollen, schauen Sie unsere kurze Anleitung auf Github an.
Übersetzungen
-Hilf mit OpenKeychain zu übersetzten! Jeder kann auf OpenKeychain auf Transifex mitmachen.
+Hilf mit, OpenKeychain zu übersetzten! Jeder kann auf OpenKeychain auf Transifex mitmachen.
diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html
index a6b2d269d..0530f3999 100644
--- a/OpenKeychain/src/main/res/raw-es/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw-es/help_changelog.html
@@ -7,7 +7,7 @@
Edición de clave: Tremendo nuevo diseño, revocación de clave
Importación de clave: Impresionante nuevo diseño, conexiones seguras al servidor de claves vía hkps, el servidor de claves resuelve mediante registros DNS SRV
Nueva pantalla de primer inicio
-Nueva pantalla de creación de clave: Autocompletado del nombre y correo electrónico basado en sus cuentas Android personales
+Nueva pantalla de creación: autocompletado de nombre y correo electrónico basado en sus cuentas de Android personales
Cifrado de fichero: Pasmante nuevo diseño, soporte para cifrar múltiples ficheros.
Nuevos iconos para mostrar el estado de la clave (por Brennan Novak)
Importante reparacion de fallo: Ahora es posible la importación de grandes colecciones de claves desde un fichero
@@ -33,13 +33,13 @@
Soporte para claves secretas parciales de GnuPG (gracias a Vincent Breitmoser)
Nuevo diseño para verificación de firma
Tamaño de clave personalizado (gracias a Greg Witczak)
-Fix share-functionality from other apps
+Repara la funcionalidad de compartido desde otras aplicaciones
2.5
-- Fix decryption of symmetric pgp messages/files
-- Refactored edit key screen (thanks to Ash Hughes)
-- New modern design for encrypt/decrypt screens
+- Repara el descifrado de mensajes/ficheros pgp simétricos
+- Pantalla de edición de clave refactorizada (gracias a Ash Hughes)
+- Nuevo diseño moderno para pantallas de cifrado/descifrado
- OpenPGP API versión 3 (múltiples cuentas API, reparaciones internas, comprobación de claves)
2.4
@@ -47,45 +47,45 @@
Además de varios parches pequeños, un notable número de correcciones fueron hechas por las siguientes personas (en orden alfabético):
Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.
-- New unified key list
-- Colorized key fingerprint
-- Support for keyserver ports
-- Deactivate possibility to generate weak keys
-- Much more internal work on the API
-- Certify user ids
-- Keyserver query based on machine-readable output
-- Lock navigation drawer on tablets
-- Suggestions for emails on creation of keys
-- Search in public key lists
-- And much more improvements and fixes…
+- Nueva lista unificada de claves
+- Huella de validación de clave coloreada
+- Soporte para puertos de servidores de claves
+- Desactiva la posibilidad de generar claves débiles.
+- Mucho más trabajo interno en la API
+- Certifica las identidades de usuario
+- Petición al servidor de claves basada en salida legible-por-máquina
+- Cerrar panel lateral de navegación en tabletas
+- Sugerencias para correos electrónicos al crear claves
+- Buscar en listas de claves públicas
+- Añadir muchas más mejoras y reparaciones...
2.3.1
-- Hotfix for crash when upgrading from old versions
+- Reparación para fallo al actualizar desde versiones antiguas.
2.3
-- Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)
-- Fix setting expiry dates on keys (thanks to Ash Hughes)
-- More internal fixes when editing keys (thanks to Ash Hughes)
-- Querying keyservers directly from the import screen
-- Fix layout and dialog style on Android 2.2-3.0
-- Fix crash on keys with empty user ids
-- Fix crash and empty lists when coming back from signing screen
+- Elimina la exportación innecesaria de claves públicas al exportar claves secretas (privadas) (gracias a Ash Hughes)
+- Repara el establecimiento de fechas de expiración de claves (gracias a Ash Hughes)
+- Más reparaciones internas al editar claves (gracias a Ash Hughes)
+- Realización de peticiones a los servidores de claves desde la pantalla de importación
+- Repara la disposición y el estilo del cuadro de diálogo en Android 2.2-3.0
+- Repara fallos en claves con identidades de usuario vacías
+- Repara fallos y listas vacías al volver desde la pantalla de firmado
- Bouncy Castle (librería criptográfica) actualizada de 1.47 a 1.50 y compilada desde la fuente
-- Fix upload of key from signing screen
+- Repara la subida de clave desde la pantalla de firmado
2.2
-- New design with navigation drawer
-- New public key list design
-- New public key view
-- Bug fixes for importing of keys
-- Key cross-certification (thanks to Ash Hughes)
-- Handle UTF-8 passwords properly (thanks to Ash Hughes)
-- First version with new languages (thanks to the contributors on Transifex)
-- Sharing of keys via QR Codes fixed and improved
-- Package signature verification for API
+- Nuevo diseño con panel lateral de navegación
+- Nuevo diseño de lista de claves públicas
+- Nueva vista de clave pública
+- Reparación de fallos para la importación de claves
+- Certificación-cruzada de clave (gracias a Ash Hughes)
+- Tratamiento adecuado de contraseñas UTF-8 (gracias a Ash Hughes)
+- Primera versión nuevos idiomas (gracias a los contribuidores en Transifex)
+- Compartición de claves mediante códigos QR reparada y mejorada
+- Verificación de firma de paquetes para la API
2.1.1
@@ -93,65 +93,65 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
2.1
-- Lots of bug fixes
-- New API for developers
+- Muchas reparaciones de fallos
+- Nueva API para desarrolladores
- corrección del bug PRNG por Google
2.0
-- Complete redesign
-- Share public keys via qr codes, nfc beam
-- Sign keys
-- Upload keys to server
-- Fixes import issues
-- New AIDL API
+- Rediseño completo
+- Compartido de claves públicas mediante códigos qr, nfc beam
+- Firmar claves
+- Subir claves al servidor
+- Repara problemas de importación
+- Nueva API AIDL
1.0.8
-- Basic keyserver support
+- Soporte básico de servidor de claves
- App2sd
-- More choices for pass phrase cache: 1, 2, 4, 8, hours
-- Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)
-- Bugfixes
-- Optimizations
+- Más opciones para caché de frase contraseña: 1, 2, 4, 8 horas
+- Traducciones: noruego (gracias, Sander Danielsen), chino (gracias, Zhang Fredrick)
+- Reparaciones de fallos
+- Optimizaciones
1.0.7
-- Fixed problem with signature verification of texts with trailing newline
-- More options for pass phrase cache time to live (20, 40, 60 mins)
+- Reparado un problema con la verificación de firma de textos con una nueva línea al principio
+- Más opciones para el periodo de vida en caché de la frase contraseña (20, 40, 60 mins)
1.0.6
-- Account adding crash on Froyo fixed
-- Secure file deletion
-- Option to delete key file after import
-- Stream encryption/decryption (gallery, etc.)
-- New options (language, force v3 signatures)
-- Interface changes
-- Bugfixes
+- Reparado el fallo de la adición de cuenta en Froyo
+- Borrado seguro de fichero
+- Opción para borrar fichero de clave después de importar
+- Cifrado/descifrado del stream (galería, etc.)
+- Nuevas opciones (idioma, forzar firmas v3)
+- Cambios en la interfaz
+- Reparaciones de fallos
1.0.5
- traducciones a alemán e italiano
-- Much smaller package, due to reduced BC sources
-- New preferences GUI
-- Layout adjustment for localization
-- Signature bugfix
+- Paquete mucho más pequeño, debido a fuentes de codec de bitrate (BC) reducido
+- Nueva interfaz gráfica (GUI) de prefencias
+- Ajuste de la disposición para localización
+- Reparación de firma
1.0.4
-- Fixed another crash caused by some SDK bug with query builder
+- Reparado otro fallo causado por algún fallo del kit de desarrollo de software (SDK) con el constructor de peticiones
1.0.3
-- Fixed crashes during encryption/signing and possibly key export
+- Reparados fallos durante el cifrado/firmado y posiblemente el exportado de clave
1.0.2
-- Filterable key lists
-- Smarter pre-selection of encryption keys
-- New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers
-- Fixes and additional features (key preselection) for K-9 Mail, new beta build available
+- Listas de claves filtrables
+- Pre-selección de claves de cifrado más inteligente
+- Nuevo objeto Intent que maneja VIEW y SEND (ver y enviar), permite que los ficheros sean cifrados/descifrados fuera de los administradores de ficheros.
+- Reparaciones y características adicionales (preselección de clave) para K-9 Mail, nueva versión beta disponible
1.0.1
@@ -160,11 +160,11 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
1.0.0
- integración con K-9 Mail, APG compatible con la compilación beta de K-9 Mail
-- Support of more file managers (including ASTRO)
+- Soporte de más administradores de ficheros (incluyendo ASTRO)
- traducción al esloveno
-- New database, much faster, less memory usage
-- Defined Intents and content provider for other apps
-- Bugfixes
+- Nueva base de datos, mucho más rápida, menos uso de memoria
+- Definidos objetos Intent y proveedores de contenido para otras aplicaciones
+- Reparaciones de fallos