commit c17ef8ef36734dfe92fe31d7f70da9c373f64e48
author Bram Moolenaar <Bram@vim.org> Sat Mar 25 21:48:58 2006 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Mar 25 21:48:58 2006 +0000
tree 6690f07dcd199de67a9b75b65ca44c4d03c6dd8e
parent 7fcab2a02c63220dfee6fc834c435414e0e41b75

updated for version 7.0b01

src/os_mswin.c

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 3d8a084..50a03a5 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -598,8 +598,16 @@
 		}
 #endif
 
-		(void)gui_mch_dialog(VIM_ERROR, (char_u *)_("Error"),
-					      p, (char_u *)_("&Ok"), 1, NULL);
+		(void)gui_mch_dialog(
+#ifdef FEAT_GUI
+				     gui.starting ? VIM_INFO :
+#endif
+					     VIM_ERROR,
+#ifdef FEAT_GUI
+				     gui.starting ? (char_u *)_("Message") :
+#endif
+					     (char_u *)_("Error"),
+				     p, (char_u *)_("&Ok"), 1, NULL);
 #if 0
 #ifdef WIN3264
 		MessageBox(NULL, p, "Vim", MB_TASKMODAL|MB_SETFOREGROUND);

src/os_unixx.h

diff --git a/src/os_unixx.h b/src/os_unixx.h
index abed14d..3dd254e 100644
--- a/src/os_unixx.h
+++ b/src/os_unixx.h
@@ -128,6 +128,10 @@
 
 /* shared library access */
 #if defined(HAVE_DLFCN_H) && defined(USE_DLOPEN)
+# ifdef __MVS__
+    /* needed to define RTLD_LAZY (Anthony Giorgio) */
+#  define __SUSV3
+# endif
 # include <dlfcn.h>
 #else
 # if defined(HAVE_DL_H) && defined(HAVE_SHL_LOAD)

src/po/ja.po

diff --git a/src/po/ja.po b/src/po/ja.po
index 49fd1b0..e46f585 100644
--- a/src/po/ja.po
+++ b/src/po/ja.po
@@ -4708,7 +4708,7 @@
 
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%d ¹ÔÌÜ¤Ë FOL/LOW/UPP ¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "%s ¹ÔÌÜ¤Ë FOL/LOW/UPP ¤¬¤¢¤ê¤Þ¤»¤ó"
 
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE ¤¬»ØÄꤵ¤ì¤Ê¤¤ COMPOUNDSYLMAX"
@@ -4772,7 +4772,7 @@
 
 #, c-format
 msgid "Reading word file %s ..."
-msgstr "ɸ½àÆþÎϤ«¤éÆɹþ¤ßÃæ..."
+msgstr "ɸ½àÆþÎϤ«¤éÆɹþ¤ßÃæ %s ..."
 
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4780,7 +4780,7 @@
 
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "¡ós ¤Î %d ¹ÔÌܤΠñ¸ì¤Î¸å¤Î /encoding= ¹Ô¤ò̵»ë¤·¤Þ¤·¤¿: %s"
+msgstr "%s ¡ós ¤Î %d ¹ÔÌܤΠñ¸ì¤Î¸å¤Î /encoding= ¹Ô¤ò̵»ë¤·¤Þ¤·¤¿: %s"
 
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
@@ -4891,7 +4891,7 @@
 
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: ¸Å¤¤ .sug ¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç, ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤"
+msgstr "E779: ¸Å¤¤ .sug ¥Õ¥¡¥¤¥ë¤Ê¤Î¤Ç, ¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤: %s"
 
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"