Changeset df1c09f in dispositivos_moviles for TibisayMovil/res/values

Timestamp:

Oct 23, 2013, 5:11:04 PM (11 years ago)

Author:

Antonio Araujo Brett <aaraujo@…>

Branches:

master

Children:

bed5c59

Parents:

292b560 (diff), e61e3a6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of https://tibisay.cenditel.gob.ve/trac/scm/git/dispositivos_moviles

Conflicts:

.gitignore

File:

• TibisayMovil/res/values/strings.xml (modified) (1 diff)

TibisayMovil/res/values/strings.xml

@@ -163 +163 @@
     <string name="encrypted_dir_files">EncryptedFiles</string>
     <string name="title_activity_encryption_result">EncryptionResultActivity</string>
-    
     <string name="label_archivo_a_cifrar">Archivo original</string>
-    
     <string name="label_archivo_cifrado">Archivo cifrado</string>
-    
     <string name="label_destinatario_cifrado">Destinatario</string>
-    
     <string name="msg_encryption_success">Archivo cifrado exitosamente</string>
     <string name="msg_encryption_error">Error:</string>
-    
-        <string name="share_encrypted">Archivo Cifrado</string>
+    <string name="share_encrypted">Archivo Cifrado</string>
+    <string name="title_activity_file_to_decrypt">FileToDecryptActivity</string>
+    <string name="decrypt_description">Seleccione el archivo a descifrar</string>
+    <string name="title_activity_pkcs12_to_decrypt">PKCS12ToDecryptActivity</string>
+    <string name="pkcs12_to_decrypt_description">Seleccione el archivo .p12 que protege su clave</string>
+    <string name="decrypted_dir_files">DecryptedFiles</string>
+    <string name="title_pkcs12_password">Introduzca la contraseña:</string>
+    <string name="error_decrypting_file_index_out_of_bounds">La clave privada no coincide con el certificado destinatario.</string>
+    <string name="title_activity_decrypt_result">DecryptResultActivity</string>
+    <string name="title_activity_decryption_result">DecryptionResultActivity</string>
+
+    <string name="label_archivo_a_descifrar">Archivo a descifrar</string>
+    <string name="label_archivo_descifrado">Archivo original</string>