Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-07-29 16:07:06 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-29 16:07:06 +0400
commit2553cdf195a1d1bbf19bde23b8bbe58de802d1f3 (patch)
treef5f7e25465de4f99c406dbba25864b150c84b67d /release/scripts/modules/bl_i18n_utils/merge_po.py
parentab38e1d3795f58b5b3e9ca0377c9348ed710471a (diff)
style cleanup
Diffstat (limited to 'release/scripts/modules/bl_i18n_utils/merge_po.py')
-rwxr-xr-xrelease/scripts/modules/bl_i18n_utils/merge_po.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/merge_po.py b/release/scripts/modules/bl_i18n_utils/merge_po.py
index 51e587ca4c8..baf67de2e81 100755
--- a/release/scripts/modules/bl_i18n_utils/merge_po.py
+++ b/release/scripts/modules/bl_i18n_utils/merge_po.py
@@ -21,7 +21,7 @@
# <pep8 compliant>
# Merge one or more .po files into the first dest one.
-# If a msgkey is present in more than one merged po, the one in the first file wins, unless
+# If a msgkey 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.
# The fuzzy flag is removed if necessary.
# All other comments are never modified.
@@ -59,7 +59,6 @@ def main():
help="The po's to merge into the dst.po one.")
args = parser.parse_args()
-
ret = 0
done_msgkeys = set()
done_fuzzy_msgkeys = set()
@@ -78,7 +77,7 @@ def main():
# If we don’t want to replace existing valid translations, pre-populate
# done_msgkeys and done_fuzzy_msgkeys.
if not args.replace:
- done_msgkeys = dst_states["trans_msg"].copy()
+ done_msgkeys = dst_states["trans_msg"].copy()
done_fuzzy_msgkeys = dst_states["fuzzy_msg"].copy()
for po in args.src:
messages, states, stats = utils.parse_messages(po)