From 17a6ca2207c8e6cfa73d6debf1ddf6c18303c057 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 8 Aug 2017 03:20:16 -0400
Subject: [PATCH] i18n: automatic i18n merges are down

---
 ci/txpull.sh | 2 +-
 ci/txpush.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/txpull.sh b/ci/txpull.sh
index 624da0bd4..49e5c698b 100755
--- a/ci/txpull.sh
+++ b/ci/txpull.sh
@@ -34,4 +34,4 @@ for MODULE_DIR in `find src/modules -maxdepth 1 -mindepth 1 -type d`; do
   fi
 done
 
-git push --set-upstream origin master
+# git push --set-upstream origin master
diff --git a/ci/txpush.sh b/ci/txpush.sh
index d1a2d82be..0bb3f35f1 100755
--- a/ci/txpush.sh
+++ b/ci/txpush.sh
@@ -25,10 +25,10 @@ for MODULE_DIR in `find src/modules -maxdepth 1 -mindepth 1 -type d`; do
       ${PYGETTEXT} -p ${MODULE_DIR}/lang -d ${MODULE_NAME} ${MODULE_DIR}/*.py
       if [ -f ${MODULE_DIR}/lang/${MODULE_NAME}.pot ]; then
         tx set -r calamares.${MODULE_NAME} --source -l en ${MODULE_DIR}/lang/${MODULE_NAME}.pot
-        tx push --force --source --no-interactive -r calamares.${MODULE_NAME}
+        tx push --source --no-interactive -r calamares.${MODULE_NAME}
       fi
     fi
   fi
 done
 
-tx push --force --source --no-interactive -r calamares.calamares-master
+tx push --source --no-interactive -r calamares.calamares-master