summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-07-14 13:59:09 +0000
committerintrigeri <intrigeri@boum.org>2019-07-14 13:59:09 +0000
commit11531ad1e1c056b5dcf2e9d4e88c57451d0e94a2 (patch)
tree710e1d4692bcb2cf5f10b92ab6e0fe60dc38771a
parentcffcd67ac62fe72d617cd662db10839a33dd3cbe (diff)
Fix typos.HEADmaster
-rwxr-xr-xfiles/weblate/scripts/merge_weblate_changes.py2
-rwxr-xr-xfiles/weblate/scripts/update_weblate_git.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/files/weblate/scripts/merge_weblate_changes.py b/files/weblate/scripts/merge_weblate_changes.py
index 5ad2d88..f1c084b 100755
--- a/files/weblate/scripts/merge_weblate_changes.py
+++ b/files/weblate/scripts/merge_weblate_changes.py
@@ -239,7 +239,7 @@ def main(repopath, local, localCommit, remote):
elif local_uptodate and not local.commit.diff(oldcommit):
# We don't have to do anything.
local.commit = oldcommit
- logger.info("Nothing to commit - local branch can be fast-forwared from {remote}.".format(remote=remote))
+ logger.info("Nothing to commit - local branch can be fast-forwarded from {remote}.".format(remote=remote))
# Set the working tree to the new status of "local" and empty the index
local.checkout(force=True)
diff --git a/files/weblate/scripts/update_weblate_git.py b/files/weblate/scripts/update_weblate_git.py
index 7fa27d6..1d31cbd 100755
--- a/files/weblate/scripts/update_weblate_git.py
+++ b/files/weblate/scripts/update_weblate_git.py
@@ -262,7 +262,7 @@ def runForNonMainGit(basepath, tree, func):
try:
tree /= str(basepath.parent)
except KeyError:
- # Tree is not existant, so we can't do anything
+ # Tree is not existent, so we can't do anything
return
for blob in tree:
path = blob.path
@@ -571,7 +571,7 @@ def main(repopath, local, localCommit, remote, pushChanges=False):
elif local_uptodate and not local.commit.diff(oldcommit):
# We don't have to do anything.
local.commit = oldcommit
- logger.info("Nothing to commit - local branch can be fast-forwared from {remote}.".format(remote=remote))
+ logger.info("Nothing to commit - local branch can be fast-forwarded from {remote}.".format(remote=remote))
# Set the working tree to the new status of "local" and empty the index
local.checkout(force=True)