diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-07-18 18:03:10 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-07-18 18:03:10 +0400 |
| commit | 1fc3f91016003fa5856bf987e7f2f8340def6c7a (patch) | |
| tree | a96df0904a6fcf74efdda2843c4752cb2b893335 /release/scripts/modules/bl_i18n_utils | |
| parent | c0e004bd61c45811f99a886d8818a7764109c5ec (diff) | |
Some small fixes (grrr, python imports...).
Diffstat (limited to 'release/scripts/modules/bl_i18n_utils')
| -rwxr-xr-x | release/scripts/modules/bl_i18n_utils/merge_po.py | 5 |
1 files changed, 3 insertions, 2 deletions
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" \ |