From 62ec22599c1b93aaa1f9ae0edf0362467f55d514 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 6 Jul 2008 12:18:46 +0200 Subject: [PATCH] l10n string fixes Note that _protocol abbreviations_ and friends are not localisable! --- modules/access/dshow/dshow.cpp | 2 +- modules/access/http.c | 2 +- modules/access/rtmp/access.c | 2 +- modules/access/screen/screen.c | 6 +++--- modules/access_output/rtmp.c | 2 +- modules/audio_output/waveout.c | 2 +- modules/codec/subtitles/subsusf.c | 2 +- modules/demux/rtp.c | 2 +- modules/demux/ty.c | 2 +- modules/gui/macosx/open.m | 8 ++++---- modules/stream_out/rtp.c | 2 +- src/libvlc-module.c | 4 ++-- src/misc/update.c | 24 ++++++++++++------------ 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 477396e8e2..a531f7fa30 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -162,7 +162,7 @@ static const char *const ppsz_amtuner_mode_text[] = { N_("Default"), #define AUDIO_CHANNELS_TEXT N_("Number of audio channels") #define AUDIO_CHANNELS_LONGTEXT N_( \ - "Select audio input format with the given number of audio channesl (if non 0)" ) + "Select audio input format with the given number of audio channels (if non 0)" ) #define AUDIO_SAMPLERATE_TEXT N_("Audio sample rate") #define AUDIO_SAMPLERATE_LONGTEXT N_( \ diff --git a/modules/access/http.c b/modules/access/http.c index 15b2be30d8..089d30612b 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -97,7 +97,7 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_description( N_("HTTP input") ); set_capability( "access", 0 ); - set_shortname( N_( "HTTP(S)" ) ); + set_shortname( "HTTP(S)" ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c index 0d3ad022f0..5e427f3ce8 100644 --- a/modules/access/rtmp/access.c +++ b/modules/access/rtmp/access.c @@ -50,7 +50,7 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_description( N_("RTMP input") ); - set_shortname( N_("RTMP") ); + set_shortname( "RTMP" ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c index c4f7422ab8..6f92341657 100644 --- a/modules/access/screen/screen.c +++ b/modules/access/screen/screen.c @@ -62,15 +62,15 @@ #define WIDTH_TEXT N_( "Subscreen width" ) #define WIDTH_LONGTEXT N_( \ - "Subscreen width." ) + "Subscreen width" ) #define HEIGHT_TEXT N_( "Subscreen height" ) #define HEIGHT_LONGTEXT N_( \ - "Subscreen height." ) + "Subscreen height" ) #define FOLLOW_MOUSE_TEXT N_( "Follow the mouse" ) #define FOLLOW_MOUSE_LONGTEXT N_( \ - "Follow the mouse when capturing a subscreen" ) + "Follow the mouse when capturing a subscreen." ) #endif static int Open ( vlc_object_t * ); diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c index a26690a097..a482c03773 100644 --- a/modules/access_output/rtmp.c +++ b/modules/access_output/rtmp.c @@ -53,7 +53,7 @@ static void Close( vlc_object_t * ); vlc_module_begin(); set_description( N_("RTMP stream output") ); - set_shortname( N_("RTMP" ) ); + set_shortname( "RTMP" ); set_capability( "sout access", 50 ); set_category( CAT_SOUT ); set_subcategory( SUBCAT_SOUT_STREAM ); diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index bf9ac03918..d3ef47c1d6 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -476,7 +476,7 @@ static void Probe( aout_instance_t * p_aout ) == VLC_SUCCESS ) { val.i_int = AOUT_VAR_5_1; - text.psz_string = (char *)N_("5.1"); + text.psz_string = "5.1"; var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); msg_Dbg( p_aout, "device supports 5.1 channels" ); diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c index 162cd1d49d..9ce8d45079 100644 --- a/modules/codec/subtitles/subsusf.c +++ b/modules/codec/subtitles/subsusf.c @@ -48,7 +48,7 @@ static subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, subpicture_t *p vlc_module_begin(); set_capability( "decoder", 40 ); - set_shortname( N_("USFSubs")); + set_shortname( "USFSubs" ); set_description( N_("USF subtitles decoder") ); set_callbacks( OpenDecoder, CloseDecoder ); set_category( CAT_INPUT ); diff --git a/modules/demux/rtp.c b/modules/demux/rtp.c index ee99286a27..1706b0fd78 100644 --- a/modules/demux/rtp.c +++ b/modules/demux/rtp.c @@ -79,7 +79,7 @@ static void Close (vlc_object_t *); * Module descriptor */ vlc_module_begin (); - set_shortname (_("RTP")); + set_shortname ( "RTP" ); set_description (_("(Experimental) Real-Time Protocol demuxer")); set_category (CAT_INPUT); set_subcategory (SUBCAT_INPUT_DEMUX); diff --git a/modules/demux/ty.c b/modules/demux/ty.c index 98d48ca831..f43c1b0bb9 100644 --- a/modules/demux/ty.c +++ b/modules/demux/ty.c @@ -56,7 +56,7 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_shortname( N_("TY") ); + set_shortname( "TY" ); set_description(N_("TY Stream audio/video demux")); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 36fac3802e..ea6c3c08cd 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -182,8 +182,8 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_disc_dvd_menus setTitle: _NS("No DVD menus")]; [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS directory")]; - [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")]; - [[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")]; + [[o_disc_type cellAtRow:1 column:0] setTitle: @"DVD"]; + [[o_disc_type cellAtRow:2 column:0] setTitle: @"VCD"]; [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")]; [o_net_udp_port_lbl setStringValue: _NS("Port")]; @@ -191,9 +191,9 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_net_udpm_port_lbl setStringValue: _NS("Port")]; [o_net_http_url_lbl setStringValue: _NS("URL")]; - [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")]; + [[o_net_mode cellAtRow:0 column:0] setTitle: @"UDP/RTP"]; [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")]; - [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")]; + [[o_net_mode cellAtRow:2 column:0] setTitle: @"HTTP/FTP/MMS/RTSP"]; [o_net_timeshift_ckbox setTitle: _NS("Allow timeshifting")]; [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )]; diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c index fb79a68818..75b28b8f79 100644 --- a/modules/stream_out/rtp.c +++ b/modules/stream_out/rtp.c @@ -158,7 +158,7 @@ static void Close( vlc_object_t * ); #define MAX_EMPTY_BLOCKS 200 vlc_module_begin(); - set_shortname( N_("RTP")); + set_shortname( "RTP" ); set_description( N_("RTP stream output") ); set_capability( "sout stream", 0 ); add_shortcut( "rtp" ); diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 47669ac822..46b0580fac 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -1352,9 +1352,9 @@ static const char *const ppsz_albumart_descriptions[] = "video output for the time being." ) #define MENU_ON_KEY_TEXT N_("Display OSD menu on top of video output") -#define MENU_ON_KEY_LONGTEXT N_("Display OSDmenu on top of video output") +#define MENU_ON_KEY_LONGTEXT N_("Display OSD menu on top of video output") #define MENU_OFF_KEY_TEXT N_("Do not display OSD menu on video output") -#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSDmenu on top of video output") +#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSD menu on top of video output") #define MENU_RIGHT_KEY_TEXT N_("Highlight widget on the right") #define MENU_RIGHT_KEY_LONGTEXT N_( \ "Move OSD menu highlight to the widget on the right") diff --git a/src/misc/update.c b/src/misc/update.c index 45fb993e4d..dd556a3e5f 100644 --- a/src/misc/update.c +++ b/src/misc/update.c @@ -1576,9 +1576,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) { utf8_unlink( psz_destfile ); - intf_UserFatal( p_udt, true, _("File can not be verified"), + intf_UserFatal( p_udt, true, _("File could not be verified"), _("It was not possible to download a cryptographic signature for " - "downloaded file \"%s\", and so VLC deleted it."), + "the downloaded file \"%s\". Thus, it was deleted."), psz_destfile ); msg_Err( p_udt, "Couldn't download signature of downloaded file" ); goto end; @@ -1589,9 +1589,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) utf8_unlink( psz_destfile ); msg_Err( p_udt, "Invalid signature issuer" ); intf_UserFatal( p_udt, true, _("Invalid signature"), - _("The cryptographic signature for downloaded file \"%s\" was " - "invalid and couldn't be used to securely verify it, and so " - "VLC deleted it."), + _("The cryptographic signature for the downloaded file \"%s\" was " + "invalid and could not be used to securely verify it. Thus, the " + "file was deleted."), psz_destfile ); goto end; } @@ -1601,9 +1601,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) utf8_unlink( psz_destfile ); msg_Err( p_udt, "Invalid signature type" ); intf_UserFatal( p_udt, true, _("Invalid signature"), - _("The cryptographic signature for downloaded file \"%s\" was " - "invalid and couldn't be used to securely verify it, and so " - "VLC deleted it."), + _("The cryptographic signature for the downloaded file \"%s\" was " + "invalid and could not be used to securely verify it. Thus, the " + "file was deleted."),, psz_destfile ); goto end; } @@ -1614,8 +1614,8 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) msg_Err( p_udt, "Unable to hash %s", psz_destfile ); utf8_unlink( psz_destfile ); intf_UserFatal( p_udt, true, _("File not verifiable"), - _("It was not possible to securely verify downloaded file \"%s\", " - "and so VLC deleted it."), + _("It was not possible to securely verify the downloaded file" + " \"%s\". Thus, it was VLC deleted."), psz_destfile ); goto end; @@ -1626,7 +1626,7 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) { utf8_unlink( psz_destfile ); intf_UserFatal( p_udt, true, _("File corrupted"), - _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."), + _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."), psz_destfile ); msg_Err( p_udt, "Bad SHA1 hash for %s", psz_destfile ); free( p_hash ); @@ -1638,7 +1638,7 @@ static void update_DownloadReal( update_download_thread_t *p_udt ) { utf8_unlink( psz_destfile ); intf_UserFatal( p_udt, true, _("File corrupted"), - _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."), + _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."), psz_destfile ); msg_Err( p_udt, "BAD SIGNATURE for %s", psz_destfile ); free( p_hash ); -- 2.39.2