See <https://jenkins.tails.boum.org/job/build_Tails_ISO_experimental/2263/>
------------------------------------------ [...truncated 3808 lines...] 102 translated messages, 4 fuzzy translations, 5 untranslated messages. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 90 translated messages, 14 fuzzy translations, 7 untranslated messages. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 102 translated messages, 4 fuzzy translations, 5 untranslated messages. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 102 translated messages, 4 fuzzy translations, 5 untranslated messages. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 102 translated messages, 4 fuzzy translations, 5 untranslated messages. .................. done. 110 translated messages, 1 untranslated message. .................. done. 102 translated messages, 4 fuzzy translations, 5 untranslated messages. .................. done. 91 translated messages, 13 fuzzy translations, 7 untranslated messages. .................. done. 108 translated messages, 2 fuzzy translations, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 102 translated messages, 4 fuzzy translations, 5 untranslated messages. .................. done. 91 translated messages, 13 fuzzy translations, 7 untranslated messages. .................. done. 102 translated messages, 4 fuzzy translations, 5 untranslated messages. ...................... done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. .................. done. 102 translated messages, 4 fuzzy translations, 5 untranslated messages. .................. done. 0 translated messages, 111 untranslated messages. .................. done. 110 translated messages, 1 untranslated message. .................. done. 110 translated messages, 1 untranslated message. 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: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. az: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. ca: 110 translated messages, 1 untranslated message. cs: 110 translated messages, 1 untranslated message. cy: 90 translated messages, 14 fuzzy translations, 7 untranslated messages. da: 110 translated messages, 1 untranslated message. de: 110 translated messages, 1 untranslated message. el: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. en_GB: 110 translated messages, 1 untranslated message. es: 110 translated messages, 1 untranslated message. fa: 110 translated messages, 1 untranslated message. fi: 110 translated messages, 1 untranslated message. fr: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. fr_CA: 110 translated messages, 1 untranslated message. hr_HR: 110 translated messages, 1 untranslated message. hu: 110 translated messages, 1 untranslated message. id: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. it: 110 translated messages, 1 untranslated message. ja: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. km: 91 translated messages, 13 fuzzy translations, 7 untranslated messages. ko: 108 translated messages, 2 fuzzy translations, 1 untranslated message. lv: 110 translated messages, 1 untranslated message. nb: 110 translated messages, 1 untranslated message. nl: 110 translated messages, 1 untranslated message. pl: 110 translated messages, 1 untranslated message. pt: 110 translated messages, 1 untranslated message. pt_BR: 110 translated messages, 1 untranslated message. ru: 110 translated messages, 1 untranslated message. sk: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. sk_SK: 91 translated messages, 13 fuzzy translations, 7 untranslated messages. sl_SI: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. sq: 110 translated messages, 1 untranslated message. sr: 110 translated messages, 1 untranslated message. sv: 110 translated messages, 1 untranslated message. tr: 110 translated messages, 1 untranslated message. uk: 102 translated messages, 4 fuzzy translations, 5 untranslated messages. zh: 0 translated messages, 111 untranslated messages. zh_CN: 110 translated messages, 1 untranslated message. zh_TW: 110 translated messages, 1 untranslated message. + echo LB_DISTRIBUTION=wheezy ++ /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-has-bootstrapped 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 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/experimental + GIT_BRANCH=experimental ++ echo experimental ++ sed s,/,_,g + CLEAN_GIT_BRANCH=experimental + '[' -n https://jenkins.tails.boum.org/ ']' ++ git rev-parse --short HEAD + GIT_SHORT_ID=248028e + BUILD_BASENAME=tails-i386-experimental-1.5-20150512T1604Z-248028e ++ head -n1 config/base_branch + GIT_BASE_BRANCH=devel + '[' -n https://jenkins.tails.boum.org/ ']' + '[' -z '' ']' + '[' experimental '!=' devel ']' ++ git rev-parse origin/devel + GIT_BASE_BRANCH_COMMIT=86a5b06ef351c702e54c715091afd6bfb31a3088 + echo 'Merging base branch origin/devel' Merging base branch origin/devel + echo '(at commit 86a5b06ef351c702e54c715091afd6bfb31a3088)...' (at commit 86a5b06ef351c702e54c715091afd6bfb31a3088)... + git merge --no-edit origin/devel error: Your local changes to the following files would be overwritten by merge: wiki/src/doc/about/features.de.po wiki/src/doc/about/features.fr.po wiki/src/doc/about/features.pt.po wiki/src/doc/advanced_topics.index.de.po wiki/src/doc/advanced_topics.index.fr.po wiki/src/doc/advanced_topics.index.pt.po wiki/src/doc/anonymous_internet/Tor_Browser.de.po wiki/src/doc/anonymous_internet/Tor_Browser.fr.po wiki/src/doc/anonymous_internet/Tor_Browser.pt.po wiki/src/doc/first_steps/installation.de.po wiki/src/news/version_1.4.de.po wiki/src/news/version_1.4.fr.po wiki/src/news/version_1.4.pt.po wiki/src/support/faq.de.po wiki/src/support/faq.fr.po wiki/src/support/faq.pt.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. error: The following untracked working tree files would be overwritten by merge: wiki/src/doc/advanced_topics/paperkey.de.po wiki/src/doc/advanced_topics/paperkey.fr.po wiki/src/doc/advanced_topics/paperkey.pt.po Please move or remove 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.hpK8IdBs ] + cd / + mount + grep -E+ awk {print $3} ^[^[:space:]]+ on /tmp/tails-build.hpK8IdBs+ sort -r + mounts=/tmp/tails-build.hpK8IdBs + [ -n /tmp/tails-build.hpK8IdBs ] + sudo umount /tmp/tails-build.hpK8IdBs + [ -d /tmp/tmpfs.sHFY7H8G ] + sudo umount /tmp/tmpfs.sHFY7H8G + rmdir /tmp/tmpfs.sHFY7H8G + [ -d /tmp/tails-build.hpK8IdBs ] + sudo rm -rf /tmp/tails-build.hpK8IdBs Build step 'Execute shell' marked build as failure _______________________________________________ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
