Commit 42ee1b38 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

* English grammar fixes and beautifications for the intf_UserFatal messages

parent e10d4311
...@@ -889,7 +889,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys, ...@@ -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", msg_Err( p_this, "can't use device: %s, unsupported device type",
devicename.c_str() ); devicename.c_str() );
intf_UserFatal( p_this, VLC_FALSE, _("Capturing failed"), 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.") ); "type is not supported.") );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -232,7 +232,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -232,7 +232,7 @@ static int Open( vlc_object_t *p_this )
{ {
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name ); msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
intf_UserFatal( p_demux, VLC_FALSE, _("Playback failure"), 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 ); free( psz_name );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
......
...@@ -279,7 +279,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) ...@@ -279,7 +279,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len )
default: default:
msg_Err (p_access, "read failed (%m)"); msg_Err (p_access, "read failed (%m)");
intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), 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 /* 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) ...@@ -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 ); msg_Err( p_access, "cannot open file %s", psz_name );
intf_UserFatal( p_access, VLC_FALSE, _("File reading failed"), 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); free (path);
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -447,7 +447,7 @@ static int open_file (access_t *p_access, const char *psz_name) ...@@ -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); msg_Err (p_access, "cannot open file %s (%m)", psz_name);
intf_UserFatal (p_access, VLC_FALSE, _("File reading failed"), 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; return -1;
} }
......
...@@ -424,7 +424,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -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." ); 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"), intf_UserFatal( p_aout, VLC_FALSE, _("Audio device is not configured"),
_("You should configure your speaker layout with " _("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.") ); "Utilities. Stereo mode is being used now.") );
} }
} }
......
...@@ -84,7 +84,7 @@ struct intf_sys_t ...@@ -84,7 +84,7 @@ struct intf_sys_t
char *psz_nowp_file; /**< file to which submit */ char *psz_nowp_file; /**< file to which submit */
#endif #endif
vlc_bool_t b_handshaked; /**< are we authenticated ? */ 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 */ /* data about song currently playing */
audioscrobbler_song_t p_current_song; /**< song being played */ audioscrobbler_song_t p_current_song; /**< song being played */
...@@ -274,7 +274,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -274,7 +274,7 @@ static void Run( intf_thread_t *p_intf )
if( b_die ) if( b_die )
{ {
msg_Dbg( p_intf, "audioscrobbler is dying\n"); msg_Dbg( p_intf, "audioscrobbler is dying");
return; return;
} }
...@@ -293,9 +293,9 @@ static void Run( intf_thread_t *p_intf ) ...@@ -293,9 +293,9 @@ static void Run( intf_thread_t *p_intf )
/* username not set */ /* username not set */
intf_UserFatal( p_intf, VLC_FALSE, intf_UserFatal( p_intf, VLC_FALSE,
_("Last.fm username not set"), _("Last.fm username not set"),
_("Please set an username or disable " _("Please set a username or disable the "
"audioscrobbler plugin, and then restart VLC.\n" "audioscrobbler plugin, and restart VLC.\n"
"Visit https://www.last.fm/join/ to get an account") "Visit http://www.last.fm/join/ to get an account.")
); );
Unload( p_intf ); Unload( p_intf );
return; return;
...@@ -418,7 +418,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -418,7 +418,7 @@ static void Run( intf_thread_t *p_intf )
p_buffer_pos = strstr( ( char * ) p_buffer, "BADSESSION" ); p_buffer_pos = strstr( ( char * ) p_buffer, "BADSESSION" );
if ( p_buffer_pos ) 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; p_sys->b_handshaked = VLC_FALSE;
HandleInterval( &p_sys->next_exchange, &p_sys->i_interval ); HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
continue; continue;
...@@ -433,11 +433,11 @@ static void Run( intf_thread_t *p_intf ) ...@@ -433,11 +433,11 @@ static void Run( intf_thread_t *p_intf )
p_sys->i_songs = 0; p_sys->i_songs = 0;
p_sys->i_interval = 0; p_sys->i_interval = 0;
time( &p_sys->next_exchange ); time( &p_sys->next_exchange );
msg_Dbg( p_intf, "Submission successfull!" ); msg_Dbg( p_intf, "Submission successful!" );
} }
else else
{ {
msg_Dbg( p_intf, "Authentification failed, handshaking again" ); msg_Dbg( p_intf, "Authentication failed, handshaking again" );
p_sys->b_handshaked = VLC_FALSE; p_sys->b_handshaked = VLC_FALSE;
HandleInterval( &p_sys->next_exchange, &p_sys->i_interval ); HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
continue; continue;
...@@ -809,8 +809,8 @@ static int Handshake( intf_thread_t *p_this ) ...@@ -809,8 +809,8 @@ static int Handshake( intf_thread_t *p_this )
/* authentication failed, bad username/password combination */ /* authentication failed, bad username/password combination */
intf_UserFatal( p_this, VLC_FALSE, intf_UserFatal( p_this, VLC_FALSE,
_("last.fm: Authentication failed"), _("last.fm: Authentication failed"),
_("last.fm Username or Password is incorrect," _("last.fm username or password is incorrect. "
" please verify your settings and relaunch VLC." ) ); "Please verify your settings and relaunch VLC." ) );
return VLC_AUDIOSCROBBLER_EFATAL; return VLC_AUDIOSCROBBLER_EFATAL;
} }
...@@ -819,7 +819,7 @@ static int Handshake( intf_thread_t *p_this ) ...@@ -819,7 +819,7 @@ static int Handshake( intf_thread_t *p_this )
{ {
/* oops, our version of vlc has been banned by last.fm servers */ /* 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. " 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; return VLC_AUDIOSCROBBLER_EFATAL;
} }
......
...@@ -103,10 +103,9 @@ static void DecoderUnsupportedCodec( decoder_t *p_dec, vlc_fourcc_t codec ) ...@@ -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" msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
"VLC probably does not support this sound or video format.", "VLC probably does not support this sound or video format.",
(char*)&codec ); (char*)&codec );
intf_UserFatal( p_dec, VLC_FALSE, _("No suitable decoder module " intf_UserFatal( p_dec, VLC_FALSE, _("No suitable decoder module"),
"for format"), _("VLC probably does not support the \"%4.4s\" " _("VLC does not support the audio or video format \"%4.4s\". "
"audio or video format. Unfortunately there is no way for you " "Unfortunately there is no way for you to fix this."), (char*)&codec );
"to fix this."), (char*)&codec );
} }
/* decoder_GetInputAttachment: /* decoder_GetInputAttachment:
......
...@@ -2363,8 +2363,8 @@ static int InputSourceInit( input_thread_t *p_input, ...@@ -2363,8 +2363,8 @@ static int InputSourceInit( input_thread_t *p_input,
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'", msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
psz_access, psz_demux, psz_path ); psz_access, psz_demux, psz_path );
intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE, intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE,
_("Can't recognize the input's format"), _("VLC can't recognize the input's format"),
_("The format of '%s' can't be detected. " _("The format of '%s' cannot be detected. "
"Have a look the log for details."), psz_mrl ); "Have a look the log for details."), psz_mrl );
goto error; goto error;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment