* English grammar fixes and beautifications for the intf_UserFatal messages

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 76b294f8db0f2c74702315e0a38c39298c544f19..74e6604f97ee79316a57627da42dd63e80e339a3 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -889,7 +889,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
         msg_Err( p_this, "can't use device: %s, unsupported device type",
                  devicename.c_str() );
         intf_UserFatal( p_this, VLC_FALSE, _("Capturing failed"),
-                        _("VLC cannot use the device \"%s\", because its device "
+                        _("VLC cannot use the device \"%s\", because its "
                           "type is not supported.") );
         return VLC_EGENERIC;
     }

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 73072163883a5b989dc1476e15fafbee7fdf0fea..7638181659fd071e90a48decb36d9a478a5c5286 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -232,7 +232,7 @@ static int Open( vlc_object_t *p_this )
     {
         msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
         intf_UserFatal( p_demux, VLC_FALSE, _("Playback failure"),
-                        _("DVDRead could not open disk \"%s\"."), psz_name );
+                        _("DVDRead could not open the disk \"%s\"."), psz_name );
         free( psz_name );
         return VLC_EGENERIC;
     }

diff --git a/modules/access/file.c b/modules/access/file.c
index 52456915fd16bd37a66131a5bfd9ea5288557859..c0cbb4349d7e4d5c651fceb6d72a9b888bf6b3d0 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -279,7 +279,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
             default:
                 msg_Err (p_access, "read failed (%m)");
                 intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
-                                _("VLC could not read file."));
+                                _("VLC could not read the file."));
         }
 
         /* Delay a bit to avoid consuming all the CPU. This is particularly
@@ -431,7 +431,7 @@ static int open_file (access_t *p_access, const char *psz_name)
     {
         msg_Err( p_access, "cannot open file %s", psz_name );
         intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"),
-                        _("VLC could not open file \"%s\"."), psz_name );
+                        _("VLC could not open the file \"%s\"."), psz_name );
         free (path);
         return VLC_EGENERIC;
     }
@@ -447,7 +447,7 @@ static int open_file (access_t *p_access, const char *psz_name)
     {
         msg_Err (p_access, "cannot open file %s (%m)", psz_name);
         intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"),
-                        _("VLC could not open file \"%s\"."), psz_name);
+                        _("VLC could not open the file \"%s\"."), psz_name);
         return -1;
     }
 

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index e3ee3a1eb804e135a6634cb60532baa59e828772..84b05f365d5d50cfa65eb57010f27671dce2367b 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -424,7 +424,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
                 msg_Err( p_aout, "You should configure your speaker layout with Audio Midi Setup Utility in /Applications/Utilities. Now using Stereo mode." );
                 intf_UserFatal( p_aout, VLC_FALSE, _("Audio device is not configured"),
                                 _("You should configure your speaker layout with "
-                                  "the \"Audio Midi Setup Utility\" in /Applications/"
+                                  "the \"Audio Midi Setup\" utility in /Applications/"
                                   "Utilities. Stereo mode is being used now.") );
             }
         }

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 4d4c6a4937767aff19022d720e5b8e6a3af36491..a5910da7b47a31d0b99be35a8392ac74b345c956 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -84,7 +84,7 @@ struct intf_sys_t
     char                    *psz_nowp_file;     /**< file to which submit   */
 #endif
     vlc_bool_t              b_handshaked;       /**< are we authenticated ? */
-    char                    psz_auth_token[33]; /**< authentification token */
+    char                    psz_auth_token[33]; /**< Authentication token */
 
     /* data about song currently playing */
     audioscrobbler_song_t   p_current_song;     /**< song being played      */
@@ -274,7 +274,7 @@ static void Run( intf_thread_t *p_intf )
 
         if( b_die )
         {
-            msg_Dbg( p_intf, "audioscrobbler is dying\n");
+            msg_Dbg( p_intf, "audioscrobbler is dying");
             return;
         }
 
@@ -293,9 +293,9 @@ static void Run( intf_thread_t *p_intf )
                     /* username not set */
                     intf_UserFatal( p_intf, VLC_FALSE,
                         _("Last.fm username not set"),
-                        _("Please set an username or disable "
-                        "audioscrobbler plugin, and then restart VLC.\n"
-                        "Visit https://www.last.fm/join/ to get an account")
+                        _("Please set a username or disable the "
+                        "audioscrobbler plugin, and restart VLC.\n"
+                        "Visit http://www.last.fm/join/ to get an account.")
                     );
                     Unload( p_intf );
                     return;
@@ -418,7 +418,7 @@ static void Run( intf_thread_t *p_intf )
         p_buffer_pos = strstr( ( char * ) p_buffer, "BADSESSION" );
         if ( p_buffer_pos )
         {
-            msg_Dbg( p_intf, "Authentification failed, handshaking again" );
+            msg_Dbg( p_intf, "Authentication failed, handshaking again" );
             p_sys->b_handshaked = VLC_FALSE;
             HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
             continue;
@@ -433,11 +433,11 @@ static void Run( intf_thread_t *p_intf )
             p_sys->i_songs = 0;
             p_sys->i_interval = 0;
             time( &p_sys->next_exchange );
-            msg_Dbg( p_intf, "Submission successfull!" );
+            msg_Dbg( p_intf, "Submission successful!" );
         }
         else
         {
-            msg_Dbg( p_intf, "Authentification failed, handshaking again" );
+            msg_Dbg( p_intf, "Authentication failed, handshaking again" );
             p_sys->b_handshaked = VLC_FALSE;
             HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
             continue;
@@ -809,8 +809,8 @@ static int Handshake( intf_thread_t *p_this )
         /* authentication failed, bad username/password combination */
         intf_UserFatal( p_this, VLC_FALSE,
             _("last.fm: Authentication failed"),
-            _("last.fm Username or Password is incorrect,"
-              " please verify your settings and relaunch VLC." ) );
+            _("last.fm username or password is incorrect. "
+              "Please verify your settings and relaunch VLC." ) );
         return VLC_AUDIOSCROBBLER_EFATAL;
     }
 
@@ -819,7 +819,7 @@ static int Handshake( intf_thread_t *p_this )
     {
         /* oops, our version of vlc has been banned by last.fm servers */
         msg_Err( p_intf, "This version of VLC has been banned by last.fm. "
-                         "You should upgrade VLC, or disable last.fm plugin." );
+                         "You should upgrade VLC, or disable the last.fm plugin." );
         return VLC_AUDIOSCROBBLER_EFATAL;
     }
 

diff --git a/src/input/decoder.c b/src/input/decoder.c
index e534407d6acbb1a89f911fc0b9e7bc1d6add117f..434eb6f0034f4a5112e501f0e358d944953ad79f 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -103,10 +103,9 @@ static void DecoderUnsupportedCodec( decoder_t *p_dec, vlc_fourcc_t codec )
     msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
              "VLC probably does not support this sound or video format.",
              (char*)&codec );
-    intf_UserFatal( p_dec, VLC_FALSE, _("No suitable decoder module "
-        "for format"), _("VLC probably does not support the \"%4.4s\" "
-        "audio or video format. Unfortunately there is no way for you "
-        "to fix this."), (char*)&codec );
+    intf_UserFatal( p_dec, VLC_FALSE, _("No suitable decoder module"), 
+                    _("VLC does not support the audio or video format \"%4.4s\". "
+                      "Unfortunately there is no way for you to fix this."), (char*)&codec );
 }
 
 /* decoder_GetInputAttachment:

diff --git a/src/input/input.c b/src/input/input.c
index 4484362c63c9218908b05b098a7be529a54435ae..fdfda62b60eaad4cd9ba9fda79304ca4b9033fdd 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2363,8 +2363,8 @@ static int InputSourceInit( input_thread_t *p_input,
             msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
                      psz_access, psz_demux, psz_path );
             intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE,
-                            _("Can't recognize the input's format"),
-                            _("The format of '%s' can't be detected. "
+                            _("VLC can't recognize the input's format"),
+                            _("The format of '%s' cannot be detected. "
                             "Have a look the log for details."), psz_mrl );
             goto error;
         }