From 1fc3f91016003fa5856bf987e7f2f8340def6c7a Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 18 Jul 2012 14:03:10 +0000 Subject: Some small fixes (grrr, python imports...). --- release/scripts/modules/bl_i18n_utils/merge_po.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'release/scripts/modules/bl_i18n_utils') diff --git a/release/scripts/modules/bl_i18n_utils/merge_po.py b/release/scripts/modules/bl_i18n_utils/merge_po.py index b09e4daefbc..51e587ca4c8 100755 --- a/release/scripts/modules/bl_i18n_utils/merge_po.py +++ b/release/scripts/modules/bl_i18n_utils/merge_po.py @@ -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" \ -- cgit v1.2.3