See <https://jenkins.tails.boum.org/job/build_Tails_ISO_feature-jessie-32-bit-UEFI/2/>
------------------------------------------ [...truncated 3837 lines...] 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 100 translated messages, 4 fuzzy translations, 6 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 100 translated messages, 4 fuzzy translations, 6 untranslated messages. ................... done. 89 translated messages, 13 fuzzy translations, 8 untranslated messages. ................... done. 106 translated messages, 2 fuzzy translations, 2 untranslated messages. .................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. .................... done. 100 translated messages, 4 fuzzy translations, 6 untranslated messages. ................... done. 89 translated messages, 13 fuzzy translations, 8 untranslated messages. ................... done. 100 translated messages, 4 fuzzy translations, 6 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 100 translated messages, 4 fuzzy translations, 6 untranslated messages. .................. done. 0 translated messages, 110 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ................... done. 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ar: .................. done. az: .................. done. ca: .................. done. cs: .................. done. cy: .................. done. da: .................. done. de: .................. done. el: .................. done. en_GB: .................. done. es: .................. done. fa: .................. done. fi: .................. done. fr: .................. done. fr_CA: .................. done. hr_HR: .................. done. hu: .................. done. id: .................. done. it: .................. done. ja: .................. done. km: .................. done. ko: .................. done. lv: .................. done. nb: .................. done. nl: .................. done. pl: .................. done. pt: .................. done. pt_BR: .................. done. ru: .................. done. sk: .................. done. sk_SK: .................. done. sl_SI: .................. done. sq: .................. done. sr: .................. done. sv: .................. done. tr: .................. done. uk: .................. done. zh: .................. done. zh_CN: .................. done. zh_TW: .................. done. * Current translation support in tails ar: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. az: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. ca: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. cs: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. cy: 88 translated messages, 14 fuzzy translations, 8 untranslated messages. da: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. de: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. el: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. en_GB: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. es: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. fa: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. fi: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. fr: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. fr_CA: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. hr_HR: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. hu: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. id: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. it: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ja: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. km: 89 translated messages, 13 fuzzy translations, 8 untranslated messages. ko: 106 translated messages, 2 fuzzy translations, 2 untranslated messages. lv: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. nb: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. nl: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. pl: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. pt: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. pt_BR: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. ru: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. sk: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. sk_SK: 89 translated messages, 13 fuzzy translations, 8 untranslated messages. sl_SI: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. sq: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. sr: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. sv: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. tr: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. uk: 100 translated messages, 4 fuzzy translations, 6 untranslated messages. zh: 0 translated messages, 110 untranslated messages. zh_CN: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. zh_TW: 107 translated messages, 1 fuzzy translation, 2 untranslated messages. + echo LB_DISTRIBUTION=jessie ++ /bin/grep -E --no-filename '[^ #]*\.in$' po/POTFILES.in ++ sed -e 's,^config/chroot_local-includes,,' ++ tr '\n' ' ' + echo 'POTFILES_DOT_IN='\''/etc/skel/Desktop/Report_an_error.desktop.in /etc/skel/Desktop/tails-documentation.desktop.in /usr/share/applications/tails-documentation.desktop.in /usr/share/applications/i2p-browser.desktop.in /usr/share/applications/tails-about.desktop.in /usr/share/applications/tails-reboot.desktop.in /usr/share/applications/tails-shutdown.desktop.in /usr/share/applications/tor-browser.desktop.in /usr/share/applications/unsafe-browser.desktop.in /usr/share/desktop-directories/Tails.directory.in '\''' + chmod -R go+rX config/binary_local-includes/ + chmod -R go+rX config/chroot_local-includes/etc + chmod 0440 config/chroot_local-includes/etc/sudoers.d/always-ask-password config/chroot_local-includes/etc/sudoers.d/zzz_boot_profile config/chroot_local-includes/etc/sudoers.d/zzz_halt config/chroot_local-includes/etc/sudoers.d/zzz_persistence-setup config/chroot_local-includes/etc/sudoers.d/zzz_tails-debugging-info config/chroot_local-includes/etc/sudoers.d/zzz_tor-launcher config/chroot_local-includes/etc/sudoers.d/zzz_unsafe-browser config/chroot_local-includes/etc/sudoers.d/zzz_upgrade + chmod go+rX config/chroot_local-includes/home + chmod go+rX config/chroot_local-includes/lib + chmod go+rX config/chroot_local-includes/lib/live + chmod -R go+rx config/chroot_local-includes/lib/live/config + chmod -R go+rX config/chroot_local-includes/lib/systemd + chmod go+rX config/chroot_local-includes/live + chmod -R go+rX config/chroot_local-includes/usr + chmod -R go+rx config/chroot_local-includes/usr/local/bin + chmod -R go+rx config/chroot_local-includes/usr/local/sbin + chmod -R go+rX config/chroot_local-includes/usr/share/doc/tails + chmod -R go+rX config/chroot_local-includes/var + chmod -R go+rX config/chroot_apt + chmod -R go+rX config/chroot_sources + : -comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K + MKSQUASHFS_OPTIONS='-comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K -wildcards -ef chroot/usr/share/amnesia/build/mksquashfs-excludes' + export MKSQUASHFS_OPTIONS ++ git symbolic-ref HEAD + GIT_REF=refs/heads/feature/jessie+32-bit-UEFI + GIT_BRANCH=feature/jessie+32-bit-UEFI ++ echo feature/jessie+32-bit-UEFI ++ sed s,/,_,g + CLEAN_GIT_BRANCH=feature_jessie+32-bit-UEFI + '[' -n https://jenkins.tails.boum.org/ ']' ++ git rev-parse --short HEAD + GIT_SHORT_ID=7b2dddd + BUILD_BASENAME=tails-i386-feature_jessie+32-bit-UEFI-1.5-20150701T1329Z-7b2dddd ++ head -n1 config/base_branch + GIT_BASE_BRANCH=feature/jessie + '[' -n https://jenkins.tails.boum.org/ ']' + '[' -z '' ']' + '[' feature/jessie+32-bit-UEFI '!=' feature/jessie ']' ++ git rev-parse origin/feature/jessie + GIT_BASE_BRANCH_COMMIT=4f0246a2de09d1ed86cc8fd81c1960ba3efc4d12 + echo 'Merging base branch origin/feature/jessie' Merging base branch origin/feature/jessie + echo '(at commit 4f0246a2de09d1ed86cc8fd81c1960ba3efc4d12)...' (at commit 4f0246a2de09d1ed86cc8fd81c1960ba3efc4d12)... + git merge --no-edit origin/feature/jessie error: Your local changes to the following files would be overwritten by merge: po/ar.po po/az.po po/ca.po po/cs.po po/cy.po po/da.po po/de.po po/el.po po/en_GB.po po/es.po po/fa.po po/fi.po po/fr.po po/fr_CA.po po/hr_HR.po po/hu.po po/id.po po/it.po po/ja.po po/km.po po/ko.po po/lv.po po/nb.po po/nl.po po/pl.po po/pt.po po/pt_BR.po po/ru.po po/sk.po po/sk_SK.po po/sl_SI.po po/sq.po po/sr.po po/sv.po po/tails.pot po/tr.po po/uk.po po/zh.po po/zh_CN.po po/zh_TW.po wiki/src/doc/about/features.de.po wiki/src/doc/about/features.fr.po wiki/src/doc/anonymous_internet/i2p.de.po wiki/src/doc/encryption_and_privacy.index.fr.po wiki/src/support/known_issues.de.po wiki/src/support/known_issues.fr.po wiki/src/support/known_issues.pt.po Please, commit your changes or stash them before you can merge. Aborting + fatal 'Failed to merge base branch.' + echo 'Failed to merge base branch.' Failed to merge base branch. + exit 1 + cleanup + [ -n /tmp/tails-build.FNFMhBO0 ] + cd / + mount + + grep -E ^[^[:space:]]+ on /tmp/tails-build.FNFMhBO0 + awk {print $3} sort -r + mounts=/tmp/tails-build.FNFMhBO0 + [ -n /tmp/tails-build.FNFMhBO0 ] + sudo umount /tmp/tails-build.FNFMhBO0 + [ -d /tmp/tmpfs.enr3Dnq3 ] + sudo umount /tmp/tmpfs.enr3Dnq3 + rmdir /tmp/tmpfs.enr3Dnq3 + [ -d /tmp/tails-build.FNFMhBO0 ] + sudo rm -rf /tmp/tails-build.FNFMhBO0 Build step 'Execute shell' marked build as failure _______________________________________________ Tails-dev mailing list [email protected] https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to [email protected].
