diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
| commit | 7dd5e2235339401b44eda13b124f3482472539d4 (patch) | |
| tree | d7f1e6ad18a258e6467a75731ab44968fe005c9a /OpenKeychain/src/main/res/values-es-rMX/strings.xml | |
| parent | a2dcb579ff5d3565e7e6c6afe37878855361595b (diff) | |
| parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
| download | open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.gz open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.bz2 open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.zip | |
Merge branch 'master' into backup-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
extern/openpgp-api-lib
Diffstat (limited to 'OpenKeychain/src/main/res/values-es-rMX/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values-es-rMX/strings.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/res/values-es-rMX/strings.xml b/OpenKeychain/src/main/res/values-es-rMX/strings.xml index fb73ac050..4110883e1 100644 --- a/OpenKeychain/src/main/res/values-es-rMX/strings.xml +++ b/OpenKeychain/src/main/res/values-es-rMX/strings.xml @@ -81,7 +81,6 @@ <string name="btn_add_files">Agregar archivo(s)</string> <string name="btn_share_decrypted_text">Compartir</string> <string name="btn_open_with">Abrir con...</string> - <string name="btn_copy_decrypted_text">Copiar texto descifrado</string> <string name="btn_decrypt_clipboard">Leer desde el portapapeles</string> <string name="btn_decrypt_files">Elegir archivo de entrada</string> <string name="btn_encrypt_files">Cifrar archivos</string> @@ -204,21 +203,11 @@ <string name="choice_8hours">8 horas</string> <string name="choice_forever">para siempre</string> <string name="choice_select_cert">Elija una clave</string> - <string name="dsa">DSA</string> - <string name="elgamal">ElGamal</string> - <string name="rsa">RSA</string> - <string name="ecdh">ECDH</string> - <string name="ecdsa">ECDSA</string> <string name="filemanager_title_open">Abrir...</string> <string name="error">Error</string> <string name="error_message">Error: %s</string> <string name="theme_dark">Oscuro</string> <string name="theme_light">Claro</string> - <!--key flags--> - <string name="flag_certify">Certificar</string> - <string name="flag_sign">Firmar</string> - <string name="flag_encrypt">Cifrar</string> - <string name="flag_authenticate">Autenticar</string> <!--sentences--> <string name="wrong_passphrase">Contraseña incorrecta.</string> <string name="no_filemanager_installed">No hay instalado un administrador de archivos compatible.</string> |