[vlc-commits] mkv: remove incorrect use of N_()

Rémi Denis-Courmont git at videolan.org
Wed Oct 21 17:21:42 CEST 2015


vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 16 23:27:02 2015 +0300| [f3686e65a98a496f638e3822717b48c1d1800706] | committer: Jean-Baptiste Kempf

mkv: remove incorrect use of N_()

(cherry picked from commit 3d94da0dbd0c468c493ae8d9c8f0b993d65da3b0)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f3686e65a98a496f638e3822717b48c1d1800706
---

 modules/demux/mkv/chapter_command.cpp |   10 +++++-----
 modules/demux/mkv/demux.cpp           |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/demux/mkv/chapter_command.cpp b/modules/demux/mkv/chapter_command.cpp
index ec7e7ac..0c8be43 100644
--- a/modules/demux/mkv/chapter_command.cpp
+++ b/modules/demux/mkv/chapter_command.cpp
@@ -133,28 +133,28 @@ std::string dvd_chapter_codec_c::GetCodecName( bool f_for_title ) const
             uint16_t i_title = (p_data[1] << 8) + p_data[2];
             char psz_str[11];
             sprintf( psz_str, " %d  ---", i_title );
-            result = N_("---  DVD Title");
+            result = "---  DVD Title";
             result += psz_str;
         }
         else */ if ( p_data[0] == MATROSKA_DVD_LEVEL_LU )
         {
             char psz_str[11];
             sprintf( psz_str, " (%c%c)  ---", p_data[1], p_data[2] );
-            result = N_("---  DVD Menu");
+            result = "---  DVD Menu";
             result += psz_str;
         }
         else if ( p_data[0] == MATROSKA_DVD_LEVEL_SS && f_for_title )
         {
             if ( p_data[1] == 0x00 )
-                result = N_("First Played");
+                result = "First Played";
             else if ( p_data[1] == 0xC0 )
-                result = N_("Video Manager");
+                result = "Video Manager";
             else if ( p_data[1] == 0x80 )
             {
                 uint16_t i_title = (p_data[2] << 8) + p_data[3];
                 char psz_str[20];
                 sprintf( psz_str, " %d -----", i_title );
-                result = N_("----- Title");
+                result = "----- Title";
                 result += psz_str;
             }
         }
diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index c78c93b..faabcaf 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -712,7 +712,7 @@ bool demux_sys_t::PreloadLinked()
                         }
 
                         if( !p_title->psz_name &&
-                            asprintf(&(p_title->psz_name), "%s %d", N_("Segment"), (int)ij) == -1 )
+                            asprintf(&(p_title->psz_name), "%s %d", "Segment", (int)ij) == -1 )
                             p_title->psz_name = NULL;
                     }
                 }



More information about the vlc-commits mailing list