[MPlayer-dev-eng] [PATCH] Duplicated texts in help file

[Torinthiel]

Some messages in help_mp-en.h are duplicated. Specifically:
MSGTR_MENU_PlayList and MSGTR_PlayList: "Playlist"
MSGTR_MENU_Preferences and MSGTR_Preferences: "Preferences"
MSGTR_PREFERENCES_Audio and MSGTR_EQU_Audio: "Audio"
MSGTR_PREFERENCES_Video and MSGTR_EQU_Video: "Video"
MSGTR_PREFERENCES_FRAME_Misc and MSGTR_PREFERENCES_Misc: "Misc"

This means that two #defines in help-* are defined to exactly the same
strings. The attached patch makes this more obvious, by defining one of
them to the other.
Rationale: 
1. Less duplication
2. Automatic generation of .po files that I'm working on will work
3. Translations can easily omit the duplicated string, help_diff.sh will
   fix it correctly.

Disadvantages: 
If one changes the master string it might go unnoticed. Maybe adding
a short comment after the master string will help it.

Anyway, without this issue being resolved I cannot do anything about .po
files and gettext support. (status right now is .po generation mainly
works, .mo files are generated, remains configure/make install patching)
Torinthiel

-- 
 Waclaw "Torinthiel" Schiller       GG#: 542916, 3073512
   torinthiel(at)megapolis(dot)pl
   gpg: 0906A2CE fpr: EE3E DFB4 C4D6 E22E 8999  D714 7CEB CDDC 0906 A2CE
 "No classmates may be used during this examination"
-------------- next part --------------
Index: help_mp-en.h
===================================================================
RCS file: /cvsroot/mplayer/main/help/help_mp-en.h,v
retrieving revision 1.169
diff -u -r1.169 help_mp-en.h
--- help_mp-en.h	23 May 2005 20:12:47 -0000	1.169
+++ help_mp-en.h	1 Jun 2005 15:29:16 -0000
@@ -694,9 +694,9 @@
 #define MSGTR_MENU_Chapter "Chapter %2d"
 #define MSGTR_MENU_AudioLanguages "Audio languages"
 #define MSGTR_MENU_SubtitleLanguages "Subtitle languages"
-#define MSGTR_MENU_PlayList "Playlist"
+#define MSGTR_MENU_PlayList MSGTR_PlayList
 #define MSGTR_MENU_SkinBrowser "Skin browser"
-#define MSGTR_MENU_Preferences "Preferences"
+#define MSGTR_MENU_Preferences MSGTR_Preferences
 #define MSGTR_MENU_Exit "Exit..."
 #define MSGTR_MENU_Mute "Mute"
 #define MSGTR_MENU_Original "Original"
@@ -733,8 +733,8 @@
 #define MSGTR_PLAYLIST_DirectoryTree "Directory tree"
 
 // --- preferences
-#define MSGTR_PREFERENCES_Audio "Audio"
-#define MSGTR_PREFERENCES_Video "Video"
+#define MSGTR_PREFERENCES_Audio MSGTR_EQU_Audio
+#define MSGTR_PREFERENCES_Video MSGTR_EQU_Video
 #define MSGTR_PREFERENCES_SubtitleOSD "Subtitle & OSD"
 #define MSGTR_PREFERENCES_Codecs "Codecs & demuxer"
 #define MSGTR_PREFERENCES_Misc "Misc"
@@ -781,7 +781,7 @@
 #define MSGTR_PREFERENCES_FRAME_PostProcess "Postprocessing"
 #define MSGTR_PREFERENCES_FRAME_CodecDemuxer "Codec & demuxer"
 #define MSGTR_PREFERENCES_FRAME_Cache "Cache"
-#define MSGTR_PREFERENCES_FRAME_Misc "Misc"
+#define MSGTR_PREFERENCES_FRAME_Misc MSGTR_PREFERENCES_Misc
 #define MSGTR_PREFERENCES_Audio_Device "Device:"
 #define MSGTR_PREFERENCES_Audio_Mixer "Mixer:"
 #define MSGTR_PREFERENCES_Audio_MixerChannel "Mixer channel:"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050601/71b6f5e6/attachment.pgp>