Update upstream source from tag 'upstream/5.1.1'

Update to upstream version '5.1.1'
with Debian dir 878f8cb06af8c1037570ac8774f9261ff9b12fa4

1 files changed, 88 insertions, 0 deletions

diff --git a/app/i18n/CMakeFiles/msgmerge-fi.dir/build.make b/app/i18n/CMakeFiles/msgmerge-fi.dir/build.make
new file mode 100644
index 0000000..11cfb79
--- /dev/null
+++ b/app/i18n/CMakeFiles/msgmerge-fi.dir/build.make
@@ -0,0 +1,88 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/martin/XTrackCAD/src/work
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/martin/XTrackCAD/src/work
+
+# Utility rule file for msgmerge-fi.
+
+# Include the progress variables for this target.
+include app/i18n/CMakeFiles/msgmerge-fi.dir/progress.make
+
+app/i18n/CMakeFiles/msgmerge-fi: app/i18n/xtrkcad.pot
+app/i18n/CMakeFiles/msgmerge-fi: app/i18n/fi.po
+	cd /home/martin/XTrackCAD/src/work/app/i18n && /usr/bin/msgmerge -U --backup=none /home/martin/XTrackCAD/src/work/app/i18n/fi.po /home/martin/XTrackCAD/src/work/app/i18n/xtrkcad.pot
+
+app/i18n/xtrkcad.pot: app/bin/xtrkcad
+app/i18n/xtrkcad.pot: app/i18n/custmsg.h
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating xtrkcad.pot"
+	cd /home/martin/XTrackCAD/src/work/app/i18n && /usr/bin/xgettext --keyword=_ --keyword=p_ --keyword=N_ -d -F -o /home/martin/XTrackCAD/src/work/app/i18n/xtrkcad.pot --from-code=ISO-8859-15 ../../CMakeFiles/3.6.2/CompilerIdC/CMakeCCompilerId.c ../../CMakeFiles/feature_tests.c ../bin/appdefaults.c ../bin/bdf2xtp.c ../bin/cbezier.c ../bin/cblock.c ../bin/ccontrol.c ../bin/ccornu.c ../bin/ccurve.c ../bin/cdraw.c ../bin/celev.c ../bin/cgroup.c ../bin/chndldto.c ../bin/chotbar.c ../bin/cjoin.c ../bin/cmisc.c ../bin/cmisc2.c ../bin/cmodify.c ../bin/cnote.c ../bin/cnvdsgn.c ../bin/compound.c ../bin/cparalle.c ../bin/cprint.c ../bin/cprofile.c ../bin/cpull.c ../bin/cruler.c ../bin/cselect.c ../bin/csensor.c ../bin/csignal.c ../bin/csnap.c ../bin/csplit.c ../bin/cstraigh.c ../bin/cstruct.c ../bin/cswitchmotor.c ../bin/ctext.c ../bin/ctodesgn.c ../bin/ctrain.c ../bin/cturnout.c ../bin/cturntbl.c ../bin/cundo.c ../bin/custom.c ../bin/dbench.c ../bin/dbitmap.c ../bin/dcar.c ../bin/dcmpnd.c ../bin/dcontmgm.c ../bin/dcustmgm.c ../bin/dease.c ../bin/denum.c ../bin/dlayer.c ../bin/doption.c ../bin/dpricels.c ../bin/dprmfile.c ../bin/draw.c ../bin/drawgeom.c ../bin/dxfformat.c ../bin/dxfoutput.c ../bin/elev.c ../bin/fileio.c ../bin/helphelper.c ../bin/i18n.c ../bin/layout.c ../bin/lprintf.c ../bin/macro.c ../bin/misc.c ../bin/misc2.c ../bin/param.c ../bin/paths.c ../bin/shrtpath.c ../bin/smalldlg.c ../bin/tbezier.c ../bin/tcornu.c ../bin/tcurve.c ../bin/tease.c ../bin/track.c ../bin/trkseg.c ../bin/tstraigh.c ../bin/unittest/defaultstest.c ../bin/unittest/dxfformattest.c ../bin/unittest/pathstest.c ../bin/utility.c ../bin/xtrackcad.c ../cornu/bezctx.c ../cornu/bezctx_xtrkcad.c ../cornu/ppedit_gtk1.c ../cornu/spiro.c ../cornu/spiroentrypoints.c ../dynstring/dynstring.c ../dynstring/unittest/DynStringTest.c ../help/genhelp.c ../help/genmessages.c ../lib/params/mkcarpart.c ../lib/params/mkstruct.c ../tools/dirent.c ../tools/halibut/biblio.c ../tools/halibut/bk_html.c ../tools/halibut/bk_paper.c ../tools/halibut/charset/big5enc.c ../tools/halibut/charset/big5set.c ../tools/halibut/charset/cns11643.c ../tools/halibut/charset/cp949.c ../tools/halibut/charset/cstable.c ../tools/halibut/charset/enum.c ../tools/halibut/charset/euc.c ../tools/halibut/charset/fromucs.c ../tools/halibut/charset/gb2312.c ../tools/halibut/charset/hz.c ../tools/halibut/charset/iso2022.c ../tools/halibut/charset/iso2022s.c ../tools/halibut/charset/istate.c ../tools/halibut/charset/jisx0208.c ../tools/halibut/charset/jisx0212.c ../tools/halibut/charset/ksx1001.c ../tools/halibut/charset/locale.c ../tools/halibut/charset/localenc.c ../tools/halibut/charset/macenc.c ../tools/halibut/charset/mimeenc.c ../tools/halibut/charset/sbcs.c ../tools/halibut/charset/sbcsdat.c ../tools/halibut/charset/shiftjis.c ../tools/halibut/charset/slookup.c ../tools/halibut/charset/superset.c ../tools/halibut/charset/test.c ../tools/halibut/charset/toucs.c ../tools/halibut/charset/utf16.c ../tools/halibut/charset/utf7.c ../tools/halibut/charset/utf8.c ../tools/halibut/charset/xenc.c ../tools/halibut/contents.c ../tools/halibut/deflate.c ../tools/halibut/error.c ../tools/halibut/help.c ../tools/halibut/in_afm.c ../tools/halibut/in_pf.c ../tools/halibut/index.c ../tools/halibut/input.c ../tools/halibut/keywords.c ../tools/halibut/licence.c ../tools/halibut/main.c ../tools/halibut/malloc.c ../tools/halibut/misc.c ../tools/halibut/psdata.c ../tools/halibut/tree234.c ../tools/halibut/ustring.c ../tools/halibut/version.c ../tools/halibut/wcwidth.c ../tools/listxtp.c ../wlib/gtklib/bitmap.c ../wlib/gtklib/boxes.c ../wlib/gtklib/browserhelp.c ../wlib/gtklib/button.c ../wlib/gtklib/color.c ../wlib/gtklib/control.c ../wlib/gtklib/droplist.c ../wlib/gtklib/filesel.c ../wlib/gtklib/font.c ../wlib/gtklib/gtkdraw-cairo.c ../wlib/gtklib/help.c ../wlib/gtklib/ixhelp.c ../wlib/gtklib/lines.c ../wlib/gtklib/list.c ../wlib/gtklib/liststore.c ../wlib/gtklib/main.c ../wlib/gtklib/menu.c ../wlib/gtklib/message.c ../wlib/gtklib/notice.c ../wlib/gtklib/osxhelp.c ../wlib/gtklib/pixbuf.c ../wlib/gtklib/png.c ../wlib/gtklib/print.c ../wlib/gtklib/single.c ../wlib/gtklib/splash.c ../wlib/gtklib/statusbar.c ../wlib/gtklib/text.c ../wlib/gtklib/timer.c ../wlib/gtklib/tooltip.c ../wlib/gtklib/treeview.c ../wlib/gtklib/util.c ../wlib/gtklib/window.c ../wlib/gtklib/wpref.c ../wlib/mswlib/checksum.c ../wlib/mswlib/getopt.c ../wlib/mswlib/gwin32.c ../wlib/mswlib/mswbitmap.c ../wlib/mswlib/mswbox.c ../wlib/mswlib/mswbutt.c ../wlib/mswlib/mswchksm.c ../wlib/mswlib/mswchoic.c ../wlib/mswlib/mswcolor.c ../wlib/mswlib/mswdraw.c ../wlib/mswlib/mswedit.c ../wlib/mswlib/mswlines.c ../wlib/mswlib/mswlist.c ../wlib/mswlib/mswmenu.c ../wlib/mswlib/mswmisc.c ../wlib/mswlib/mswmsg.c ../wlib/mswlib/mswpref.c ../wlib/mswlib/mswprint.c ../wlib/mswlib/mswsplash.c ../wlib/mswlib/mswstatus.c ../wlib/mswlib/mswtext.c ../wlib/mswlib/simple-gettext.c ../wlib/test/alarmtst.c ../wlib/test/boxtest.c ../wlib/test/btest.c ../wlib/test/colortst.c ../wlib/test/draw.c ../wlib/test/fred.c ../wlib/test/listtest.c ../wlib/test/testapp.c stripmsg.c ../../xtrkcad-config.h ../bin/acclkeys.h ../bin/cbezier.h ../bin/ccornu.h ../bin/ccurve.h ../bin/cjoin.h ../bin/common.h ../bin/compound.h ../bin/cselect.h ../bin/cstraigh.h ../bin/ctrain.h ../bin/cundo.h ../bin/custom.h ../bin/draw.h ../bin/drawgeom.h ../bin/dxfformat.h ../bin/fileio.h ../bin/i18n.h ../bin/layout.h ../bin/misc.h ../bin/misc2.h ../bin/param.h ../bin/paths.h ../bin/shrtpath.h ../bin/smalldlg.h ../bin/tbezier.h ../bin/tcornu.h ../bin/track.h ../bin/trackx.h ../bin/uthash.h ../bin/utility.h ../bin/version.h ../cornu/bezctx.h ../cornu/bezctx_intf.h ../cornu/bezctx_xtrkcad.h ../cornu/spiro.h ../cornu/spiroentrypoints.h ../cornu/zmisc.h ../dynstring/dynstring.h ../tools/dirent.h ../tools/halibut/charset/charset.h ../tools/halibut/charset/internal.h ../tools/halibut/charset/sbcsdat.h ../tools/halibut/deflate.h ../tools/halibut/halibut.h ../tools/halibut/paper.h ../tools/halibut/tree234.h ../wlib/gtklib/dynarr.h ../wlib/gtklib/gtkint.h ../wlib/gtklib/uthash.h ../wlib/include/ctl3d.h ../wlib/include/getopt.h ../wlib/include/mswlib.h ../wlib/include/wcolors.h ../wlib/include/wlib.h ../wlib/mswlib/dynarr.h ../wlib/mswlib/mswint.h ../help/messages.h ../bin/bllnhlp.c custmsg.h
+
+app/i18n/custmsg.h: app/i18n/stripmsg
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Generating custmsg.h"
+	cd /home/martin/XTrackCAD/src/work/app/i18n && ./stripmsg /home/martin/XTrackCAD/src/work/app/lib/xtrkcad.xtq /home/martin/XTrackCAD/src/work/app/lib/demos/dmadjend.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmbench.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmcancel.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmcircle.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmconn1.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmconn2.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmcrvtrk.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmctlpnl.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmdelund.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmdialog.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmdimlin.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmease.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmelev.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmexcept.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmextend.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmflip.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmgroup.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmhelix.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmhndld.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmintro.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmjcir.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmjnabut.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmjncs.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmjnmove.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmjnss.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmjntt.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmlines.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmlines2.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmmouse.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmmovabt.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmnotes.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmparall.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmplymod.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmprof.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmrescal.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmrotate.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmruler.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmselect.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmsplit.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmstrtrk.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmtbledg.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmtodes.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmtosel.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmtotrim.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmtoyard.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmtrkwid.xtr /home/martin/XTrackCAD/src/work/app/lib/demos/dmtrntab.xtr /home/martin/XTrackCAD/src/work/app/help/xtrkcad.tip > /home/martin/XTrackCAD/src/work/app/i18n/custmsg.h
+
+msgmerge-fi: app/i18n/CMakeFiles/msgmerge-fi
+msgmerge-fi: app/i18n/xtrkcad.pot
+msgmerge-fi: app/i18n/custmsg.h
+msgmerge-fi: app/i18n/CMakeFiles/msgmerge-fi.dir/build.make
+
+.PHONY : msgmerge-fi
+
+# Rule to build all files generated by this target.
+app/i18n/CMakeFiles/msgmerge-fi.dir/build: msgmerge-fi
+
+.PHONY : app/i18n/CMakeFiles/msgmerge-fi.dir/build
+
+app/i18n/CMakeFiles/msgmerge-fi.dir/clean:
+	cd /home/martin/XTrackCAD/src/work/app/i18n && $(CMAKE_COMMAND) -P CMakeFiles/msgmerge-fi.dir/cmake_clean.cmake
+.PHONY : app/i18n/CMakeFiles/msgmerge-fi.dir/clean
+
+app/i18n/CMakeFiles/msgmerge-fi.dir/depend:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/i18n /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/i18n /home/martin/XTrackCAD/src/work/app/i18n/CMakeFiles/msgmerge-fi.dir/DependInfo.cmake --color=$(COLOR)
+.PHONY : app/i18n/CMakeFiles/msgmerge-fi.dir/depend
+