[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49033] trunk/blender/release/scripts/ modules/bl_i18n_utils/merge_po.py: Some small fixes (grrr, python imports.. .).

[Bastien Montagne]

Revision: 49033
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49033
Author:   mont29
Date:     2012-07-18 14:03:10 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Some small fixes (grrr, python imports...).

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py

Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py	2012-07-18 13:44:48 UTC (rev 49032)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/merge_po.py	2012-07-18 14:03:10 UTC (rev 49033)
@@ -31,16 +31,17 @@
 import sys
 
 try:
+    import settings
     import utils
 except:
-    from . import utils
+    from . import (settings, utils)
 
 
 def main():
     import argparse
     parser = argparse.ArgumentParser(description="" \
                     "Merge one or more .po files into the first dest one.\n" \
-                    "If a msgkey (msgid, msgctxt) is present in more than " \
+                    "If a msgkey (msgctxt, msgid) is present in more than " \
                     "one merged po, the one in the first file wins, unless " \
                     "it’s marked as fuzzy and one later is not.\n" \
                     "The fuzzy flag is removed if necessary.\n" \