From ab9d021d2e46252abe798cbe892146d631f447fd Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 24 Nov 2017 15:10:24 +0100 Subject: [PATCH] Strings simplification for translations --- modules/access/bluray.c | 4 ++-- modules/access/dvdread.c | 2 +- modules/access/nfs.c | 2 +- modules/access/smb_common.h | 4 ++-- .../audio_filter/channel_mixer/spatialaudio.cpp | 4 ++-- modules/audio_filter/scaletempo.c | 2 +- modules/gui/qt/qt.cpp | 2 +- modules/keystore/keychain.m | 4 ++-- src/input/es_out.c | 8 ++++---- src/libvlc-module.c | 23 ++++++++++------------ 10 files changed, 26 insertions(+), 29 deletions(-) diff --git a/modules/access/bluray.c b/modules/access/bluray.c index df1ebb7cd1..cb1986fa98 100644 --- a/modules/access/bluray.c +++ b/modules/access/bluray.c @@ -790,8 +790,8 @@ static int blurayOpen(vlc_object_t *object) "BD-J support: %d, JVM found: %d, JVM usable: %d", disc_info->bdj_supported, disc_info->libjvm_detected, disc_info->bdj_handled); vlc_dialog_display_error(p_demux, _("Java required"), - _("This Blu-ray disc needs Java for menus.%s\nDisc is played without menus."), - !disc_info->libjvm_detected ? _(" Java was not found from your system.") : ""); + _("This Blu-ray disc requires Java for menus support.%s\nThe disc will be played without menus."), + !disc_info->libjvm_detected ? _("Java was not found on your system.") : ""); p_sys->b_menu = false; } diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index c395bd229c..0f8d7a1059 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -214,7 +214,7 @@ static int Open( vlc_object_t *p_this ) if( DVDISOVolumeInfo( p_dvdread, rgsz_volid, 32, NULL, 0 ) == 0 ) { vlc_dialog_display_error( p_demux, _("Playback failure"), - _("Cannot play a non UDF mastered DVD. (Found ISO9660 '%s')"), rgsz_volid ); + _("Cannot play a non-UDF mastered DVD." ) ); msg_Err( p_demux, "Invalid UDF DVD. (Found ISO9660 '%s')", rgsz_volid ); } } diff --git a/modules/access/nfs.c b/modules/access/nfs.c index f94b6cc746..1f32379094 100644 --- a/modules/access/nfs.c +++ b/modules/access/nfs.c @@ -48,7 +48,7 @@ #define AUTO_GUID_TEXT N_("Set NFS uid/guid automatically") #define AUTO_GUID_LONGTEXT N_("If uid/gid are not specified in " \ - "the url, this module will try to automatically set a uid/gid.") + "the url, VLC will automatically set a uid/gid.") static int Open(vlc_object_t *); static void Close(vlc_object_t *); diff --git a/modules/access/smb_common.h b/modules/access/smb_common.h index 6bc9ee8a3e..7f869d1ac3 100644 --- a/modules/access/smb_common.h +++ b/modules/access/smb_common.h @@ -30,5 +30,5 @@ #define SMB_LOGIN_DIALOG_TITLE N_( "SMB authentication required" ) #define SMB_LOGIN_DIALOG_TEXT N_( "The computer (%s) you are trying to connect " \ - "to requires authentication.\nPlease provide a username (and ideally a " \ - "domain name using the format DOMAIN;username)\n and a password" ) + "to requires authentication.\nPlease provide a username (ideally a " \ + "domain name using the format DOMAIN;username) and a password." ) diff --git a/modules/audio_filter/channel_mixer/spatialaudio.cpp b/modules/audio_filter/channel_mixer/spatialaudio.cpp index 2414dfa582..a141ef3093 100644 --- a/modules/audio_filter/channel_mixer/spatialaudio.cpp +++ b/modules/audio_filter/channel_mixer/spatialaudio.cpp @@ -47,8 +47,8 @@ #define DEFAULT_HRTF_PATH "hrtfs" DIR_SEP "dodeca_and_7channel_FHK_HRTF.sofa" -#define HRTF_FILE_TEXT N_("HRTF SOFA file for the binauralization") -#define HRTF_FILE_LONGTEXT N_("To use a custom HRTF (Head-related transfer function)" \ +#define HRTF_FILE_TEXT N_("HRTF file for the binauralization") +#define HRTF_FILE_LONGTEXT N_("Custom HRTF (Head-related transfer function) file" \ "in the SOFA format.") #define HEADPHONES_TEXT N_("Headphones mode (binaural)") diff --git a/modules/audio_filter/scaletempo.c b/modules/audio_filter/scaletempo.c index 26f57f0096..5b2c408b97 100644 --- a/modules/audio_filter/scaletempo.c +++ b/modules/audio_filter/scaletempo.c @@ -71,7 +71,7 @@ vlc_module_begin () N_("Search Length"), N_("Length in milliseconds to search for best overlap position"), true ) #ifdef PITCH_SHIFTER add_float_with_range( "pitch-shift", 0, -12, 12, - N_("Pitch Shift"), N_("Pitch shift in semitones"), false ) + N_("Pitch Shift"), N_("Pitch shift in semitones."), false ) set_callbacks( OpenPitch, ClosePitch ) #else set_callbacks( Open, Close ) diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp index 6dfa04e3ff..abb54c647b 100644 --- a/modules/gui/qt/qt.cpp +++ b/modules/gui/qt/qt.cpp @@ -211,7 +211,7 @@ static const int i_raise_list[] = MainInterface::RAISE_AUDIO, MainInterface::RAISE_AUDIOVIDEO, }; static const char *const psz_raise_list_text[] = - { N_( "Never" ), N_( "Video" ), N_( "Audio" ), _( "Both" ) }; + { N_( "Never" ), N_( "Video" ), N_( "Audio" ), _( "Audio/Video" ) }; /**********************************************************************/ vlc_module_begin () diff --git a/modules/keystore/keychain.m b/modules/keystore/keychain.m index 3d1f94c68c..9f4908cc8c 100644 --- a/modules/keystore/keychain.m +++ b/modules/keystore/keychain.m @@ -54,12 +54,12 @@ static const char *const accessibility_list_text[] = { }; #define SYNC_ITEMS_TEXT N_("Synchronize stored items") -#define SYNC_ITEMS_LONGTEXT N_("Synchronizes stored items via iCloud Keychain if enabled in the user domain. Requires iOS 7 / Mac OS X 10.9 / tvOS 9.0 or higher.") +#define SYNC_ITEMS_LONGTEXT N_("Synchronizes stored items via iCloud Keychain if enabled in the user domain.") #define ACCESSIBILITY_TYPE_TEXT N_("Accessibility type for all future passwords saved to the Keychain") #define ACCESS_GROUP_TEXT N_("Keychain access group") -#define ACCESS_GROUP_LONGTEXT N_("Keychain access group as defined by the app entitlements. Requires iOS 3 / Mac OS X 10.9 / tvOS 9.0 or higher.") +#define ACCESS_GROUP_LONGTEXT N_("Keychain access group as defined by the app entitlements.") /* VLC can be compiled against older SDKs (like before OS X 10.10) * but newer features should still be available. diff --git a/src/input/es_out.c b/src/input/es_out.c index df92fe89e2..e0e34676a4 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -3284,12 +3284,12 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t * } if ( fmt->video.mastering.max_luminance ) { - info_category_AddInfo( p_cat, _("Max luminance"), "%.4f cd/m²", + info_category_AddInfo( p_cat, _("Max. luminance"), "%.4f cd/m²", fmt->video.mastering.max_luminance / 10000.f ); } if ( fmt->video.mastering.min_luminance ) { - info_category_AddInfo( p_cat, _("Min luminance"), "%.4f cd/m²", + info_category_AddInfo( p_cat, _("Min. luminance"), "%.4f cd/m²", fmt->video.mastering.min_luminance / 10000.f ); } if ( fmt->video.mastering.primaries[4] && @@ -3322,12 +3322,12 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t * } if ( fmt->video.lighting.MaxCLL ) { - info_category_AddInfo( p_cat, _("MaxCLL"), "%d cd/m²", + info_category_AddInfo( p_cat, "MaxCLL", "%d cd/m²", fmt->video.lighting.MaxCLL ); } if ( fmt->video.lighting.MaxFALL ) { - info_category_AddInfo( p_cat, _("MaxFALL"), "%d cd/m²", + info_category_AddInfo( p_cat, "MaxFALL", "%d cd/m²", fmt->video.lighting.MaxFALL ); } break; diff --git a/src/libvlc-module.c b/src/libvlc-module.c index a482bdca80..b41d58b3f0 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -613,10 +613,9 @@ static const char *const ppsz_clock_descriptions[] = #define INPUT_SUBTRACK_ID_LONGTEXT N_( \ "Stream ID of the subtitle track to use.") -#define INPUT_CAPTIONS_TEXT N_(N_("Closed Captions decoder")) -#define INPUT_CAPTIONS_LONGTEXT N_("Preferred closed captions decoder") +#define INPUT_CAPTIONS_TEXT N_(N_("Preferred Closed Captions decoder")) static const int pi_captions[] = { 608, 708 }; -static const char *const ppsz_captions[] = { N_("EIA/CEA 608"), N_("CEA 708") }; +static const char *const ppsz_captions[] = { "EIA/CEA 608", "CEA 708" }; #define INPUT_PREFERREDRESOLUTION_TEXT N_("Preferred video resolution") #define INPUT_PREFERREDRESOLUTION_LONGTEXT N_( \ @@ -697,8 +696,7 @@ static const char *const ppsz_prefres[] = { "$n: Track num
$p: Now playing
$A: Date
$D: Duration
" \ "$Z: \"Now playing\" (Fall back on Title - Artist)" ) -#define INPUT_LUA_TEXT N_( "Disable lua" ) -#define INPUT_LUA_LONGTEXT N_( "Disable all lua plugins" ) +#define INPUT_LUA_TEXT N_( "Disable all lua plugins" ) // DEPRECATED #define SUB_CAT_LONGTEXT N_( \ @@ -714,7 +712,7 @@ static const char *const ppsz_prefres[] = { "instead of over the movie. Try several positions.") #define SUB_TEXT_SCALE_TEXT N_("Subtitles text scaling factor") -#define SUB_TEXT_SCALE_LONGTEXT N_("Set value to alter subtitles size where possible") +#define SUB_TEXT_SCALE_LONGTEXT N_("Changes the subtitles size where possible") #define SPU_TEXT N_("Enable sub-pictures") #define SPU_LONGTEXT N_( \ @@ -1053,8 +1051,7 @@ static const char *const ppsz_prefres[] = { #define KEYSTORE_TEXT N_("Preferred keystore list") #define KEYSTORE_LONGTEXT N_( \ - "List of keystores that VLC will use in " \ - "priority. Only advanced users should alter this option." ) + "List of keystores that VLC will use in priority." ) #define STATS_TEXT N_("Locally collect statistics") #define STATS_LONGTEXT N_( \ @@ -1099,8 +1096,8 @@ static const char *const ppsz_prefres[] = { "and keep playing current item.") #define DBUS_TEXT N_("Expose media player via D-Bus") -#define DBUS_LONGTEXT N_("Allow other applications to control " \ - "the VLC media player using the D-Bus MPRIS protocol.") +#define DBUS_LONGTEXT N_("Allow other applications to control VLC " \ + "using the D-Bus MPRIS protocol.") /***************************************************************************** * Playlist @@ -1118,7 +1115,7 @@ static const char *const ppsz_prefres[] = { #define PREPARSE_TIMEOUT_TEXT N_( "Preparsing timeout" ) #define PREPARSE_TIMEOUT_LONGTEXT N_( \ - "Maximum time (in milliseconds) allowed to preparse an item" ) + "Maximum time allowed to preparse an item, in milliseconds" ) #define METADATA_NETWORK_TEXT N_( "Allow metadata network access" ) @@ -1739,7 +1736,7 @@ vlc_module_begin () INPUT_SUBTRACK_ID_TEXT, INPUT_SUBTRACK_ID_LONGTEXT, true ) change_safe () add_integer( "captions", 608, - INPUT_CAPTIONS_TEXT, INPUT_CAPTIONS_LONGTEXT, true ) + INPUT_CAPTIONS_TEXT, INPUT_CAPTIONS_TEXT, true ) change_integer_list( pi_captions, ppsz_captions ) change_safe () add_integer( "preferred-resolution", -1, INPUT_PREFERREDRESOLUTION_TEXT, @@ -1915,7 +1912,7 @@ vlc_module_begin () add_string( "input-title-format", "$Z", INPUT_TITLE_FORMAT_TEXT, INPUT_TITLE_FORMAT_LONGTEXT, false ); - add_bool( "lua", true, INPUT_LUA_TEXT, INPUT_LUA_LONGTEXT, true ); + add_bool( "lua", true, INPUT_LUA_TEXT, INPUT_LUA_TEXT, true ); /* Decoder options */ set_subcategory( SUBCAT_INPUT_VCODEC ) -- 2.11.4.GIT