Changeset f907928 in dispositivos_moviles for TibisayMovil/res/values


Ignore:
Timestamp:
Oct 22, 2013, 3:53:16 PM (11 years ago)
Author:
Jose Ruiz <joseruiz@…>
Branches:
master
Children:
3fe55cf
Parents:
288126d (diff), c231890 (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:

TibisayMovil/AndroidManifest?.xml
TibisayMovil?/gen/net/neiti/droidtext/R.java
TibisayMovil?/gen/ve/gob/cenditel/tibisaymovil/R.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/CertificateRepositoryActivity.java
TibisayMovil?/src/ve/gob/cenditel/tibisaymovil/TibisayMovilActivity.java

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TibisayMovil/res/values/strings.xml

    r288126d rf907928  
    121121    <string name="verificar_titulo_lista_docs">Documento (s) firmado (s):</string>
    122122    <string name="verificar_titulo_lista_firmantes">Firmante (s):</string>
    123     <string name="title_activity_bdocverify_result">BDOCVerifyResultActivity</string>
     123    <string name="title_activity_bdocverify_result">Tibisay Móvil</string>
    124124    <string name="extracted_dir_files">ExtractedFiles</string>
     125    <string name="downloaded_dir_files">DownloadedFiles</string>
     126    <string name="certificates_dir">CertificateToEncrypt</string>
    125127    <string name="open_it_using">Abrir usando:</string>
    126128    <string name="share_it_using">Compartir usando:</string>
     
    135137    <string name="label_signature_errors">Errores en firmas:</string>
    136138    <string name="title_activity_activity_signature_errors">ActivitySignatureErrors</string>
    137 
     139    <string name="string_valid_signature">Válida</string>
     140    <string name="string_invalid_signature">Inválida</string>
     141    <string name="title_activity_tibisay_movil">TibisayMovil</string>
     142    <string name="title_activity_downloader">Tibisay Móvil</string>
     143    <string name="share_pdf_signed">Archivo Firmado</string>
     144    <string name="share_bdoc_downloaded">Archivo BDOC Descargado</string>
     145    <string name="share_extracted_file_from_bdoc">Archivo Extraído de BDOC</string>
     146    <string name="title_activity_file_to_share">FileToShareActivity</string>
     147    <string name="share_description">Seleccione el archivo a compartir</string>
     148    <string name="manage_personal_certificates">Gestionar certificados personales</string>
     149    <string name="manage_certificates_for_encryption">Gestionar certificados para cifrado</string>
     150    <string name="title_activity_encryption_certificates">EncryptionCertificatesActivity</string>
     151    <string name="label_recipient_certificate">Certificados de destinatarios</string>
     152    <string name="label_certificate_to_remove">Certificado a eliminar:</string>
     153    <string name="label_add_recipient_certificate">Agregar</string>
     154    <string name="label_remove_recipient_certificate">Eliminar</string>
     155    <string name="title_activity_certificate_to_load">CertificateToLoadActivity</string>
     156    <string name="certificate_to_load_description">Seleccione el certificado a cargar</string>
     157    <string name="title_activity_file_to_encrypt">FileToEncryptActivity</string>
     158    <string name="file_to_encrypt_description">Seleccione el archivo a cifrar</string>
     159    <string name="encrypt_description">Seleccione el archivo a cifrar</string>
     160    <string name="title_activity_select_certificate_to_encrypt">SelectCertificateToEncryptActivity</string>
     161    <string name="certificate_description">Seleccione el certificado de destinatario</string>
     162    <string name="certificate_dir_files">CertificateToEncrypt</string>
     163    <string name="encrypted_dir_files">EncryptedFiles</string>
     164    <string name="title_activity_encryption_result">EncryptionResultActivity</string>
     165   
     166    <string name="label_archivo_a_cifrar">Archivo original</string>
     167   
     168    <string name="label_archivo_cifrado">Archivo cifrado</string>
     169   
     170    <string name="label_destinatario_cifrado">Destinatario</string>
     171   
     172    <string name="msg_encryption_success">Archivo cifrado exitosamente</string>
     173    <string name="msg_encryption_error">Error:</string>
     174   
     175        <string name="share_encrypted">Archivo Cifrado</string>
     176   
     177   
    138178</resources>
Note: See TracChangeset for help on using the changeset viewer.