Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_intf_strings.h

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index de51b7df0ab86a6543ff056fd26221cbb2c759b4..cd532b5c9e5b4ee7264189b101b2eaab0b391523 100644 (file)
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -29,20 +29,32 @@
  * This file defines a number of strings used in user interfaces
  */
 
+/* A helper macro that will expand to either of the arguments
+   depanding on platform. The arguments are supposed to be:
+   1. dir: a string containing "directory"
+   2. folder: a string with the same meaning but with directory
+              substituted with "folder"
+*/
+#if defined( WIN32 ) || defined(__APPLE__)
+    #define I_DIR_OR_FOLDER( dir, folder ) folder
+#else
+    #define I_DIR_OR_FOLDER( dir, folder ) dir
+#endif
+
 /*************** Open dialogs **************/
 
 #define I_OP_OPF        N_("Quick &Open File...")
 #define I_OP_ADVOP      N_("&Advanced Open...")
-#define I_OP_OPDIR      N_("Open &Directory...")
-
+#define I_OP_OPDIR I_DIR_OR_FOLDER( N_("Open D&irectory..."), \
+                                    N_("Open &Folder...") )
 #define I_OP_SEL_FILES  N_("Select one or more files to open")
+#define I_OP_SEL_DIR   I_DIR_OR_FOLDER( N_("Select Directory"), N_("Select Folder") )
 
 /******************* Menus *****************/
 
 #define I_MENU_INFO  N_("Media &Information")
 #define I_MENU_CODECINFO  N_("&Codec Information")
 #define I_MENU_MSG   N_("&Messages")
-#define I_MENU_EXT   N_("&Extended Settings")
 #define I_MENU_GOTOTIME N_("Jump to Specific &Time")
 #define I_MENU_BOOKMARK N_("&Bookmarks")
 #define I_MENU_VLM N_("&VLM Configuration")
@@ -52,29 +64,33 @@
 /* Playlist popup */
 #define I_POP_PLAY N_("Play")
 #define I_POP_PREPARSE N_("Fetch Information")
-#define I_POP_DEL N_("Delete")
+#define I_POP_DEL N_("Remove Selected")
 #define I_POP_INFO N_("Information...")
 #define I_POP_SORT N_("Sort")
-#define I_POP_ADD N_("Add Node")
+#define I_POP_NEWFOLDER I_DIR_OR_FOLDER( N_("Create Directory..."), \
+                                         N_("Create Folder...") )
+#define I_POP_EXPLORE I_DIR_OR_FOLDER( N_("Show Containing Directory..."), \
+                                       N_("Show Containing Folder...") )
 #define I_POP_STREAM N_("Stream...")
 #define I_POP_SAVE N_("Save...")
-#define I_POP_EXPLORE N_("Open Folder...")
+
 
 /*************** Playlist *************/
 
-#define I_PL_LOOP       N_("Repeat all")
-#define I_PL_REPEAT     N_("Repeat one")
-#define I_PL_NOREPEAT   N_("No repeat")
+#define I_PL_LOOP       N_("Repeat All")
+#define I_PL_REPEAT     N_("Repeat One")
+#define I_PL_NOREPEAT   N_("No Repeat")
 
 #define I_PL_RANDOM     N_("Random")
-#define I_PL_NORANDOM   N_("Random off")
+#define I_PL_NORANDOM   N_("Random Off")
 
-#define I_PL_ADDPL      N_("Add to playlist")
-#define I_PL_ADDML      N_("Add to media library")
+#define I_PL_ADDPL      N_("Add to Playlist")
+#define I_PL_ADDML      N_("Add to Media Library")
 
-#define I_PL_ADDF       N_("Add file...")
-#define I_PL_ADVADD     N_("Advanced open...")
-#define I_PL_ADDDIR     N_("Add directory...")
+#define I_PL_ADDF       N_("Add File...")
+#define I_PL_ADVADD     N_("Advanced Open...")
+#define I_PL_ADDDIR     I_DIR_OR_FOLDER( N_("Add Directory..."), \
+                                         N_("Add Folder...") )
 
 #define I_PL_SAVE       N_("Save Playlist to &File...")
 #define I_PL_LOAD       N_("Open Play&list...")
@@ -127,8 +143,8 @@
             "<p>If you are unsure about terminology, please consult the <a href=\"http://wiki.videolan.org/Knowledge_Base\">knowledge base</a>.</p>" \
             "<p>To understand the main keyboard shortcuts, read the <a href=\"http://wiki.videolan.org/Hotkeys\">shortcuts</a> page.</p>" \
         "<h3>Help</h3>" \
-            "<p>Before asking any question, please refer yourself to the <a href=\"http://wiki.videolan.org/Frequently_Asked_Questions\">FAQ</a>.</p>" \
-            "<p>You might then get (and give) help on the <a href=\"http://forum.videolan.org\">Forums</a>, the <a href=\"http://www.videolan.org/vlc/lists.html\">mailing-lists</a> or our IRC channel ( <a href=\"http://www.videolan.org/webirc/\"><em>#videolan</em></a> on irc.freenode.net ).</p>" \
+            "<p>Before asking any question, please refer yourself to the <a href=\"http://www.videolan.org/support/faq.html\">FAQ</a>.</p>" \
+            "<p>You might then get (and give) help on the <a href=\"http://forum.videolan.org\">Forums</a>, the <a href=\"http://www.videolan.org/vlc/lists.html\">mailing-lists</a> or our IRC channel (<em>#videolan</em> on irc.freenode.net).</p>" \
         "<h3>Contribute to the project</h3>" \
             "<p>You can help the VideoLAN project giving some of your time to help the community, to design skins, to translate the documentation, to test and to code. You can also give funds and material to help us. And of course, you can <b>promote</b> VLC media player.</p>" \
     "</body></html>")