Update layouts to format 30.

[lyx.git] / lib / lyx2lyx / LyX.py

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index ba3067d3f78b6c3f2fc676584a43219e07a7f7d7..2b9560aac91d2ce6342ca0e40eb9397a7fc15e27 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -81,8 +81,7 @@ format_relation = [("0_06",    [200], minor_versions("0.6" , 4)),
                    ("1_4", range(222,246), minor_versions("1.4" , 5)),
                    ("1_5", range(246,277), minor_versions("1.5" , 7)),
                    ("1_6", range(277,346), minor_versions("1.6" , 0)),
-                   ]
-#                   ("2_0",     [],    minor_versions("2.0", 0))]
+                   ("2_0",     [],    minor_versions("2.0", 0))]
 
 ####################################################################
 # This is useful just for development versions                     #
@@ -255,7 +254,7 @@ class LyX_base:
         " Emits a warning and exits if not in try_hard mode."
         self.warning(message)
         if not self.try_hard:
-            self.warning("Quiting.")
+            self.warning("Quitting.")
             sys.exit(1)
 
         self.status = 2
@@ -522,16 +521,16 @@ class LyX_base:
 
     def convert(self):
         "Convert from current (self.format) to self.end_format."
-        mode, convertion_chain = self.chain()
-        self.warning("convertion chain: " + str(convertion_chain), 3)
+        mode, conversion_chain = self.chain()
+        self.warning("conversion chain: " + str(conversion_chain), 3)
 
-        for step in convertion_chain:
+        for step in conversion_chain:
             steps = getattr(__import__("lyx_" + step), mode)
 
             self.warning("Convertion step: %s - %s" % (step, mode),
                          default_debug__ + 1)
             if not steps:
-                self.error("The convertion to an older "
+                self.error("The conversion to an older "
                 "format (%s) is not implemented." % self.format)
 
             multi_conv = len(steps) != 1
@@ -564,7 +563,7 @@ class LyX_base:
 
     def chain(self):
         """ This is where all the decisions related with the
-        convertion are taken.  It returns a list of modules needed to
+        conversion are taken.  It returns a list of modules needed to
         convert the LyX file from self.format to self.end_format"""
 
         self.start =  self.format