Consistent strings to avoid duplications

diff --git a/modules/access/dsm/access.c b/modules/access/dsm/access.c
index b50d8ee539451b8506ae304cfbe8c502e3ddc967..6e30adc13970b181c2268eb4b729480a8d210a55 100644 (file)
--- a/modules/access/dsm/access.c
+++ b/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.")

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 5224e7eb0d751a19eae4ea8580b83d5e0f96b194..e0dc37124f12714a628ea2e897deef2a8d9691dd 100644 (file)
--- a/modules/access/ftp.c
+++ b/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.")

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index ececbaf88c9db9193c6ee89a8fa6259fe9d5330c..a3faa77bbe1c9e64f10f9818949abb2cbbf25be6 100644 (file)
--- a/modules/access/live555.cpp
+++ b/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")

diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index 769ba6033b0183ee86d939fbcf4689b1d7fdf15e..2bb27fe130f34c0077f4b991566cb972468e017c 100644 (file)
--- a/modules/access/rdp.c
+++ b/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 )
 

diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index cbe9a5ccbddcf3561919178a1e4eb35d05fcd660..46499dab9b123ebceecda2a7cbd0eef97836e53a 100644 (file)
--- a/modules/access/sftp.c
+++ b/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" )

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 60b26ee4a46340d3d178a87e650326849f64da09..f738f209c7ecfc0166776126130937f857e12643 100644 (file)
--- a/modules/access/smb.c
+++ b/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.")

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 290c0f30a451dd63c1d052897e9bc2ffd0116788..f85eb42161cb2cab9da05480fb34667baaabad18 100644 (file)
--- a/modules/access_output/http.c
+++ b/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 " \

diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index 3289e6b9ef0e4024c22226dfee1c023f33da3ff1..fd51456e8828ec4d3f771a5801b63cc7c9f0ad21 100644 (file)
--- a/modules/gui/macosx/coredialogs.m
+++ b/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")];

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index f2e5ffcc9f46ec790f24f51bc72aef3e7d91c95c..8697769e154f2d0d8b63b9f54d37cb2b6a4ae289 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/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")];

diff --git a/modules/gui/macosx_dialog_provider/VLCLoginPanel.m b/modules/gui/macosx_dialog_provider/VLCLoginPanel.m
index 568a636f2366a577b42c676f00c0973219a7c991..5bf7953d17d7b74eab826e31e04fc46d491d4310 100644 (file)
--- a/modules/gui/macosx_dialog_provider/VLCLoginPanel.m
+++ b/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];

diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp
index 86a234f2788313c9e8efb4230c1ebba1b30f0bd2..39164a9d6c2ccc3e3c5815881292801cb3761eb9 100644 (file)
--- a/modules/gui/qt4/dialogs/external.cpp
+++ b/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;

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 1c0b1c27fac3f41b0fc35c22d568922b150344b7..6a701242f26ba7edc5d2bdd496a60668908f759b 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/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 " \