moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 16:38:50 -05:00
Code Issues 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-27 19:28:46 +02:00
commit c2f6aa09c5
8 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@ -496,7 +496,7 @@ public class UncachedKeyRing {
// Replace modified key in the keyring // Replace modified key in the keyring
ring = replacePublicKey(ring, modified); ring = replacePublicKey(ring, modified);
if (ring == null) { if (ring == null) {
log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent);
return null; return null;
} }
indent -= 1; indent -= 1;
@ -667,7 +667,7 @@ public class UncachedKeyRing {
// replace pubkey in keyring // replace pubkey in keyring
ring = replacePublicKey(ring, modified); ring = replacePublicKey(ring, modified);
if (ring == null) { if (ring == null) {
log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent);
return null; return null;
} }
indent -= 1; indent -= 1;
@ -712,7 +712,7 @@ public class UncachedKeyRing {
if (getMasterKeyId() != masterKeyId if (getMasterKeyId() != masterKeyId
|| !Arrays.equals(getFingerprint(), other.getFingerprint())) { || !Arrays.equals(getFingerprint(), other.getFingerprint())) {
log.add(LogLevel.ERROR, LogType.MSG_MG_HETEROGENEOUS, indent); log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_HETEROGENEOUS, indent);
return null; return null;
} }
@ -760,7 +760,7 @@ public class UncachedKeyRing {
// otherwise, just insert the public key // otherwise, just insert the public key
result = replacePublicKey(result, key); result = replacePublicKey(result, key);
if (result == null) { if (result == null) {
log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent);
return null; return null;
} }
} }
@ -792,7 +792,7 @@ public class UncachedKeyRing {
if (modified != resultKey) { if (modified != resultKey) {
result = replacePublicKey(result, modified); result = replacePublicKey(result, modified);
if (result == null) { if (result == null) {
log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent);
return null; return null;
} }
} }
@ -820,7 +820,7 @@ public class UncachedKeyRing {
if (modified != resultKey) { if (modified != resultKey) {
result = replacePublicKey(result, modified); result = replacePublicKey(result, modified);
if (result == null) { if (result == null) {
log.add(LogLevel.ERROR, LogType.MSG_MG_NO_SECRET_KEYRING, indent); log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_SECRET_DUMMY, indent);
return null; return null;
} }
} }
@ -837,7 +837,7 @@ public class UncachedKeyRing {
return new UncachedKeyRing(result); return new UncachedKeyRing(result);
} catch (IOException e) { } catch (IOException e) {
log.add(LogLevel.ERROR, LogType.MSG_MG_FATAL_ENCODE, indent); log.add(LogLevel.ERROR, LogType.MSG_MG_ERROR_ENCODE, indent);
return null; return null;
} }

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
View File

@ -333,14 +333,14 @@ public class OperationResultParcel implements Parcelable {
// keyring consolidation // keyring consolidation
MSG_MG_ERROR_SECRET_DUMMY(R.string.msg_mg_error_secret_dummy),
MSG_MG_ERROR_ENCODE(R.string.msg_mg_error_encode),
MSG_MG_ERROR_HETEROGENEOUS(R.string.msg_mg_error_heterogeneous),
MSG_MG_PUBLIC (R.string.msg_mg_public), MSG_MG_PUBLIC (R.string.msg_mg_public),
MSG_MG_SECRET (R.string.msg_mg_secret), MSG_MG_SECRET (R.string.msg_mg_secret),
MSG_MG_FATAL_ENCODE (R.string.msg_mg_fatal_encode),
MSG_MG_HETEROGENEOUS (R.string.msg_mg_heterogeneous),
MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey), MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey),
MSG_MG_FOUND_NEW (R.string.msg_mg_found_new), MSG_MG_FOUND_NEW (R.string.msg_mg_found_new),
MSG_MG_UNCHANGED (R.string.msg_mg_unchanged), MSG_MG_UNCHANGED (R.string.msg_mg_unchanged),
MSG_MG_NO_SECRET_KEYRING (R.string.msg_mg_no_secret_keyring),
// secret key create // secret key create
MSG_CR (R.string.msg_cr), MSG_CR (R.string.msg_cr),

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

@ -572,8 +572,8 @@
<!--Keyring merging log entries--> <!--Keyring merging log entries-->
<string name="msg_mg_public">Incorporándolas en el juego de claves públicas %s</string> <string name="msg_mg_public">Incorporándolas en el juego de claves públicas %s</string>
<string name="msg_mg_secret">Incorporándolas en el juego de claves secretas (privadas) %s</string> <string name="msg_mg_secret">Incorporándolas en el juego de claves secretas (privadas) %s</string>
<string name="msg_mg_fatal_encode">Error fatal codificando la firma</string> <string name="msg_mg_error_encode">Error fatal codificando la firma</string>
<string name="msg_mg_heterogeneous">¡Se intentaron fusionar juegos de claves con diferentes huellas de validación de claves!</string> <string name="msg_mg_error_heterogeneous">¡Se intentaron fusionar juegos de claves con diferentes huellas de validación de claves!</string>
<string name="msg_mg_new_subkey">Añadiendo nueva subclave %s</string> <string name="msg_mg_new_subkey">Añadiendo nueva subclave %s</string>
<string name="msg_mg_found_new">Se encontraron %s nuevos certificados en el juego de claves</string> <string name="msg_mg_found_new">Se encontraron %s nuevos certificados en el juego de claves</string>
<string name="msg_mg_unchanged">No hay nuevos certificados</string> <string name="msg_mg_unchanged">No hay nuevos certificados</string>

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

@ -572,8 +572,8 @@
<!--Keyring merging log entries--> <!--Keyring merging log entries-->
<string name="msg_mg_public">Fusion vers le trousseau public %s</string> <string name="msg_mg_public">Fusion vers le trousseau public %s</string>
<string name="msg_mg_secret">Fusion vers le trousseau secret %s</string> <string name="msg_mg_secret">Fusion vers le trousseau secret %s</string>
<string name="msg_mg_fatal_encode">Erreur fatale lors de l\'encodage de la signature</string> <string name="msg_mg_error_encode">Erreur fatale lors de l\'encodage de la signature</string>
<string name="msg_mg_heterogeneous">Il a été tenté de fusionner des trousseaux avec des empreintes différentes !</string> <string name="msg_mg_error_heterogeneous">Il a été tenté de fusionner des trousseaux avec des empreintes différentes !</string>
<string name="msg_mg_new_subkey">Ajout de la nouvelle sous-clef %s</string> <string name="msg_mg_new_subkey">Ajout de la nouvelle sous-clef %s</string>
<string name="msg_mg_found_new">%s nouveaux certificats trouvés dans le trousseau</string> <string name="msg_mg_found_new">%s nouveaux certificats trouvés dans le trousseau</string>
<string name="msg_mg_unchanged">Aucun nouveau certificat</string> <string name="msg_mg_unchanged">Aucun nouveau certificat</string>

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

@ -572,8 +572,8 @@
<!--Keyring merging log entries--> <!--Keyring merging log entries-->
<string name="msg_mg_public">Fusione nel portachiavi pubblico %s</string> <string name="msg_mg_public">Fusione nel portachiavi pubblico %s</string>
<string name="msg_mg_secret">Fusione nel portachiavi privato %s</string> <string name="msg_mg_secret">Fusione nel portachiavi privato %s</string>
<string name="msg_mg_fatal_encode">Errore fatale nella codifica della firma</string> <string name="msg_mg_error_encode">Errore fatale nella codifica della firma</string>
<string name="msg_mg_heterogeneous">Tentativo di unire portachiavi con impronte digitali diverse!</string> <string name="msg_mg_error_heterogeneous">Tentativo di unire portachiavi con impronte digitali diverse!</string>
<string name="msg_mg_new_subkey">Aggiunta nuova sottochiave %s</string> <string name="msg_mg_new_subkey">Aggiunta nuova sottochiave %s</string>
<string name="msg_mg_found_new">Trovati %s nuovi certificati nel portachiavi</string> <string name="msg_mg_found_new">Trovati %s nuovi certificati nel portachiavi</string>
<string name="msg_mg_unchanged">Nessun nuovo certificato</string> <string name="msg_mg_unchanged">Nessun nuovo certificato</string>

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

@ -555,8 +555,8 @@
<!--Keyring merging log entries--> <!--Keyring merging log entries-->
<string name="msg_mg_public">公開鍵の鍵輪 %s にマージ中</string> <string name="msg_mg_public">公開鍵の鍵輪 %s にマージ中</string>
<string name="msg_mg_secret">秘密鍵の鍵輪 %s にマージ中</string> <string name="msg_mg_secret">秘密鍵の鍵輪 %s にマージ中</string>
<string name="msg_mg_fatal_encode">署名のエンコードでの致命的なエラー</string> <string name="msg_mg_error_encode">署名のエンコードでの致命的なエラー</string>
<string name="msg_mg_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string> <string name="msg_mg_error_heterogeneous">指紋が異なる鍵輪をマージしようとしています!</string>
<string name="msg_mg_new_subkey">新しい副鍵 %s を追加中</string> <string name="msg_mg_new_subkey">新しい副鍵 %s を追加中</string>
<string name="msg_mg_found_new">鍵輪に新しい検証を %s 発見</string> <string name="msg_mg_found_new">鍵輪に新しい検証を %s 発見</string>
<string name="msg_mg_unchanged">新しい証明がない</string> <string name="msg_mg_unchanged">新しい証明がない</string>

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

@ -552,8 +552,8 @@
<!--Keyring merging log entries--> <!--Keyring merging log entries-->
<string name="msg_mg_public">Злиття у публічну в\'язку %s</string> <string name="msg_mg_public">Злиття у публічну в\'язку %s</string>
<string name="msg_mg_secret">Злиття у секретну в\'язку %s</string> <string name="msg_mg_secret">Злиття у секретну в\'язку %s</string>
<string name="msg_mg_fatal_encode">Фатальна помилка шифрування підпису</string> <string name="msg_mg_error_encode">Фатальна помилка шифрування підпису</string>
<string name="msg_mg_heterogeneous">Спробували злити в\'язки із різними відбитками!</string> <string name="msg_mg_error_heterogeneous">Спробували злити в\'язки із різними відбитками!</string>
<string name="msg_mg_new_subkey">Додається новий підключ %s</string> <string name="msg_mg_new_subkey">Додається новий підключ %s</string>
<string name="msg_mg_found_new">Знайдено %s нових сертифікатів у в\'язці</string> <string name="msg_mg_found_new">Знайдено %s нових сертифікатів у в\'язці</string>
<string name="msg_mg_unchanged">Немає нових сертифікатів</string> <string name="msg_mg_unchanged">Немає нових сертифікатів</string>

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

@ -500,6 +500,8 @@
<string name="cert_verify_error">error!</string> <string name="cert_verify_error">error!</string>
<string name="cert_verify_unavailable">key unavailable</string> <string name="cert_verify_unavailable">key unavailable</string>
<!-- LogType log messages. Errors should have _ERROR_ in their name and end with a ! -->
<!-- Import Public log entries --> <!-- Import Public log entries -->
<string name="msg_ip_apply_batch">Applying insert batch operation.</string> <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> <string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string>
@ -620,14 +622,14 @@
<string name="msg_kc_uid_dup">Removing duplicate user id "%s". The secret key contained two of them. This may result in missing certifications!</string> <string name="msg_kc_uid_dup">Removing duplicate user id "%s". The secret key contained two of them. This may result in missing certifications!</string>
<!-- Keyring merging log entries --> <!-- Keyring merging log entries -->
<string name="msg_mg_error_secret_dummy">New public subkey found, but secret subkey dummy generation is not supported!</string>
<string name="msg_mg_error_heterogeneous">Tried to merge keyrings with differing fingerprints!</string>
<string name="msg_mg_error_encode">Fatal error encoding signature!</string>
<string name="msg_mg_public">Merging into public keyring %s</string> <string name="msg_mg_public">Merging into public keyring %s</string>
<string name="msg_mg_secret">Merging into secret keyring %s</string> <string name="msg_mg_secret">Merging into secret keyring %s</string>
<string name="msg_mg_fatal_encode">Fatal error encoding signature</string>
<string name="msg_mg_heterogeneous">Tried to merge keyrings with differing fingerprints!</string>
<string name="msg_mg_new_subkey">Adding new subkey %s</string> <string name="msg_mg_new_subkey">Adding new subkey %s</string>
<string name="msg_mg_found_new">Found %s new certificates in keyring</string> <string name="msg_mg_found_new">Found %s new certificates in keyring</string>
<string name="msg_mg_unchanged">No new certificates</string> <string name="msg_mg_unchanged">No new certificates</string>
<string name="msg_mg_no_secret_keyring">No secret keyring to add subkey to</string>
<!-- createSecretKeyRing --> <!-- createSecretKeyRing -->
<string name="msg_cr">Generating new master key</string> <string name="msg_cr">Generating new master key</string>