*** empty log message ***

diff --git a/FORMATS/IM.ja.txt b/FORMATS/IM.ja.txt
index e2149bf..797e564 100644 (file)
--- a/FORMATS/IM.ja.txt
+++ b/FORMATS/IM.ja.txt
@@ -27,7 +27,11 @@ INPUT-METHOD ::=
     IM-DECLARATION ? DESCRIPTION ? VARIABLE-LIST ? COMMAND-LIST ?
     TITLE MAP-LIST MACRO-LIST ? MODULE-LIST ? STATE-LIST
 
+<<<<<<< IM.ja.txt
+IM-DECLARATION ::= '(' 'input-method' LANGUAGE NAME [ VERSION ] ')'
+=======
 IM-DECLARATION ::= '(' 'input-method' LANGUAGE NAME [ '(version' VERSION ')'] ')'
+>>>>>>> 1.13
 DESCRIPTION ::= '(' 'description' [ MTEXT-OR-GETTEXT | nil] ')'
 VARIABLE-LIST ::= '(' 'variable' VARIABLE-DECLARATION * ')'
 COMMAND-LIST ::= '(' 'command' COMMAND-DECLARATION * ')'
@@ -44,7 +48,11 @@ MTEXT-OR-GETTEXT ::=
 
 LANGUAGE ::= SYMBOL
 NAME ::= SYMBOL
+<<<<<<< IM.ja.txt
+VERSION ::=MTEXT
+=======
 VERSION ::= MTEXT
+>>>>>>> 1.13
 VAR-NAME ::= SYMBOL
 VAR-DESCRIPTION ::= MTEXT
 VALUE ::= MTEXT | SYMBOL | INTEGER
@@ -58,10 +66,17 @@ TITLE-TEXT ::= MTEXT
 
 @c IM-DECLARATION ¤Ï¤³¤ÎÆþÎϥ᥽¥Ã¥É¤Î¸À¸ì¤È̾Á°¤ò»ØÄꤹ¤ë¡£
 
+<<<<<<< IM.ja.txt
+@c VERSION ¤Ï ºÇÄãɬÍ×¤Ê m17n ¥é¥¤¥Ö¥é¥ê¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò¼¨¤¹¡£¥Õ¥©¡¼
+¥Þ¥Ã¥È¤Ï "XX.YY.ZZ" ¤Ç¤¢¤ê¡¢XX ¤Ï¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥óÈֹ桢YY ¤Ï¥Þ¥¤¥Ê¡¼
+¥Ð¡¼¥¸¥ç¥óÈֹ桢ZZ ¤Ï¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤Ç¤¢¤ë¡£
+
+=======
 @c VERSION ¤Ï¤³¤ÎÆþÎϥ᥽¥Ã¥É¤¬É¬ÍפȤ¹¤ë m17n ¥é¥¤¥Ö¥é¥ê¤ÎºÇ¾®¥Ð¡¼¥¸¥ç
 ¥ó¤ò»ØÄꤹ¤ë¡£¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï "XX.YY.ZZ" ¤Ç¤¢¤ê¡¢XX ¤Ï¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç
 ¥ó¡¢ YY ¤Ï¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¡¢ZZ ¤Ï¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤òɽ¤¹¡£
 
+>>>>>>> 1.13
 @c DESCRIPTION ¤Ï¤³¤ÎÆþÎϥ᥽¥Ã¥É¤ÎÀâÌÀ¤ò @c MTEXT-OR-GETTEXT ¤Ç»ØÄꤹ
 ¤ë¡£¤â¤·¤³¤ì¤¬£²ÈÖÌܤηÁ¼°¤ò¼è¤Ã¤Æ¤¤¤ì¤Ð¡¢ @c MTEXT ¤Ï¸½ºß¤Î¥í¥±¡¼¥ë¤Ë
 ½¾¤Ã¤Æ "gettext" ¤Ë¤è¤Ã¤ÆËÝÌõ¤µ¤ì¤ë¡ÊËÝÌõʸ¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡Ë¡£

diff --git a/FORMATS/IM.txt b/FORMATS/IM.txt
index f2b5f2b..234498e 100644 (file)
--- a/FORMATS/IM.txt
+++ b/FORMATS/IM.txt
@@ -89,7 +89,7 @@ be used in two ways.  One is to introduce a new variable.  In that
 case, VALUE must not be omitted.  Another is to inherit the variable
 from what declared in the special MIM file "global.mim", and to give
 the different default value and/or to make the variable customizable
-specially for the current input method.  In the last case, VALUE can
+specially for the current input method.  In the latter case, VALUE can
 be omitted.
 
 
@@ -101,7 +101,7 @@ to introduce a new command.  In that case, KEYSEQ must not be omitted.
 Another is to inherit the command from what declared in the special
 MIM file "global.mim", and to give the different key binding and/or to
 make the command customizable specially for the current input method.
-In the last case, KEYSEQ can be omitted.
+In the latter case, KEYSEQ can be omitted.
 
 @verbatim
 MODULE-LIST ::= '(' 'module' MODULE * ')'