Consistent strings to avoid duplications

modules/access/dsm/access.c

@@ -55,12 +55,12 @@ static void Close( vlc_object_t * );
 
 #define vlc_sd_probe_Open bdsm_sd_probe_Open
 
-#define USER_TEXT N_("SMB user name")
-#define USER_LONGTEXT N_("User name that will " \
-    "be used for the connection. username in uri take precedence over this")
-#define PASS_TEXT N_("SMB password")
-#define PASS_LONGTEXT N_("Password that will be " \
-    "used for the connection. Password in uri take precedence over this.")
+#define USER_TEXT N_("Username")
+#define USER_LONGTEXT N_("Username that will be used for the connection, " \
+        "if no username is set in the URL.")
+#define PASS_TEXT N_("Password")
+#define PASS_LONGTEXT N_("Password that will be used for the connection, " \
+        "if no username or password are set in URL.")
 #define DOMAIN_TEXT N_("SMB domain")
 #define DOMAIN_LONGTEXT N_("Domain/Workgroup that " \
     "will be used for the connection. Domain of uri will also be tried.")

modules/access/ftp.c

@@ -62,12 +62,12 @@ static int  OutOpen ( vlc_object_t * );
 static void OutClose( vlc_object_t * );
 #endif
 
-#define USER_TEXT N_("FTP user name")
-#define USER_LONGTEXT N_("User name that will " \
-    "be used for the connection.")
-#define PASS_TEXT N_("FTP password")
-#define PASS_LONGTEXT N_("Password that will be " \
-    "used for the connection.")
+#define USER_TEXT N_("Username")
+#define USER_LONGTEXT N_("Username that will be used for the connection, " \
+        "if no username is set in the URL.")
+#define PASS_TEXT N_("Password")
+#define PASS_LONGTEXT N_("Password that will be used for the connection, " \
+        "if no username or password are set in URL.")
 #define ACCOUNT_TEXT N_("FTP account")
 #define ACCOUNT_LONGTEXT N_("Account that will be " \
     "used for the connection.")

modules/access/live555.cpp

@@ -85,10 +85,10 @@ static void Close( vlc_object_t * );
     "of RTSP. Selecting this parameter will tell VLC to assume some " \
     "options contrary to RFC 2326 guidelines.")
 
-#define USER_TEXT N_("RTSP user name")
+#define USER_TEXT N_("Username")
 #define USER_LONGTEXT N_("Sets the username for the connection, " \
     "if no username or password are set in the url.")
-#define PASS_TEXT N_("RTSP password")
+#define PASS_TEXT N_("Password")
 #define PASS_LONGTEXT N_("Sets the password for the connection, " \
     "if no username or password are set in the url.")
 #define FRAME_BUFFER_SIZE_TEXT N_("RTSP frame buffer size")

modules/access/rdp.c

@@ -62,9 +62,13 @@
 # include <poll.h>
 #endif
 
-#define RDP_USER N_("RDP auth username")
-#define RDP_PASSWORD N_("RDP auth password")
-#define RDP_PASSWORD_LONGTEXT N_("RDP Password")
+#define USER_TEXT N_("Username")
+#define USER_LONGTEXT N_("Username that will be used for the connection, " \
+        "if no username is set in the URL.")
+#define PASS_TEXT N_("Password")
+#define PASS_LONGTEXT N_("Password that will be used for the connection, " \
+        "if no username or password are set in URL.")
+
 #define RDP_ENCRYPT N_("Encrypted connexion")
 #define RDP_FPS N_("Frame rate")
 #define RDP_FPS_LONGTEXT N_("Acquisition rate (in fps)")
@@ -85,9 +89,9 @@ vlc_module_begin()
     set_description( N_("RDP Remote Desktop") )
     set_capability( "access_demux", 0 )
 
-    add_string( CFG_PREFIX "user", NULL, RDP_USER, RDP_USER, false )
+    add_string( CFG_PREFIX "user", NULL, USER_TEXT, USER_LONGTEXT, false )
         change_safe()
-    add_password( CFG_PREFIX "password", NULL, RDP_PASSWORD, RDP_PASSWORD_LONGTEXT, false )
+    add_password( CFG_PREFIX "password", NULL, PASS_TEXT, PASS_LONGTEXT, false )
         change_safe()
     add_float( CFG_PREFIX "fps", 5, RDP_FPS, RDP_FPS_LONGTEXT, true )
 

modules/access/sftp.c

@@ -52,12 +52,12 @@ static void Close( vlc_object_t* );
 #define PORT_LONGTEXT N_("SFTP port number to use on the server")
 #define MTU_TEXT N_("Read size")
 #define MTU_LONGTEXT N_("Size of the request for reading access")
-#define USER_TEXT N_("SFTP user name")
-#define USER_LONGTEXT N_("Sets the username for the connection, " \
-    "if no username or password are set in the url.")
-#define PASS_TEXT N_("SFTP password")
-#define PASS_LONGTEXT N_("Sets the password for the connection, " \
-    "if no username or password are set in the url.")
+#define USER_TEXT N_("Username")
+#define USER_LONGTEXT N_("Username that will be used for the connection, " \
+        "if no username is set in the URL.")
+#define PASS_TEXT N_("Password")
+#define PASS_LONGTEXT N_("Password that will be used for the connection, " \
+        "if no username or password are set in URL.")
 
 vlc_module_begin ()
     set_shortname( "SFTP" )

modules/access/smb.c

@@ -53,12 +53,12 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#define USER_TEXT N_("SMB user name")
-#define USER_LONGTEXT N_("User name that will " \
-    "be used for the connection.")
-#define PASS_TEXT N_("SMB password")
-#define PASS_LONGTEXT N_("Password that will be " \
-    "used for the connection.")
+#define USER_TEXT N_("Username")
+#define USER_LONGTEXT N_("Username that will be used for the connection, " \
+        "if no username is set in the URL.")
+#define PASS_TEXT N_("Password")
+#define PASS_LONGTEXT N_("Password that will be used for the connection, " \
+        "if no username or password are set in URL.")
 #define DOMAIN_TEXT N_("SMB domain")
 #define DOMAIN_LONGTEXT N_("Domain/Workgroup that " \
     "will be used for the connection.")

modules/access_output/http.c

@@ -50,7 +50,7 @@ static void Close( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-http-"
 
 #define USER_TEXT N_("Username")
-#define USER_LONGTEXT N_("User name that will be " \
+#define USER_LONGTEXT N_("Username that will be " \
                          "requested to access the stream." )
 #define PASS_TEXT N_("Password")
 #define PASS_LONGTEXT N_("Password that will be " \

modules/gui/macosx/coredialogs.m

@@ -56,7 +56,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 
 -(void)awakeFromNib
 {
-    [o_auth_login_txt setStringValue: _NS("User name")];
+    [o_auth_login_txt setStringValue: _NS("Username")];
     [o_auth_pw_txt setStringValue: _NS("Password")];
     [o_auth_cancel_btn setTitle: _NS("Cancel")];
     [o_auth_ok_btn setTitle: _NS("OK")];

modules/gui/macosx/simple_prefs.m

@@ -313,7 +313,7 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
     [o_audio_lang_txt setStringValue: _NS("Preferred Audio language")];
     [o_audio_last_ckb setTitle: _NS("Enable Last.fm submissions")];
     [o_audio_lastpwd_txt setStringValue: _NS("Password")];
-    [o_audio_lastuser_txt setStringValue: _NS("User name")];
+    [o_audio_lastuser_txt setStringValue: _NS("Username")];
     [o_audio_spdif_ckb setTitle: _NS("Use S/PDIF when available")];
     [o_audio_visual_txt setStringValue: _NS("Visualization")];
     [o_audio_autosavevol_yes_bcell setTitle: _NS("Keep audio level between sessions")];

modules/gui/macosx_dialog_provider/VLCLoginPanel.m

@@ -78,7 +78,7 @@
     s_rc.size.width = 129;
     _userNameLabel = [[NSTextField alloc] initWithFrame:s_rc];
     [_userNameLabel setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
-    [_userNameLabel setStringValue:@"User Name"];
+    [_userNameLabel setStringValue:@"Username"];
     [_userNameLabel setBezeled:NO];
     [_userNameLabel setEditable:NO];
     [_userNameLabel setSelectable:NO];

modules/gui/qt4/dialogs/external.cpp

@@ -104,13 +104,13 @@ void DialogHandler::requestLogin (void *value)
     dialog->setWindowRole ("vlc-login");
     layout->setMargin (2);
 
-    /* User name and password fields */
+    /* Username and password fields */
     QWidget *panel = new QWidget (dialog);
     QGridLayout *grid = new QGridLayout;
     grid->addWidget (new QLabel (qfu(data->message)), 0, 0, 1, 2);
 
     QLineEdit *userLine = new QLineEdit;
-    grid->addWidget (new QLabel (qtr("User name")), 1, 0);
+    grid->addWidget (new QLabel (qtr("Username")), 1, 0);
     grid->addWidget (userLine, 1, 1);
 
     QLineEdit *passLine = new QLineEdit;

modules/stream_out/rtp.c

@@ -173,7 +173,7 @@ static const char *const ppsz_protocols[] = {
     "minute)." )
 
 #define RTSP_USER_TEXT N_("Username")
-#define RTSP_USER_LONGTEXT N_("User name that will be " \
+#define RTSP_USER_LONGTEXT N_("Username that will be " \
                               "requested to access the stream." )
 #define RTSP_PASS_TEXT N_("Password")
 #define RTSP_PASS_LONGTEXT N_("Password that will be " \