Changeset 38b5e7cd2d56cd54dd595e574a88d8a834c09320

Show
Ignore:
Timestamp:
13/11/04 13:19:06 (4 years ago)
Author:
Clément Stenac <zorglub@videolan.org>
git-committer:
Clément Stenac <zorglub@videolan.org> 1100348346 +0000
git-parent:

[4ef4f8dd590e3a7a5a538c40330a28d66689e5fc]

git-author:
Clément Stenac <zorglub@videolan.org> 1100348346 +0000
Message:

Merge string fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/access_output/http.c

    r5aa8d01 r38b5e7c  
    5454#define MIME_TEXT N_("Mime") 
    5555#define MIME_LONGTEXT N_("Allows you to give the mime returned by the server." ) 
     56 
    5657#define CERT_TEXT N_( "Certificate file" ) 
    57 #define CERT_LONGTEXT N_( "HTTP/SSL stream output x509 PEM certificate file" ) 
     58#define CERT_LONGTEXT N_( "Path to the x509 PEM certificate file that will "\ 
     59                          "be used by the HTTP/SSL stream output" ) 
    5860#define KEY_TEXT N_( "Private key file" ) 
    59 #define KEY_LONGTEXT N_( "HTTP/SSL stream output x509 PEM private key file" ) 
     61#define KEY_LONGTEXT N_( "Path to the x509 PEM private key file that will " \ 
     62                         " be used by the HTTP/SSL stream output. Leave " \ 
     63                         "empty if you don't have one." ) 
    6064#define CA_TEXT N_( "Root CA file" ) 
    61 #define CA_LONGTEXT N_( "HTTP/SSL stream output x509 PEM trusted root CA certificates file" ) 
     65#define CA_LONGTEXT N_( "Path to the x509 PEM trusted root CA certificates " \ 
     66                        "(certificate authority) file that will be used by " \ 
     67                        "the HTTP/SSL stream output. Leave empty if you " \ 
     68                        "don't have one." ) 
    6269#define CRL_TEXT N_( "CRL file" ) 
    63 #define CRL_LONGTEXT N_( "HTTP/SSL stream output Certificates Revocation List file" ) 
     70#define CRL_LONGTEXT N_( "Path to the x509 PEM Certificates Revocation List " \ 
     71                         "file that will be HTTP/SSL stream output. Leave " \ 
     72                         "empty if you don't have one." ) 
    6473 
    6574vlc_module_begin(); 
     
    6978    add_shortcut( "https" ); 
    7079    add_shortcut( "mmsh" ); 
    71     add_string( SOUT_CFG_PREFIX "user", "", NULL, USER_TEXT, USER_LONGTEXT, VLC_TRUE ); 
    72     add_string( SOUT_CFG_PREFIX "pwd", "", NULL, PASS_TEXT, PASS_LONGTEXT, VLC_TRUE ); 
    73     add_string( SOUT_CFG_PREFIX "mime", "", NULL, MIME_TEXT, MIME_LONGTEXT, VLC_TRUE ); 
    74     add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL, CERT_TEXT, CERT_LONGTEXT, VLC_TRUE ); 
    75     add_string( SOUT_CFG_PREFIX "key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, VLC_TRUE ); 
    76     add_string( SOUT_CFG_PREFIX "ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, VLC_TRUE ); 
    77     add_string( SOUT_CFG_PREFIX "crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, VLC_TRUE ); 
     80    add_string( SOUT_CFG_PREFIX "user", "", NULL, 
     81                USER_TEXT, USER_LONGTEXT, VLC_TRUE ); 
     82    add_string( SOUT_CFG_PREFIX "pwd", "", NULL, 
     83                PASS_TEXT, PASS_LONGTEXT, VLC_TRUE ); 
     84    add_string( SOUT_CFG_PREFIX "mime", "", NULL, 
     85                MIME_TEXT, MIME_LONGTEXT, VLC_TRUE ); 
     86    add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL, 
     87                CERT_TEXT, CERT_LONGTEXT, VLC_TRUE ); 
     88    add_string( SOUT_CFG_PREFIX "key", NULL, NULL, 
     89                KEY_TEXT, KEY_LONGTEXT, VLC_TRUE ); 
     90    add_string( SOUT_CFG_PREFIX "ca", NULL, NULL, 
     91                CA_TEXT, CA_LONGTEXT, VLC_TRUE ); 
     92    add_string( SOUT_CFG_PREFIX "crl", NULL, NULL, 
     93                CRL_TEXT, CRL_LONGTEXT, VLC_TRUE ); 
    7894    set_callbacks( Open, Close ); 
    7995vlc_module_end(); 
  • modules/codec/x264.c

    rc2731db r38b5e7c  
    6464 
    6565#define KEYINT_TEXT N_("Sets maximum interval between I frames") 
    66 #define KEYINT_LONGTEXT N_( "Larger values save bits, thus improve quality, "
    67     "at the cost of seeking precision." ) 
     66#define KEYINT_LONGTEXT N_( "Larger values save bits, thus improve quality "
     67    "for a given bitrate, at the cost of seeking precision." ) 
    6868 
    6969#define IDRINT_TEXT N_("IDR frames") 
  • modules/control/http.c

    red49737 r38b5e7c  
    8080#define SRC_LONGTEXT N_( "Source directory" ) 
    8181#define CERT_TEXT N_( "Certificate file" ) 
    82 #define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file (enables SSL)" ) 
     82#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file " \ 
     83                          "(enables SSL)" ) 
    8384#define KEY_TEXT N_( "Private key file" ) 
    8485#define KEY_LONGTEXT N_( "HTTP interface x509 PEM private key file" ) 
    8586#define CA_TEXT N_( "Root CA file" ) 
    86 #define CA_LONGTEXT N_( "HTTP interface x509 PEM trusted root CA certificates file" ) 
     87#define CA_LONGTEXT N_( "HTTP interface x509 PEM trusted root CA " \ 
     88                        "certificates file" ) 
    8789#define CRL_TEXT N_( "CRL file" ) 
    8890#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file" ) 
  • modules/misc/gnutls.c

    r17ae484 r38b5e7c  
    3030 */ 
    3131 
    32   
     32 
    3333/***************************************************************************** 
    3434 * Preamble 
     
    5454#define DH_BITS_TEXT N_("Diffie-Hellman prime bits") 
    5555#define DH_BITS_LONGTEXT N_( \ 
    56     "Allows you to modify the Diffie-Hellman prime's number of bits" \ 
     56    "Allows you to modify the Diffie-Hellman prime's number of bits " \ 
    5757    "(used for TLS or SSL-based server-side encryption)." ) 
    5858 
     
    586586} 
    587587 
    588 static struct gcry_thread_cbs gcry_threads_vlc =                         
     588static struct gcry_thread_cbs gcry_threads_vlc = 
    589589{ 
    590590    GCRY_THREAD_OPTION_USER,