[vlc-devel] [PATCH 1/3] i18n: corrections of missing spaces and new lines

Michał Trzebiatowski michtrz at gmail.com
Wed Nov 29 03:01:52 CET 2017


Signed-off-by: Michał Trzebiatowski <michtrz at gmail.com>
---
 modules/codec/kate.c                     |  2 +-
 modules/codec/x264.c                     | 14 +++++++-------
 modules/codec/zvbi.c                     |  4 ++--
 modules/demux/mpeg/ts.c                  |  2 +-
 modules/gui/qt/dialogs/messages.cpp      |  2 +-
 modules/gui/skins2/src/dialogs.cpp       |  8 ++++----
 modules/spu/logo.c                       |  2 +-
 modules/spu/mosaic.c                     |  4 ++--
 modules/stream_out/transcode/transcode.c |  4 ++--
 src/misc/update.c                        |  4 ++--
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index cdff514..b50d94c 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -190,7 +190,7 @@ static void UpdateTigerFontDesc( decoder_t *p_dec );
 
 #define FORMAT_TEXT N_("Formatted Subtitles")
 #define FORMAT_LONGTEXT N_("Kate streams allow for text formatting. " \
- "VLC partly implements this, but you can choose to disable all formatting." \
+ "VLC partly implements this, but you can choose to disable all formatting. " \
  "Note that this has no effect is rendering via Tiger is enabled.")
 
 #ifdef HAVE_TIGER
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 0f34d9c..e02048f 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -69,7 +69,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
 /* Frame-type options */
 
 #define KEYINT_TEXT N_("Maximum GOP size")
-#define KEYINT_LONGTEXT N_( "Sets maximum interval between IDR-frames." \
+#define KEYINT_LONGTEXT N_( "Sets maximum interval between IDR-frames. " \
     "Larger values save bits, thus improving quality for a given bitrate at " \
     "the cost of seeking precision. Use -1 for infinite." )
 
@@ -271,7 +271,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
 /* Analysis */
 
 #define ANALYSE_TEXT N_("Partitions to consider")
-#define ANALYSE_LONGTEXT N_( "Partitions to consider in analyse mode: \n" \
+#define ANALYSE_LONGTEXT N_( "Partitions to consider in analyse mode:\n" \
     " - none  : \n" \
     " - fast  : i4x4\n" \
     " - normal: i4x4,p8x8,(i8x8)\n" \
@@ -283,7 +283,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
 #define DIRECT_PRED_LONGTEXT DIRECT_PRED_TEXT
 
 #define DIRECT_PRED_SIZE_TEXT N_("Direct prediction size")
-#define DIRECT_PRED_SIZE_LONGTEXT N_( "Direct prediction size: "\
+#define DIRECT_PRED_SIZE_LONGTEXT N_( "Direct prediction size:\n" \
     " -  0: 4x4\n" \
     " -  1: 8x8\n" \
     " - -1: smallest possible according to level\n" )
@@ -292,7 +292,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
 #define WEIGHTB_LONGTEXT N_( "Weighted prediction for B-frames.")
 
 #define WEIGHTP_TEXT N_("Weighted prediction for P-frames")
-#define WEIGHTP_LONGTEXT N_("Weighted prediction for P-frames: "\
+#define WEIGHTP_LONGTEXT N_("Weighted prediction for P-frames:\n" \
     " - 0: Disabled\n"\
     " - 1: Blind offset\n"\
     " - 2: Smart analysis\n" )
@@ -349,7 +349,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
     "SATD-based decision for 8x8 transform in inter-MBs.")
 
 #define TRELLIS_TEXT N_("Trellis RD quantization" )
-#define TRELLIS_LONGTEXT N_( "Trellis RD quantization: \n" \
+#define TRELLIS_LONGTEXT N_( "Trellis RD quantization:\n" \
     " - 0: disabled\n" \
     " - 1: enabled only on the final encode of a MB\n" \
     " - 2: enabled on all mode decisions\n" \
@@ -359,7 +359,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
 #define FAST_PSKIP_LONGTEXT N_( "Early SKIP detection on P-frames.")
 
 #define DCT_DECIMATE_TEXT N_("Coefficient thresholding on P-frames")
-#define DCT_DECIMATE_LONGTEXT N_( "Coefficient thresholding on P-frames." \
+#define DCT_DECIMATE_LONGTEXT N_( "Coefficient thresholding on P-frames. " \
     "Eliminate dct blocks containing only a small single coefficient.")
 
 #define PSY_TEXT N_("Use Psy-optimizations")
@@ -419,7 +419,7 @@ static void x264_log( void *, int i_level, const char *psz, va_list );
 #define PRESET_TEXT N_("Default preset setting used" )
 
 #define X264_OPTIONS_TEXT N_("x264 advanced options")
-#define X264_OPTIONS_LONGTEXT N_("x264 advanced options, in the form {opt=val,op2=val2} .")
+#define X264_OPTIONS_LONGTEXT N_("x264 advanced options, in the form {opt=val,op2=val2}.")
 
 static const char *const enc_me_list[] =
   { "dia", "hex", "umh", "esa", "tesa" };
diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 6b7be223..ffef4dc 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -60,7 +60,7 @@ static void Close( vlc_object_t * );
 
 #define PAGE_TEXT N_("Teletext page")
 #define PAGE_LONGTEXT N_("Open the indicated Teletext page. " \
-        "Default page is index 100")
+        "Default page is index 100.")
 
 #define OPAQUE_TEXT N_("Opacity")
 #define OPAQUE_LONGTEXT N_("Setting to true " \
@@ -74,7 +74,7 @@ static void Close( vlc_object_t * );
 
 #define TELX_TEXT N_("Teletext text subtitles")
 #define TELX_LONGTEXT N_( "Output teletext subtitles as text " \
-  "instead of as RGBA" )
+  "instead of as RGBA." )
 
 #define LEVEL_TEXT N_("Presentation Level")
 
diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 0b24ffd..d045189 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -120,7 +120,7 @@ static const char *const ts_standards_list_text[] =
   { N_("Auto"), "MPEG", "DVB", "ARIB", "ATSC", "T-DMB" };
 
 #define STANDARD_TEXT N_("Digital TV Standard")
-#define STANDARD_LONGTEXT N_( "Selects mode for digital TV standard." \
+#define STANDARD_LONGTEXT N_( "Selects mode for digital TV standard. " \
                               "This feature affects EPG information and subtitles." )
 
 vlc_module_begin ()
diff --git a/modules/gui/qt/dialogs/messages.cpp b/modules/gui/qt/dialogs/messages.cpp
index cb3836a..c015868 100644
--- a/modules/gui/qt/dialogs/messages.cpp
+++ b/modules/gui/qt/dialogs/messages.cpp
@@ -258,7 +258,7 @@ bool MessagesDialog::save()
     QString saveLogFileName = QFileDialog::getSaveFileName(
             this, qtr( "Save log file as..." ),
             QVLCUserDir( VLC_DOCUMENTS_DIR ),
-            qtr( "Texts / Logs (*.log *.txt);; All (*.*)") );
+            qtr( "Texts/Logs (*.log *.txt);; All (*.*)") );
 
     if( !saveLogFileName.isNull() )
     {
diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index 276909a..f59ea71 100644
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -212,7 +212,7 @@ void Dialogs::showChangeSkin()
 void Dialogs::showPlaylistLoad()
 {
     std::stringstream fileTypes;
-    fileTypes << _("Playlist Files|") << EXTENSIONS_PLAYLIST  << _("|All Files|*");
+    fileTypes << _("Playlist Files |") << EXTENSIONS_PLAYLIST  << _("|All Files |*");
     showFileGeneric( _("Open playlist"),
                      fileTypes.str(),
                      showPlaylistLoadCB, kOPEN );
@@ -221,9 +221,9 @@ void Dialogs::showPlaylistLoad()
 
 void Dialogs::showPlaylistSave()
 {
-    showFileGeneric( _("Save playlist"), _("XSPF playlist|*.xspf|"
-                                           "M3U file|*.m3u|"
-                                           "HTML playlist|*.html"),
+    showFileGeneric( _("Save playlist"), _("XSPF playlist |*.xspf|"
+                                           "M3U file |*.m3u|"
+                                           "HTML playlist |*.html"),
                      showPlaylistSaveCB, kSAVE );
 }
 
diff --git a/modules/spu/logo.c b/modules/spu/logo.c
index 8ee88aa..44b1bca 100644
--- a/modules/spu/logo.c
+++ b/modules/spu/logo.c
@@ -51,7 +51,7 @@
 "<image>[,<delay in ms>[,<alpha>]][;<image>[,<delay>[,<alpha>]]][;...]. " \
 "If you only have one file, simply enter its filename.")
 #define REPEAT_TEXT N_("Logo animation # of loops")
-#define REPEAT_LONGTEXT N_("Number of loops for the logo animation." \
+#define REPEAT_LONGTEXT N_("Number of loops for the logo animation. " \
         "-1 = continuous, 0 = disabled")
 #define DELAY_TEXT N_("Logo individual image time in ms")
 #define DELAY_LONGTEXT N_("Individual image display time of 0 - 60000 ms.")
diff --git a/modules/spu/mosaic.c b/modules/spu/mosaic.c
index 30e2b35..b761664 100644
--- a/modules/spu/mosaic.c
+++ b/modules/spu/mosaic.c
@@ -129,7 +129,7 @@ struct filter_sys_t
 #define COLS_TEXT N_("Number of columns")
 #define COLS_LONGTEXT N_( \
         "Number of image columns in the mosaic (only used if " \
-        "positioning method is set to \"fixed\".)" )
+        "positioning method is set to \"fixed\")." )
 
 #define AR_TEXT N_("Keep aspect ratio")
 #define AR_LONGTEXT N_( \
@@ -142,7 +142,7 @@ struct filter_sys_t
 #define ORDER_TEXT N_("Elements order" )
 #define ORDER_LONGTEXT N_( \
         "You can enforce the order of the elements on " \
-        "the mosaic. You must give a comma-separated list of picture ID(s)." \
+        "the mosaic. You must give a comma-separated list of picture ID(s). " \
         "These IDs are assigned in the \"mosaic-bridge\" module." )
 
 #define OFFSETS_TEXT N_("Offsets in order" )
diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 96baf80..99784a3 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -115,10 +115,10 @@
 
 #define SFILTER_TEXT N_("Overlays")
 #define SFILTER_LONGTEXT N_( \
-    "This allows you to add overlays (also known as \"subpictures\" on the "\
+    "This allows you to add overlays (also known as \"subpictures\") on the "\
     "transcoded video stream. The subpictures produced by the filters will "\
     "be overlayed directly onto the video. You can specify a colon-separated "\
-    "list of subpicture modules" )
+    "list of subpicture modules." )
 
 #define THREADS_TEXT N_("Number of threads")
 #define THREADS_LONGTEXT N_( \
diff --git a/src/misc/update.c b/src/misc/update.c
index d8e6ded..e991b93 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -720,8 +720,8 @@ static void* update_DownloadReal( void *obj )
 
 #ifdef _WIN32
     const char *psz_msg =
-        _("The new version was successfully downloaded."
-        "Do you want to close VLC and install it now?");
+        _("The new version was successfully downloaded. "
+          "Do you want to close VLC and install it now?");
     int answer = vlc_dialog_wait_question( p_udt, VLC_DIALOG_QUESTION_NORMAL,
                                            _("Cancel"), _("Install"), NULL,
                                            _("Update VLC media player"), "%s",
-- 
2.10.0.windows.1



More information about the vlc-devel mailing list