diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 19:28:46 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 19:28:46 +0200 |
| commit | c2f6aa09c587d615adefcee968371ce29ef94f14 (patch) | |
| tree | cd4114f765f61438ecea8c5af57b20abc36475f3 /OpenKeychain/src/main/res/values-es/strings.xml | |
| parent | d795f8d4e240877861ab993608fb7f5aed0a2042 (diff) | |
| parent | cb2eb8aca2e7aab6243fd3e1a3313c941e3f1998 (diff) | |
| download | open-keychain-c2f6aa09c587d615adefcee968371ce29ef94f14.tar.gz open-keychain-c2f6aa09c587d615adefcee968371ce29ef94f14.tar.bz2 open-keychain-c2f6aa09c587d615adefcee968371ce29ef94f14.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res/values-es/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values-es/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index e2b2d2e73..16d60dc82 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -572,8 +572,8 @@ <!--Keyring merging log entries--> <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_fatal_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_encode">Error fatal codificando la firma</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_found_new">Se encontraron %s nuevos certificados en el juego de claves</string> <string name="msg_mg_unchanged">No hay nuevos certificados</string> |