diff -Nru pioneers-15.5/aclocal.m4 pioneers-15.6/aclocal.m4 --- pioneers-15.5/aclocal.m4 2018-03-14 16:02:11.000000000 +0000 +++ pioneers-15.6/aclocal.m4 2020-08-02 12:59:31.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,13 +332,12 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -346,49 +345,43 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -397,18 +390,17 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -495,8 +487,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -563,7 +555,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -605,7 +597,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +618,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -648,7 +640,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -683,7 +675,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -691,49 +683,42 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -772,7 +757,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -801,7 +786,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -848,7 +833,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -867,7 +852,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -948,7 +933,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1008,7 +993,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1036,7 +1021,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1055,7 +1040,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru pioneers-15.5/ChangeLog pioneers-15.6/ChangeLog --- pioneers-15.5/ChangeLog 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/ChangeLog 2020-08-02 12:55:59.000000000 +0000 @@ -1,3 +1,270 @@ +2020-08-02 Roland Clobus + * Released 15.6. + +2020-08-02 Roland Clobus + * Makefile.am: Fixed 'make pristine'. + * Makefile.am: Fixed 'make distclean' when running with -j. + * client/ai/genetic.c, client/ai/genetic_core.c, + client/common/client.c, common/gtk/game-settings.c, + common/map_query.c, editor/gtk/editor.c: Apply 'make codespell'. + * client/ai/lobbybot.c, po/*: Apply 'make codespell' for a + translatable string. + * client/gtk/trade.c: Fixed translator comment. + * NEWS, client/ai/lobbybot.c: Prepare for the release of 15.6. + * docs/README.release: Prepare for the release of 15.6. + +2020-07-26 Roland Clobus + * common/game-list.c: Set pointer to NULL after free (SF bug 304). + +2020-07-25 Roland Clobus + * editor/gtk/editor.c: Prevent writing invalid games (SF bug 307). + +2020-06-27 Roland Clobus + * MinGW/README.txt: Updated building instructions. + * MinGW/Makefile.am: Added two more missing icons. + +2020-06-24 Roland Clobus + * MinGW/Makefile.am: Use the MKDIR_P and INSTALL_x macros. + * MinGW/Makefile.am, MinGW/pioneers.nsi.in, configure.ac: Use a + portable-zip package instead of an installer for MinGW. + * editor/gtk/editor.c: If the config_dir and the data_dir are + identical (as on Windows), use another folder name for the custom + games. Also ensure that the folder exists. + +2020-06-21 Roland Clobus + * client/gtk/connect.c, client/gtk/offline.c, server/gtk/main.c, + server/meta.c: Fixed hints for translators. + * client/gtk/gui.c, client/gtk/gui.h, client/gtk/interface.c: Allow + automatic rolling of the dice. The default still is manual rolling. + +2020-06-20 Roland Clobus + * client/common/main.c, client/gtk/offline.c, common/Makefile.am, + common/gettext.c, common/gettext.h, configure.ac, editor/gtk/editor.c, + metaserver/main.c, server/gtk/main.c, server/main.c: Moved the + initialisation for gettext to a single location. This fixes the + translation for the MinGW port (selectable with the environment + variable LANG). Note that on Linux you should use LANGUAGE. + * client/ai/ai.c, client/ai/genetic.c, client/ai/genetic_core.c, + client/callback.h, client/common/resource.c, client/gtk/connect.c, + client/gtk/gui.h, client/gtk/identity.c, client/gtk/offline.c, + client/gtk/player.c, client/gtk/quote-view.h, + client/gtk/resource-table.h, common/driver.h, common/game.c, + common/game.h, common/gettext.c, common/gtk/colors.c, + common/gtk/game-settings.h, common/gtk/guimap.c, common/gtk/guimap.h, + common/gtk/select-game.h, common/gtk/theme.c, common/log.h, + common/network.h, common/set.h, editor/gtk/editor.c, + metaserver/main.c, server/gtk/main.c, server/main.c: Upgraded from + indent 2.2.11 to 2.2.12. + +2020-06-13 Roland Clobus + * client/gtk/gold.c: Show the order of the players that select gold. + * client/gtk/data/develop.svg: Use Times New Roman on Windows. + * MinGW/Makefile.am: libnotify is optional on Windows. + * MinGW/Makefile.am: Fix File|Open in the editor (Windows). + +2020-06-06 Roland Clobus + * client/common/resource.c: When all resources are selected for a + trade, use the wording 'any resource'. + * client/gtk/gui.c, client/gtk/gui.h, client/gtk/quote.c, + client/gtk/trade.c: Added a new checkbox: 'Enable Charity'. When + enabled, you can give away resources without getting anything back in + return. + * client/gtk/gui.c: The default for charity is off. + * server/player.c: Fixed assert ses!=NULL in net_write. If the + disconnected player is marked as disconnect, no further messages need + to be sent. + +2020-06-03 Roland Clobus + * client/gtk/trade.c: Fixed logic for enabling Call for Quotes button. + +2020-06-01 Roland Clobus + * MinGW/Makefile.am, MinGW/loaders.cache: Runtime version of Pioneers + works with MinGW64 and Windows 10 (1909). + +2020-05-31 Roland Clobus + * client/gtk/Makefile.am, client/gtk/client.gresource.xml, + client/gtk/client.ui, client/gtk/data/Makefile.am, + client/gtk/frontend.c, client/gtk/frontend.h, client/gtk/gui.c, + client/gtk/interface.c, client/gtk/legend.c, + client/gtk/notification.c, client/gtk/quote.c, + client/gtk/settingscreen.c, client/gtk/trade.c, po/POTFILES.in: + Replace GtkUIManager with GtkBuilder. Use an icon theme instead of + individual images for the toolbar. The notification icons are + in-memory. Restored the shortcuts in the toolbar. + * clientk/gtk/data/pioneers-finish.svg: New name of finish.svg, to + avoid using the image from the default theme. + +2020-05-21 Roland Clobus + * client/gtk/avahi.c: When connecting with a link local IPv6 + connection over Avahi, use the zone index. + +2020-05-13 Roland Clobus + * server/server.c: Fixed a small memory leak. + * server/main.c: Restored functionality of -k/--empty-timeout. + +2020-05-11 Roland Clobus + * client/gtk/data/develop.svg, client/gtk/data/splash.svg: Replace + Bitstream Charter by Gentium, because pango stopped support for Type 1 + fonts. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939748 + +2020-05-04 Roland Clobus + * editor/gtk/editor.c: Open the default game when loading the old game + fails. + +2020-04-24 Roland Clobus + * common/game.h: Fixed FTBFS for gcc-10. + +2020-04-18 Roland Clobus + * client/gtk/histogram.c: Nicer filling for the bars in the dice + histogram. Fixes showing the hexagons for some themes. + +2020-04-15 Roland Clobus + * client/gtk/frontend.h, client/gtk/gui.c, client/gtk/histogram.c, + client/gtk/histogram.h, client/gtk/legend.c, + client/gtk/settingscreen.c: Avoid the global variable app_window. + +2020-04-14 Roland Clobus + * server/gtk/Makefile.am, server/gtk/main.c, + server/gtk/server.gresource.xml, server/gtk/server.ui, po/POTFILES.in: + Replace GtkUIManager with GtkBuilder. + +2020-04-13 Roland Clobus + * configure.ac, editor/gtk/Makefile.am, editor/gtk/editor.c, + editor/gtk/editor.gresource.xml, editor/gtk/editor.ui, + po/POTFILES.in: Replace GtkUIManager with GtkBuilder. + +2020-04-08 Roland Clobus + * common/gtk/map-icons.c: Properly apply the scaling of the theme. + * editor/gtk/editor.c: Always show the icons in the context menus. + * editor/gtk/editor.c: Replace deprecated gtk_widget_set_margin_right. + * client/gtk/gui.c: When changing the theme, the whole map must be + redrawn. + +2020-03-27 Roland Clobus + * client/gtk/quote-view.c: Fix for a crash: the client would segfault + when the theme was changed after a maritime was shown at least once in + the game. + * common/network.c: Allow building on Ubuntu 18.04 and Debian 8. + +2020-03-26 Roland Clobus + * configure.ac: Fix for warning in ar. + * common/deck.c, client/ai/genetic.c: Fix for -Wold-style-definition. + * editor/gtk/editor.c, editor/gtk/game-buildings.c, + editor/gtk/game-devcards.c: Fix for -Wsign-conversion. + +2020-03-25 Roland Clobus + * client/gtk/Makefile.am, client/gtk/audio.c, configure.ac: Use + libcanberra instead of beep, which allows for sounds when pioneers is + not started from a console. + * client/gtk/gui.c: Use 16:9 layout as the default. + * client/ai/genetic.c, client/ai/genetic_core.c: Fix fall-through + warnings. + +2020-03-23 Roland Clobus + * po/POTFILES.in: client/gtk/audio.c contains a translatable text too. + +2020-03-22 Roland Clobus + * client/gtk/audio.c: Fixed beeping, effectively reverting 2019-06-30. + +2020-01-02 Roland Clobus + * ChangeLog, client/gtk/avahi.c, docs/README.states: Apply + misspell-fixer. + * common/state.c: Fix for Coverity CID 241968: out-of-bounds access. + +2019-10-10 Roland Clobus + * server/meta.c: The maximum reconnect interval is 24 hours. + +2019-07-22 Roland Clobus + * client/ai/genetic.c: Fix for Coverity CID 241969: out-of-bounds + read. + +2019-06-30 Roland Clobus + * client/gtk/audio.c: Beep was not working correctly. + +2018-11-22 Roland Clobus + * client/gtk/resource-view.gob: Fixed a compiler warning. + +2018-07-07 Roland Clobus + * client/common/client.c: Fixed a racing condition where the old map + was drawn while loading the new map. Found by clang ASAN. + * client/gtk/connect.c, client/gtk/develop.c, client/gtk/discard.c, + client/gtk/gold.c, client/gtk/gui.c, client/gtk/legend.c, + client/gtk/monopoly.c, client/gtk/name.c, client/gtk/player.c, + client/gtk/quote.c, client/gtk/resource-table.c, + client/gtk/resource-view.gob, client/gtk/resource.c, + client/gtk/settingscreen.c, client/gtk/trade.c, + common/gtk/common_gtk.c, common/gtk/game-rules.c, + common/gtk/game-settings.c, editor/gtk/editor.c, + editor/gtk/game-buildings.c, editor/gtk/game-devcards.c, + editor/gtk/game-resources.c, server/gtk/main.c: Migrate away from + GtkMisc. + +2018-06-19 Roland Clobus + * common/gtk/game-rules.c: Fixed a Gdk warning (SF bug 295) + +2018-06-16 Roland Clobus + * client/gtk/data/themes/Iceland/theme.cfg, + client/gtk/data/themes/Tiny/theme.cfg, + client/gtk/data/themes/ccFlickr/theme.cfg, common/gtk/theme.c, + common/gtk/theme.h, client/gtk/histogram.c, editor/gtk/editor.c: Use + the SEA_TERRAIN for the colours of the chits in the editor and the + dice histogram. + * client/gtk/frontend.h, client/gtk/histogram.c, + client/gtk/identity.c, client/gtk/name.c, client/gtk/player.c, + client/gtk/quote-view.c, common/gtk/colors.c, common/gtk/colors.h, + common/gtk/guimap.c, common/gtk/player-icon.c, + common/gtk/player-icon.h, common/gtk/polygon.c, common/gtk/polygon.h, + common/gtk/theme.c, common/gtk/theme.h, editor/gtk/editor.c: Migrate + from GdkColor to GdkRGBA. + +2018-05-30 Roland Clobus + * client/gtk/discard.c, client/gtk/gold.c, client/gtk/plenty.c, + client/gtk/quote.c, client/gtk/resource-table.c, + client/gtk/resource-table.h: Removed the Gtk+-2 More and Less buttons. + * client/common/client.c, client/common/client.h, + client/common/stock.c: Don't count development cards twice on + reconnect. + * server/player.c: Fixed an integer underflow when assigning a player + number. + +2018-05-23 Roland Clobus + * client/gtk/avahi-browser.c, client/gtk/avahi-browser.h, + client/gtk/connect.c, client/gtk/gui.c, client/gtk/legend.c, + client/gtk/resource-table.c, client/gtk/resource-table.h, + client/gtk/resource.c, client/gtk/settingscreen.c, client/gtk/trade.c, + common/gtk/game-rules.c, common/gtk/game-rules.h, + common/gtk/game-settings.c, common/gtk/game-settings.h, + common/gtk/metaserver.c, common/gtk/metaserver.h, + common/gtk/select-game.c, common/gtk/select-game.h, + editor/gtk/editor.c, editor/gtk/game-buildings.c, + editor/gtk/game-buildings.h, editor/gtk/game-devcards.c, + editor/gtk/game-devcards.h, editor/gtk/game-resources.c, + editor/gtk/game-resources.h, server/gtk/main.c: Migrate from gtk_table + to gtk_grid. + * editor/gtk/editor.c: The toolbar is now one row high, depending on + the width. Show the dots for the dice values. + +2018-05-16 Roland Clobus + * common/gtk/common_gtk.c: Fixed compiler warning from previous + commit. + +2018-04-27 Roland Clobus + * client/gtk/gui.c, common/gtk/common_gtk.c, common/gtk/common_gtk.h, + server/gtk/main.c: Removed the need for a custom style for the close + button on a notebook tab. + +2018-04-25 Roland Clobus + * common/gtk/guimap.c, common/gtk/guimap.h, common/gtk/select-game.c: + (Re-)enable zoom functionality. Simplify code related to zoom. + +2018-04-20 Roland Clobus + * editor/gtk/editor.c: Removed GTK warning for context menu. + * editor/gtk/editor.c: Fix for showing the context menu when the mouse + was moved during the previous display of a context menu. + +2018-03-14 Roland Clobus + * configure.ac: Work version is 15.6. + 2018-03-14 Roland Clobus * Released 15.5. @@ -2828,7 +3095,7 @@ 2005-09-14 0.9.27 Bas Wijnen - * editor/gtk/editor.c: Warn instead of crash when clearing nonexistant + * editor/gtk/editor.c: Warn instead of crash when clearing nonexistent hex. Set minimum map size to 1, not 2. Set sensitivity of correct buttons when resize limits are hit. Let ports disappear correctly. * client/gtk/gold.c, client/gtk/discard.c: Reindented. @@ -4133,7 +4400,7 @@ * client/common/callback.h, client/common/client.c (client_start), * client/common/gnocatan.c, client/gtk/callbacks.c, * client/gtk/frontend.h, client/gtk/offline.c: Changes to frontend - intialisation + initialisation 2003-12-21 0.8.1.1 Bas Wijnen * client/common/Makefile.am: Generalized file generation for diff -Nru pioneers-15.5/client/ai/ai.c pioneers-15.6/client/ai/ai.c --- pioneers-15.5/client/ai/ai.c 2014-05-20 20:57:22.000000000 +0000 +++ pioneers-15.6/client/ai/ai.c 2020-06-20 10:52:00.000000000 +0000 @@ -66,7 +66,7 @@ /** Name of the algorithm (for commandline) */ const gchar *name; /** Init function */ - void (*init_func) (void); + void (*init_func)(void); /** Request to be a player? */ gboolean request_player; /** Quit if request not honoured */ @@ -85,34 +85,34 @@ UIDriver Glib_Driver; static GOptionEntry commandline_entries[] = { - {"chromosome-file", '\0', 0, G_OPTION_ARG_STRING, &chromosomeFile, + { "chromosome-file", '\0', 0, G_OPTION_ARG_STRING, &chromosomeFile, /* Commandline pioneersai: chromosome-file */ - N_("Chromosome File"), NULL}, - {"server", 's', 0, G_OPTION_ARG_STRING, &server, + N_("Chromosome File"), NULL }, + { "server", 's', 0, G_OPTION_ARG_STRING, &server, /* Commandline pioneersai: server */ - N_("Server Host"), PIONEERS_DEFAULT_GAME_HOST}, - {"port", 'p', 0, G_OPTION_ARG_STRING, &port, + N_("Server Host"), PIONEERS_DEFAULT_GAME_HOST }, + { "port", 'p', 0, G_OPTION_ARG_STRING, &port, /* Commandline pioneersai: port */ - N_("Server Port"), PIONEERS_DEFAULT_GAME_PORT}, - {"name", 'n', 0, G_OPTION_ARG_STRING, &name, + N_("Server Port"), PIONEERS_DEFAULT_GAME_PORT }, + { "name", 'n', 0, G_OPTION_ARG_STRING, &name, /* Commandline pioneersai: name */ - N_("Computer name (mandatory)"), NULL}, - {"time", 't', 0, G_OPTION_ARG_INT, &waittime, + N_("Computer name (mandatory)"), NULL }, + { "time", 't', 0, G_OPTION_ARG_INT, &waittime, /* Commandline pioneersai: time */ - N_("Time to wait between turns (in milliseconds)"), "1000"}, - {"chat-free", 'c', 0, G_OPTION_ARG_NONE, &silent, + N_("Time to wait between turns (in milliseconds)"), "1000" }, + { "chat-free", 'c', 0, G_OPTION_ARG_NONE, &silent, /* Commandline pioneersai: chat-free */ - N_("Stop computer player from talking"), NULL}, - {"algorithm", 'a', 0, G_OPTION_ARG_STRING, &ai, + N_("Stop computer player from talking"), NULL }, + { "algorithm", 'a', 0, G_OPTION_ARG_STRING, &ai, /* Commandline pioneersai: algorithm */ - N_("Type of computer player"), "greedy"}, - {"debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, + N_("Type of computer player"), "greedy" }, + { "debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, /* Commandline option of ai: enable debug logging */ - N_("Enable debug messages"), NULL}, - {"version", '\0', 0, G_OPTION_ARG_NONE, &show_version, + N_("Enable debug messages"), NULL }, + { "version", '\0', 0, G_OPTION_ARG_NONE, &show_version, /* Commandline option of ai: version */ - N_("Show version information"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Show version information"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; static void ai_init_glib_et_al(int argc, char **argv) diff -Nru pioneers-15.5/client/ai/genetic.c pioneers-15.6/client/ai/genetic.c --- pioneers-15.5/client/ai/genetic.c 2015-05-30 23:12:43.000000000 +0000 +++ pioneers-15.6/client/ai/genetic.c 2020-08-02 07:03:10.000000000 +0000 @@ -32,19 +32,19 @@ /** default chromosome */ struct chromosome_t thisChromosome = (struct chromosome_t) { { - {1.371242, 1.984368, 1.336144, 1.111876, 1.206090, 0.052862, - 1.506242, 1.684672}, - /* weight of every resource, value of Development Card, relative value of City (compared to equivalen Settlement) and Ports, when I have 0 Victory Points */ - {1.262966, 1.813653, 1.542921, 1.117926, 1.338699, 3.004164, 1.682371, 3.554963}, /* when I have 1 */ - {1.770271, 1.405915, 1.947900, 1.267916, 1.645481, 0.266591, 1.194223, 9.644183}, /* 2 */ - {1.371931, 1.962052, 1.071650, 1.335991, 1.076773, 3.367637, 1.703712, 6.706741}, /* 3 */ - {1.680568, 1.306249, 1.743218, 1.761761, 1.025129, 1.121913, 0.284101, 1.559953}, /* 4 */ - {1.674057, 1.994260, 1.067930, 1.046954, 1.594052, 3.381377, 0.250717, 4.673997}, /* 5 */ - {1.116162, 1.225133, 1.141381, 1.093680, 1.976306, 3.066351, 0.672955, 9.152541}, /* 6 */ - {1.402262, 1.515350, 1.835050, 1.781056, 1.091004, 4.470943, 0.112013, 9.202737}, /* 7 */ - {1.009420, 1.065439, 1.938907, 1.966596, 1.279951, 0.777970, 1.659520, 3.782044}, /* 8 */ - {1.828237, 1.597190, 1.909004, 1.690179, 1.643655, 2.087759, 1.848852, 2.809332}, /* 9 */ - }, + /* weight of every resource, value of Development Card, relative value of City + (compared to equivalen Settlement) and Ports, when I have X Victory Points */ + { 1.371242, 1.984368, 1.336144, 1.111876, 1.206090, 0.052862, 1.506242, 1.684672}, /* 0 */ + { 1.262966, 1.813653, 1.542921, 1.117926, 1.338699, 3.004164, 1.682371, 3.554963}, /* 1 */ + { 1.770271, 1.405915, 1.947900, 1.267916, 1.645481, 0.266591, 1.194223, 9.644183}, /* 2 */ + { 1.371931, 1.962052, 1.071650, 1.335991, 1.076773, 3.367637, 1.703712, 6.706741}, /* 3 */ + { 1.680568, 1.306249, 1.743218, 1.761761, 1.025129, 1.121913, 0.284101, 1.559953}, /* 4 */ + { 1.674057, 1.994260, 1.067930, 1.046954, 1.594052, 3.381377, 0.250717, 4.673997}, /* 5 */ + { 1.116162, 1.225133, 1.141381, 1.093680, 1.976306, 3.066351, 0.672955, 9.152541}, /* 6 */ + { 1.402262, 1.515350, 1.835050, 1.781056, 1.091004, 4.470943, 0.112013, 9.202737}, /* 7 */ + { 1.009420, 1.065439, 1.938907, 1.966596, 1.279951, 0.777970, 1.659520, 3.782044}, /* 8 */ + { 1.828237, 1.597190, 1.909004, 1.690179, 1.643655, 2.087759, 1.848852, 2.809332}, /* 9 */ + }, 1.714336, 0.580583, 0.265190 /* depreciation, turn and probability */ }; @@ -591,7 +591,7 @@ -/* It returns the value given to an hex surrounding a node. We also need to know the node to check (for maritime hexes) if it has acces to the port */ +/* It returns the value given to an hex surrounding a node. We also need to know the node to check (for maritime hexes) if it has access to the port */ static float genetic_score_hex(const Node * node, Hex * hex, const struct chromosome_t *myChromosome, const struct gameState_t *myGameState) @@ -615,7 +615,7 @@ /* I want to decrease the devaluation the hex resource suffers (increase the hex value) if a I have a generic port or a specific port to export that resource */ if (info.any_resource) port = 3; /* I have a generic port, depreciation will be less */ - else if (info.specific_resource[resrc]) + else if (resrc < NO_RESOURCE && info.specific_resource[resrc]) port = 2; /* I have a port to export this resource, depreciation will be even less */ nodeHasPort = facingOK(node, hex); if (resrc < NO_RESOURCE) { @@ -1975,8 +1975,8 @@ else if ((destinationLongRoadScore)&&(destinationLongRoadScore>destinationRoadScore)) { cb_build_road(long_road_edge); return; - } - break; */ + } */ + break; case RSET: if (destinationRoadScore) { printf @@ -2266,7 +2266,7 @@ /** Determine the best resource to get with a monopoly card. * @return the resource */ -static gint determine_monopoly_resource() +static gint determine_monopoly_resource(void) { gint assets[NO_RESOURCE]; int i; diff -Nru pioneers-15.5/client/ai/genetic_core.c pioneers-15.6/client/ai/genetic_core.c --- pioneers-15.5/client/ai/genetic_core.c 2015-05-30 23:26:08.000000000 +0000 +++ pioneers-15.6/client/ai/genetic_core.c 2020-08-02 07:03:10.000000000 +0000 @@ -50,26 +50,31 @@ int num_players); static int resourcesNeededForAction[NUM_ACTIONS][5] = { - /*Resources of every type needed to perform every action possible */ - {1, 1, 0, 1, 1}, /*SET*/ {0, 2, 3, 0, 0}, /*CIT*/ {0, 1, 1, 1, 0}, /*DEV*/ {2, 1, 0, 1, 2}, /*RSET*/ {3, 1, 0, 1, 3}, /*RRSET*/ {2, 2, 0, 2, 2}, /*SET+SET */ - {1, 3, 3, 1, 1}, /*SET+CIT */ - {1, 2, 1, 2, 1}, /*SET+DEV */ - {3, 2, 0, 2, 3}, /*SET+RSET */ - {4, 2, 0, 2, 4}, /*SET+RRSET */ - - {0, 4, 6, 0, 0}, /*CIT+CIT */ - {0, 3, 4, 1, 0}, /*CIT+DEV */ - {2, 3, 3, 1, 2}, /*CIT+RSET */ - {3, 3, 3, 1, 3}, /*CIT+RRSET */ - - {0, 2, 2, 2, 0}, /*DEV+DEV */ - {2, 2, 1, 2, 2}, /*DEV+RSET */ - {3, 2, 1, 2, 3}, /*DEV+RRSET */ +/*Resources of every type needed to perform every action possible */ + { 1, 1, 0, 1, 1 }, /*SET */ + { 0, 2, 3, 0, 0 }, /*CIT */ + { 0, 1, 1, 1, 0 }, /*DEV */ + { 2, 1, 0, 1, 2 }, /*RSET */ + { 3, 1, 0, 1, 3 }, /*RRSET */ + { 2, 2, 0, 2, 2 }, /*SET+SET */ + { 1, 3, 3, 1, 1 }, /*SET+CIT */ + { 1, 2, 1, 2, 1 }, /*SET+DEV */ + { 3, 2, 0, 2, 3 }, /*SET+RSET */ + { 4, 2, 0, 2, 4 }, /*SET+RRSET */ + + { 0, 4, 6, 0, 0 }, /*CIT+CIT */ + { 0, 3, 4, 1, 0 }, /*CIT+DEV */ + { 2, 3, 3, 1, 2 }, /*CIT+RSET */ + { 3, 3, 3, 1, 3 }, /*CIT+RRSET */ + + { 0, 2, 2, 2, 0 }, /*DEV+DEV */ + { 2, 2, 1, 2, 2 }, /*DEV+RSET */ + { 3, 2, 1, 2, 3 }, /*DEV+RRSET */ - {4, 2, 0, 2, 4}, /*RSET+RSET */ - {5, 2, 0, 2, 5}, /*RSET+RRSET */ + { 4, 2, 0, 2, 4 }, /*RSET+RSET */ + { 5, 2, 0, 2, 5 }, /*RSET+RRSET */ - {6, 2, 0, 2, 6} /*RRSET+RRSET */ + { 6, 2, 0, 2, 6 } /*RRSET+RRSET */ }; /*First index is the action, second index the kind of resource */ int totalResources(const struct gameState_t *myGameState) @@ -273,7 +278,7 @@ for (sim = 0; sim < MAX_SIMS; sim++) { updateSimulation(sim, probability, Data); } - /*At this point numberOfSimulationsOK will hold, for avery action, the number of simulations that, up to the turn calculated, meet the requirements to do it */ + /*At this point numberOfSimulationsOK will hold, for every action, the number of simulations that, up to the turn calculated, meet the requirements to do it */ } void updateTurnsToAction(float probability, int currentTurn, @@ -291,7 +296,7 @@ #if 0 -/*This should ne rewriten in orden to take acount of the order change in resources (Now it should go Br,Gr,Or,Wo and Lu)*/ +/*This should be rewritten in order to take account of the order change in resources (Now it should go Br,Gr,Or,Wo and Lu)*/ void outputSims(int number, int turn, struct simulationsData_t *Data) { @@ -449,7 +454,7 @@ int num_players) { /*Returns the benefit I get in a given turn if I try to do firstAction ending at time_a and then secondAction ending at time_b - * time_a, time_b and turn should be possitive numbers, turn>=0, time_b>=time_a>=0*/ + * time_a, time_b and turn should be positive numbers, turn>=0, time_b>=time_a>=0*/ float profit; float firstActionValue = myGameState.actionValue[oneStrategy[0]]; float secondActionValue = myGameState.actionValue[oneStrategy[1]]; @@ -460,7 +465,7 @@ int roadsWillBuild; if (firstActionValue == 0) return 0; /*It is impossible to do first action (not enough tokens, no place for it, etc.), so this strategy is worthless */ - /*If this strategy requires doing nothing now, the amount of resources I finsh the turn with can decrease this strategy value depending on the risk of being affected by the thief */ + /*If this strategy requires doing nothing now, the amount of resources I finish the turn with can decrease this strategy value depending on the risk of being affected by the thief */ if ((time_a != 0) && (myTurn)) { /*I am waiting to do something, will I finish my turn with a "risky" amount of resources? */ endOfTurnResources = totalResources(&myGameState); roadsWillBuild = @@ -622,6 +627,7 @@ return (roadsPossible); break; } + return 0; case RSET: /*Even if I can do two roads now, I should not use the resources I will need for the settlement of RSET */ return (1); diff -Nru pioneers-15.5/client/ai/lobbybot.c pioneers-15.6/client/ai/lobbybot.c --- pioneers-15.5/client/ai/lobbybot.c 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/client/ai/lobbybot.c 2020-08-02 12:38:51.000000000 +0000 @@ -118,7 +118,7 @@ /* AI chat that explains '/why' */ ai_chat(N_("This board is not intended to be a game that " "can be played. Instead, players can find " - "eachother here, and decide which board they " + "each other here, and decide which board they " "want to play. Then, one of the players will " "host the proposed game by starting a server, " "and registers it at the metaserver. The other " @@ -129,7 +129,7 @@ if (!strncmp(chat, "/news", 5)) { ai_chat(N_("The last released version of Pioneers is")); /* Update this string when releasing a new version */ - ai_chat("15.5"); + ai_chat("15.6"); return; } } diff -Nru pioneers-15.5/client/callback.h pioneers-15.6/client/callback.h --- pioneers-15.5/client/callback.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/callback.h 2020-06-20 10:52:00.000000000 +0000 @@ -90,143 +90,143 @@ /* This function is called when the client is initializing. The * frontend should initialize its libraries and use the command * line for the default commands. */ - void (*init_glib_et_al) (int argc, char **argv); + void (*init_glib_et_al)(int argc, char **argv); /* This function is called when the client is initialized. The * frontend should initialize itself now and process its own * command line options. */ - void (*init) (void); + void (*init)(void); /* Allows the frontend to show a message considering the network * status, probably in the status bar */ - void (*network_status) (const gchar * description); + void (*network_status)(const gchar * description); /* playing instructions. conventionally shown in the "development * panel", but they can of course be put anywhere */ - void (*instructions) (const gchar * message); + void (*instructions)(const gchar * message); /* Message if client is waiting for network. If it is, it may be * a good idea to disable all user controls and put a message in the * status bar. */ - void (*network_wait) (gboolean is_waiting); + void (*network_wait)(gboolean is_waiting); /* we are in mode_offline, do something (probably call cb_connect). * This function is called every time the mode is entered, which is * at the start of the game and after every network event (after a * failed connect, that is) */ - void (*offline) (void); + void (*offline)(void); /* some people must discard resources. this hook allows the frontend * to prepare for it. */ - void (*discard) (void); + void (*discard)(void); /* add a player to the list of players who must discard. Note that * if player_num == my_player_num (), the frontend is supposed to * call cb_discard. */ - void (*discard_add) (gint player_num, gint discard_num); + void (*discard_add)(gint player_num, gint discard_num); /* a player discarded resources */ - void (*discard_remove) (gint player_num); + void (*discard_remove)(gint player_num); /* discard mode is finished. */ - void (*discard_done) (void); + void (*discard_done)(void); /* starting gold distribution */ - void (*gold) (void); + void (*gold)(void); /* someone is added to the list of receiving players. No special * reaction is required if player_num == my_player_num () */ - void (*gold_add) (gint player_num, gint gold_num); + void (*gold_add)(gint player_num, gint gold_num); /* someone chose gold resources */ - void (*gold_remove) (gint player_num, gint * resources); + void (*gold_remove)(gint player_num, gint * resources); /* You must choose the resources for your gold. */ - void (*gold_choose) (gint gold_num, const gint * bank); + void (*gold_choose)(gint gold_num, const gint * bank); /* all players chose their gold, the game continues. */ - void (*gold_done) (void); + void (*gold_done)(void); /* the game is over, someone won. */ - void (*game_over) (gint player_num, gint points); + void (*game_over)(gint player_num, gint points); /* The game is about to (re)start, nothing is known about the new game */ - void (*init_game) (void); + void (*init_game)(void); /* The game is about to start, all rules are known. */ - void (*start_game) (void); + void (*start_game)(void); /* You must setup. Num_* is the number of settlements/roads that * should still be built. */ - void (*setup) (gint num_settlements, gint num_roads); + void (*setup)(gint num_settlements, gint num_roads); /* Someone did a call for quotes */ - void (*quote) (gint player_num, gint * they_supply, - gint * they_receive); + void (*quote)(gint player_num, gint * they_supply, + gint * they_receive); /* you played a roadbuilding development card, so start building. */ - void (*roadbuilding) (gint num_roads); + void (*roadbuilding)(gint num_roads); /* choose your monopoly. */ - void (*monopoly) (void); + void (*monopoly)(void); /* choose the resources for your year of plenty. */ - void (*plenty) (const gint * bank); + void (*plenty)(const gint * bank); /* it's your turn, do something */ - void (*turn) (void); + void (*turn)(void); /* it's someone else's turn */ - void (*player_turn) (gint player_num); + void (*player_turn)(gint player_num); /* you're trading */ - void (*trade) (void); + void (*trade)(void); /* while you're trading, someone else rejects the trade */ - void (*trade_player_end) (gint player_num); + void (*trade_player_end)(gint player_num); /* while you're trading, someone else offers you a quote */ - void (*trade_add_quote) (gint player_num, gint quote_num, - const gint * they_supply, - const gint * they_receive); + void (*trade_add_quote)(gint player_num, gint quote_num, + const gint * they_supply, + const gint * they_receive); /* while you're trading, someone revokes a quote */ - void (*trade_remove_quote) (gint player_num, gint quote_num); + void (*trade_remove_quote)(gint player_num, gint quote_num); /* you're trading, and a trade has just been performed. */ - void (*trade_domestic) (gint partner_num, gint quote_num, - const gint * we_supply, - const gint * we_receive); + void (*trade_domestic)(gint partner_num, gint quote_num, + const gint * we_supply, + const gint * we_receive); /* you're trading, and a trade has just been performed. */ - void (*trade_maritime) (gint ratio, Resource we_supply, - Resource we_receive); + void (*trade_maritime)(gint ratio, Resource we_supply, + Resource we_receive); /* while someone else is trading, a player rejects the trade */ - void (*quote_player_end) (gint player_num); + void (*quote_player_end)(gint player_num); /* while someone else is trading, a player makes a quote */ - void (*quote_add) (gint player_num, gint quote_num, - const gint * they_supply, - const gint * they_receive); + void (*quote_add)(gint player_num, gint quote_num, + const gint * they_supply, + const gint * they_receive); /* while someone else is trading, a player revokes a quote */ - void (*quote_remove) (gint player_num, gint quote_num); + void (*quote_remove)(gint player_num, gint quote_num); /* someone else makes a call for quotes. This is an initialization * callback, it is only called once. After that, quote is called * for every call for quotes (at least once, immediately after this * function returns. quote can be called more times, until quote_end * is called, which marks the end of the trading session. */ - void (*quote_start) (void); + void (*quote_start)(void); /* someone else finishes trading */ - void (*quote_end) (void); + void (*quote_end)(void); /* you rejected the trade, now you're monitoring it */ - void (*quote_monitor) (void); + void (*quote_monitor)(void); /* while someone else is trading, a quote is accepted. */ - void (*quote_trade) (gint player_num, gint partner_num, - gint quote_num, const gint * they_supply, - const gint * they_receive); + void (*quote_trade)(gint player_num, gint partner_num, + gint quote_num, const gint * they_supply, + const gint * they_receive); /* the dice have been rolled */ - void (*rolled_dice) (gint die1, gint die2, gint player_num); + void (*rolled_dice)(gint die1, gint die2, gint player_num); /* An edge changed, it should be drawn */ - void (*draw_edge) (Edge * edge); + void (*draw_edge)(Edge * edge); /* A node changed, it should be drawn */ - void (*draw_node) (Node * node); + void (*draw_node)(Node * node); /* You bought a development card */ - void (*bought_develop) (DevelType type); + void (*bought_develop)(DevelType type); /* someone played a development card */ - void (*played_develop) (gint player_num, guint card_idx, - DevelType type); + void (*played_develop)(gint player_num, guint card_idx, + DevelType type); /* Something happened to your resources. The frontend should not * apply the change. When this function is called, the value is * already changed. */ - void (*resource_change) (Resource type, gint num); + void (*resource_change)(Resource type, gint num); /* a hex has changed, it should be drawn. */ - void (*draw_hex) (Hex * hex); + void (*draw_hex)(Hex * hex); /* something happened to your pieces stock (ships, roads, etc.) */ - void (*update_stock) (void); + void (*update_stock)(void); /* You should move the robber or pirate */ - void (*robber) (void); + void (*robber)(void); /* Someone moved the robber */ - void (*robber_moved) (Hex * old, Hex * new); + void (*robber_moved)(Hex * old, Hex * new); /* You should steal something from a building */ - void (*steal_building) (void); + void (*steal_building)(void); /* The robber placement has finished, continue normally */ - void (*robber_done) (void); + void (*robber_done)(void); /* You should steal something from a ship */ - void (*steal_ship) (void); + void (*steal_ship)(void); /* Someone has been robbed. The frontend should allow player_num to * be negative, meaning no one was robbed. This is not implemented * yet. */ - void (*player_robbed) (gint robber_num, gint victim_num, - Resource resource); + void (*player_robbed)(gint robber_num, gint victim_num, + Resource resource); /* The dice have been rolled, and resources are being distributed. * This is called once for every player receiving resources. The * frontend should also be able to handle players not getting any @@ -235,46 +235,46 @@ * been a call to resource_change when this is called. * If resources is different from wanted, the player should have * received resources, but the bank was empty. */ - void (*get_rolled_resources) (gint player_num, - const gint * resources, - const gint * wanted); + void (*get_rolled_resources)(gint player_num, + const gint * resources, + const gint * wanted); /* Something happened to someones stats. As with resource_change, * the value must not be updated by the frontend, it has already been * done by the client. */ - void (*new_statistics) (gint player_num, StatisticType type, - gint num); + void (*new_statistics)(gint player_num, StatisticType type, + gint num); /* Something happened to someones special points. As with * resource_change, the value must not be updated by the frontend, * it has already been done by the client. */ - void (*new_points) (gint player_num, Points * points, - gboolean added); + void (*new_points)(gint player_num, Points * points, + gboolean added); /* a spectator changed his/her name */ - void (*spectator_name) (gint spectator_num, const gchar * name); + void (*spectator_name)(gint spectator_num, const gchar * name); /* a player changed his/her name */ - void (*player_name) (gint player_num, const gchar * name); + void (*player_name)(gint player_num, const gchar * name); /* a player changed his/her style */ - void (*player_style) (gint player_num, const gchar * style); + void (*player_style)(gint player_num, const gchar * style); /* a player left the game */ - void (*player_quit) (gint player_num); + void (*player_quit)(gint player_num); /* a spectator left the game */ - void (*spectator_quit) (gint player_num); + void (*spectator_quit)(gint player_num); /* respond to incoming chat messages */ - void (*incoming_chat) (gint player_num, const gchar * chat); + void (*incoming_chat)(gint player_num, const gchar * chat); /* something changed in the bank. */ - void (*new_bank) (const gint * new_bank); + void (*new_bank)(const gint * new_bank); /* some communication error occurred, and it has already been logged */ - void (*error) (const gchar * message); + void (*error)(const gchar * message); /* get the map */ - Map *(*get_map) (void); + Map *(*get_map)(void); /* set the map */ - void (*set_map) (Map * map); + void (*set_map)(Map * map); /* mainloop. This is initialized to run the glib main loop. It can * be overridden */ - void (*mainloop) (void); + void (*mainloop)(void); /* exit the main loop. The program will then quit. This is * initialized to quit the main loop. It should be overridden if * mainloop is. */ - void (*quit) (void); + void (*quit)(void); }; extern struct callbacks callbacks; diff -Nru pioneers-15.5/client/common/client.c pioneers-15.6/client/common/client.c --- pioneers-15.5/client/common/client.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/common/client.c 2020-08-02 07:03:10.000000000 +0000 @@ -95,7 +95,7 @@ /* When commands are sent to the server, front ends may want to update * the status bar or something to indicate the the game is currently - * waiting for server respose. + * waiting for server response. * Since the GUI may get disabled while waiting, it is good to let the * user know why all controls are unresponsive. */ @@ -609,7 +609,7 @@ } /*---------------------------------------------------------------------- - * Server notifcations about player name changes and chat messages. + * Server notifications about player name changes and chat messages. * These can happen in any state (maybe this should be moved to * global_filter()?). */ @@ -637,7 +637,7 @@ } /*---------------------------------------------------------------------- - * Server notifcations about other players name changes and chat + * Server notifications about other players name changes and chat * messages. These can happen in almost any state in which the game * is running. */ @@ -1036,8 +1036,10 @@ if (event != SM_RECV) return FALSE; if (sm_recv(sm, "game")) { - if (game_params != NULL) + if (game_params != NULL) { + callbacks.set_map(NULL); params_free(game_params); + } game_params = params_new(); return TRUE; } @@ -1177,6 +1179,7 @@ return FALSE; } + stock_dont_count_develop(); develop_bought_card_turn(devcard, devcardturnbought != 0); devcardidx++; diff -Nru pioneers-15.5/client/common/client.h pioneers-15.6/client/common/client.h --- pioneers-15.5/client/common/client.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/common/client.h 2018-05-30 10:31:55.000000000 +0000 @@ -145,6 +145,7 @@ void stock_use_city_wall(void); void stock_replace_city_wall(void); void stock_use_develop(void); +void stock_dont_count_develop(void); /********** resource.c **********/ void resource_init(void); diff -Nru pioneers-15.5/client/common/main.c pioneers-15.6/client/common/main.c --- pioneers-15.5/client/common/main.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/common/main.c 2020-06-20 10:14:16.000000000 +0000 @@ -20,12 +20,12 @@ */ #include "config.h" -#include #include #include "client.h" #include "callback.h" #include "network.h" +#include "gettext.h" static GMainLoop *loop; @@ -53,14 +53,8 @@ callbacks.quit = &quit; loop = NULL; -#if ENABLE_NLS - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - - /* have gettext return strings in UTF-8 */ - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif + /* Initialize translations */ + gettext_init(); frontend_set_callbacks(); diff -Nru pioneers-15.5/client/common/resource.c pioneers-15.6/client/common/resource.c --- pioneers-15.5/client/common/resource.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/common/resource.c 2020-06-20 10:52:00.000000000 +0000 @@ -32,23 +32,23 @@ static gint bank[NO_RESOURCE]; static const gchar *resource_names[][2] = { - {N_("brick"), N_("Brick")}, - {N_("grain"), N_("Grain")}, - {N_("ore"), N_("Ore")}, - {N_("wool"), N_("Wool")}, - {N_("lumber"), N_("Lumber")}, - {N_("no resource (bug)"), N_("No resource (bug)")}, - {N_("any resource (bug)"), N_("Any resource (bug)")}, - {N_("gold"), N_("Gold")} + { N_("brick"), N_("Brick") }, + { N_("grain"), N_("Grain") }, + { N_("ore"), N_("Ore") }, + { N_("wool"), N_("Wool") }, + { N_("lumber"), N_("Lumber") }, + { N_("no resource (bug)"), N_("No resource (bug)") }, + { N_("any resource (bug)"), N_("Any resource (bug)") }, + { N_("gold"), N_("Gold") } }; static const gchar *resource_lists[][2] = { - {N_("a brick card"), N_("%d brick cards")}, - {N_("a grain card"), N_("%d grain cards")}, - {N_("an ore card"), N_("%d ore cards")}, - {N_("a wool card"), N_("%d wool cards")}, - {N_("a lumber card"), N_("%d lumber cards")} + { N_("a brick card"), N_("%d brick cards") }, + { N_("a grain card"), N_("%d grain cards") }, + { N_("an ore card"), N_("%d ore cards") }, + { N_("a wool card"), N_("%d wool cards") }, + { N_("a lumber card"), N_("%d lumber cards") } }; typedef enum { @@ -226,6 +226,12 @@ return; } + if (num_types == NO_RESOURCE) { + /* All resource types are active in the trade */ + strcpy(str, _("any resource")); + return; + } + if (num_types == 1) { for (idx = 0; idx < NO_RESOURCE; idx++) { gint num = resources[idx]; diff -Nru pioneers-15.5/client/common/stock.c pioneers-15.6/client/common/stock.c --- pioneers-15.5/client/common/stock.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/common/stock.c 2018-05-30 10:31:55.000000000 +0000 @@ -165,3 +165,10 @@ { num_develop--; } + +/** Do not count the next development card. +*/ +void stock_dont_count_develop(void) +{ + num_develop++; +} diff -Nru pioneers-15.5/client/gtk/audio.c pioneers-15.6/client/gtk/audio.c --- pioneers-15.5/client/gtk/audio.c 2013-04-25 13:59:28.000000000 +0000 +++ pioneers-15.6/client/gtk/audio.c 2020-03-25 09:42:20.000000000 +0000 @@ -1,7 +1,7 @@ /* Pioneers - Implementation of the excellent Settlers of Catan board game. * Go buy a copy. * - * Copyright (C) 2008,2013 Roland Clobus + * Copyright (C) 2020 Roland Clobus * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,13 +19,20 @@ */ #include "config.h" -#include - #include "audio.h" +#include "log.h" + +#ifdef HAVE_CANBERRA +#include +#endif static gboolean silent_mode = FALSE; static gboolean announce_player = TRUE; +#ifdef HAVE_CANBERRA +static ca_context *canberra_context = NULL; +#endif + gboolean get_announce_player(void) { return announce_player; @@ -46,25 +53,78 @@ silent_mode = silent; } +#ifdef HAVE_CANBERRA +void play_sound(SoundType sound) +{ + int result; + + if (get_silent_mode()) { + return; + } + if (canberra_context == NULL) { + result = ca_context_create(&canberra_context); + if (result != 0) { + log_message(MSG_ERROR, + _("Error starting %s: %s\n"), + "ca_canberra_create", + ca_strerror(result)); + set_silent_mode(TRUE); + } else { + (void) ca_context_change_props(canberra_context, + CA_PROP_APPLICATION_NAME, + _("Pioneers"), + CA_PROP_MEDIA_ROLE, + "game", + CA_PROP_CANBERRA_CACHE_CONTROL, + "volatile", NULL); + } + } + if (!get_silent_mode()) { + switch (sound) { + case SOUND_BEEP: + ca_context_play(canberra_context, 0, + CA_PROP_EVENT_ID, "service-login", + NULL); + break; + case SOUND_TURN: + ca_context_play(canberra_context, 0, + CA_PROP_EVENT_ID, "message-sent", + NULL); + break; + case SOUND_ANNOUNCE: + if (get_announce_player()) + ca_context_play(canberra_context, 0, + CA_PROP_EVENT_ID, + "device-added", NULL); + break; + } + } +} +#else static void do_beep(guint frequency) { - gchar *argv[5]; + gchar *argv[4]; + GError *error = NULL; guint i; + guint n = 0; + + argv[n++] = g_strdup("beep"); + argv[n++] = g_strdup("-f"); + argv[n++] = g_strdup_printf("%u", frequency); + argv[n++] = NULL; + g_assert(n <= G_N_ELEMENTS(argv)); - argv[0] = g_strdup("beep"); - argv[1] = g_strdup("beep"); - argv[2] = g_strdup("-f"); - argv[3] = g_strdup_printf("%u", frequency); - argv[4] = NULL; if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, - NULL)) { - /* Use old style beep, which does not always work */ - gdk_beep(); + &error)) { + /* Beep is not working, turn on silent mode */ + set_silent_mode(TRUE); + log_message(MSG_ERROR, _("Error starting %s: %s\n"), + argv[0], error->message); + g_error_free(error); } - for (i = 0; i < G_N_ELEMENTS(argv); i++) { + for (i = 0; argv[i] != NULL; i++) g_free(argv[i]); - } } void play_sound(SoundType sound) @@ -85,3 +145,4 @@ break; } } +#endif diff -Nru pioneers-15.5/client/gtk/avahi-browser.c pioneers-15.6/client/gtk/avahi-browser.c --- pioneers-15.5/client/gtk/avahi-browser.c 2012-12-18 12:39:00.000000000 +0000 +++ pioneers-15.6/client/gtk/avahi-browser.c 2020-03-25 17:52:23.000000000 +0000 @@ -25,8 +25,7 @@ #include "avahi-browser.h" -static void avahibrowser_class_init(AvahiBrowserClass * klass); -static void avahibrowser_init(AvahiBrowser * ab); +static void avahibrowser_init(GTypeInstance * instance, gpointer g_class); /* Register the class */ GType avahibrowser_get_type(void) @@ -38,30 +37,27 @@ sizeof(AvahiBrowserClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) avahibrowser_class_init, + NULL, /* class_init */ NULL, /* class_finalize */ NULL, /* class_data */ sizeof(AvahiBrowser), 0, - (GInstanceInitFunc) avahibrowser_init, + avahibrowser_init, NULL }; sg_type = - g_type_register_static(GTK_TYPE_TABLE, + g_type_register_static(GTK_TYPE_GRID, "AvahiBrowser", &sg_info, 0); } return sg_type; } -static void avahibrowser_class_init(G_GNUC_UNUSED AvahiBrowserClass * - klass) -{ -} - /* Build the composite widget */ -static void avahibrowser_init(AvahiBrowser * ab) +static void avahibrowser_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkCellRenderer *cell; + AvahiBrowser *ab = AVAHIBROWSER(instance); /* Create model */ ab->data = @@ -81,9 +77,8 @@ gtk_widget_set_tooltip_text(ab->combo_box, _ ("Select an automatically discovered game")); - gtk_table_resize(GTK_TABLE(ab), 1, 1); - gtk_table_attach_defaults(GTK_TABLE(ab), ab->combo_box, 0, 1, 0, - 1); + gtk_grid_attach(GTK_GRID(ab), ab->combo_box, 0, 1, 1, 1); + gtk_widget_set_hexpand(ab->combo_box, TRUE); } /* Create a new instance of the widget */ diff -Nru pioneers-15.5/client/gtk/avahi-browser.h pioneers-15.6/client/gtk/avahi-browser.h --- pioneers-15.5/client/gtk/avahi-browser.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/avahi-browser.h 2018-05-23 10:51:57.000000000 +0000 @@ -36,7 +36,7 @@ typedef struct _AvahiBrowserClass AvahiBrowserClass; struct _AvahiBrowser { - GtkTable table; + GtkGrid grid; GtkWidget *combo_box; GtkListStore *data; diff -Nru pioneers-15.5/client/gtk/avahi.c pioneers-15.6/client/gtk/avahi.c --- pioneers-15.5/client/gtk/avahi.c 2012-12-18 12:39:00.000000000 +0000 +++ pioneers-15.6/client/gtk/avahi.c 2020-05-21 13:31:08.000000000 +0000 @@ -43,14 +43,14 @@ static AvahiBrowser *zcsptr = NULL; static void resolve_callback(AvahiServiceResolver * r, - AVAHI_GCC_UNUSED AvahiIfIndex interface, - AVAHI_GCC_UNUSED AvahiProtocol protocol, + AvahiIfIndex interface, + AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, - AVAHI_GCC_UNUSED const AvahiAddress * address, + const AvahiAddress * address, uint16_t port, AvahiStringList * txt, AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, @@ -95,15 +95,40 @@ port); char resolved_hostname [AVAHI_ADDRESS_STR_MAX]; + gchar *resolved_address; avahi_address_snprint(resolved_hostname, sizeof (resolved_hostname), address); + /* For IPv6 link local addresses, the zone index must be provided. + * See https://en.wikipedia.org/wiki/Link-local_address + * See https://github.com/lathiat/avahi/issues/110 + */ + if (protocol == AVAHI_PROTO_INET6) { + GInetAddress *a = + g_inet_address_new_from_bytes((const guint8 *) (&address->data.ipv6), G_SOCKET_FAMILY_IPV6); + if (g_inet_address_get_is_link_local(a)) { + resolved_address = + g_strdup_printf + ("[%s%%%d]", + resolved_hostname, + interface); + } else { + resolved_address = + g_strdup + (resolved_hostname); + } + g_object_unref(a); + } else { + resolved_address = + g_strdup(resolved_hostname); + } avahibrowser_add(zcsptr, name, - resolved_hostname, + resolved_address, host_name, sport, version, title); g_free(sport); + g_free(resolved_address); } g_free(version); g_free(title); @@ -195,7 +220,7 @@ avahi_client_new(poll_api, 0, client_callback, NULL, &error); - /* Check wether creating the client object succeeded */ + /* Check whether creating the client object succeeded */ if (!client) { debug("Avahi: Failed to create client: %s", avahi_strerror(error)); diff -Nru pioneers-15.5/client/gtk/client.gresource.xml pioneers-15.6/client/gtk/client.gresource.xml --- pioneers-15.5/client/gtk/client.gresource.xml 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/client/gtk/client.gresource.xml 2020-05-31 11:54:46.000000000 +0000 @@ -0,0 +1,6 @@ + + + + client/gtk/client.ui + + diff -Nru pioneers-15.5/client/gtk/client-resources.c pioneers-15.6/client/gtk/client-resources.c --- pioneers-15.5/client/gtk/client-resources.c 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/client/gtk/client-resources.c 2020-08-02 12:59:36.000000000 +0000 @@ -0,0 +1,3156 @@ +#include + +#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) +# define SECTION __attribute__ ((section (".gresource.client"), aligned (8))) +#else +# define SECTION +#endif + +#ifdef _MSC_VER +static const SECTION union { const guint8 data[23885]; const double alignment; void * const ptr;} client_resource_data = { { + 0107, 0126, 0141, 0162, 0151, 0141, 0156, 0164, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, + 0030, 0000, 0000, 0000, 0344, 0000, 0000, 0000, 0000, 0000, 0000, 0050, 0007, 0000, 0000, 0000, + 0000, 0000, 0000, 0000, 0001, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 0003, 0000, 0000, 0000, + 0003, 0000, 0000, 0000, 0006, 0000, 0000, 0000, 0007, 0000, 0000, 0000, 0164, 0175, 0161, 0023, + 0003, 0000, 0000, 0000, 0344, 0000, 0000, 0000, 0004, 0000, 0114, 0000, 0350, 0000, 0000, 0000, + 0354, 0000, 0000, 0000, 0112, 0216, 0217, 0013, 0002, 0000, 0000, 0000, 0354, 0000, 0000, 0000, + 0004, 0000, 0114, 0000, 0360, 0000, 0000, 0000, 0364, 0000, 0000, 0000, 0324, 0265, 0002, 0000, + 0377, 0377, 0377, 0377, 0364, 0000, 0000, 0000, 0001, 0000, 0114, 0000, 0370, 0000, 0000, 0000, + 0374, 0000, 0000, 0000, 0135, 0337, 0307, 0275, 0001, 0000, 0000, 0000, 0374, 0000, 0000, 0000, + 0014, 0000, 0114, 0000, 0010, 0001, 0000, 0000, 0014, 0001, 0000, 0000, 0242, 0110, 0322, 0117, + 0006, 0000, 0000, 0000, 0014, 0001, 0000, 0000, 0011, 0000, 0166, 0000, 0030, 0001, 0000, 0000, + 0066, 0135, 0000, 0000, 0302, 0107, 0157, 0245, 0000, 0000, 0000, 0000, 0066, 0135, 0000, 0000, + 0007, 0000, 0114, 0000, 0100, 0135, 0000, 0000, 0104, 0135, 0000, 0000, 0067, 0317, 0253, 0327, + 0005, 0000, 0000, 0000, 0104, 0135, 0000, 0000, 0004, 0000, 0114, 0000, 0110, 0135, 0000, 0000, + 0114, 0135, 0000, 0000, 0160, 0151, 0157, 0057, 0005, 0000, 0000, 0000, 0156, 0145, 0164, 0057, + 0003, 0000, 0000, 0000, 0057, 0000, 0000, 0000, 0001, 0000, 0000, 0000, 0163, 0157, 0165, 0162, + 0143, 0145, 0146, 0157, 0162, 0147, 0145, 0057, 0000, 0000, 0000, 0000, 0143, 0154, 0151, 0145, + 0156, 0164, 0056, 0165, 0151, 0000, 0000, 0000, 0016, 0134, 0000, 0000, 0000, 0000, 0000, 0000, + 0074, 0077, 0170, 0155, 0154, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, 0075, 0042, 0061, + 0056, 0060, 0042, 0040, 0145, 0156, 0143, 0157, 0144, 0151, 0156, 0147, 0075, 0042, 0125, 0124, + 0106, 0055, 0070, 0042, 0077, 0076, 0012, 0074, 0041, 0055, 0055, 0040, 0107, 0145, 0156, 0145, + 0162, 0141, 0164, 0145, 0144, 0040, 0167, 0151, 0164, 0150, 0040, 0147, 0154, 0141, 0144, 0145, + 0040, 0063, 0056, 0062, 0062, 0056, 0062, 0040, 0012, 0012, 0160, 0151, 0157, 0156, 0145, 0145, + 0162, 0163, 0040, 0055, 0040, 0115, 0141, 0151, 0156, 0040, 0167, 0151, 0156, 0144, 0157, 0167, + 0012, 0103, 0157, 0160, 0171, 0162, 0151, 0147, 0150, 0164, 0040, 0050, 0103, 0051, 0040, 0062, + 0060, 0062, 0060, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, 0142, 0165, + 0163, 0012, 0012, 0124, 0150, 0151, 0163, 0040, 0160, 0162, 0157, 0147, 0162, 0141, 0155, 0040, + 0151, 0163, 0040, 0146, 0162, 0145, 0145, 0040, 0163, 0157, 0146, 0164, 0167, 0141, 0162, 0145, + 0073, 0040, 0171, 0157, 0165, 0040, 0143, 0141, 0156, 0040, 0162, 0145, 0144, 0151, 0163, 0164, + 0162, 0151, 0142, 0165, 0164, 0145, 0040, 0151, 0164, 0040, 0141, 0156, 0144, 0057, 0157, 0162, + 0012, 0155, 0157, 0144, 0151, 0146, 0171, 0040, 0151, 0164, 0040, 0165, 0156, 0144, 0145, 0162, + 0040, 0164, 0150, 0145, 0040, 0164, 0145, 0162, 0155, 0163, 0040, 0157, 0146, 0040, 0164, 0150, + 0145, 0040, 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0154, 0040, 0120, 0165, + 0142, 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0012, 0141, 0163, 0040, + 0160, 0165, 0142, 0154, 0151, 0163, 0150, 0145, 0144, 0040, 0142, 0171, 0040, 0164, 0150, 0145, + 0040, 0106, 0162, 0145, 0145, 0040, 0123, 0157, 0146, 0164, 0167, 0141, 0162, 0145, 0040, 0106, + 0157, 0165, 0156, 0144, 0141, 0164, 0151, 0157, 0156, 0073, 0040, 0145, 0151, 0164, 0150, 0145, + 0162, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, 0040, 0062, 0012, 0157, 0146, 0040, 0164, + 0150, 0145, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0054, 0040, 0157, 0162, 0040, 0050, + 0141, 0164, 0040, 0171, 0157, 0165, 0162, 0040, 0157, 0160, 0164, 0151, 0157, 0156, 0051, 0040, + 0141, 0156, 0171, 0040, 0154, 0141, 0164, 0145, 0162, 0040, 0166, 0145, 0162, 0163, 0151, 0157, + 0156, 0056, 0012, 0012, 0124, 0150, 0151, 0163, 0040, 0160, 0162, 0157, 0147, 0162, 0141, 0155, + 0040, 0151, 0163, 0040, 0144, 0151, 0163, 0164, 0162, 0151, 0142, 0165, 0164, 0145, 0144, 0040, + 0151, 0156, 0040, 0164, 0150, 0145, 0040, 0150, 0157, 0160, 0145, 0040, 0164, 0150, 0141, 0164, + 0040, 0151, 0164, 0040, 0167, 0151, 0154, 0154, 0040, 0142, 0145, 0040, 0165, 0163, 0145, 0146, + 0165, 0154, 0054, 0012, 0142, 0165, 0164, 0040, 0127, 0111, 0124, 0110, 0117, 0125, 0124, 0040, + 0101, 0116, 0131, 0040, 0127, 0101, 0122, 0122, 0101, 0116, 0124, 0131, 0073, 0040, 0167, 0151, + 0164, 0150, 0157, 0165, 0164, 0040, 0145, 0166, 0145, 0156, 0040, 0164, 0150, 0145, 0040, 0151, + 0155, 0160, 0154, 0151, 0145, 0144, 0040, 0167, 0141, 0162, 0162, 0141, 0156, 0164, 0171, 0040, + 0157, 0146, 0012, 0115, 0105, 0122, 0103, 0110, 0101, 0116, 0124, 0101, 0102, 0111, 0114, 0111, + 0124, 0131, 0040, 0157, 0162, 0040, 0106, 0111, 0124, 0116, 0105, 0123, 0123, 0040, 0106, 0117, + 0122, 0040, 0101, 0040, 0120, 0101, 0122, 0124, 0111, 0103, 0125, 0114, 0101, 0122, 0040, 0120, + 0125, 0122, 0120, 0117, 0123, 0105, 0056, 0040, 0040, 0123, 0145, 0145, 0040, 0164, 0150, 0145, + 0012, 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0154, 0040, 0120, 0165, 0142, + 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0040, 0146, 0157, 0162, 0040, + 0155, 0157, 0162, 0145, 0040, 0144, 0145, 0164, 0141, 0151, 0154, 0163, 0056, 0012, 0012, 0131, + 0157, 0165, 0040, 0163, 0150, 0157, 0165, 0154, 0144, 0040, 0150, 0141, 0166, 0145, 0040, 0162, + 0145, 0143, 0145, 0151, 0166, 0145, 0144, 0040, 0141, 0040, 0143, 0157, 0160, 0171, 0040, 0157, + 0146, 0040, 0164, 0150, 0145, 0040, 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, + 0154, 0040, 0120, 0165, 0142, 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, + 0012, 0141, 0154, 0157, 0156, 0147, 0040, 0167, 0151, 0164, 0150, 0040, 0164, 0150, 0151, 0163, + 0040, 0160, 0162, 0157, 0147, 0162, 0141, 0155, 0073, 0040, 0151, 0146, 0040, 0156, 0157, 0164, + 0054, 0040, 0167, 0162, 0151, 0164, 0145, 0040, 0164, 0157, 0040, 0164, 0150, 0145, 0040, 0106, + 0162, 0145, 0145, 0040, 0123, 0157, 0146, 0164, 0167, 0141, 0162, 0145, 0012, 0106, 0157, 0165, + 0156, 0144, 0141, 0164, 0151, 0157, 0156, 0054, 0040, 0111, 0156, 0143, 0056, 0054, 0040, 0065, + 0061, 0040, 0106, 0162, 0141, 0156, 0153, 0154, 0151, 0156, 0040, 0123, 0164, 0162, 0145, 0145, + 0164, 0054, 0040, 0106, 0151, 0146, 0164, 0150, 0040, 0106, 0154, 0157, 0157, 0162, 0054, 0040, + 0102, 0157, 0163, 0164, 0157, 0156, 0054, 0040, 0115, 0101, 0040, 0040, 0060, 0062, 0061, 0061, + 0060, 0055, 0061, 0063, 0060, 0061, 0054, 0040, 0125, 0123, 0101, 0056, 0012, 0012, 0101, 0165, + 0164, 0150, 0157, 0162, 0072, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, + 0142, 0165, 0163, 0012, 0012, 0055, 0055, 0076, 0012, 0074, 0151, 0156, 0164, 0145, 0162, 0146, + 0141, 0143, 0145, 0076, 0074, 0162, 0145, 0161, 0165, 0151, 0162, 0145, 0163, 0040, 0154, 0151, + 0142, 0075, 0042, 0147, 0164, 0153, 0053, 0042, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, + 0075, 0042, 0063, 0056, 0062, 0060, 0042, 0057, 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, + 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0154, 0151, 0143, 0145, 0156, 0163, 0145, 0055, + 0164, 0171, 0160, 0145, 0040, 0147, 0160, 0154, 0166, 0062, 0040, 0055, 0055, 0076, 0074, 0041, + 0055, 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0156, 0141, 0155, + 0145, 0040, 0160, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0040, 0055, 0055, 0076, 0074, 0041, + 0055, 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0144, 0145, 0163, + 0143, 0162, 0151, 0160, 0164, 0151, 0157, 0156, 0040, 0115, 0141, 0151, 0156, 0040, 0167, 0151, + 0156, 0144, 0157, 0167, 0040, 0055, 0055, 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, 0164, + 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0143, 0157, 0160, 0171, 0162, 0151, 0147, 0150, 0164, + 0040, 0062, 0060, 0062, 0060, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, + 0142, 0165, 0163, 0040, 0055, 0055, 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, 0164, 0145, + 0162, 0146, 0141, 0143, 0145, 0055, 0141, 0165, 0164, 0150, 0157, 0162, 0163, 0040, 0122, 0157, + 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, 0142, 0165, 0163, 0040, 0055, 0055, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0101, 0143, 0143, 0145, 0154, 0107, 0162, 0157, 0165, 0160, 0042, 0040, 0151, 0144, 0075, + 0042, 0147, 0154, 0157, 0142, 0141, 0154, 0101, 0143, 0143, 0145, 0154, 0107, 0162, 0157, 0165, + 0160, 0042, 0057, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0127, 0151, 0156, 0144, 0157, 0167, 0042, 0040, 0151, 0144, + 0075, 0042, 0164, 0157, 0160, 0154, 0145, 0166, 0145, 0154, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, + 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, + 0160, 0145, 0075, 0042, 0164, 0151, 0164, 0154, 0145, 0142, 0141, 0162, 0042, 0076, 0074, 0160, + 0154, 0141, 0143, 0145, 0150, 0157, 0154, 0144, 0145, 0162, 0057, 0076, 0074, 0057, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, + 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0102, 0157, 0170, + 0042, 0040, 0151, 0144, 0075, 0042, 0166, 0142, 0157, 0170, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, + 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0157, + 0162, 0151, 0145, 0156, 0164, 0141, 0164, 0151, 0157, 0156, 0042, 0076, 0166, 0145, 0162, 0164, + 0151, 0143, 0141, 0154, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, + 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0102, 0141, 0162, 0042, + 0040, 0151, 0144, 0075, 0042, 0155, 0141, 0151, 0156, 0055, 0155, 0145, 0156, 0165, 0042, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, + 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, + 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, + 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, + 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, + 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0107, 0141, 0155, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, + 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, + 0160, 0145, 0075, 0042, 0163, 0165, 0142, 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0157, 0142, + 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, + 0145, 0156, 0165, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, + 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, + 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, + 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, + 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, + 0040, 0146, 0157, 0162, 0040, 0116, 0145, 0167, 0040, 0107, 0141, 0155, 0145, 0040, 0155, 0145, + 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0123, 0164, 0141, 0162, 0164, 0040, + 0141, 0040, 0156, 0145, 0167, 0040, 0147, 0141, 0155, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, + 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0147, 0141, 0155, + 0145, 0137, 0156, 0145, 0167, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0137, 0116, 0145, 0167, 0040, 0107, 0141, 0155, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, + 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, + 0145, 0171, 0075, 0042, 0156, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, + 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, + 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, + 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, + 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, + 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, + 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, + 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, + 0040, 0146, 0157, 0162, 0040, 0114, 0145, 0141, 0166, 0145, 0040, 0107, 0141, 0155, 0145, 0040, + 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0114, 0145, 0141, 0166, + 0145, 0040, 0164, 0150, 0151, 0163, 0040, 0147, 0141, 0155, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, + 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0147, 0141, + 0155, 0145, 0137, 0154, 0145, 0141, 0166, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, + 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, + 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0137, 0114, 0145, 0141, 0166, 0145, 0040, 0107, 0141, 0155, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, + 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0040, 0151, 0144, 0075, 0042, 0141, + 0144, 0155, 0151, 0156, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, + 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, + 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, + 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, + 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0101, 0144, 0155, 0151, 0156, 0040, 0155, 0145, + 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0101, 0144, 0155, 0151, 0156, 0151, + 0163, 0164, 0145, 0162, 0040, 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0040, 0163, 0145, + 0162, 0166, 0145, 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, + 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, + 0101, 0144, 0155, 0151, 0156, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, + 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, + 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0163, + 0150, 0157, 0167, 0137, 0141, 0144, 0155, 0151, 0156, 0137, 0151, 0156, 0164, 0145, 0162, 0146, + 0141, 0143, 0145, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, + 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, + 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0141, 0042, 0040, 0163, 0151, 0147, 0156, 0141, + 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, + 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0103, 0117, 0116, 0124, + 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, + 0075, 0042, 0107, 0164, 0153, 0123, 0145, 0160, 0141, 0162, 0141, 0164, 0157, 0162, 0115, 0145, + 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, + 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, + 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0120, 0154, 0141, 0171, 0145, 0162, 0040, + 0116, 0141, 0155, 0145, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0103, 0150, 0141, 0156, 0147, 0145, 0040, 0171, 0157, 0165, 0162, 0040, 0160, 0154, 0141, + 0171, 0145, 0162, 0040, 0156, 0141, 0155, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, + 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0160, 0154, 0141, 0171, 0145, + 0162, 0137, 0156, 0141, 0155, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0137, 0120, 0154, 0141, 0171, 0145, 0162, 0040, 0116, 0141, 0155, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, + 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, + 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0160, 0042, 0040, 0163, 0151, 0147, 0156, 0141, + 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, + 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0103, 0117, 0116, 0124, + 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, + 0075, 0042, 0107, 0164, 0153, 0123, 0145, 0160, 0141, 0162, 0141, 0164, 0157, 0162, 0115, 0145, + 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, + 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, + 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0114, 0145, 0147, 0145, 0156, 0144, 0040, + 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0124, 0145, 0162, 0162, + 0141, 0151, 0156, 0040, 0154, 0145, 0147, 0145, 0156, 0144, 0040, 0141, 0156, 0144, 0040, 0142, + 0165, 0151, 0154, 0144, 0151, 0156, 0147, 0040, 0143, 0157, 0163, 0164, 0163, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, + 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, + 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, + 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0114, 0137, 0145, 0147, 0145, 0156, 0144, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, + 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, + 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0147, 0141, 0155, 0145, 0137, 0154, 0145, + 0147, 0145, 0156, 0144, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, + 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, + 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, + 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, + 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, + 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, + 0040, 0146, 0157, 0162, 0040, 0107, 0141, 0155, 0145, 0040, 0123, 0145, 0164, 0164, 0151, 0156, + 0147, 0163, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0123, + 0145, 0164, 0164, 0151, 0156, 0147, 0163, 0040, 0146, 0157, 0162, 0040, 0164, 0150, 0145, 0040, + 0143, 0165, 0162, 0162, 0145, 0156, 0164, 0040, 0147, 0141, 0155, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, + 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, + 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, + 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0107, 0141, 0155, 0145, 0040, 0123, 0145, 0164, + 0164, 0151, 0156, 0147, 0163, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, + 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, + 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0147, + 0141, 0155, 0145, 0137, 0163, 0145, 0164, 0164, 0151, 0156, 0147, 0163, 0137, 0143, 0142, 0042, + 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, + 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, + 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, + 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, + 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, + 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0104, 0151, 0143, + 0145, 0040, 0110, 0151, 0163, 0164, 0157, 0147, 0162, 0141, 0155, 0040, 0155, 0145, 0156, 0165, + 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0110, 0151, 0163, 0164, 0157, 0147, 0162, 0141, + 0155, 0040, 0157, 0146, 0040, 0144, 0151, 0143, 0145, 0040, 0162, 0157, 0154, 0154, 0163, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, + 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, + 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, + 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0104, 0151, 0143, 0145, 0040, + 0110, 0151, 0163, 0164, 0157, 0147, 0162, 0141, 0155, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, + 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, + 0162, 0075, 0042, 0147, 0141, 0155, 0145, 0137, 0150, 0151, 0163, 0164, 0157, 0147, 0162, 0141, + 0155, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, + 0157, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0123, 0145, + 0160, 0141, 0162, 0141, 0164, 0157, 0162, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, + 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, + 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, + 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, + 0162, 0040, 0121, 0165, 0151, 0164, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0121, 0165, 0151, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0137, 0121, 0165, 0151, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, + 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, + 0042, 0147, 0141, 0155, 0145, 0137, 0161, 0165, 0151, 0164, 0137, 0143, 0142, 0042, 0040, 0163, + 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, + 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0161, + 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, + 0104, 0113, 0137, 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, + 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, + 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, + 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, + 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, + 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0101, 0143, 0164, 0151, + 0157, 0156, 0163, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, + 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0163, 0165, 0142, 0155, 0145, 0156, 0165, + 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, + 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, + 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, + 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, + 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, + 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, + 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, + 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0122, 0157, 0154, 0154, 0040, 0104, + 0151, 0143, 0145, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0122, 0157, 0154, 0154, 0040, 0164, 0150, 0145, 0040, 0144, 0151, 0143, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, + 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, + 0162, 0157, 0154, 0154, 0137, 0144, 0151, 0143, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, + 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, + 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, + 0162, 0171, 0042, 0076, 0122, 0157, 0154, 0154, 0040, 0104, 0151, 0143, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, + 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0061, 0042, 0040, 0163, 0151, + 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, + 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, + 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0124, + 0162, 0141, 0144, 0145, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0124, 0162, 0141, 0144, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, + 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0164, 0162, 0141, 0144, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, + 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0124, 0162, 0141, 0144, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, + 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0062, 0042, 0040, 0163, + 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, + 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, + 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, + 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, + 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, + 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, + 0125, 0156, 0144, 0157, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0125, 0156, 0144, 0157, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, + 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0165, 0156, 0144, 0157, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, + 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, + 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, + 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0125, 0156, 0144, 0157, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, + 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0063, 0042, 0040, 0163, 0151, 0147, 0156, + 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, + 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, + 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, + 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, + 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, + 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0106, 0151, 0156, + 0151, 0163, 0150, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0106, 0151, 0156, 0151, 0163, 0150, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, + 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0146, 0151, 0156, 0151, 0163, 0150, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, + 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, + 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, + 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0106, 0151, 0156, 0151, 0163, 0150, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, + 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0064, 0042, + 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, + 0145, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0123, 0145, + 0160, 0141, 0162, 0141, 0164, 0157, 0162, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, + 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, + 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, + 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, + 0162, 0040, 0122, 0157, 0141, 0144, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0102, 0165, 0151, 0154, 0144, 0040, 0141, 0040, 0162, 0157, 0141, 0144, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, + 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, + 0156, 0137, 0142, 0165, 0151, 0154, 0144, 0137, 0162, 0157, 0141, 0144, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, + 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, + 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, + 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0122, 0157, 0141, 0144, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, + 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0065, 0042, 0040, 0163, 0151, 0147, 0156, + 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, + 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, + 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, + 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, + 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, + 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0123, 0150, 0151, + 0160, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0102, 0165, + 0151, 0154, 0144, 0040, 0141, 0040, 0163, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, + 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, 0151, + 0154, 0144, 0137, 0163, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0123, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, + 0171, 0075, 0042, 0106, 0066, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, + 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, + 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, + 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, + 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, + 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, + 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, + 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, + 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0115, 0157, 0166, 0145, 0040, 0123, 0150, 0151, + 0160, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0115, 0157, + 0166, 0145, 0040, 0141, 0040, 0163, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, + 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0155, 0157, 0166, 0145, + 0137, 0163, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0115, 0157, 0166, 0145, 0040, 0123, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, + 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0067, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, + 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, 0076, 0074, 0057, 0157, + 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, + 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, + 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, + 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, + 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, + 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0102, 0162, 0151, 0144, 0147, + 0145, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0102, 0165, + 0151, 0154, 0144, 0040, 0141, 0040, 0142, 0162, 0151, 0144, 0147, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, + 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, + 0165, 0151, 0154, 0144, 0137, 0142, 0162, 0151, 0144, 0147, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, + 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, + 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, + 0156, 0164, 0162, 0171, 0042, 0076, 0102, 0162, 0151, 0144, 0147, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, + 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0070, 0042, 0040, 0163, 0151, 0147, + 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, 0076, + 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, + 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, + 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, + 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, + 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, + 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, + 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0123, 0145, + 0164, 0164, 0154, 0145, 0155, 0145, 0156, 0164, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, + 0164, 0162, 0171, 0042, 0076, 0102, 0165, 0151, 0154, 0144, 0040, 0141, 0040, 0163, 0145, 0164, + 0164, 0154, 0145, 0155, 0145, 0156, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, + 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, 0151, 0154, 0144, 0137, + 0163, 0145, 0164, 0164, 0154, 0145, 0155, 0145, 0156, 0164, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, + 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, + 0164, 0162, 0171, 0042, 0076, 0123, 0145, 0164, 0164, 0154, 0145, 0155, 0145, 0156, 0164, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, + 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0071, 0042, 0040, + 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, + 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, + 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, + 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, + 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, + 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, + 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, + 0040, 0103, 0151, 0164, 0171, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0102, 0165, 0151, 0154, 0144, 0040, 0141, 0040, 0143, 0151, 0164, 0171, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, + 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, + 0137, 0142, 0165, 0151, 0154, 0144, 0137, 0143, 0151, 0164, 0171, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, + 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, + 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, + 0156, 0164, 0162, 0171, 0042, 0076, 0103, 0151, 0164, 0171, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, + 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0061, 0060, 0042, 0040, 0163, 0151, 0147, 0156, + 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, + 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, + 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, + 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, + 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, + 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0104, 0145, 0166, + 0145, 0154, 0157, 0160, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0102, 0165, 0171, 0040, 0141, 0040, 0144, 0145, 0166, 0145, 0154, 0157, 0160, 0155, 0145, + 0156, 0164, 0040, 0143, 0141, 0162, 0144, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, + 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, 0171, 0137, 0144, 0145, + 0166, 0145, 0154, 0157, 0160, 0155, 0145, 0156, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, + 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, + 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, + 0162, 0171, 0042, 0076, 0104, 0145, 0166, 0145, 0154, 0157, 0160, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, + 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0106, 0061, 0061, 0042, 0040, 0163, 0151, 0147, + 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0057, 0076, + 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, + 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, + 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, + 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, + 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, + 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, + 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0103, 0151, + 0164, 0171, 0040, 0127, 0141, 0154, 0154, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, + 0162, 0171, 0042, 0076, 0102, 0165, 0151, 0154, 0144, 0040, 0141, 0040, 0143, 0151, 0164, 0171, + 0040, 0167, 0141, 0154, 0154, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, + 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, 0151, 0154, 0144, 0137, 0143, 0151, + 0164, 0171, 0137, 0167, 0141, 0154, 0154, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0103, 0151, 0164, 0171, 0040, 0127, 0141, 0154, 0154, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, + 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, + 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, + 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, + 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, + 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, + 0123, 0145, 0164, 0164, 0151, 0156, 0147, 0163, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, + 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0163, 0165, + 0142, 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0103, 0150, 0145, 0143, 0153, + 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0040, 0151, 0144, 0075, 0042, 0164, 0157, + 0157, 0154, 0142, 0141, 0162, 0137, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, + 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0124, 0157, 0157, 0154, 0142, 0141, 0162, + 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0123, 0150, 0157, + 0167, 0040, 0157, 0162, 0040, 0150, 0151, 0144, 0145, 0040, 0164, 0150, 0145, 0040, 0164, 0157, + 0157, 0154, 0142, 0141, 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0137, 0124, 0157, 0157, 0154, 0142, 0141, 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, + 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0141, 0143, 0164, 0151, 0166, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0147, 0147, 0154, 0145, 0144, 0042, 0040, 0150, + 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0163, 0150, 0157, 0167, 0150, 0151, 0144, 0145, + 0137, 0164, 0157, 0157, 0154, 0142, 0141, 0162, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, + 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, + 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, + 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0120, 0162, 0145, 0146, 0145, 0162, 0145, + 0156, 0143, 0145, 0163, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0103, 0157, 0156, 0146, 0151, 0147, 0165, 0162, 0145, 0040, 0164, 0150, 0145, 0040, 0141, + 0160, 0160, 0154, 0151, 0143, 0141, 0164, 0151, 0157, 0156, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, + 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, + 0164, 0162, 0171, 0042, 0076, 0120, 0162, 0145, 0146, 0145, 0162, 0145, 0137, 0156, 0143, 0145, + 0163, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, + 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, + 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, + 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0160, 0162, 0145, 0146, 0145, + 0162, 0145, 0156, 0143, 0145, 0163, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, + 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, + 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, + 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, + 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0137, 0126, 0151, 0145, 0167, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0163, 0165, 0142, + 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, + 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0042, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, + 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, + 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, + 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0103, 0150, 0145, 0143, 0153, 0115, + 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, + 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, + 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, + 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, + 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, + 0157, 0162, 0040, 0106, 0165, 0154, 0154, 0163, 0143, 0162, 0145, 0145, 0156, 0040, 0155, 0145, + 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0123, 0145, 0164, 0040, 0167, 0151, + 0156, 0144, 0157, 0167, 0040, 0164, 0157, 0040, 0146, 0165, 0154, 0154, 0040, 0163, 0143, 0162, + 0145, 0145, 0156, 0040, 0155, 0157, 0144, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, + 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, + 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0137, 0106, 0165, 0154, 0154, 0163, 0143, 0162, 0145, 0145, 0156, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, + 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0147, 0147, 0154, 0145, 0144, 0042, 0040, 0150, 0141, + 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0164, 0157, 0147, 0147, 0154, 0145, 0137, 0146, 0165, + 0154, 0154, 0137, 0163, 0143, 0162, 0145, 0145, 0156, 0137, 0143, 0142, 0042, 0040, 0163, 0167, + 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, + 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0122, 0145, + 0164, 0165, 0162, 0156, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, + 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, + 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0115, 0117, 0104, 0061, 0137, 0115, 0101, 0123, 0113, + 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, + 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, + 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, + 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, + 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, + 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, + 0040, 0122, 0145, 0163, 0145, 0164, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0126, 0151, 0145, 0167, 0040, 0164, 0150, 0145, 0040, 0146, 0165, 0154, 0154, + 0040, 0155, 0141, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, + 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, + 0122, 0145, 0163, 0145, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, + 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, + 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0172, + 0157, 0157, 0155, 0137, 0156, 0157, 0162, 0155, 0141, 0154, 0137, 0143, 0142, 0042, 0040, 0163, + 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, + 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0060, + 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, + 0104, 0113, 0137, 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, + 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, + 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, + 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, + 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, + 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, + 0103, 0145, 0156, 0164, 0145, 0162, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0103, 0145, 0156, 0164, 0145, 0162, 0040, 0164, 0150, 0145, 0040, 0155, 0141, + 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, + 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, + 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0103, 0145, 0156, + 0164, 0145, 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, + 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, + 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0172, 0157, 0157, + 0155, 0137, 0143, 0145, 0156, 0164, 0145, 0162, 0137, 0155, 0141, 0160, 0137, 0143, 0142, 0042, + 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, + 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, + 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, + 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, + 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0110, 0145, 0154, 0160, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, + 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, + 0145, 0075, 0042, 0163, 0165, 0142, 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, + 0156, 0165, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, + 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, + 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, + 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, + 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, + 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, + 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, + 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, + 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, + 0146, 0157, 0162, 0040, 0101, 0142, 0157, 0165, 0164, 0040, 0120, 0151, 0157, 0156, 0145, 0145, + 0162, 0163, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0111, + 0156, 0146, 0157, 0162, 0155, 0141, 0164, 0151, 0157, 0156, 0040, 0141, 0142, 0157, 0165, 0164, + 0040, 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, + 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, + 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, + 0162, 0171, 0042, 0076, 0137, 0101, 0142, 0157, 0165, 0164, 0040, 0120, 0151, 0157, 0156, 0145, + 0145, 0162, 0163, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, + 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, + 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0150, 0145, 0154, + 0160, 0137, 0141, 0142, 0157, 0165, 0164, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, + 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, + 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, + 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0040, 0151, 0144, + 0075, 0042, 0150, 0145, 0154, 0160, 0137, 0155, 0141, 0156, 0165, 0141, 0154, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, + 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, + 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, + 0040, 0110, 0145, 0154, 0160, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0123, 0150, 0157, 0167, 0040, 0164, 0150, 0145, 0040, 0155, 0141, 0156, 0165, 0141, + 0154, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, + 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, + 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0110, 0145, 0154, + 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, + 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, + 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, + 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0150, 0145, 0154, 0160, 0137, + 0155, 0141, 0156, 0165, 0141, 0154, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, + 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, + 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0150, 0042, 0040, 0163, 0151, + 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, + 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0103, + 0117, 0116, 0124, 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, 0057, + 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, + 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0146, 0151, 0154, 0154, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0160, 0157, 0163, 0151, 0164, 0151, 0157, 0156, 0042, 0076, 0060, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0124, 0157, 0157, 0154, 0142, 0141, 0162, 0042, 0040, 0151, 0144, 0075, 0042, 0164, 0157, + 0157, 0154, 0142, 0141, 0162, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, + 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, + 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0142, 0141, + 0162, 0137, 0163, 0164, 0171, 0154, 0145, 0042, 0076, 0142, 0157, 0164, 0150, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, 0042, 0040, 0151, 0144, 0075, + 0042, 0162, 0157, 0154, 0154, 0137, 0144, 0151, 0143, 0145, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, + 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, + 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, + 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, + 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, + 0160, 0040, 0146, 0157, 0162, 0040, 0122, 0157, 0154, 0154, 0040, 0104, 0151, 0143, 0145, 0040, + 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0122, 0157, 0154, 0154, + 0040, 0164, 0150, 0145, 0040, 0144, 0151, 0143, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, + 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0162, 0157, 0154, 0154, + 0137, 0144, 0151, 0143, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0156, 0157, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0122, + 0157, 0154, 0154, 0040, 0104, 0151, 0143, 0145, 0012, 0106, 0061, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, + 0076, 0144, 0151, 0143, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, + 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, + 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, 0042, 0040, 0151, 0144, 0075, + 0042, 0164, 0162, 0141, 0144, 0145, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, + 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0124, 0162, 0141, 0144, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, + 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, + 0151, 0157, 0156, 0137, 0164, 0162, 0141, 0144, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, + 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0124, 0162, + 0141, 0144, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, + 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0164, 0162, 0141, 0144, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, + 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, + 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, + 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, + 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, + 0164, 0164, 0157, 0156, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, + 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, + 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, + 0125, 0156, 0144, 0157, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0125, 0156, 0144, 0157, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, + 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0165, 0156, 0144, 0157, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, + 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, + 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, + 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0125, 0156, 0144, 0157, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, + 0076, 0145, 0144, 0151, 0164, 0055, 0165, 0156, 0144, 0157, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, + 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, + 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, + 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, + 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, + 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, + 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, + 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0106, 0151, 0156, 0151, + 0163, 0150, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0106, + 0151, 0156, 0151, 0163, 0150, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, + 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0146, 0151, 0156, 0151, 0163, 0150, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, + 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0106, 0151, 0156, 0151, 0163, 0150, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0156, + 0141, 0155, 0145, 0042, 0076, 0160, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0055, 0146, 0151, + 0156, 0151, 0163, 0150, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, 0156, + 0145, 0157, 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, + 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, + 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, + 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, 0042, 0040, 0151, 0144, 0075, 0042, + 0102, 0165, 0151, 0154, 0144, 0122, 0157, 0141, 0144, 0042, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, + 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, + 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, + 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0102, + 0165, 0151, 0154, 0144, 0040, 0141, 0040, 0162, 0157, 0141, 0144, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, + 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, + 0151, 0154, 0144, 0137, 0162, 0157, 0141, 0144, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, + 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0122, 0157, 0141, + 0144, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, + 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0162, 0157, 0141, 0144, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, + 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, + 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0150, 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, + 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, + 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, + 0156, 0042, 0040, 0151, 0144, 0075, 0042, 0102, 0165, 0151, 0154, 0144, 0123, 0150, 0151, 0160, + 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, + 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, + 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0076, 0102, 0165, 0151, 0154, 0144, 0040, 0141, 0040, 0163, 0150, + 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, + 0151, 0142, 0154, 0145, 0137, 0150, 0157, 0162, 0151, 0172, 0157, 0156, 0164, 0141, 0154, 0042, + 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, + 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, 0151, 0154, 0144, 0137, 0163, + 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, + 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, + 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0123, 0150, 0151, 0160, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0156, 0141, 0155, 0145, + 0042, 0076, 0163, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, + 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, 0157, 0155, 0157, 0147, + 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, + 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, + 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, 0042, 0040, 0151, 0144, + 0075, 0042, 0115, 0157, 0166, 0145, 0123, 0150, 0151, 0160, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, + 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, + 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, + 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, + 0115, 0157, 0166, 0145, 0040, 0141, 0040, 0163, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0137, 0150, 0157, + 0162, 0151, 0172, 0157, 0156, 0164, 0141, 0154, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, + 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, + 0156, 0137, 0155, 0157, 0166, 0145, 0137, 0163, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, + 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, + 0115, 0157, 0166, 0145, 0040, 0123, 0150, 0151, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0163, + 0150, 0151, 0160, 0137, 0155, 0157, 0166, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, + 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, + 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, 0157, 0155, + 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, + 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, + 0042, 0107, 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, 0042, 0040, + 0151, 0144, 0075, 0042, 0102, 0165, 0151, 0154, 0144, 0102, 0162, 0151, 0144, 0147, 0145, 0042, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, + 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, + 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, + 0171, 0145, 0163, 0042, 0076, 0102, 0165, 0151, 0154, 0144, 0040, 0141, 0040, 0142, 0162, 0151, + 0144, 0147, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, + 0163, 0151, 0142, 0154, 0145, 0137, 0150, 0157, 0162, 0151, 0172, 0157, 0156, 0164, 0141, 0154, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, + 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, 0151, 0154, 0144, 0137, + 0142, 0162, 0151, 0144, 0147, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0102, 0162, 0151, 0144, 0147, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, + 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0142, 0162, 0151, 0144, 0147, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, + 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, + 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, + 0164, 0157, 0156, 0042, 0040, 0151, 0144, 0075, 0042, 0102, 0165, 0151, 0154, 0144, 0123, 0145, + 0164, 0164, 0154, 0145, 0155, 0145, 0156, 0164, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, + 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, + 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, + 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, + 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0102, 0165, + 0151, 0154, 0144, 0040, 0141, 0040, 0163, 0145, 0164, 0164, 0154, 0145, 0155, 0145, 0156, 0164, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, + 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, + 0157, 0156, 0137, 0142, 0165, 0151, 0154, 0144, 0137, 0163, 0145, 0164, 0164, 0154, 0145, 0155, + 0145, 0156, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, + 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, + 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0123, 0145, 0164, 0164, 0154, 0145, 0155, 0145, + 0156, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, + 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0163, 0145, 0164, 0164, 0154, 0145, 0155, 0145, + 0156, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, + 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, + 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, + 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0124, 0157, + 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, 0042, 0040, 0151, 0144, 0075, 0042, 0102, 0165, + 0151, 0154, 0144, 0103, 0151, 0164, 0171, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, + 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, + 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, + 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0102, 0165, 0151, + 0154, 0144, 0040, 0141, 0040, 0143, 0151, 0164, 0171, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0137, 0150, 0157, 0162, 0151, + 0172, 0157, 0156, 0164, 0141, 0154, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, + 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, + 0142, 0165, 0151, 0154, 0144, 0137, 0143, 0151, 0164, 0171, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0103, + 0151, 0164, 0171, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, + 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, 0076, 0143, 0151, 0164, 0171, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, + 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, + 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, + 0164, 0157, 0156, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, + 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0104, + 0145, 0166, 0145, 0154, 0157, 0160, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0102, 0165, 0171, 0040, 0141, 0040, 0144, 0145, 0166, 0145, 0154, 0157, 0160, + 0155, 0145, 0156, 0164, 0040, 0143, 0141, 0162, 0144, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0156, 0141, 0155, 0145, 0042, + 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, 0137, 0142, 0165, 0171, 0137, + 0144, 0145, 0166, 0145, 0154, 0157, 0160, 0155, 0145, 0156, 0164, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, + 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, + 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, + 0156, 0164, 0162, 0171, 0042, 0076, 0104, 0145, 0166, 0145, 0154, 0157, 0160, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0156, 0141, 0155, + 0145, 0042, 0076, 0144, 0145, 0166, 0145, 0154, 0157, 0160, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, + 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0150, + 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, + 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0124, 0157, 0157, 0154, 0102, 0165, 0164, 0164, 0157, 0156, + 0042, 0040, 0151, 0144, 0075, 0042, 0102, 0165, 0151, 0154, 0144, 0103, 0151, 0164, 0171, 0127, + 0141, 0154, 0154, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, + 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0076, 0102, 0165, 0151, 0154, 0144, 0040, 0141, + 0040, 0143, 0151, 0164, 0171, 0040, 0167, 0141, 0154, 0154, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0137, 0150, 0157, 0162, + 0151, 0172, 0157, 0156, 0164, 0141, 0154, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0157, 0156, 0137, + 0156, 0141, 0155, 0145, 0042, 0076, 0167, 0151, 0156, 0056, 0141, 0143, 0164, 0151, 0157, 0156, + 0137, 0142, 0165, 0151, 0154, 0144, 0137, 0143, 0151, 0164, 0171, 0137, 0167, 0141, 0154, 0154, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, + 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, + 0171, 0145, 0163, 0042, 0076, 0103, 0151, 0164, 0171, 0040, 0127, 0141, 0154, 0154, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0151, 0143, 0157, 0156, 0137, 0156, 0141, + 0155, 0145, 0042, 0076, 0143, 0151, 0164, 0171, 0137, 0167, 0141, 0154, 0154, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, + 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0150, 0157, 0155, 0157, 0147, 0145, 0156, 0145, 0157, 0165, 0163, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, + 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, + 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0146, 0151, 0154, 0154, 0042, 0076, + 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0160, + 0157, 0163, 0151, 0164, 0151, 0157, 0156, 0042, 0076, 0061, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, + 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, + 0076, 0074, 0057, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0076, 0012, 0000, 0000, + 0050, 0165, 0165, 0141, 0171, 0051, 0143, 0154, 0151, 0145, 0156, 0164, 0057, 0000, 0000, 0000, + 0006, 0000, 0000, 0000, 0147, 0164, 0153, 0057, 0004, 0000, 0000, 0000 +} }; +#else /* _MSC_VER */ +static const SECTION union { const guint8 data[23885]; const double alignment; void * const ptr;} client_resource_data = { + "\107\126\141\162\151\141\156\164\000\000\000\000\000\000\000\000" + "\030\000\000\000\344\000\000\000\000\000\000\050\007\000\000\000" + "\000\000\000\000\001\000\000\000\002\000\000\000\003\000\000\000" + "\003\000\000\000\006\000\000\000\007\000\000\000\164\175\161\023" + "\003\000\000\000\344\000\000\000\004\000\114\000\350\000\000\000" + "\354\000\000\000\112\216\217\013\002\000\000\000\354\000\000\000" + "\004\000\114\000\360\000\000\000\364\000\000\000\324\265\002\000" + "\377\377\377\377\364\000\000\000\001\000\114\000\370\000\000\000" + "\374\000\000\000\135\337\307\275\001\000\000\000\374\000\000\000" + "\014\000\114\000\010\001\000\000\014\001\000\000\242\110\322\117" + "\006\000\000\000\014\001\000\000\011\000\166\000\030\001\000\000" + "\066\135\000\000\302\107\157\245\000\000\000\000\066\135\000\000" + "\007\000\114\000\100\135\000\000\104\135\000\000\067\317\253\327" + "\005\000\000\000\104\135\000\000\004\000\114\000\110\135\000\000" + "\114\135\000\000\160\151\157\057\005\000\000\000\156\145\164\057" + "\003\000\000\000\057\000\000\000\001\000\000\000\163\157\165\162" + "\143\145\146\157\162\147\145\057\000\000\000\000\143\154\151\145" + "\156\164\056\165\151\000\000\000\016\134\000\000\000\000\000\000" + "\074\077\170\155\154\040\166\145\162\163\151\157\156\075\042\061" + "\056\060\042\040\145\156\143\157\144\151\156\147\075\042\125\124" + "\106\055\070\042\077\076\012\074\041\055\055\040\107\145\156\145" + "\162\141\164\145\144\040\167\151\164\150\040\147\154\141\144\145" + "\040\063\056\062\062\056\062\040\012\012\160\151\157\156\145\145" + "\162\163\040\055\040\115\141\151\156\040\167\151\156\144\157\167" + "\012\103\157\160\171\162\151\147\150\164\040\050\103\051\040\062" + "\060\062\060\040\122\157\154\141\156\144\040\103\154\157\142\165" + "\163\012\012\124\150\151\163\040\160\162\157\147\162\141\155\040" + "\151\163\040\146\162\145\145\040\163\157\146\164\167\141\162\145" + "\073\040\171\157\165\040\143\141\156\040\162\145\144\151\163\164" + "\162\151\142\165\164\145\040\151\164\040\141\156\144\057\157\162" + "\012\155\157\144\151\146\171\040\151\164\040\165\156\144\145\162" + "\040\164\150\145\040\164\145\162\155\163\040\157\146\040\164\150" + "\145\040\107\116\125\040\107\145\156\145\162\141\154\040\120\165" + "\142\154\151\143\040\114\151\143\145\156\163\145\012\141\163\040" + "\160\165\142\154\151\163\150\145\144\040\142\171\040\164\150\145" + "\040\106\162\145\145\040\123\157\146\164\167\141\162\145\040\106" + "\157\165\156\144\141\164\151\157\156\073\040\145\151\164\150\145" + "\162\040\166\145\162\163\151\157\156\040\062\012\157\146\040\164" + "\150\145\040\114\151\143\145\156\163\145\054\040\157\162\040\050" + "\141\164\040\171\157\165\162\040\157\160\164\151\157\156\051\040" + "\141\156\171\040\154\141\164\145\162\040\166\145\162\163\151\157" + "\156\056\012\012\124\150\151\163\040\160\162\157\147\162\141\155" + "\040\151\163\040\144\151\163\164\162\151\142\165\164\145\144\040" + "\151\156\040\164\150\145\040\150\157\160\145\040\164\150\141\164" + "\040\151\164\040\167\151\154\154\040\142\145\040\165\163\145\146" + "\165\154\054\012\142\165\164\040\127\111\124\110\117\125\124\040" + "\101\116\131\040\127\101\122\122\101\116\124\131\073\040\167\151" + "\164\150\157\165\164\040\145\166\145\156\040\164\150\145\040\151" + "\155\160\154\151\145\144\040\167\141\162\162\141\156\164\171\040" + "\157\146\012\115\105\122\103\110\101\116\124\101\102\111\114\111" + "\124\131\040\157\162\040\106\111\124\116\105\123\123\040\106\117" + "\122\040\101\040\120\101\122\124\111\103\125\114\101\122\040\120" + "\125\122\120\117\123\105\056\040\040\123\145\145\040\164\150\145" + "\012\107\116\125\040\107\145\156\145\162\141\154\040\120\165\142" + "\154\151\143\040\114\151\143\145\156\163\145\040\146\157\162\040" + "\155\157\162\145\040\144\145\164\141\151\154\163\056\012\012\131" + "\157\165\040\163\150\157\165\154\144\040\150\141\166\145\040\162" + "\145\143\145\151\166\145\144\040\141\040\143\157\160\171\040\157" + "\146\040\164\150\145\040\107\116\125\040\107\145\156\145\162\141" + "\154\040\120\165\142\154\151\143\040\114\151\143\145\156\163\145" + "\012\141\154\157\156\147\040\167\151\164\150\040\164\150\151\163" + "\040\160\162\157\147\162\141\155\073\040\151\146\040\156\157\164" + "\054\040\167\162\151\164\145\040\164\157\040\164\150\145\040\106" + "\162\145\145\040\123\157\146\164\167\141\162\145\012\106\157\165" + "\156\144\141\164\151\157\156\054\040\111\156\143\056\054\040\065" + "\061\040\106\162\141\156\153\154\151\156\040\123\164\162\145\145" + "\164\054\040\106\151\146\164\150\040\106\154\157\157\162\054\040" + "\102\157\163\164\157\156\054\040\115\101\040\040\060\062\061\061" + "\060\055\061\063\060\061\054\040\125\123\101\056\012\012\101\165" + "\164\150\157\162\072\040\122\157\154\141\156\144\040\103\154\157" + "\142\165\163\012\012\055\055\076\012\074\151\156\164\145\162\146" + "\141\143\145\076\074\162\145\161\165\151\162\145\163\040\154\151" + "\142\075\042\147\164\153\053\042\040\166\145\162\163\151\157\156" + "\075\042\063\056\062\060\042\057\076\074\041\055\055\040\151\156" + "\164\145\162\146\141\143\145\055\154\151\143\145\156\163\145\055" + "\164\171\160\145\040\147\160\154\166\062\040\055\055\076\074\041" + "\055\055\040\151\156\164\145\162\146\141\143\145\055\156\141\155" + "\145\040\160\151\157\156\145\145\162\163\040\055\055\076\074\041" + "\055\055\040\151\156\164\145\162\146\141\143\145\055\144\145\163" + "\143\162\151\160\164\151\157\156\040\115\141\151\156\040\167\151" + "\156\144\157\167\040\055\055\076\074\041\055\055\040\151\156\164" + "\145\162\146\141\143\145\055\143\157\160\171\162\151\147\150\164" + "\040\062\060\062\060\040\122\157\154\141\156\144\040\103\154\157" + "\142\165\163\040\055\055\076\074\041\055\055\040\151\156\164\145" + "\162\146\141\143\145\055\141\165\164\150\157\162\163\040\122\157" + "\154\141\156\144\040\103\154\157\142\165\163\040\055\055\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\101\143\143\145\154\107\162\157\165\160\042\040\151\144\075" + "\042\147\154\157\142\141\154\101\143\143\145\154\107\162\157\165" + "\160\042\057\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\127\151\156\144\157\167\042\040\151\144" + "\075\042\164\157\160\154\145\166\145\154\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137" + "\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\143\150\151\154\144\040\164\171" + "\160\145\075\042\164\151\164\154\145\142\141\162\042\076\074\160" + "\154\141\143\145\150\157\154\144\145\162\057\076\074\057\143\150" + "\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152\145" + "\143\164\040\143\154\141\163\163\075\042\107\164\153\102\157\170" + "\042\040\151\144\075\042\166\142\157\170\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151" + "\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\157" + "\162\151\145\156\164\141\164\151\157\156\042\076\166\145\162\164" + "\151\143\141\154\074\057\160\162\157\160\145\162\164\171\076\074" + "\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154" + "\141\163\163\075\042\107\164\153\115\145\156\165\102\141\162\042" + "\040\151\144\075\042\155\141\151\156\055\155\145\156\165\042\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165" + "\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\143\150\151\154\144\076\074\157\142\152\145\143" + "\164\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165" + "\111\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141" + "\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\154\141\142\145\154\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\115\145\156" + "\165\040\145\156\164\162\171\042\076\137\107\141\155\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\165\163\145\137\165\156\144" + "\145\162\154\151\156\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\143\150\151\154\144\040\164\171" + "\160\145\075\042\163\165\142\155\145\156\165\042\076\074\157\142" + "\152\145\143\164\040\143\154\141\163\163\075\042\107\164\153\115" + "\145\156\165\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\115\145\156\165\111\164\145\155\042\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142" + "\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141" + "\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\164\157" + "\157\154\164\151\160\137\164\145\170\164\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143" + "\157\155\155\145\156\164\163\075\042\124\157\157\154\164\151\160" + "\040\146\157\162\040\116\145\167\040\107\141\155\145\040\155\145" + "\156\165\040\145\156\164\162\171\042\076\123\164\141\162\164\040" + "\141\040\156\145\167\040\147\141\155\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\141\143\164\151\157\156\137\156\141\155\145" + "\042\076\167\151\156\056\141\143\164\151\157\156\137\147\141\155" + "\145\137\156\145\167\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076" + "\137\116\145\167\040\107\141\155\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\165\163\145\137\165\156\144\145\162\154\151\156" + "\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\141\143\143\145\154\145\162\141\164\157\162\040\153" + "\145\171\075\042\156\042\040\163\151\147\156\141\154\075\042\141" + "\143\164\151\166\141\164\145\042\040\155\157\144\151\146\151\145" + "\162\163\075\042\107\104\113\137\103\117\116\124\122\117\114\137" + "\115\101\123\113\042\057\076\074\057\157\142\152\145\143\164\076" + "\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\115\145\156\165\111\164\145\155\042\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142" + "\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141" + "\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\164\157" + "\157\154\164\151\160\137\164\145\170\164\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143" + "\157\155\155\145\156\164\163\075\042\124\157\157\154\164\151\160" + "\040\146\157\162\040\114\145\141\166\145\040\107\141\155\145\040" + "\155\145\156\165\040\145\156\164\162\171\042\076\114\145\141\166" + "\145\040\164\150\151\163\040\147\141\155\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\141\143\164\151\157\156\137\156\141\155" + "\145\042\076\167\151\156\056\141\143\164\151\157\156\137\147\141" + "\155\145\137\154\145\141\166\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154" + "\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155" + "\155\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162" + "\171\042\076\137\114\145\141\166\145\040\107\141\155\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\165\163\145\137\165\156\144" + "\145\162\154\151\156\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\057\157\142\152\145\143\164\076" + "\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\115\145\156\165\111\164\145\155\042\040\151\144\075\042\141" + "\144\155\151\156\042\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042" + "\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\164\157\157\154\164\151\160\137\164\145\170\164\042\040\164" + "\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163" + "\042\040\143\157\155\155\145\156\164\163\075\042\124\157\157\154" + "\164\151\160\040\146\157\162\040\101\144\155\151\156\040\155\145" + "\156\165\040\145\156\164\162\171\042\076\101\144\155\151\156\151" + "\163\164\145\162\040\120\151\157\156\145\145\162\163\040\163\145" + "\162\166\145\162\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154" + "\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076\137" + "\101\144\155\151\156\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\165\163\145\137\165\156\144\145\162\154\151\156\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\163" + "\151\147\156\141\154\040\156\141\155\145\075\042\141\143\164\151" + "\166\141\164\145\042\040\150\141\156\144\154\145\162\075\042\163" + "\150\157\167\137\141\144\155\151\156\137\151\156\164\145\162\146" + "\141\143\145\137\143\142\042\040\163\167\141\160\160\145\144\075" + "\042\156\157\042\057\076\074\141\143\143\145\154\145\162\141\164" + "\157\162\040\153\145\171\075\042\141\042\040\163\151\147\156\141" + "\154\075\042\141\143\164\151\166\141\164\145\042\040\155\157\144" + "\151\146\151\145\162\163\075\042\107\104\113\137\103\117\116\124" + "\122\117\114\137\115\101\123\113\042\057\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151" + "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163" + "\075\042\107\164\153\123\145\160\141\162\141\164\157\162\115\145" + "\156\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151" + "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163" + "\075\042\107\164\153\115\145\156\165\111\164\145\155\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\164\157\157\154\164\151\160\137\164\145\170\164\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\124\157\157" + "\154\164\151\160\040\146\157\162\040\120\154\141\171\145\162\040" + "\116\141\155\145\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\103\150\141\156\147\145\040\171\157\165\162\040\160\154\141" + "\171\145\162\040\156\141\155\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\141\143\164\151\157\156\137\156\141\155\145\042\076" + "\167\151\156\056\141\143\164\151\157\156\137\160\154\141\171\145" + "\162\137\156\141\155\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042" + "\076\137\120\154\141\171\145\162\040\116\141\155\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\165\163\145\137\165\156\144\145" + "\162\154\151\156\145\042\076\124\162\165\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\141\143\143\145\154\145\162\141\164" + "\157\162\040\153\145\171\075\042\160\042\040\163\151\147\156\141" + "\154\075\042\141\143\164\151\166\141\164\145\042\040\155\157\144" + "\151\146\151\145\162\163\075\042\107\104\113\137\103\117\116\124" + "\122\117\114\137\115\101\123\113\042\057\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151" + "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163" + "\075\042\107\164\153\123\145\160\141\162\141\164\157\162\115\145" + "\156\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151" + "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163" + "\075\042\107\164\153\115\145\156\165\111\164\145\155\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\164\157\157\154\164\151\160\137\164\145\170\164\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\124\157\157" + "\154\164\151\160\040\146\157\162\040\114\145\147\145\156\144\040" + "\155\145\156\165\040\145\156\164\162\171\042\076\124\145\162\162" + "\141\151\156\040\154\145\147\145\156\144\040\141\156\144\040\142" + "\165\151\154\144\151\156\147\040\143\157\163\164\163\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\154\141\142\145\154\042\040\164" + "\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163" + "\042\040\143\157\155\155\145\156\164\163\075\042\115\145\156\165" + "\040\145\156\164\162\171\042\076\114\137\145\147\145\156\144\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\165\163\145\137\165\156" + "\144\145\162\154\151\156\145\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\163\151\147\156\141\154\040" + "\156\141\155\145\075\042\141\143\164\151\166\141\164\145\042\040" + "\150\141\156\144\154\145\162\075\042\147\141\155\145\137\154\145" + "\147\145\156\144\137\143\142\042\040\163\167\141\160\160\145\144" + "\075\042\156\157\042\057\076\074\057\157\142\152\145\143\164\076" + "\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\115\145\156\165\111\164\145\155\042\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142" + "\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141" + "\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\164\157" + "\157\154\164\151\160\137\164\145\170\164\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143" + "\157\155\155\145\156\164\163\075\042\124\157\157\154\164\151\160" + "\040\146\157\162\040\107\141\155\145\040\123\145\164\164\151\156" + "\147\163\040\155\145\156\165\040\145\156\164\162\171\042\076\123" + "\145\164\164\151\156\147\163\040\146\157\162\040\164\150\145\040" + "\143\165\162\162\145\156\164\040\147\141\155\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162" + "\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042" + "\040\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040" + "\145\156\164\162\171\042\076\137\107\141\155\145\040\123\145\164" + "\164\151\156\147\163\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\165\163\145\137\165\156\144\145\162\154\151\156\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\163" + "\151\147\156\141\154\040\156\141\155\145\075\042\141\143\164\151" + "\166\141\164\145\042\040\150\141\156\144\154\145\162\075\042\147" + "\141\155\145\137\163\145\164\164\151\156\147\163\137\143\142\042" + "\040\163\167\141\160\160\145\144\075\042\156\157\042\057\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145" + "\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146" + "\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145" + "\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145" + "\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075" + "\042\124\157\157\154\164\151\160\040\146\157\162\040\104\151\143" + "\145\040\110\151\163\164\157\147\162\141\155\040\155\145\156\165" + "\040\145\156\164\162\171\042\076\110\151\163\164\157\147\162\141" + "\155\040\157\146\040\144\151\143\145\040\162\157\154\154\163\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\154\141\142\145\154\042" + "\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171" + "\145\163\042\040\143\157\155\155\145\156\164\163\075\042\115\145" + "\156\165\040\145\156\164\162\171\042\076\137\104\151\143\145\040" + "\110\151\163\164\157\147\162\141\155\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\165\163\145\137\165\156\144\145\162\154\151\156" + "\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\163\151\147\156\141\154\040\156\141\155\145\075\042" + "\141\143\164\151\166\141\164\145\042\040\150\141\156\144\154\145" + "\162\075\042\147\141\155\145\137\150\151\163\164\157\147\162\141" + "\155\137\143\142\042\040\163\167\141\160\160\145\144\075\042\156" + "\157\042\057\076\074\057\157\142\152\145\143\164\076\074\057\143" + "\150\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\123\145" + "\160\141\162\141\164\157\162\115\145\156\165\111\164\145\155\042" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143" + "\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\057\157\142\152\145\143\164\076\074\057\143" + "\150\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\115\145" + "\156\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164" + "\151\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\124\157\157\154\164\151\160\040\146\157" + "\162\040\121\165\151\164\040\155\145\156\165\040\145\156\164\162" + "\171\042\076\121\165\151\164\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171" + "\042\076\137\121\165\151\164\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\165\163\145\137\165\156\144\145\162\154\151\156\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\163\151\147\156\141\154\040\156\141\155\145\075\042\141\143" + "\164\151\166\141\164\145\042\040\150\141\156\144\154\145\162\075" + "\042\147\141\155\145\137\161\165\151\164\137\143\142\042\040\163" + "\167\141\160\160\145\144\075\042\156\157\042\057\076\074\141\143" + "\143\145\154\145\162\141\164\157\162\040\153\145\171\075\042\161" + "\042\040\163\151\147\156\141\154\075\042\141\143\164\151\166\141" + "\164\145\042\040\155\157\144\151\146\151\145\162\163\075\042\107" + "\104\113\137\103\117\116\124\122\117\114\137\115\101\123\113\042" + "\057\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151" + "\154\144\076\074\057\157\142\152\145\143\164\076\074\057\143\150" + "\151\154\144\076\074\057\157\142\152\145\143\164\076\074\057\143" + "\150\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\115\145" + "\156\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\154\141\142\145\154" + "\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042" + "\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042\115" + "\145\156\165\040\145\156\164\162\171\042\076\137\101\143\164\151" + "\157\156\163\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\165\163" + "\145\137\165\156\144\145\162\154\151\156\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\143\150\151" + "\154\144\040\164\171\160\145\075\042\163\165\142\155\145\156\165" + "\042\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075" + "\042\107\164\153\115\145\156\165\042\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142\154" + "\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141\154" + "\163\145\074\057\160\162\157\160\145\162\164\171\076\074\143\150" + "\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\115\145\156\165\111\164\145\155\042\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165" + "\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\164\157\157\154\164\151\160\137\164\145\170\164\042" + "\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171" + "\145\163\042\040\143\157\155\155\145\156\164\163\075\042\124\157" + "\157\154\164\151\160\040\146\157\162\040\122\157\154\154\040\104" + "\151\143\145\040\155\145\156\165\040\145\156\164\162\171\042\076" + "\122\157\154\154\040\164\150\145\040\144\151\143\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\141\143\164\151\157\156\137\156" + "\141\155\145\042\076\167\151\156\056\141\143\164\151\157\156\137" + "\162\157\154\154\137\144\151\143\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163" + "\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157" + "\155\155\145\156\164\163\075\042\115\145\156\165\040\145\156\164" + "\162\171\042\076\122\157\154\154\040\104\151\143\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\141\143\143\145\154\145\162" + "\141\164\157\162\040\153\145\171\075\042\106\061\042\040\163\151" + "\147\156\141\154\075\042\141\143\164\151\166\141\164\145\042\057" + "\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154" + "\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111" + "\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137" + "\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040\124" + "\162\141\144\145\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\124\162\141\144\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\141\143\164\151\157\156\137\156\141\155\145\042\076\167\151" + "\156\056\141\143\164\151\157\156\137\164\162\141\144\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\154\141\142\145\154\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\115\145\156" + "\165\040\145\156\164\162\171\042\076\124\162\141\144\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\141\143\143\145\154\145" + "\162\141\164\157\162\040\153\145\171\075\042\106\062\042\040\163" + "\151\147\156\141\154\075\042\141\143\164\151\166\141\164\145\042" + "\057\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151" + "\154\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143" + "\164\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165" + "\111\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141" + "\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160" + "\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040" + "\125\156\144\157\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\125\156\144\157\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\141\143\164\151\157\156\137\156\141\155\145\042\076\167\151\156" + "\056\141\143\164\151\157\156\137\165\156\144\157\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162" + "\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042" + "\040\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040" + "\145\156\164\162\171\042\076\125\156\144\157\074\057\160\162\157" + "\160\145\162\164\171\076\074\141\143\143\145\154\145\162\141\164" + "\157\162\040\153\145\171\075\042\106\063\042\040\163\151\147\156" + "\141\154\075\042\141\143\164\151\166\141\164\145\042\057\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145" + "\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146" + "\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145" + "\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145" + "\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075" + "\042\124\157\157\154\164\151\160\040\146\157\162\040\106\151\156" + "\151\163\150\040\155\145\156\165\040\145\156\164\162\171\042\076" + "\106\151\156\151\163\150\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\141\143\164\151\157\156\137\156\141\155\145\042\076\167\151" + "\156\056\141\143\164\151\157\156\137\146\151\156\151\163\150\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\154\141\142\145\154\042" + "\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171" + "\145\163\042\040\143\157\155\155\145\156\164\163\075\042\115\145" + "\156\165\040\145\156\164\162\171\042\076\106\151\156\151\163\150" + "\074\057\160\162\157\160\145\162\164\171\076\074\141\143\143\145" + "\154\145\162\141\164\157\162\040\153\145\171\075\042\106\064\042" + "\040\163\151\147\156\141\154\075\042\141\143\164\151\166\141\164" + "\145\042\057\076\074\057\157\142\152\145\143\164\076\074\057\143" + "\150\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\123\145" + "\160\141\162\141\164\157\162\115\145\156\165\111\164\145\155\042" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143" + "\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\057\157\142\152\145\143\164\076\074\057\143" + "\150\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\115\145" + "\156\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164" + "\151\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\124\157\157\154\164\151\160\040\146\157" + "\162\040\122\157\141\144\040\155\145\156\165\040\145\156\164\162" + "\171\042\076\102\165\151\154\144\040\141\040\162\157\141\144\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\141\143\164\151\157\156" + "\137\156\141\155\145\042\076\167\151\156\056\141\143\164\151\157" + "\156\137\142\165\151\154\144\137\162\157\141\144\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162" + "\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042" + "\040\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040" + "\145\156\164\162\171\042\076\122\157\141\144\074\057\160\162\157" + "\160\145\162\164\171\076\074\141\143\143\145\154\145\162\141\164" + "\157\162\040\153\145\171\075\042\106\065\042\040\163\151\147\156" + "\141\154\075\042\141\143\164\151\166\141\164\145\042\057\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145" + "\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146" + "\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145" + "\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145" + "\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075" + "\042\124\157\157\154\164\151\160\040\146\157\162\040\123\150\151" + "\160\040\155\145\156\165\040\145\156\164\162\171\042\076\102\165" + "\151\154\144\040\141\040\163\150\151\160\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\141\143\164\151\157\156\137\156\141\155\145" + "\042\076\167\151\156\056\141\143\164\151\157\156\137\142\165\151" + "\154\144\137\163\150\151\160\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171" + "\042\076\123\150\151\160\074\057\160\162\157\160\145\162\164\171" + "\076\074\141\143\143\145\154\145\162\141\164\157\162\040\153\145" + "\171\075\042\106\066\042\040\163\151\147\156\141\154\075\042\141" + "\143\164\151\166\141\164\145\042\057\076\074\057\157\142\152\145" + "\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151\154" + "\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075" + "\042\107\164\153\115\145\156\165\111\164\145\155\042\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151" + "\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042" + "\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\164\157\157\154\164\151\160\137\164\145\170\164\042\040\164" + "\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163" + "\042\040\143\157\155\155\145\156\164\163\075\042\124\157\157\154" + "\164\151\160\040\146\157\162\040\115\157\166\145\040\123\150\151" + "\160\040\155\145\156\165\040\145\156\164\162\171\042\076\115\157" + "\166\145\040\141\040\163\150\151\160\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\141\143\164\151\157\156\137\156\141\155\145\042" + "\076\167\151\156\056\141\143\164\151\157\156\137\155\157\166\145" + "\137\163\150\151\160\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076" + "\115\157\166\145\040\123\150\151\160\074\057\160\162\157\160\145" + "\162\164\171\076\074\141\143\143\145\154\145\162\141\164\157\162" + "\040\153\145\171\075\042\106\067\042\040\163\151\147\156\141\154" + "\075\042\141\143\164\151\166\141\164\145\042\057\076\074\057\157" + "\142\152\145\143\164\076\074\057\143\150\151\154\144\076\074\143" + "\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141" + "\163\163\075\042\107\164\153\115\145\156\165\111\164\145\155\042" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143" + "\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\164\157\157\154\164\151\160\137\164\145\170\164" + "\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042" + "\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042\124" + "\157\157\154\164\151\160\040\146\157\162\040\102\162\151\144\147" + "\145\040\155\145\156\165\040\145\156\164\162\171\042\076\102\165" + "\151\154\144\040\141\040\142\162\151\144\147\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\141\143\164\151\157\156\137\156\141" + "\155\145\042\076\167\151\156\056\141\143\164\151\157\156\137\142" + "\165\151\154\144\137\142\162\151\144\147\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141" + "\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040" + "\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040\145" + "\156\164\162\171\042\076\102\162\151\144\147\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\141\143\143\145\154\145\162\141" + "\164\157\162\040\153\145\171\075\042\106\070\042\040\163\151\147" + "\156\141\154\075\042\141\143\164\151\166\141\164\145\042\057\076" + "\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144" + "\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040" + "\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164" + "\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137" + "\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164" + "\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154" + "\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163" + "\075\042\124\157\157\154\164\151\160\040\146\157\162\040\123\145" + "\164\164\154\145\155\145\156\164\040\155\145\156\165\040\145\156" + "\164\162\171\042\076\102\165\151\154\144\040\141\040\163\145\164" + "\164\154\145\155\145\156\164\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\141\143\164\151\157\156\137\156\141\155\145\042\076\167" + "\151\156\056\141\143\164\151\157\156\137\142\165\151\154\144\137" + "\163\145\164\164\154\145\155\145\156\164\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143" + "\157\155\155\145\156\164\163\075\042\115\145\156\165\040\145\156" + "\164\162\171\042\076\123\145\164\164\154\145\155\145\156\164\074" + "\057\160\162\157\160\145\162\164\171\076\074\141\143\143\145\154" + "\145\162\141\164\157\162\040\153\145\171\075\042\106\071\042\040" + "\163\151\147\156\141\154\075\042\141\143\164\151\166\141\164\145" + "\042\057\076\074\057\157\142\152\145\143\164\076\074\057\143\150" + "\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152\145" + "\143\164\040\143\154\141\163\163\075\042\107\164\153\115\145\156" + "\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076" + "\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143" + "\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151" + "\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162" + "\040\103\151\164\171\040\155\145\156\165\040\145\156\164\162\171" + "\042\076\102\165\151\154\144\040\141\040\143\151\164\171\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\141\143\164\151\157\156\137" + "\156\141\155\145\042\076\167\151\156\056\141\143\164\151\157\156" + "\137\142\165\151\154\144\137\143\151\164\171\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141" + "\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040" + "\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040\145" + "\156\164\162\171\042\076\103\151\164\171\074\057\160\162\157\160" + "\145\162\164\171\076\074\141\143\143\145\154\145\162\141\164\157" + "\162\040\153\145\171\075\042\106\061\060\042\040\163\151\147\156" + "\141\154\075\042\141\143\164\151\166\141\164\145\042\057\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145" + "\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146" + "\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145" + "\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145" + "\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075" + "\042\124\157\157\154\164\151\160\040\146\157\162\040\104\145\166" + "\145\154\157\160\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\102\165\171\040\141\040\144\145\166\145\154\157\160\155\145" + "\156\164\040\143\141\162\144\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\141\143\164\151\157\156\137\156\141\155\145\042\076\167" + "\151\156\056\141\143\164\151\157\156\137\142\165\171\137\144\145" + "\166\145\154\157\160\155\145\156\164\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163" + "\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157" + "\155\155\145\156\164\163\075\042\115\145\156\165\040\145\156\164" + "\162\171\042\076\104\145\166\145\154\157\160\074\057\160\162\157" + "\160\145\162\164\171\076\074\141\143\143\145\154\145\162\141\164" + "\157\162\040\153\145\171\075\042\106\061\061\042\040\163\151\147" + "\156\141\154\075\042\141\143\164\151\166\141\164\145\042\057\076" + "\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144" + "\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040" + "\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164" + "\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137" + "\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164" + "\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154" + "\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163" + "\075\042\124\157\157\154\164\151\160\040\146\157\162\040\103\151" + "\164\171\040\127\141\154\154\040\155\145\156\165\040\145\156\164" + "\162\171\042\076\102\165\151\154\144\040\141\040\143\151\164\171" + "\040\167\141\154\154\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\141\143\164\151\157\156\137\156\141\155\145\042\076\167\151\156" + "\056\141\143\164\151\157\156\137\142\165\151\154\144\137\143\151" + "\164\171\137\167\141\154\154\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171" + "\042\076\103\151\164\171\040\127\141\154\154\074\057\160\162\157" + "\160\145\162\164\171\076\074\057\157\142\152\145\143\164\076\074" + "\057\143\150\151\154\144\076\074\057\157\142\152\145\143\164\076" + "\074\057\143\150\151\154\144\076\074\057\157\142\152\145\143\164" + "\076\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076" + "\074\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107" + "\164\153\115\145\156\165\111\164\145\155\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151" + "\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154" + "\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076\137" + "\123\145\164\164\151\156\147\163\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\165\163\145\137\165\156\144\145\162\154\151\156\145" + "\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\143\150\151\154\144\040\164\171\160\145\075\042\163\165" + "\142\155\145\156\165\042\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\103\150\145\143\153" + "\115\145\156\165\111\164\145\155\042\040\151\144\075\042\164\157" + "\157\154\142\141\162\137\166\151\163\151\142\154\145\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\164\157\157\154\164\151\160\137\164\145\170\164\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\124\157\157" + "\154\164\151\160\040\146\157\162\040\124\157\157\154\142\141\162" + "\040\155\145\156\165\040\145\156\164\162\171\042\076\123\150\157" + "\167\040\157\162\040\150\151\144\145\040\164\150\145\040\164\157" + "\157\154\142\141\162\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076" + "\137\124\157\157\154\142\141\162\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\165\163\145\137\165\156\144\145\162\154\151\156\145" + "\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\141\143\164\151\166\145\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\163\151\147\156\141\154\040" + "\156\141\155\145\075\042\164\157\147\147\154\145\144\042\040\150" + "\141\156\144\154\145\162\075\042\163\150\157\167\150\151\144\145" + "\137\164\157\157\154\142\141\162\137\143\142\042\040\163\167\141" + "\160\160\145\144\075\042\156\157\042\057\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151" + "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163" + "\075\042\107\164\153\115\145\156\165\111\164\145\155\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\164\157\157\154\164\151\160\137\164\145\170\164\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\124\157\157" + "\154\164\151\160\040\146\157\162\040\120\162\145\146\145\162\145" + "\156\143\145\163\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\103\157\156\146\151\147\165\162\145\040\164\150\145\040\141" + "\160\160\154\151\143\141\164\151\157\156\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143" + "\157\155\155\145\156\164\163\075\042\115\145\156\165\040\145\156" + "\164\162\171\042\076\120\162\145\146\145\162\145\137\156\143\145" + "\163\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\165\163\145\137" + "\165\156\144\145\162\154\151\156\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\163\151\147\156\141" + "\154\040\156\141\155\145\075\042\141\143\164\151\166\141\164\145" + "\042\040\150\141\156\144\154\145\162\075\042\160\162\145\146\145" + "\162\145\156\143\145\163\137\143\142\042\040\163\167\141\160\160" + "\145\144\075\042\156\157\042\057\076\074\057\157\142\152\145\143" + "\164\076\074\057\143\150\151\154\144\076\074\057\157\142\152\145" + "\143\164\076\074\057\143\150\151\154\144\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151" + "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163" + "\075\042\107\164\153\115\145\156\165\111\164\145\155\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171" + "\042\076\137\126\151\145\167\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\165\163\145\137\165\156\144\145\162\154\151\156\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\143\150\151\154\144\040\164\171\160\145\075\042\163\165\142" + "\155\145\156\165\042\076\074\157\142\152\145\143\164\040\143\154" + "\141\163\163\075\042\107\164\153\115\145\156\165\042\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151" + "\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042" + "\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040" + "\143\154\141\163\163\075\042\107\164\153\103\150\145\143\153\115" + "\145\156\165\111\164\145\155\042\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145" + "\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\164\157\157\154" + "\164\151\160\137\164\145\170\164\042\040\164\162\141\156\163\154" + "\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155" + "\155\145\156\164\163\075\042\124\157\157\154\164\151\160\040\146" + "\157\162\040\106\165\154\154\163\143\162\145\145\156\040\155\145" + "\156\165\040\145\156\164\162\171\042\076\123\145\164\040\167\151" + "\156\144\157\167\040\164\157\040\146\165\154\154\040\163\143\162" + "\145\145\156\040\155\157\144\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154" + "\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155" + "\155\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162" + "\171\042\076\137\106\165\154\154\163\143\162\145\145\156\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\165\163\145\137\165\156\144" + "\145\162\154\151\156\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\163\151\147\156\141\154\040\156" + "\141\155\145\075\042\164\157\147\147\154\145\144\042\040\150\141" + "\156\144\154\145\162\075\042\164\157\147\147\154\145\137\146\165" + "\154\154\137\163\143\162\145\145\156\137\143\142\042\040\163\167" + "\141\160\160\145\144\075\042\156\157\042\057\076\074\141\143\143" + "\145\154\145\162\141\164\157\162\040\153\145\171\075\042\122\145" + "\164\165\162\156\042\040\163\151\147\156\141\154\075\042\141\143" + "\164\151\166\141\164\145\042\040\155\157\144\151\146\151\145\162" + "\163\075\042\107\104\113\137\115\117\104\061\137\115\101\123\113" + "\042\057\076\074\057\157\142\152\145\143\164\076\074\057\143\150" + "\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152\145" + "\143\164\040\143\154\141\163\163\075\042\107\164\153\115\145\156" + "\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076" + "\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143" + "\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151" + "\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162" + "\040\122\145\163\145\164\040\155\145\156\165\040\145\156\164\162" + "\171\042\076\126\151\145\167\040\164\150\145\040\146\165\154\154" + "\040\155\141\160\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154" + "\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076\137" + "\122\145\163\145\164\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\165\163\145\137\165\156\144\145\162\154\151\156\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\163" + "\151\147\156\141\154\040\156\141\155\145\075\042\141\143\164\151" + "\166\141\164\145\042\040\150\141\156\144\154\145\162\075\042\172" + "\157\157\155\137\156\157\162\155\141\154\137\143\142\042\040\163" + "\167\141\160\160\145\144\075\042\156\157\042\057\076\074\141\143" + "\143\145\154\145\162\141\164\157\162\040\153\145\171\075\042\060" + "\042\040\163\151\147\156\141\154\075\042\141\143\164\151\166\141" + "\164\145\042\040\155\157\144\151\146\151\145\162\163\075\042\107" + "\104\113\137\103\117\116\124\122\117\114\137\115\101\123\113\042" + "\057\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151" + "\154\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143" + "\164\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165" + "\111\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141" + "\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160" + "\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040" + "\103\145\156\164\145\162\040\155\145\156\165\040\145\156\164\162" + "\171\042\076\103\145\156\164\145\162\040\164\150\145\040\155\141" + "\160\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\154\141\142\145" + "\154\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042" + "\115\145\156\165\040\145\156\164\162\171\042\076\137\103\145\156" + "\164\145\162\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\165\163" + "\145\137\165\156\144\145\162\154\151\156\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\163\151\147" + "\156\141\154\040\156\141\155\145\075\042\141\143\164\151\166\141" + "\164\145\042\040\150\141\156\144\154\145\162\075\042\172\157\157" + "\155\137\143\145\156\164\145\162\137\155\141\160\137\143\142\042" + "\040\163\167\141\160\160\145\144\075\042\156\157\042\057\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144" + "\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154" + "\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111" + "\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\154\141\142\145\154\042\040\164" + "\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163" + "\042\040\143\157\155\155\145\156\164\163\075\042\115\145\156\165" + "\040\145\156\164\162\171\042\076\137\110\145\154\160\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\165\163\145\137\165\156\144\145" + "\162\154\151\156\145\042\076\124\162\165\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\143\150\151\154\144\040\164\171\160" + "\145\075\042\163\165\142\155\145\156\165\042\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\115\145" + "\156\165\042\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137" + "\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\143\150\151\154\144\076\074\157" + "\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164\153" + "\115\145\156\165\111\164\145\155\042\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142\154" + "\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141\154" + "\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\164\157\157" + "\154\164\151\160\137\164\145\170\164\042\040\164\162\141\156\163" + "\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157" + "\155\155\145\156\164\163\075\042\124\157\157\154\164\151\160\040" + "\146\157\162\040\101\142\157\165\164\040\120\151\157\156\145\145" + "\162\163\040\155\145\156\165\040\145\156\164\162\171\042\076\111" + "\156\146\157\162\155\141\164\151\157\156\040\141\142\157\165\164" + "\040\120\151\157\156\145\145\162\163\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163" + "\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157" + "\155\155\145\156\164\163\075\042\115\145\156\165\040\145\156\164" + "\162\171\042\076\137\101\142\157\165\164\040\120\151\157\156\145" + "\145\162\163\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\165\163" + "\145\137\165\156\144\145\162\154\151\156\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\163\151\147" + "\156\141\154\040\156\141\155\145\075\042\141\143\164\151\166\141" + "\164\145\042\040\150\141\156\144\154\145\162\075\042\150\145\154" + "\160\137\141\142\157\165\164\137\143\142\042\040\163\167\141\160" + "\160\145\144\075\042\156\157\042\057\076\074\057\157\142\152\145" + "\143\164\076\074\057\143\150\151\154\144\076\074\143\150\151\154" + "\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075" + "\042\107\164\153\115\145\156\165\111\164\145\155\042\040\151\144" + "\075\042\150\145\154\160\137\155\141\156\165\141\154\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143" + "\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151" + "\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162" + "\040\110\145\154\160\040\155\145\156\165\040\145\156\164\162\171" + "\042\076\123\150\157\167\040\164\150\145\040\155\141\156\165\141" + "\154\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\154\141\142\145" + "\154\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042" + "\115\145\156\165\040\145\156\164\162\171\042\076\137\110\145\154" + "\160\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\165\163\145\137" + "\165\156\144\145\162\154\151\156\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\163\151\147\156\141" + "\154\040\156\141\155\145\075\042\141\143\164\151\166\141\164\145" + "\042\040\150\141\156\144\154\145\162\075\042\150\145\154\160\137" + "\155\141\156\165\141\154\137\143\142\042\040\163\167\141\160\160" + "\145\144\075\042\156\157\042\057\076\074\141\143\143\145\154\145" + "\162\141\164\157\162\040\153\145\171\075\042\150\042\040\163\151" + "\147\156\141\154\075\042\141\143\164\151\166\141\164\145\042\040" + "\155\157\144\151\146\151\145\162\163\075\042\107\104\113\137\103" + "\117\116\124\122\117\114\137\115\101\123\113\042\057\076\074\057" + "\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144" + "\076\074\057\157\142\152\145\143\164\076\074\160\141\143\153\151" + "\156\147\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\145\170\160\141\156\144\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\146\151\154\154\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\160\157\163\151\164\151\157\156\042\076\060\074\057\160\162\157" + "\160\145\162\164\171\076\074\057\160\141\143\153\151\156\147\076" + "\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\124\157\157\154\142\141\162\042\040\151\144\075\042\164\157" + "\157\154\142\141\162\042\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076" + "\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143" + "\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\164\157\157\154\142\141" + "\162\137\163\164\171\154\145\042\076\142\157\164\150\074\057\160" + "\162\157\160\145\162\164\171\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\124\157\157\154\102\165\164\164\157\156\042\040\151\144\075" + "\042\162\157\154\154\137\144\151\143\145\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151" + "\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\164" + "\157\157\154\164\151\160\137\164\145\170\164\042\040\164\162\141" + "\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040" + "\143\157\155\155\145\156\164\163\075\042\124\157\157\154\164\151" + "\160\040\146\157\162\040\122\157\154\154\040\104\151\143\145\040" + "\155\145\156\165\040\145\156\164\162\171\042\076\122\157\154\154" + "\040\164\150\145\040\144\151\143\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\141\143\164\151\157\156\137\156\141\155\145\042" + "\076\167\151\156\056\141\143\164\151\157\156\137\162\157\154\154" + "\137\144\151\143\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\156\157\042\040\143\157\155\155\145\156\164" + "\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076\122" + "\157\154\154\040\104\151\143\145\012\106\061\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\151\143\157\156\137\156\141\155\145\042" + "\076\144\151\143\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\057\157\142\152\145\143\164\076\074\160\141\143\153\151\156" + "\147\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\145\170\160\141\156\144\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\150\157\155\157\147\145" + "\156\145\157\165\163\042\076\124\162\165\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\057\160\141\143\153\151\156\147\076" + "\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\124\157\157\154\102\165\164\164\157\156\042\040\151\144\075" + "\042\164\162\141\144\145\042\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164" + "\151\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\076\124\162\141\144" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\141\143\164\151" + "\157\156\137\156\141\155\145\042\076\167\151\156\056\141\143\164" + "\151\157\156\137\164\162\141\144\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163" + "\154\141\164\141\142\154\145\075\042\171\145\163\042\076\124\162" + "\141\144\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\151\143" + "\157\156\137\156\141\155\145\042\076\164\162\141\144\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\057\157\142\152\145\143" + "\164\076\074\160\141\143\153\151\156\147\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\145\170\160\141\156" + "\144\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\150\157\155\157\147\145\156\145\157\165\163\042\076" + "\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\057\160\141\143\153\151\156\147\076\074\057\143\150\151\154\144" + "\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040" + "\143\154\141\163\163\075\042\107\164\153\124\157\157\154\102\165" + "\164\164\157\156\042\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141" + "\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160" + "\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040" + "\125\156\144\157\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\125\156\144\157\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\141\143\164\151\157\156\137\156\141\155\145\042\076\167\151\156" + "\056\141\143\164\151\157\156\137\165\156\144\157\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162" + "\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042" + "\040\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040" + "\145\156\164\162\171\042\076\125\156\144\157\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\151\143\157\156\137\156\141\155\145\042" + "\076\145\144\151\164\055\165\156\144\157\074\057\160\162\157\160" + "\145\162\164\171\076\074\057\157\142\152\145\143\164\076\074\160" + "\141\143\153\151\156\147\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\145\170\160\141\156\144\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\150" + "\157\155\157\147\145\156\145\157\165\163\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\057\160\141\143" + "\153\151\156\147\076\074\057\143\150\151\154\144\076\074\143\150" + "\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\124\157\157\154\102\165\164\164\157\156" + "\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157" + "\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145\170" + "\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042" + "\124\157\157\154\164\151\160\040\146\157\162\040\106\151\156\151" + "\163\150\040\155\145\156\165\040\145\156\164\162\171\042\076\106" + "\151\156\151\163\150\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\141\143\164\151\157\156\137\156\141\155\145\042\076\167\151\156" + "\056\141\143\164\151\157\156\137\146\151\156\151\163\150\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\154\141\142\145\154\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\115\145\156" + "\165\040\145\156\164\162\171\042\076\106\151\156\151\163\150\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\151\143\157\156\137\156" + "\141\155\145\042\076\160\151\157\156\145\145\162\163\055\146\151" + "\156\151\163\150\074\057\160\162\157\160\145\162\164\171\076\074" + "\057\157\142\152\145\143\164\076\074\160\141\143\153\151\156\147" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\145\170\160\141\156\144\042\076\106\141\154\163\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\150\157\155\157\147\145\156" + "\145\157\165\163\042\076\124\162\165\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\057\160\141\143\153\151\156\147\076\074" + "\057\143\150\151\154\144\076\074\143\150\151\154\144\076\074\157" + "\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164\153" + "\124\157\157\154\102\165\164\164\157\156\042\040\151\144\075\042" + "\102\165\151\154\144\122\157\141\144\042\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142" + "\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141" + "\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\164\157" + "\157\154\164\151\160\137\164\145\170\164\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\076\102" + "\165\151\154\144\040\141\040\162\157\141\144\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\141\143\164\151\157\156\137\156\141\155" + "\145\042\076\167\151\156\056\141\143\164\151\157\156\137\142\165" + "\151\154\144\137\162\157\141\144\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154" + "\141\164\141\142\154\145\075\042\171\145\163\042\076\122\157\141" + "\144\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\151\143\157\156" + "\137\156\141\155\145\042\076\162\157\141\144\074\057\160\162\157" + "\160\145\162\164\171\076\074\057\157\142\152\145\143\164\076\074" + "\160\141\143\153\151\156\147\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\145\170\160\141\156\144\042\076" + "\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\150\157\155\157\147\145\156\145\157\165\163\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\057\160\141" + "\143\153\151\156\147\076\074\057\143\150\151\154\144\076\074\143" + "\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141" + "\163\163\075\042\107\164\153\124\157\157\154\102\165\164\164\157" + "\156\042\040\151\144\075\042\102\165\151\154\144\123\150\151\160" + "\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157" + "\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145\170" + "\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\076\102\165\151\154\144\040\141\040\163\150" + "\151\160\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163" + "\151\142\154\145\137\150\157\162\151\172\157\156\164\141\154\042" + "\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\141\143\164\151\157\156\137\156\141\155\145\042\076\167\151" + "\156\056\141\143\164\151\157\156\137\142\165\151\154\144\137\163" + "\150\151\160\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154\141" + "\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142\154" + "\145\075\042\171\145\163\042\076\123\150\151\160\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\151\143\157\156\137\156\141\155\145" + "\042\076\163\150\151\160\074\057\160\162\157\160\145\162\164\171" + "\076\074\057\157\142\152\145\143\164\076\074\160\141\143\153\151" + "\156\147\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\145\170\160\141\156\144\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\150\157\155\157\147" + "\145\156\145\157\165\163\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\057\160\141\143\153\151\156\147" + "\076\074\057\143\150\151\154\144\076\074\143\150\151\154\144\076" + "\074\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107" + "\164\153\124\157\157\154\102\165\164\164\157\156\042\040\151\144" + "\075\042\115\157\166\145\123\150\151\160\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151" + "\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\164" + "\157\157\154\164\151\160\137\164\145\170\164\042\040\164\162\141" + "\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042\076" + "\115\157\166\145\040\141\040\163\150\151\160\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\166\151\163\151\142\154\145\137\150\157" + "\162\151\172\157\156\164\141\154\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\141\143\164\151\157\156" + "\137\156\141\155\145\042\076\167\151\156\056\141\143\164\151\157" + "\156\137\155\157\166\145\137\163\150\151\160\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141" + "\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042\076" + "\115\157\166\145\040\123\150\151\160\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\151\143\157\156\137\156\141\155\145\042\076\163" + "\150\151\160\137\155\157\166\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\057\157\142\152\145\143\164\076\074\160\141\143" + "\153\151\156\147\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\145\170\160\141\156\144\042\076\106\141\154" + "\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\150\157\155" + "\157\147\145\156\145\157\165\163\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\057\160\141\143\153\151" + "\156\147\076\074\057\143\150\151\154\144\076\074\143\150\151\154" + "\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075" + "\042\107\164\153\124\157\157\154\102\165\164\164\157\156\042\040" + "\151\144\075\042\102\165\151\154\144\102\162\151\144\147\145\042" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143" + "\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\164\157\157\154\164\151\160\137\164\145\170\164" + "\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042" + "\171\145\163\042\076\102\165\151\154\144\040\141\040\142\162\151" + "\144\147\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151" + "\163\151\142\154\145\137\150\157\162\151\172\157\156\164\141\154" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\141\143\164\151\157\156\137\156\141\155\145\042\076\167" + "\151\156\056\141\143\164\151\157\156\137\142\165\151\154\144\137" + "\142\162\151\144\147\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\076\102\162\151\144\147" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\151\143\157\156" + "\137\156\141\155\145\042\076\142\162\151\144\147\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\057\157\142\152\145\143\164" + "\076\074\160\141\143\153\151\156\147\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\145\170\160\141\156\144" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\150\157\155\157\147\145\156\145\157\165\163\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\057" + "\160\141\143\153\151\156\147\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\124\157\157\154\102\165\164" + "\164\157\156\042\040\151\144\075\042\102\165\151\154\144\123\145" + "\164\164\154\145\155\145\156\164\042\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142\154" + "\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141\154" + "\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\164\157\157" + "\154\164\151\160\137\164\145\170\164\042\040\164\162\141\156\163" + "\154\141\164\141\142\154\145\075\042\171\145\163\042\076\102\165" + "\151\154\144\040\141\040\163\145\164\164\154\145\155\145\156\164" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\141\143\164\151\157" + "\156\137\156\141\155\145\042\076\167\151\156\056\141\143\164\151" + "\157\156\137\142\165\151\154\144\137\163\145\164\164\154\145\155" + "\145\156\164\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154\141" + "\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142\154" + "\145\075\042\171\145\163\042\076\123\145\164\164\154\145\155\145" + "\156\164\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\151\143\157" + "\156\137\156\141\155\145\042\076\163\145\164\164\154\145\155\145" + "\156\164\074\057\160\162\157\160\145\162\164\171\076\074\057\157" + "\142\152\145\143\164\076\074\160\141\143\153\151\156\147\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\145" + "\170\160\141\156\144\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\150\157\155\157\147\145\156\145\157" + "\165\163\042\076\124\162\165\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\057\160\141\143\153\151\156\147\076\074\057\143" + "\150\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\124\157" + "\157\154\102\165\164\164\157\156\042\040\151\144\075\042\102\165" + "\151\154\144\103\151\164\171\042\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145" + "\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\164\157\157\154" + "\164\151\160\137\164\145\170\164\042\040\164\162\141\156\163\154" + "\141\164\141\142\154\145\075\042\171\145\163\042\076\102\165\151" + "\154\144\040\141\040\143\151\164\171\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\166\151\163\151\142\154\145\137\150\157\162\151" + "\172\157\156\164\141\154\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\141\143\164\151\157\156\137\156" + "\141\155\145\042\076\167\151\156\056\141\143\164\151\157\156\137" + "\142\165\151\154\144\137\143\151\164\171\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\076\103" + "\151\164\171\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\151\143" + "\157\156\137\156\141\155\145\042\076\143\151\164\171\074\057\160" + "\162\157\160\145\162\164\171\076\074\057\157\142\152\145\143\164" + "\076\074\160\141\143\153\151\156\147\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\145\170\160\141\156\144" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\150\157\155\157\147\145\156\145\157\165\163\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\057" + "\160\141\143\153\151\156\147\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\124\157\157\154\102\165\164" + "\164\157\156\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137" + "\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040\104" + "\145\166\145\154\157\160\040\155\145\156\165\040\145\156\164\162" + "\171\042\076\102\165\171\040\141\040\144\145\166\145\154\157\160" + "\155\145\156\164\040\143\141\162\144\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\141\143\164\151\157\156\137\156\141\155\145\042" + "\076\167\151\156\056\141\143\164\151\157\156\137\142\165\171\137" + "\144\145\166\145\154\157\160\155\145\156\164\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141" + "\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040" + "\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040\145" + "\156\164\162\171\042\076\104\145\166\145\154\157\160\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\151\143\157\156\137\156\141\155" + "\145\042\076\144\145\166\145\154\157\160\074\057\160\162\157\160" + "\145\162\164\171\076\074\057\157\142\152\145\143\164\076\074\160" + "\141\143\153\151\156\147\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\145\170\160\141\156\144\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\150" + "\157\155\157\147\145\156\145\157\165\163\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\057\160\141\143" + "\153\151\156\147\076\074\057\143\150\151\154\144\076\074\143\150" + "\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\124\157\157\154\102\165\164\164\157\156" + "\042\040\151\144\075\042\102\165\151\154\144\103\151\164\171\127" + "\141\154\154\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137" + "\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\076\102\165\151\154\144\040\141" + "\040\143\151\164\171\040\167\141\154\154\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\137\150\157\162" + "\151\172\157\156\164\141\154\042\076\106\141\154\163\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\141\143\164\151\157\156\137" + "\156\141\155\145\042\076\167\151\156\056\141\143\164\151\157\156" + "\137\142\165\151\154\144\137\143\151\164\171\137\167\141\154\154" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\154\141\142\145\154" + "\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042" + "\171\145\163\042\076\103\151\164\171\040\127\141\154\154\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\151\143\157\156\137\156\141" + "\155\145\042\076\143\151\164\171\137\167\141\154\154\074\057\160" + "\162\157\160\145\162\164\171\076\074\057\157\142\152\145\143\164" + "\076\074\160\141\143\153\151\156\147\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\145\170\160\141\156\144" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\150\157\155\157\147\145\156\145\157\165\163\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\057" + "\160\141\143\153\151\156\147\076\074\057\143\150\151\154\144\076" + "\074\057\157\142\152\145\143\164\076\074\160\141\143\153\151\156" + "\147\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\145\170\160\141\156\144\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\146\151\154\154\042\076" + "\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\160" + "\157\163\151\164\151\157\156\042\076\061\074\057\160\162\157\160" + "\145\162\164\171\076\074\057\160\141\143\153\151\156\147\076\074" + "\057\143\150\151\154\144\076\074\057\157\142\152\145\143\164\076" + "\074\057\143\150\151\154\144\076\074\057\157\142\152\145\143\164" + "\076\074\057\151\156\164\145\162\146\141\143\145\076\012\000\000" + "\050\165\165\141\171\051\143\154\151\145\156\164\057\000\000\000" + "\006\000\000\000\147\164\153\057\004\000\000\000" }; +#endif /* !_MSC_VER */ + +static GStaticResource static_resource = { client_resource_data.data, sizeof (client_resource_data.data) - 1 /* nul terminator */, NULL, NULL, NULL }; + +G_MODULE_EXPORT +GResource *client_get_resource (void); +GResource *client_get_resource (void) +{ + return g_static_resource_get_resource (&static_resource); +} +/* + If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and + destructors, in a usable way, including e.g. on library unload. If not you're on + your own. + + Some compilers need #pragma to handle this, which does not work with macros, + so the way you need to use this is (for constructors): + + #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA + #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor) + #endif + G_DEFINE_CONSTRUCTOR(my_constructor) + static void my_constructor(void) { + ... + } + +*/ + +#ifndef __GTK_DOC_IGNORE__ + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void); +#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void); + +#elif defined (_MSC_VER) && (_MSC_VER >= 1500) +/* Visual studio 2008 and later has _Pragma */ + +#include + +#define G_HAS_CONSTRUCTORS 1 + +/* We do some weird things to avoid the constructors being optimized + * away on VS2015 if WholeProgramOptimization is enabled. First we + * make a reference to the array from the wrapper to make sure its + * references. Then we use a pragma to make sure the wrapper function + * symbol is always included at the link stage. Also, the symbols + * need to be extern (but not dllexport), even though they are not + * really used from another object file. + */ + +/* We need to account for differences between the mangling of symbols + * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed + * with an underscore but symbols on x64 are not. + */ +#ifdef _WIN64 +#define G_MSVC_SYMBOL_PREFIX "" +#else +#define G_MSVC_SYMBOL_PREFIX "_" +#endif + +#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) +#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX) + +#define G_MSVC_CTOR(_func,_sym_prefix) \ + static void _func(void); \ + extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper; + +#define G_MSVC_DTOR(_func,_sym_prefix) \ + static void _func(void); \ + extern int (* _array ## _func)(void); \ + int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined (_MSC_VER) + +#define G_HAS_CONSTRUCTORS 1 + +/* Pre Visual studio 2008 must use #pragma section */ +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _wrapper(void) { _func(); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper; + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _constructor(void) { atexit (_func); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined(__SUNPRO_C) + +/* This is not tested, but i believe it should work, based on: + * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c + */ + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + init(_func) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + fini(_func) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); + +#else + +/* constructors not supported for this compiler */ + +#endif + +#endif /* __GTK_DOC_IGNORE__ */ + +#ifdef G_HAS_CONSTRUCTORS + +#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor) +#endif +G_DEFINE_CONSTRUCTOR(resource_constructor) +#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor) +#endif +G_DEFINE_DESTRUCTOR(resource_destructor) + +#else +#warning "Constructor not supported on this compiler, linking in resources will not work" +#endif + +static void resource_constructor (void) +{ + g_static_resource_init (&static_resource); +} + +static void resource_destructor (void) +{ + g_static_resource_fini (&static_resource); +} diff -Nru pioneers-15.5/client/gtk/client-resources.h pioneers-15.6/client/gtk/client-resources.h --- pioneers-15.5/client/gtk/client-resources.h 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/client/gtk/client-resources.h 2020-08-02 12:59:36.000000000 +0000 @@ -0,0 +1,7 @@ +#ifndef __RESOURCE_client_H__ +#define __RESOURCE_client_H__ + +#include + +extern GResource *client_get_resource (void); +#endif diff -Nru pioneers-15.5/client/gtk/client.ui pioneers-15.6/client/gtk/client.ui --- pioneers-15.5/client/gtk/client.ui 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/client/gtk/client.ui 2020-05-31 11:54:46.000000000 +0000 @@ -0,0 +1,611 @@ + + + + + + + + + + + + False + + + + + + True + False + vertical + + + True + False + + + True + False + _Game + True + + + True + False + + + True + False + Start a new game + win.action_game_new + _New Game + True + + + + + + True + False + Leave this game + win.action_game_leave + _Leave Game + True + + + + + False + Administer Pioneers server + _Admin + True + + + + + + + True + False + + + + + True + False + Change your player name + win.action_player_name + _Player Name + True + + + + + + True + False + + + + + True + False + Terrain legend and building costs + L_egend + True + + + + + + True + False + Settings for the current game + _Game Settings + True + + + + + + True + False + Histogram of dice rolls + _Dice Histogram + True + + + + + + True + False + + + + + True + False + Quit + _Quit + True + + + + + + + + + + + True + False + _Actions + True + + + True + False + + + True + False + Roll the dice + win.action_roll_dice + Roll Dice + + + + + + True + False + Trade + win.action_trade + Trade + + + + + + True + False + Undo + win.action_undo + Undo + + + + + + True + False + Finish + win.action_finish + Finish + + + + + + True + False + + + + + True + False + Build a road + win.action_build_road + Road + + + + + + True + False + Build a ship + win.action_build_ship + Ship + + + + + + True + False + Move a ship + win.action_move_ship + Move Ship + + + + + + True + False + Build a bridge + win.action_build_bridge + Bridge + + + + + + True + False + Build a settlement + win.action_build_settlement + Settlement + + + + + + True + False + Build a city + win.action_build_city + City + + + + + + True + False + Buy a development card + win.action_buy_development + Develop + + + + + + True + False + Build a city wall + win.action_build_city_wall + City Wall + + + + + + + + + True + False + _Settings + True + + + True + False + + + True + False + Show or hide the toolbar + _Toolbar + True + True + + + + + + True + False + Configure the application + Prefere_nces + True + + + + + + + + + + True + False + _View + True + + + True + False + + + True + False + Set window to full screen mode + _Fullscreen + True + + + + + + + True + False + View the full map + _Reset + True + + + + + + + True + False + Center the map + _Center + True + + + + + + + + + + True + False + _Help + True + + + True + False + + + True + False + Information about Pioneers + _About Pioneers + True + + + + + + False + Show the manual + _Help + True + + + + + + + + + + + False + True + 0 + + + + + True + False + both + + + True + False + Roll the dice + win.action_roll_dice + Roll Dice +F1 + dice + + + False + True + + + + + True + False + Trade + win.action_trade + Trade + trade + + + False + True + + + + + True + False + Undo + win.action_undo + Undo + edit-undo + + + False + True + + + + + True + False + Finish + win.action_finish + Finish + pioneers-finish + + + False + True + + + + + True + False + Build a road + win.action_build_road + Road + road + + + False + True + + + + + True + False + Build a ship + False + win.action_build_ship + Ship + ship + + + False + True + + + + + True + False + Move a ship + False + win.action_move_ship + Move Ship + ship_move + + + False + True + + + + + True + False + Build a bridge + False + win.action_build_bridge + Bridge + bridge + + + False + True + + + + + True + False + Build a settlement + win.action_build_settlement + Settlement + settlement + + + False + True + + + + + True + False + Build a city + False + win.action_build_city + City + city + + + False + True + + + + + True + False + Buy a development card + win.action_buy_development + Develop + develop + + + False + True + + + + + True + False + Build a city wall + False + win.action_build_city_wall + City Wall + city_wall + + + False + True + + + + + False + True + 1 + + + + + + diff -Nru pioneers-15.5/client/gtk/connect.c pioneers-15.6/client/gtk/connect.c --- pioneers-15.5/client/gtk/connect.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/connect.c 2020-06-21 09:18:27.000000000 +0000 @@ -136,7 +136,8 @@ /** The settings of a game */ GameParams *params; } metaserver_info = { -NULL, NULL, 0, 0, 0, FALSE, NULL, 0u, NULL}; + NULL, NULL, 0, 0, 0, FALSE, NULL, 0u, NULL +}; #define STRARG_LEN 128 #define INTARG_LEN 16 @@ -909,13 +910,13 @@ "change-players", G_CALLBACK(player_change_cb), NULL); - gtk_table_get_size(GTK_TABLE(game_settings), &row, NULL); + /* Add the number of computer players at the end of the grid */ + row = 99; /* Label */ label = gtk_label_new(_("Number of computer players")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(game_settings), label, 0, 1, row, - row + 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(game_settings), label, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, @@ -927,9 +928,8 @@ gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(aiplayers_spin), TRUE); gtk_widget_show(aiplayers_spin); gtk_entry_set_alignment(GTK_ENTRY(aiplayers_spin), 1.0); - gtk_table_attach(GTK_TABLE(game_settings), aiplayers_spin, - 1, 2, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(game_settings), aiplayers_spin, 1, row, 1, + 1); gtk_widget_set_tooltip_text(aiplayers_spin, /* Tooltip */ _("The number of computer players")); @@ -1010,8 +1010,8 @@ child_argv[2] = NULL; if (!g_spawn_async(NULL, child_argv, NULL, flags, NULL, NULL, NULL, &error)) { - /* Error message when program %1 is started, reason is %2 */ log_message(MSG_ERROR, + /* Error message when program %1 is started, reason is %2 */ _("Error starting %s: %s\n"), child_argv[0], error->message); g_error_free(error); @@ -1412,7 +1412,7 @@ void connect_create_dlg(void) { GtkWidget *dlg_vbox; - GtkWidget *table; + GtkWidget *grid; GtkWidget *lbl; GtkWidget *hbox; GtkWidget *btn; @@ -1452,20 +1452,19 @@ dlg_vbox = gtk_dialog_get_content_area(GTK_DIALOG(connect_dlg)); gtk_widget_show(dlg_vbox); - table = gtk_table_new(4, 3, FALSE); + grid = gtk_grid_new(); row = 0; - gtk_widget_show(table); - gtk_box_pack_start(GTK_BOX(dlg_vbox), table, FALSE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(table), 5); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 5); + gtk_widget_show(grid); + gtk_box_pack_start(GTK_BOX(dlg_vbox), grid, FALSE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(grid), 5); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); /* Label */ lbl = gtk_label_new(_("Player name")); gtk_widget_show(lbl); - gtk_table_attach(GTK_TABLE(table), lbl, 0, 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), lbl, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(lbl), 0.0); name = notifying_string_get(requested_name); name_entry = gtk_entry_new(); @@ -1474,8 +1473,7 @@ gtk_entry_set_text(GTK_ENTRY(name_entry), name); g_free(name); - gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), name_entry, 1, row, 1, 1); /* Tooltip */ gtk_widget_set_tooltip_text(name_entry, _("Enter your name")); @@ -1485,8 +1483,7 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(spectator_toggle), connect_spectator); - gtk_table_attach(GTK_TABLE(table), spectator_toggle, 2, 3, row, - row + 1, 0, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), spectator_toggle, 2, row, 1, 1); gtk_widget_set_tooltip_text(spectator_toggle, /* Tooltip for checkbox Spectator */ _ @@ -1495,17 +1492,15 @@ sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); gtk_widget_show(sep); - gtk_table_attach(GTK_TABLE(table), sep, 0, 3, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 6); + gtk_grid_attach(GTK_GRID(grid), sep, 0, row, 3, 1); row++; #ifdef HAVE_AVAHI /* Label */ lbl = gtk_label_new(_("Avahi")); gtk_widget_show(lbl); - gtk_table_attach(GTK_TABLE(table), lbl, 0, 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), lbl, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(lbl), 0.0); /* Button */ btn = gtk_button_new_with_label(_("Join")); @@ -1514,14 +1509,11 @@ /* Tooltip for button Join */ _("" "Join an automatically discovered game")); - gtk_table_attach(GTK_TABLE(table), btn, 2, 3, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), btn, 2, row, 1, 1); avahibrowser_entry = avahibrowser_new(btn); gtk_widget_show(avahibrowser_entry); - gtk_table_attach(GTK_TABLE(table), avahibrowser_entry, 1, 2, row, - row + 1, GTK_EXPAND | GTK_FILL, - GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), avahibrowser_entry, 1, row, 1, 1); row++; g_signal_connect(G_OBJECT(btn), "clicked", @@ -1533,31 +1525,26 @@ sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); gtk_widget_show(sep); - gtk_table_attach(GTK_TABLE(table), sep, 0, 3, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 6); + gtk_grid_attach(GTK_GRID(grid), sep, 0, row, 3, 1); row++; #endif /* HAVE_AVAHI */ /* Label */ lbl = gtk_label_new(_("Metaserver")); gtk_widget_show(lbl); - gtk_table_attach(GTK_TABLE(table), lbl, 0, 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), lbl, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(lbl), 0.0); metaserver_entry = metaserver_new(); gtk_widget_show(metaserver_entry); - gtk_table_attach(GTK_TABLE(table), metaserver_entry, 1, 3, row, - row + 1, GTK_EXPAND | GTK_FILL, - GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), metaserver_entry, 1, row, 2, 1); metaserver_add(METASERVER(metaserver_entry), metaserver_info.server); row++; hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); gtk_widget_show(hbox); - gtk_table_attach(GTK_TABLE(table), hbox, 0, 3, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 3); + gtk_grid_attach(GTK_GRID(grid), hbox, 0, row, 3, 1); row++; /* Button */ @@ -1716,7 +1703,7 @@ GtkWindow * parent) { GtkWidget *dlg_vbox; - GtkWidget *table; + GtkWidget *grid; GtkWidget *lbl; GtkWidget *hbox; @@ -1766,25 +1753,22 @@ gtk_dialog_get_content_area(GTK_DIALOG(connect_private_dlg)); gtk_widget_show(dlg_vbox); - table = gtk_table_new(3, 2, FALSE); - gtk_widget_show(table); - gtk_box_pack_start(GTK_BOX(dlg_vbox), table, FALSE, TRUE, 0); - gtk_container_set_border_width(GTK_CONTAINER(table), 5); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 5); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_box_pack_start(GTK_BOX(dlg_vbox), grid, FALSE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(grid), 5); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); /* Label */ lbl = gtk_label_new(_("Server host")); gtk_widget_show(lbl); - gtk_table_attach(GTK_TABLE(table), lbl, 0, 1, 0, 1, - GTK_FILL, GTK_EXPAND, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), lbl, 0, 0, 1, 1); + gtk_label_set_xalign(GTK_LABEL(lbl), 0.0); host_entry = gtk_entry_new(); gtk_widget_show(host_entry); - gtk_table_attach(GTK_TABLE(table), host_entry, 1, 2, 0, 1, - GTK_EXPAND | GTK_FILL, - GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), host_entry, 1, 0, 1, 1); gtk_entry_set_text(GTK_ENTRY(host_entry), connect_server); gtk_widget_set_tooltip_text(host_entry, /* Tooltip */ @@ -1794,14 +1778,12 @@ /* Label */ lbl = gtk_label_new(_("Server port")); gtk_widget_show(lbl); - gtk_table_attach(GTK_TABLE(table), lbl, 0, 1, 1, 2, - GTK_FILL, GTK_EXPAND, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), lbl, 0, 1, 1, 1); + gtk_label_set_xalign(GTK_LABEL(lbl), 0.0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show(hbox); - gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 1, 2, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), hbox, 1, 1, 1, 1); port_entry = gtk_entry_new(); gtk_widget_show(port_entry); @@ -1848,17 +1830,15 @@ g_signal_connect(G_OBJECT(host_list), "changed", G_CALLBACK(host_list_select_cb), host_entries); - gtk_table_attach(GTK_TABLE(table), host_list, 1, 2, 2, 3, - GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), host_list, 1, 2, 1, 1); /* Tooltip */ gtk_widget_set_tooltip_text(host_list, _("Recent games")); /* Label */ lbl = gtk_label_new(_("Recent games")); gtk_widget_show(lbl); - gtk_table_attach(GTK_TABLE(table), lbl, 0, 1, 2, 3, - GTK_FILL, GTK_EXPAND, 0, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), lbl, 0, 2, 1, 1); + gtk_label_set_xalign(GTK_LABEL(lbl), 0.0); gtk_entry_set_activates_default(GTK_ENTRY(host_entry), TRUE); gtk_entry_set_activates_default(GTK_ENTRY(port_entry), TRUE); diff -Nru pioneers-15.5/client/gtk/data/develop.svg pioneers-15.6/client/gtk/data/develop.svg --- pioneers-15.5/client/gtk/data/develop.svg 2011-10-27 18:44:51.000000000 +0000 +++ pioneers-15.6/client/gtk/data/develop.svg 2020-06-14 10:47:18.000000000 +0000 @@ -1,6 +1,4 @@ - - + width="256" + inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + version="1.1" + id="svg2"> @@ -30,35 +28,36 @@ + inkscape:window-y="27" + inkscape:window-x="0" + inkscape:cy="128" + inkscape:cx="128" + inkscape:zoom="3.1992188" + showgrid="false" + id="namedview4" + inkscape:window-height="1016" + inkscape:window-width="1920" + inkscape:pageshadow="2" + inkscape:pageopacity="0" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10" + borderopacity="1" + bordercolor="#666666" + pagecolor="#ffffff" /> ? + transform="scale(0.99987001,1.00013)">? diff -Nru pioneers-15.5/client/gtk/data/finish.svg pioneers-15.6/client/gtk/data/finish.svg --- pioneers-15.5/client/gtk/data/finish.svg 2011-10-27 18:44:51.000000000 +0000 +++ pioneers-15.6/client/gtk/data/finish.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - diff -Nru pioneers-15.5/client/gtk/data/Makefile.am pioneers-15.6/client/gtk/data/Makefile.am --- pioneers-15.5/client/gtk/data/Makefile.am 2013-06-26 07:24:01.000000000 +0000 +++ pioneers-15.6/client/gtk/data/Makefile.am 2020-05-31 11:54:46.000000000 +0000 @@ -31,7 +31,7 @@ client/gtk/data/city_wall.svg \ client/gtk/data/develop.svg \ client/gtk/data/dice.svg \ - client/gtk/data/finish.svg \ + client/gtk/data/pioneers-finish.svg \ client/gtk/data/road.svg \ client/gtk/data/settlement.svg \ client/gtk/data/ship.svg \ Binary files /tmp/tmprNzjQx/ytk7fihRg_/pioneers-15.5/client/gtk/data/pioneers.48x48_apps.png and /tmp/tmprNzjQx/qpK4jKD3ob/pioneers-15.6/client/gtk/data/pioneers.48x48_apps.png differ diff -Nru pioneers-15.5/client/gtk/data/pioneers-finish.svg pioneers-15.6/client/gtk/data/pioneers-finish.svg --- pioneers-15.5/client/gtk/data/pioneers-finish.svg 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/client/gtk/data/pioneers-finish.svg 2020-05-31 11:54:46.000000000 +0000 @@ -0,0 +1,70 @@ + + + + + + + + image/svg+xml + + + + + + + + + Binary files /tmp/tmprNzjQx/ytk7fihRg_/pioneers-15.5/client/gtk/data/pioneers.png and /tmp/tmprNzjQx/qpK4jKD3ob/pioneers-15.6/client/gtk/data/pioneers.png differ Binary files /tmp/tmprNzjQx/ytk7fihRg_/pioneers-15.5/client/gtk/data/splash.png and /tmp/tmprNzjQx/qpK4jKD3ob/pioneers-15.6/client/gtk/data/splash.png differ diff -Nru pioneers-15.5/client/gtk/data/splash.svg pioneers-15.6/client/gtk/data/splash.svg --- pioneers-15.5/client/gtk/data/splash.svg 2013-10-12 19:33:21.000000000 +0000 +++ pioneers-15.6/client/gtk/data/splash.svg 2020-05-11 10:25:26.000000000 +0000 @@ -1,6 +1,4 @@ - - + inkscape:version="1.0rc1 (09960d6f05, 2020-04-09)" + height="744" + width="744" + sodipodi:version="0.34" + id="svg559"> @@ -25,7 +23,7 @@ image/svg+xml - + @@ -34,1384 +32,1488 @@ + style="stop-color:#b51e00;stop-opacity:1;" /> + style="stop-color:#b51e00;stop-opacity:0;" /> + style="stop-color:#deaa00;stop-opacity:1.0000;" /> + style="stop-color:#deaa00;stop-opacity:0;" /> + style="stop-color:#940000;stop-opacity:1.0000;" /> + style="stop-color:#ff6d00;stop-opacity:1.0000;" /> + xlink:href="#linearGradient563" + gradientUnits="userSpaceOnUse" /> + id="linearGradient568" + xlink:href="#linearGradient569" /> + xlink:href="#linearGradient636" /> + id="radialGradient1010" + xlink:href="#linearGradient636" /> + showgrid="false" + inkscape:window-y="27" + inkscape:window-x="0" + inkscape:window-height="1016" + inkscape:window-width="1920" + inkscape:cy="396.8504" + inkscape:cx="396.8504" + inkscape:zoom="1.031875" + snaptoguides="true" + id="base" /> - + - - IONEER - - - IONEER - - Version 15 - + style="fill:url(#linearGradient568);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" /> + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + style="font-size:12px;fill:url(#radialGradient635);fill-opacity:0.75;fill-rule:evenodd;stroke-width:3pt" /> + transform="matrix(0.165518,0,0,0.165518,358.1883,622.8139)" + id="g667"> + d="M 81.073425,-172.87383 H 218.05954 l -68.49306,-78.27779 z" + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + transform="matrix(0.165518,0,0,0.165518,372.07,622.1198)" + id="g672"> + d="M 81.073425,-172.87383 H 218.05954 l -68.49306,-78.27779 z" + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + transform="matrix(0.15493,0,0,0.15493,305.8857,666.6518)" + id="g701"> + style="font-size:12px;fill:#ffff00;fill-rule:evenodd;stroke-width:3pt" /> + transform="translate(-40.53671,-286.5526)" + id="g682"> + d="M 81.073425,-172.87383 H 218.05954 l -68.49306,-78.27779 z" + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + d="m 159.35122,-459.42643 h 136.98612 l -68.49306,-67.09525 z" + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" /> + transform="translate(-23.75,-2.5)" + id="g726"> + d="m 546.10623,605.61179 h 24.11723 l -12.05861,-13.78127 z" + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-rule:evenodd;stroke-width:3pt" /> + d="m 431.21627,550.6336 v 0.91861 h -1.09473 v 0.54909 h 1.09473 v 2.85942 l -4.86782,10.52943 v 52.35364 h 10.345 44.88101 v -25.00266 l -9.49473,-10.22208 h -35.38628 v -17.1289 l -4.83593,-10.46036 v -2.92849 h 1.1337 v -0.54909 h -1.1337 v -0.91861 z" + style="font-size:12px;fill-rule:evenodd;stroke-width:3pt" /> + style="font-size:12px;fill:#ffff00;fill-rule:evenodd;stroke-width:3pt" /> + width="17.5" + id="rect742" + style="font-size:12px;fill:#ffff00;fill-rule:evenodd;stroke-width:3pt" /> + style="fill:#000000;fill-opacity:1" + transform="matrix(0.0466422,0,0,0.05609369,640.726,625.5025)" + id="g919"> + id="defs573" /> + inkscape:window-x="134" + inkscape:window-height="1085" + inkscape:window-width="1404" + inkscape:cy="238.500019" + inkscape:cx="420.999993" + inkscape:zoom="3.07667732" + id="namedview921" /> + inkscape:connector-curvature="0" + id="path922" + d="m 536.00321,-6.377304 c -0.86399,9.4048 -1.72975,18.81395 -2.59375,28.21875 -3.16698,0.479901 -6.333,0.9577 -9.5,1.4375 -10e-6,-1e-6 6.598,3.72605 7.75,7.46875 1.15101,3.742798 -8.0625,2.59375 -8.0625,2.59375 -10e-6,-10e-7 7.4865,6.35295 8.0625,8.65625 0.57501,2.3032 -10.34375,2.875 -10.34375,2.875 0,2e-6 9.20525,6.60105 9.78125,10.34375 0.576,3.7428 0,5.78125 0,5.78125 0,-2e-6 -15.2735,-13.2428 -25.0625,-9.5 -5.087,2.657699 11.659,3.88675 22.75,13.53125 -0.026,2.147797 -26.91525,-6.55905 -27.90625,-1.15625 0.62401,1.5037 28.71025,5.54495 30.78125,9.21875 -10.26899,0.384003 -31.48325,-2.2729 -30.78125,1.125 -2.14599,3.923003 20.03675,1.70725 29.34375,4.90625 2.72801,3.099998 2.46475,5.70425 -2.28125,6.03125 -8.97001,-4.288999 -29.04575,-7.476 -29.09375,-2 0.12199,1.461999 20.74275,0.51075 28.21875,5.46875 -9.979,2.269999 -43.81725,-4.605 -44.03125,-1.25 0.96399,1.566998 6.31825,8.44425 15.53125,8.15625 9.21302,-0.287998 30.52875,3.746 31.96875,6.625004 1.43901,2.87899 -27.65375,-6.057004 -38.59375,-0.875 -10.94001,5.183 31.37125,2.041 38.28125,8.375 6.91001,6.334 -13.8125,-0.59375 -13.8125,-0.59375 1e-5,0 -28.77575,-4.015 -33.09375,-2 -4.31901,2.01599 -9.21875,6.625 -9.21875,6.625 0,0 2.871,5.74475 5.75,4.59375 2.879,-1.152 -0.875,3.46875 -0.875,3.46875 -1e-5,0 40.325,9.76925 49.25,18.40625 8.92499,8.638 -51.25,-13.53125 -51.25,-13.53125 0,-10e-6 -24.1855,8.924 1.4375,9.5 -2.94799,4.313 1.4375,6.90625 1.4375,6.90625 0,0 42.6195,8.93375 46.9375,15.84375 4.319,6.90999 -29.0765,-6.633 -36.5625,-10.375 -7.48501,-3.74301 -28.788,2.311 -28.5,3.75 0.28801,1.44 10.36925,3.4715 10.65625,6.0625 0.288,2.591 -12.40625,3.447 -12.40625,5.75 -1e-5,2.304 53.855,13.533 68.25,25.625 14.39499,12.09199 -42.3125,-14.40625 -42.3125,-14.40625 10e-6,0 3.167,4.31675 0,5.46875 -3.16699,1.151 -14.41775,-16.12175 -32.84375,-5.46875 -3.356,4.383 16.08825,7.86175 21.03125,8.34375 -1.688,4.34 -3.16,5.77575 3.75,10.09375 6.90899,4.319 -13.53125,-6.35625 -13.53125,-5.78125 0,0.57599 1.4375,7.5 1.4375,7.5 -6.379,-5.182 -14.0895,-6.7445 -21.3125,-1.4375 -1e-5,0 -0.2975,5.17675 7.1875,8.34375 -4.087,8.351 4.6185,5.75825 18.4375,13.53125 -20.53899,-5.36801 -22.183,4.60325 -7.5,6.90625 14.68299,2.303 54.999,3.746 64.5,16.125 9.501,12.37999 -13.501,-4.7525 -16.125,-5.1875 -0.57599,0.288 -1.15625,6.34375 -1.15625,6.34375 -6.14201,-3.55502 -11.778,-6.744 -19.125,-8.25 -0.57599,1.15099 -0.45525,2.7865 -1.03125,3.9375 -6.667,-4.80802 -12.47525,-8.18825 -22.15625,-8.65625 -0.38399,1.53599 -0.77225,3.089 -1.15625,4.625 2e-5,-2e-5 -8.07125,-10.077 -23.90625,0 -8.84199,6.33898 33.4025,2.29525 40.3125,9.78125 6.91001,7.48501 1.4375,8.625 1.4375,8.625 -5.75799,-2.11101 -11.492,-4.2015 -17.25,-6.3125 0,0 -20.46075,-3.76225 -26.21875,0.84375 -5.758,4.607 84.06525,15.83875 86.65625,28.21875 1.74701,6.714 -21.104,-7.0305 -40.875,-12.9375 -0.768,2.20699 -1.5445,4.418 -2.3125,6.625 10e-6,-2e-5 -7.8405,-7.89275 -16.6875,-9.21875 -0.28799,0 1.71875,7.78125 1.71875,7.78125 -1e-5,10e-6 -22.147,-10.37625 -33.375,-4.90625 -11.22898,5.47 39.144,8.34825 43.75,13.53125 4.606,5.18199 -15.273,-3.455 -17,0 -1.72801,3.45499 -26.19425,-6.32475 -25.90625,-1.71875 0.28801,4.60698 3.46875,7.1875 3.46875,7.1875 -1e-5,-2e-5 50.9595,4.8915 52.6875,10.9375 1.72701,6.04598 -28.21875,-3.4375 -28.21875,-3.4375 10e-6,0 -2.89675,4.2975 -0.59375,6.3125 2.303,2.01598 -17.25825,-11.51875 -15.53125,-2.59375 -6.34901,-2.52801 -22.7405,-10.3585 -20.4375,-4.3125 2.303,6.04601 46.34375,14.6875 46.34375,14.6875 10e-6,0 -19.3015,1.44875 -18.4375,6.34375 -24.815,-15.11802 -24.16975,-5.4755 -23.59375,-5.1875 0.576,0.288 -31.971,-8.0565 -7.5,5.1875 24.47199,13.24298 13.24325,10.93075 13.53125,11.21875 0.28801,0.28799 2.60725,6.625 2.03125,6.625 -0.576,10e-6 -16.68625,-8.64375 -22.15625,-9.21875 -5.471,-0.57601 -31.389,7.18925 -3.75,19.28125 27.63901,12.09199 44.616,-2.88425 59.875,-1.15625 15.25901,1.72699 22.47025,4.32375 21.03125,9.21875 -1.43999,4.89401 -15.609,-16.0455 -30.5,2.0625 -16.93899,-3.35199 -28.4315,-5.29175 -19.6875,7.15625 -27.66301,-10.33799 -44.55575,3.154 -9.71875,8.625 34.23301,1.009 55.28125,-8.34375 55.28125,-8.34375 0,10e-6 5.775,10.6735 14.125,3.1875 8.349,-7.48502 8.61825,2.875 8.90625,2.875 0.28701,-1e-5 8.0625,-3.46875 8.0625,-3.46875 0.67201,0 1.35925,0 2.03125,0 -10e-6,23.032 0,46.06175 0,69.09375 9.30899,0.096 18.59725,0.18525 27.90625,0.28125 -10e-6,-1e-5 -8.92525,-60.15775 -4.03125,-68.21875 4.895,-8.061 9.5,-6.90625 9.5,-6.90625 -10e-6,0 18.14125,5.45775 20.15625,4.59375 2.01598,-0.864 -0.289,-6.89525 9.5,-6.03125 3.167,-1.15201 1.46475,-6.61825 4.34375,-6.90625 2.87903,-0.288 58.43925,15.5335 70.53125,0.5625 -3.16698,-8.34899 -14.121,-0.56925 -17,-0.28125 -2.59102,0 -13.54,-5.182 -19.875,0 -5.75799,-4.318 -31.9375,-7.1875 -31.9375,-7.1875 -3.45502,-3.455 62.47575,1.716 66.21875,-0.875 7.77302,-7.77399 -14.38875,-6.9035 -17.84375,-4.3125 -6.142,-3.74299 -13.8595,-3.466 -18.5625,-0.875 -2.25501,-5.39402 -23.6625,-3.05775 -35.5625,-4.59375 -3.80903,-2.23399 -3.17475,-3.51625 -0.59375,-4.90625 24.85602,1.05599 49.5855,4.3015 74.5625,3.1875 6.75101,-8.801 -8.49875,-12.12 -17.84375,-4.625 -5.48602,-9.02201 -16.7015,-0.29325 -24.1875,-1.15625 -7.485,-0.864 -4.03125,-10.064 5.46875,-8.625 9.50103,1.44 26.48925,-0.58725 29.65625,-4.90625 3.166,-4.31799 -1.8905,-8.69275 -17.5625,-4.59375 -5.30401,-5.184 -16.9675,-0.008 -22.4375,1.71875 -7.27801,-4.05999 -24.21075,-0.565 -29.96875,0.875 -5.637,-3.50401 29.65625,-9.21875 29.65625,-9.21875 13.62301,-0.241 21.307,-2.598 25.625,-3.75 20.59402,-11.03801 -0.28675,-12.2105 -11.09375,-4.1875 -6.70799,-5.237 -13.079,0.45275 -19.125,2.46875 -6.04597,2.01501 -17.5625,3.45775 -17.5625,2.59375 2e-5,-0.864 16.40625,-10.9375 16.40625,-10.9375 1e-5,-2e-5 20.1565,-1.45525 24.1875,-2.03125 4.03098,-0.576 24.64525,-11.16325 -3.46875,-4.03125 -9.789,0.864 -15.53825,0.30575 -19.28125,0.59375 -21.70502,-2.24402 2.03125,-4.34375 2.03125,-4.34375 -10e-6,10e-6 30.73175,-2.8185 31.09375,-4.3125 0.60303,-11.98199 -25.05575,-6.3125 -25.34375,-6.3125 0.074,-8.56001 -23.90625,0.288 -23.90625,0 -4.58101,-2.69901 2.59375,-5.46875 2.59375,-5.46875 6.33399,-1.53501 15.80425,-2.01425 18.28125,-4.03125 -10e-6,-2e-5 17.877,-0.15725 20,-4.90625 -4.38697,-12.10299 -37.8335,2.1425 -42.3125,4.3125 -6.04601,1e-5 4.0245,-9.7745 4.3125,-10.0625 0.28802,-0.28799 27.63875,-1.437 40.59375,-19 0.90003,-10.69001 -15.25,6.03125 -15.25,6.03125 -1.206,-13.864 -17.5615,0.87925 -27.0625,2.03125 -9.50001,1.15099 -9.77825,-4.3235 -3.15625,-5.1875 6.621,-0.86301 14.10075,-0.298 17.84375,-10.375 3.74203,-10.07701 14.985,0.58675 17,-3.15625 2.01501,-3.743 -4.03125,-6.90625 -4.03125,-6.90625 1e-5,0 8.3435,-8.663 -5.1875,-8.375 -13.53198,0.288 -31.09375,-1.71875 -31.09375,-1.71875 1e-5,-1e-5 14.10075,-5.4755 27.34375,-5.1875 13.244,0.28799 6.043,-9.5 -6.625,-9.5 -12.66699,-1e-5 -19.28125,-4.3125 -19.28125,-4.3125 7.19801,-2.68701 14.39575,-5.3755 21.59375,-8.0625 -0.48001,-2.01501 -0.9575,-4.01625 -1.4375,-6.03125 -10e-6,0 12.6625,-10.08425 -5.1875,-7.78125 -17.85,2.304 -19.875,2.59375 -19.875,2.59375 -10e-6,0 -35.68075,5.46875 -35.96875,5.46875 -0.288,-1e-5 -9.80675,-2.8835 -0.59375,-5.1875 9.21302,-2.303 41.76225,-8.9155 46.65625,-7.1875 4.895,1.72699 -0.601,-12.0845 -17.875,-13.8125 -17.27402,-1.727 -27.90625,4.3125 -27.90625,4.3125 1e-5,0 -11.24,-4.045 -0.875,-7.5 10.36402,-3.45401 26.78125,1.15625 26.78125,1.15625 -10e-6,0 18.41525,-5.47825 3.15625,-7.78125 -15.259,-2.304 -20.0705,2.0715 -27.0625,2.3125 -2.79101,-3.484 23.956,-4.3065 25.625,-7.1875 -2.821,-5.184 -19.3695,0 -29.0625,0 -4.12299,-1.749 -4.39575,-4.59475 0.28125,-6.34375 9.88501,-0.384 19.1775,0.1965 29.0625,-0.1875 -0.28798,-5.278 0.007,-11.534504 -0.28125,-16.812504 -12.538,-2.290996 -27.24225,1.67775 -34.28125,1.34375 1.883,-5.758997 28.95475,-7.2455 31.96875,-8.8125 6.26898,-7.836003 -26.462,0 -26.75,0 -5.71299,-0.844003 -5.367,-4.455 -1.75,-6.625 8.349,-0.960002 27.07225,1.2235 25.65625,-4.4375 -1.08497,-5.304703 -12.981,-2.4645 -17.875,-1.3125 -4.89398,1.151001 -12.09375,0.28125 -12.09375,0.28125 -3.134,-4.219501 28.2245,-2.4949 27.9375,-5.75 -0.40898,-3.737301 -19.878,-1.163 -26.5,-0.875 -5.174,-3.5699 24.86175,-5.93515 25.34375,-6.34375 1.085,-9.570799 -20.1565,0 -24.1875,0 -4.03101,1e-6 -2,-6.03125 -2,-6.03125 1e-5,-2e-6 8.3505,-3.7367 8.0625,-4.3125 -0.288,-0.575797 -6.3615,-2.59375 -6.9375,-2.59375 -0.57499,-2e-6 0,-6.625 0,-6.625 1e-5,0 6.91975,-5.1855 6.34375,-6.625 -0.57601,-1.4396 -8.0625,1.15625 -8.0625,1.15625 0,-1.919399 0,-3.8306 0,-5.75 0,-1e-6 5.4865,-0.5964 6.0625,-3.1875 0.57601,-2.5912 -6.625,-2.875 -6.625,-2.875 -0.95998,-10.076599 -1.915,-20.14215 -2.875,-30.21875 z m -5.125,98.65625 v 4 c 2e-5,-1e-6 -9.87975,-0.4995 -7.46875,-2.1875 2.41099,-1.688002 7.46875,-1.4515 7.46875,-1.8125 z m 9.15625,5.3125 c 0.241,0 14.96401,0.107247 14,2.15625 -0.965,2.050004 -13.75,3.281254 -13.75,3.281254 z m -0.71875,7.843754 c 0.482,0.241 7.74127,0.36149 6.65625,1.6875 -1.085,1.326 -5.91525,1.6875 -6.15625,1.6875 -0.241,0 -0.50001,-3.37501 -0.5,-3.375 z m -35.90625,10.46875 c 4.66641,0.22186 12.449,1.48762 25.0625,4.96875 0,0.361 0.366,5.1835 0.125,5.0625 -0.241,-0.121 -27.968,-8.08875 -30.5,-7.96875 -1.58187,0.0756 -2.46485,-2.43227 5.3125,-2.0625 z m 11.25,11.78125 c 4.18797,-0.39733 16.09375,2.5355 16.09375,2.21875 -10e-6,0.965 0.62125,6.02225 -0.34375,5.78125 -0.96401,-0.241 -18.808,-5.90575 -17,-7.59375 0.226,-0.211 0.65172,-0.34949 1.25,-0.40625 z m 47.5625,11 c 2.13985,0.16387 3.28475,0.59475 2.53125,1.46875 -3.014,3.496 -23.84374,6.37499 -23.84375,6.375 l -0.375,-6.375 c -0.09,0 15.26797,-1.96038 21.6875,-1.46875 z m -63.03125,19.78125 c 3.63175,-0.12063 11.9165,1.87625 30,9.53125 l 0.125,4.59375 c 1e-5,0 -31.1025,-9.433 -32.1875,-11 -0.5425,-0.7835 -1.56925,-3.00438 2.0625,-3.125 z m 60.78125,6.84375 c 1.59371,-0.081 2.3795,0.18625 1.65625,1 -2.894,3.256 -18.4375,6.5 -18.4375,6.5 0,0 0,-4.09775 0,-4.21875 0,0.18075 12.00014,-3.03816 16.78125,-3.28125 z m -67.75,0.5625 c 4.85225,-0.0755 15.4025,2.55375 38.1875,13.34375 -10e-6,0.121 0.246,4.34375 0.125,4.34375 -0.12098,-1e-5 -42.3125,-14.84375 -42.3125,-14.84375 0,0 -0.85225,-2.76825 4,-2.84375 z m 76.5625,18.03125 c 2.4186,-0.18644 3.65325,-2.5e-4 2.71875,0.84375 -3.737,3.375 -27.70551,7.46875 -28.1875,7.46875 -0.482,0 0.21875,-3.85275 0.21875,-4.09375 0.2715,0.2715 17.99422,-3.65944 25.25,-4.21875 z m -67.34375,10.4375 c 8.2575,0.681 28.125,9.86825 28.125,9.6875 -0.12099,0.482 -0.129,4.71375 -0.25,4.59375 -0.11999,-0.121 -30.00875,-12.5225 -31.09375,-11.4375 -0.9925,-2.32576 0.46625,-3.07075 3.21875,-2.84375 z m 61.78125,2.53125 c 2.02872,-0.0791 3.1675,0.049 2.625,0.53125 -2.17,1.929 -22.3125,5.90625 -22.3125,5.90625 0,0 -0.0938,-3.73176 -0.0937,-4.09375 -0.2715,0 13.69509,-2.10652 19.78125,-2.34375 z m -1.84375,12.90625 c 1.81402,-0.0602 2.92751,0.079 2.65625,0.53125 -1.085,1.808 -19.40624,5.65625 -19.40625,5.65625 0,0 -0.46875,-4.09775 -0.46875,-4.21875 0,0.0907 11.77671,-1.7881 17.21875,-1.96875 z m -70.34375,1.03125 c 5.00188,0.23975 15.565,2.51075 37.8125,10.59375 l 0.84375,4.9375 c 1e-5,0 -43.27725,-13.96875 -43.15625,-13.96875 0.06,0 -0.50187,-1.80225 4.5,-1.5625 z m 53.5625,10.71875 c 0,0.121 10.05374,0.34325 8.96875,2.03125 -1.085,1.688 -8.43749,2.3125 -8.4375,2.3125 0,0 -0.36123,-3.30775 -0.53125,-4.34375 z m 18.75,9.6875 c 1.51453,0.177 1.9445,0.76449 0.4375,2 -6.028,4.943 -19.15624,5.90625 -19.15625,5.90625 0,0 1e-5,-5.31752 0,-5.4375 0,0.09 14.17516,-2.99976 18.71875,-2.46875 z m 15.96875,5 c 3.78662,0.12287 2.14949,2.06675 1.125,3.03125 -2.05,1.929 -34.71874,12.28125 -34.71875,12.28125 0,0 -0.24599,-6.86675 -0.125,-7.46875 20.719,-6.279 29.93213,-7.96663 33.71875,-7.84375 z m -23.8125,19.53125 c 3.77063,-0.264 6.76701,-0.15276 5.875,1.21875 -2.795,2.743 -16.37501,3.15625 -16.375,3.15625 v -3.40625 c 2.2055,-0.0745 6.72938,-0.70475 10.5,-0.96875 z m 14.125,5.625 c 2.1116,-0.24674 3.0125,-0.0582 1.65625,0.90625 -5.425,3.857 -25.81249,7.81249 -25.8125,7.8125 0,0 0.25401,-2.772 0.375,-3.375 0.18075,0.0908 17.44647,-4.60355 23.78125,-5.34375 z m 10.875,4.25 c 3.24755,-0.22164 5.74475,0.0623 7.03125,1 0.242,0 -0.93877,4.20123 -6.96875,5.90625 -6.751,-0.603 -35.56649,7.93748 -35.6875,7.9375 -0.12,0 0.34376,-3.50002 0.34375,-3.5 9.22275,-5.5155 25.53861,-10.67883 35.28125,-11.34375 z m -70.84375,16.40625 c 12.297,1.326 16.8895,5.92923 18.1875,7.78125 -2.741,4.81 -26.7335,-7.80925 -18.1875,-7.78125 z m 70.6875,0.84375 c 0.7988,0.0615 1.341,0.43449 1.40625,1.34375 -1.326,2.049 -8.375,1.0625 -8.375,1.0625 0,0.09 4.57236,-2.5909 6.96875,-2.40625 z m -27.84375,13.4375 c 1.00662,-0.10987 1.91544,-0.12999 2.5625,0 0.86275,0.17331 1.26351,0.627 0.78125,1.53125 -1.929,3.617 -10.37499,2.28124 -10.375,2.28125 v -2.53125 c 0.13556,0.13556 4.0114,-0.95165 7.03125,-1.28125 z m -48.59375,9.4375 c 2.56528,-0.0928 4.83175,1.58749 7.1875,2.9375 5.304,-1.085 16.18749,0.84375 16.1875,0.84375 0,0 -10e-6,4.45051 0,4.8125 0,0.241 -13.69123,-0.28026 -16.65625,-2.15625 -2.531,0 -10.13025,-4.08925 -9.40625,-5.65625 0.93825,-0.5 1.83241,-0.75032 2.6875,-0.78125 z m 55.46875,2.40625 c 2.18479,-0.17602 3.15874,0.382 1.53125,2.6875 -4.34,6.148 -15.56249,3.625 -15.5625,3.625 l -0.46875,-3.8125 c 3.86188,0.15062 10.85869,-2.20663 14.5,-2.5 z m -39.46875,12.5 c 3.79013,0.28099 7.25,1.53125 7.25,1.53125 0.121,0.241 2.65699,5.174 0.125,6.5 -2.532,1.326 -14.63376,-1.03625 -15.34375,-5.90625 1.085,-1.14525 2.55766,-1.72855 4.1875,-2 1.22239,-0.20359 2.51788,-0.21867 3.78125,-0.125 z m -46.875,2.40625 c 3.78718,0.50034 7.32675,2.57675 7.21875,2.46875 -1e-5,0.144 -0.15625,4.625 -0.15625,4.625 0,0 -8.2155,-2.29025 -10.8125,-6.90625 1.19026,-0.32451 2.48761,-0.35428 3.75,-0.1875 z m 77.25,0.53125 c 5.53804,0.0284 12.21748,1.57651 10.5,3.65625 -2.291,2.772 -15.31249,0.24998 -15.3125,0.25 v -3.375 c 1.23575,-0.3615 2.96649,-0.54074 4.8125,-0.53125 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#000000;fill-opacity:1" + transform="matrix(0.07059591,0,0,0.07059591,581.1598,605.9706)" + id="g923"> + id="defs924" /> + inkscape:window-x="134" + inkscape:window-height="1085" + inkscape:window-width="1404" + inkscape:cy="238.500019" + inkscape:cx="420.999993" + inkscape:zoom="3.07667732" + id="namedview925" /> + inkscape:connector-curvature="0" + id="path926" + d="m 536.00321,-6.377304 c -0.86399,9.4048 -1.72975,18.81395 -2.59375,28.21875 -3.16698,0.479901 -6.333,0.9577 -9.5,1.4375 -10e-6,-1e-6 6.598,3.72605 7.75,7.46875 1.15101,3.742798 -8.0625,2.59375 -8.0625,2.59375 -10e-6,-10e-7 7.4865,6.35295 8.0625,8.65625 0.57501,2.3032 -10.34375,2.875 -10.34375,2.875 0,2e-6 9.20525,6.60105 9.78125,10.34375 0.576,3.7428 0,5.78125 0,5.78125 0,-2e-6 -15.2735,-13.2428 -25.0625,-9.5 -5.087,2.657699 11.659,3.88675 22.75,13.53125 -0.026,2.147797 -26.91525,-6.55905 -27.90625,-1.15625 0.62401,1.5037 28.71025,5.54495 30.78125,9.21875 -10.26899,0.384003 -31.48325,-2.2729 -30.78125,1.125 -2.14599,3.923003 20.03675,1.70725 29.34375,4.90625 2.72801,3.099998 2.46475,5.70425 -2.28125,6.03125 -8.97001,-4.288999 -29.04575,-7.476 -29.09375,-2 0.12199,1.461999 20.74275,0.51075 28.21875,5.46875 -9.979,2.269999 -43.81725,-4.605 -44.03125,-1.25 0.96399,1.566998 6.31825,8.44425 15.53125,8.15625 9.21302,-0.287998 30.52875,3.746 31.96875,6.625004 1.43901,2.87899 -27.65375,-6.057004 -38.59375,-0.875 -10.94001,5.183 31.37125,2.041 38.28125,8.375 6.91001,6.334 -13.8125,-0.59375 -13.8125,-0.59375 1e-5,0 -28.77575,-4.015 -33.09375,-2 -4.31901,2.01599 -9.21875,6.625 -9.21875,6.625 0,0 2.871,5.74475 5.75,4.59375 2.879,-1.152 -0.875,3.46875 -0.875,3.46875 -1e-5,0 40.325,9.76925 49.25,18.40625 8.92499,8.638 -51.25,-13.53125 -51.25,-13.53125 0,-10e-6 -24.1855,8.924 1.4375,9.5 -2.94799,4.313 1.4375,6.90625 1.4375,6.90625 0,0 42.6195,8.93375 46.9375,15.84375 4.319,6.90999 -29.0765,-6.633 -36.5625,-10.375 -7.48501,-3.74301 -28.788,2.311 -28.5,3.75 0.28801,1.44 10.36925,3.4715 10.65625,6.0625 0.288,2.591 -12.40625,3.447 -12.40625,5.75 -1e-5,2.304 53.855,13.533 68.25,25.625 14.39499,12.09199 -42.3125,-14.40625 -42.3125,-14.40625 10e-6,0 3.167,4.31675 0,5.46875 -3.16699,1.151 -14.41775,-16.12175 -32.84375,-5.46875 -3.356,4.383 16.08825,7.86175 21.03125,8.34375 -1.688,4.34 -3.16,5.77575 3.75,10.09375 6.90899,4.319 -13.53125,-6.35625 -13.53125,-5.78125 0,0.57599 1.4375,7.5 1.4375,7.5 -6.379,-5.182 -14.0895,-6.7445 -21.3125,-1.4375 -1e-5,0 -0.2975,5.17675 7.1875,8.34375 -4.087,8.351 4.6185,5.75825 18.4375,13.53125 -20.53899,-5.36801 -22.183,4.60325 -7.5,6.90625 14.68299,2.303 54.999,3.746 64.5,16.125 9.501,12.37999 -13.501,-4.7525 -16.125,-5.1875 -0.57599,0.288 -1.15625,6.34375 -1.15625,6.34375 -6.14201,-3.55502 -11.778,-6.744 -19.125,-8.25 -0.57599,1.15099 -0.45525,2.7865 -1.03125,3.9375 -6.667,-4.80802 -12.47525,-8.18825 -22.15625,-8.65625 -0.38399,1.53599 -0.77225,3.089 -1.15625,4.625 2e-5,-2e-5 -8.07125,-10.077 -23.90625,0 -8.84199,6.33898 33.4025,2.29525 40.3125,9.78125 6.91001,7.48501 1.4375,8.625 1.4375,8.625 -5.75799,-2.11101 -11.492,-4.2015 -17.25,-6.3125 0,0 -20.46075,-3.76225 -26.21875,0.84375 -5.758,4.607 84.06525,15.83875 86.65625,28.21875 1.74701,6.714 -21.104,-7.0305 -40.875,-12.9375 -0.768,2.20699 -1.5445,4.418 -2.3125,6.625 10e-6,-2e-5 -7.8405,-7.89275 -16.6875,-9.21875 -0.28799,0 1.71875,7.78125 1.71875,7.78125 -1e-5,10e-6 -22.147,-10.37625 -33.375,-4.90625 -11.22898,5.47 39.144,8.34825 43.75,13.53125 4.606,5.18199 -15.273,-3.455 -17,0 -1.72801,3.45499 -26.19425,-6.32475 -25.90625,-1.71875 0.28801,4.60698 3.46875,7.1875 3.46875,7.1875 -1e-5,-2e-5 50.9595,4.8915 52.6875,10.9375 1.72701,6.04598 -28.21875,-3.4375 -28.21875,-3.4375 10e-6,0 -2.89675,4.2975 -0.59375,6.3125 2.303,2.01598 -17.25825,-11.51875 -15.53125,-2.59375 -6.34901,-2.52801 -22.7405,-10.3585 -20.4375,-4.3125 2.303,6.04601 46.34375,14.6875 46.34375,14.6875 10e-6,0 -19.3015,1.44875 -18.4375,6.34375 -24.815,-15.11802 -24.16975,-5.4755 -23.59375,-5.1875 0.576,0.288 -31.971,-8.0565 -7.5,5.1875 24.47199,13.24298 13.24325,10.93075 13.53125,11.21875 0.28801,0.28799 2.60725,6.625 2.03125,6.625 -0.576,10e-6 -16.68625,-8.64375 -22.15625,-9.21875 -5.471,-0.57601 -31.389,7.18925 -3.75,19.28125 27.63901,12.09199 44.616,-2.88425 59.875,-1.15625 15.25901,1.72699 22.47025,4.32375 21.03125,9.21875 -1.43999,4.89401 -15.609,-16.0455 -30.5,2.0625 -16.93899,-3.35199 -28.4315,-5.29175 -19.6875,7.15625 -27.66301,-10.33799 -44.55575,3.154 -9.71875,8.625 34.23301,1.009 55.28125,-8.34375 55.28125,-8.34375 0,10e-6 5.775,10.6735 14.125,3.1875 8.349,-7.48502 8.61825,2.875 8.90625,2.875 0.28701,-1e-5 8.0625,-3.46875 8.0625,-3.46875 0.67201,0 1.35925,0 2.03125,0 -10e-6,23.032 0,46.06175 0,69.09375 9.30899,0.096 18.59725,0.18525 27.90625,0.28125 -10e-6,-1e-5 -8.92525,-60.15775 -4.03125,-68.21875 4.895,-8.061 9.5,-6.90625 9.5,-6.90625 -10e-6,0 18.14125,5.45775 20.15625,4.59375 2.01598,-0.864 -0.289,-6.89525 9.5,-6.03125 3.167,-1.15201 1.46475,-6.61825 4.34375,-6.90625 2.87903,-0.288 58.43925,15.5335 70.53125,0.5625 -3.16698,-8.34899 -14.121,-0.56925 -17,-0.28125 -2.59102,0 -13.54,-5.182 -19.875,0 -5.75799,-4.318 -31.9375,-7.1875 -31.9375,-7.1875 -3.45502,-3.455 62.47575,1.716 66.21875,-0.875 7.77302,-7.77399 -14.38875,-6.9035 -17.84375,-4.3125 -6.142,-3.74299 -13.8595,-3.466 -18.5625,-0.875 -2.25501,-5.39402 -23.6625,-3.05775 -35.5625,-4.59375 -3.80903,-2.23399 -3.17475,-3.51625 -0.59375,-4.90625 24.85602,1.05599 49.5855,4.3015 74.5625,3.1875 6.75101,-8.801 -8.49875,-12.12 -17.84375,-4.625 -5.48602,-9.02201 -16.7015,-0.29325 -24.1875,-1.15625 -7.485,-0.864 -4.03125,-10.064 5.46875,-8.625 9.50103,1.44 26.48925,-0.58725 29.65625,-4.90625 3.166,-4.31799 -1.8905,-8.69275 -17.5625,-4.59375 -5.30401,-5.184 -16.9675,-0.008 -22.4375,1.71875 -7.27801,-4.05999 -24.21075,-0.565 -29.96875,0.875 -5.637,-3.50401 29.65625,-9.21875 29.65625,-9.21875 13.62301,-0.241 21.307,-2.598 25.625,-3.75 20.59402,-11.03801 -0.28675,-12.2105 -11.09375,-4.1875 -6.70799,-5.237 -13.079,0.45275 -19.125,2.46875 -6.04597,2.01501 -17.5625,3.45775 -17.5625,2.59375 2e-5,-0.864 16.40625,-10.9375 16.40625,-10.9375 1e-5,-2e-5 20.1565,-1.45525 24.1875,-2.03125 4.03098,-0.576 24.64525,-11.16325 -3.46875,-4.03125 -9.789,0.864 -15.53825,0.30575 -19.28125,0.59375 -21.70502,-2.24402 2.03125,-4.34375 2.03125,-4.34375 -10e-6,10e-6 30.73175,-2.8185 31.09375,-4.3125 0.60303,-11.98199 -25.05575,-6.3125 -25.34375,-6.3125 0.074,-8.56001 -23.90625,0.288 -23.90625,0 -4.58101,-2.69901 2.59375,-5.46875 2.59375,-5.46875 6.33399,-1.53501 15.80425,-2.01425 18.28125,-4.03125 -10e-6,-2e-5 17.877,-0.15725 20,-4.90625 -4.38697,-12.10299 -37.8335,2.1425 -42.3125,4.3125 -6.04601,1e-5 4.0245,-9.7745 4.3125,-10.0625 0.28802,-0.28799 27.63875,-1.437 40.59375,-19 0.90003,-10.69001 -15.25,6.03125 -15.25,6.03125 -1.206,-13.864 -17.5615,0.87925 -27.0625,2.03125 -9.50001,1.15099 -9.77825,-4.3235 -3.15625,-5.1875 6.621,-0.86301 14.10075,-0.298 17.84375,-10.375 3.74203,-10.07701 14.985,0.58675 17,-3.15625 2.01501,-3.743 -4.03125,-6.90625 -4.03125,-6.90625 1e-5,0 8.3435,-8.663 -5.1875,-8.375 -13.53198,0.288 -31.09375,-1.71875 -31.09375,-1.71875 1e-5,-1e-5 14.10075,-5.4755 27.34375,-5.1875 13.244,0.28799 6.043,-9.5 -6.625,-9.5 -12.66699,-1e-5 -19.28125,-4.3125 -19.28125,-4.3125 7.19801,-2.68701 14.39575,-5.3755 21.59375,-8.0625 -0.48001,-2.01501 -0.9575,-4.01625 -1.4375,-6.03125 -10e-6,0 12.6625,-10.08425 -5.1875,-7.78125 -17.85,2.304 -19.875,2.59375 -19.875,2.59375 -10e-6,0 -35.68075,5.46875 -35.96875,5.46875 -0.288,-1e-5 -9.80675,-2.8835 -0.59375,-5.1875 9.21302,-2.303 41.76225,-8.9155 46.65625,-7.1875 4.895,1.72699 -0.601,-12.0845 -17.875,-13.8125 -17.27402,-1.727 -27.90625,4.3125 -27.90625,4.3125 1e-5,0 -11.24,-4.045 -0.875,-7.5 10.36402,-3.45401 26.78125,1.15625 26.78125,1.15625 -10e-6,0 18.41525,-5.47825 3.15625,-7.78125 -15.259,-2.304 -20.0705,2.0715 -27.0625,2.3125 -2.79101,-3.484 23.956,-4.3065 25.625,-7.1875 -2.821,-5.184 -19.3695,0 -29.0625,0 -4.12299,-1.749 -4.39575,-4.59475 0.28125,-6.34375 9.88501,-0.384 19.1775,0.1965 29.0625,-0.1875 -0.28798,-5.278 0.007,-11.534504 -0.28125,-16.812504 -12.538,-2.290996 -27.24225,1.67775 -34.28125,1.34375 1.883,-5.758997 28.95475,-7.2455 31.96875,-8.8125 6.26898,-7.836003 -26.462,0 -26.75,0 -5.71299,-0.844003 -5.367,-4.455 -1.75,-6.625 8.349,-0.960002 27.07225,1.2235 25.65625,-4.4375 -1.08497,-5.304703 -12.981,-2.4645 -17.875,-1.3125 -4.89398,1.151001 -12.09375,0.28125 -12.09375,0.28125 -3.134,-4.219501 28.2245,-2.4949 27.9375,-5.75 -0.40898,-3.737301 -19.878,-1.163 -26.5,-0.875 -5.174,-3.5699 24.86175,-5.93515 25.34375,-6.34375 1.085,-9.570799 -20.1565,0 -24.1875,0 -4.03101,1e-6 -2,-6.03125 -2,-6.03125 1e-5,-2e-6 8.3505,-3.7367 8.0625,-4.3125 -0.288,-0.575797 -6.3615,-2.59375 -6.9375,-2.59375 -0.57499,-2e-6 0,-6.625 0,-6.625 1e-5,0 6.91975,-5.1855 6.34375,-6.625 -0.57601,-1.4396 -8.0625,1.15625 -8.0625,1.15625 0,-1.919399 0,-3.8306 0,-5.75 0,-1e-6 5.4865,-0.5964 6.0625,-3.1875 0.57601,-2.5912 -6.625,-2.875 -6.625,-2.875 -0.95998,-10.076599 -1.915,-20.14215 -2.875,-30.21875 z m -5.125,98.65625 v 4 c 2e-5,-1e-6 -9.87975,-0.4995 -7.46875,-2.1875 2.41099,-1.688002 7.46875,-1.4515 7.46875,-1.8125 z m 9.15625,5.3125 c 0.241,0 14.96401,0.107247 14,2.15625 -0.965,2.050004 -13.75,3.281254 -13.75,3.281254 z m -0.71875,7.843754 c 0.482,0.241 7.74127,0.36149 6.65625,1.6875 -1.085,1.326 -5.91525,1.6875 -6.15625,1.6875 -0.241,0 -0.50001,-3.37501 -0.5,-3.375 z m -35.90625,10.46875 c 4.66641,0.22186 12.449,1.48762 25.0625,4.96875 0,0.361 0.366,5.1835 0.125,5.0625 -0.241,-0.121 -27.968,-8.08875 -30.5,-7.96875 -1.58187,0.0756 -2.46485,-2.43227 5.3125,-2.0625 z m 11.25,11.78125 c 4.18797,-0.39733 16.09375,2.5355 16.09375,2.21875 -10e-6,0.965 0.62125,6.02225 -0.34375,5.78125 -0.96401,-0.241 -18.808,-5.90575 -17,-7.59375 0.226,-0.211 0.65172,-0.34949 1.25,-0.40625 z m 47.5625,11 c 2.13985,0.16387 3.28475,0.59475 2.53125,1.46875 -3.014,3.496 -23.84374,6.37499 -23.84375,6.375 l -0.375,-6.375 c -0.09,0 15.26797,-1.96038 21.6875,-1.46875 z m -63.03125,19.78125 c 3.63175,-0.12063 11.9165,1.87625 30,9.53125 l 0.125,4.59375 c 1e-5,0 -31.1025,-9.433 -32.1875,-11 -0.5425,-0.7835 -1.56925,-3.00438 2.0625,-3.125 z m 60.78125,6.84375 c 1.59371,-0.081 2.3795,0.18625 1.65625,1 -2.894,3.256 -18.4375,6.5 -18.4375,6.5 0,0 0,-4.09775 0,-4.21875 0,0.18075 12.00014,-3.03816 16.78125,-3.28125 z m -67.75,0.5625 c 4.85225,-0.0755 15.4025,2.55375 38.1875,13.34375 -10e-6,0.121 0.246,4.34375 0.125,4.34375 -0.12098,-1e-5 -42.3125,-14.84375 -42.3125,-14.84375 0,0 -0.85225,-2.76825 4,-2.84375 z m 76.5625,18.03125 c 2.4186,-0.18644 3.65325,-2.5e-4 2.71875,0.84375 -3.737,3.375 -27.70551,7.46875 -28.1875,7.46875 -0.482,0 0.21875,-3.85275 0.21875,-4.09375 0.2715,0.2715 17.99422,-3.65944 25.25,-4.21875 z m -67.34375,10.4375 c 8.2575,0.681 28.125,9.86825 28.125,9.6875 -0.12099,0.482 -0.129,4.71375 -0.25,4.59375 -0.11999,-0.121 -30.00875,-12.5225 -31.09375,-11.4375 -0.9925,-2.32576 0.46625,-3.07075 3.21875,-2.84375 z m 61.78125,2.53125 c 2.02872,-0.0791 3.1675,0.049 2.625,0.53125 -2.17,1.929 -22.3125,5.90625 -22.3125,5.90625 0,0 -0.0938,-3.73176 -0.0937,-4.09375 -0.2715,0 13.69509,-2.10652 19.78125,-2.34375 z m -1.84375,12.90625 c 1.81402,-0.0602 2.92751,0.079 2.65625,0.53125 -1.085,1.808 -19.40624,5.65625 -19.40625,5.65625 0,0 -0.46875,-4.09775 -0.46875,-4.21875 0,0.0907 11.77671,-1.7881 17.21875,-1.96875 z m -70.34375,1.03125 c 5.00188,0.23975 15.565,2.51075 37.8125,10.59375 l 0.84375,4.9375 c 1e-5,0 -43.27725,-13.96875 -43.15625,-13.96875 0.06,0 -0.50187,-1.80225 4.5,-1.5625 z m 53.5625,10.71875 c 0,0.121 10.05374,0.34325 8.96875,2.03125 -1.085,1.688 -8.43749,2.3125 -8.4375,2.3125 0,0 -0.36123,-3.30775 -0.53125,-4.34375 z m 18.75,9.6875 c 1.51453,0.177 1.9445,0.76449 0.4375,2 -6.028,4.943 -19.15624,5.90625 -19.15625,5.90625 0,0 1e-5,-5.31752 0,-5.4375 0,0.09 14.17516,-2.99976 18.71875,-2.46875 z m 15.96875,5 c 3.78662,0.12287 2.14949,2.06675 1.125,3.03125 -2.05,1.929 -34.71874,12.28125 -34.71875,12.28125 0,0 -0.24599,-6.86675 -0.125,-7.46875 20.719,-6.279 29.93213,-7.96663 33.71875,-7.84375 z m -23.8125,19.53125 c 3.77063,-0.264 6.76701,-0.15276 5.875,1.21875 -2.795,2.743 -16.37501,3.15625 -16.375,3.15625 v -3.40625 c 2.2055,-0.0745 6.72938,-0.70475 10.5,-0.96875 z m 14.125,5.625 c 2.1116,-0.24674 3.0125,-0.0582 1.65625,0.90625 -5.425,3.857 -25.81249,7.81249 -25.8125,7.8125 0,0 0.25401,-2.772 0.375,-3.375 0.18075,0.0908 17.44647,-4.60355 23.78125,-5.34375 z m 10.875,4.25 c 3.24755,-0.22164 5.74475,0.0623 7.03125,1 0.242,0 -0.93877,4.20123 -6.96875,5.90625 -6.751,-0.603 -35.56649,7.93748 -35.6875,7.9375 -0.12,0 0.34376,-3.50002 0.34375,-3.5 9.22275,-5.5155 25.53861,-10.67883 35.28125,-11.34375 z m -70.84375,16.40625 c 12.297,1.326 16.8895,5.92923 18.1875,7.78125 -2.741,4.81 -26.7335,-7.80925 -18.1875,-7.78125 z m 70.6875,0.84375 c 0.7988,0.0615 1.341,0.43449 1.40625,1.34375 -1.326,2.049 -8.375,1.0625 -8.375,1.0625 0,0.09 4.57236,-2.5909 6.96875,-2.40625 z m -27.84375,13.4375 c 1.00662,-0.10987 1.91544,-0.12999 2.5625,0 0.86275,0.17331 1.26351,0.627 0.78125,1.53125 -1.929,3.617 -10.37499,2.28124 -10.375,2.28125 v -2.53125 c 0.13556,0.13556 4.0114,-0.95165 7.03125,-1.28125 z m -48.59375,9.4375 c 2.56528,-0.0928 4.83175,1.58749 7.1875,2.9375 5.304,-1.085 16.18749,0.84375 16.1875,0.84375 0,0 -10e-6,4.45051 0,4.8125 0,0.241 -13.69123,-0.28026 -16.65625,-2.15625 -2.531,0 -10.13025,-4.08925 -9.40625,-5.65625 0.93825,-0.5 1.83241,-0.75032 2.6875,-0.78125 z m 55.46875,2.40625 c 2.18479,-0.17602 3.15874,0.382 1.53125,2.6875 -4.34,6.148 -15.56249,3.625 -15.5625,3.625 l -0.46875,-3.8125 c 3.86188,0.15062 10.85869,-2.20663 14.5,-2.5 z m -39.46875,12.5 c 3.79013,0.28099 7.25,1.53125 7.25,1.53125 0.121,0.241 2.65699,5.174 0.125,6.5 -2.532,1.326 -14.63376,-1.03625 -15.34375,-5.90625 1.085,-1.14525 2.55766,-1.72855 4.1875,-2 1.22239,-0.20359 2.51788,-0.21867 3.78125,-0.125 z m -46.875,2.40625 c 3.78718,0.50034 7.32675,2.57675 7.21875,2.46875 -1e-5,0.144 -0.15625,4.625 -0.15625,4.625 0,0 -8.2155,-2.29025 -10.8125,-6.90625 1.19026,-0.32451 2.48761,-0.35428 3.75,-0.1875 z m 77.25,0.53125 c 5.53804,0.0284 12.21748,1.57651 10.5,3.65625 -2.291,2.772 -15.31249,0.24998 -15.3125,0.25 v -3.375 c 1.23575,-0.3615 2.96649,-0.54074 4.8125,-0.53125 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#000000;fill-opacity:1" + transform="matrix(0.07059591,0,0,0.07059591,592.3472,609.345)" + id="g927"> + id="defs928" /> + inkscape:window-x="134" + inkscape:window-height="1085" + inkscape:window-width="1404" + inkscape:cy="238.500019" + inkscape:cx="420.999993" + inkscape:zoom="3.07667732" + id="namedview929" /> + inkscape:connector-curvature="0" + id="path930" + d="m 536.00321,-6.377304 c -0.86399,9.4048 -1.72975,18.81395 -2.59375,28.21875 -3.16698,0.479901 -6.333,0.9577 -9.5,1.4375 -10e-6,-1e-6 6.598,3.72605 7.75,7.46875 1.15101,3.742798 -8.0625,2.59375 -8.0625,2.59375 -10e-6,-10e-7 7.4865,6.35295 8.0625,8.65625 0.57501,2.3032 -10.34375,2.875 -10.34375,2.875 0,2e-6 9.20525,6.60105 9.78125,10.34375 0.576,3.7428 0,5.78125 0,5.78125 0,-2e-6 -15.2735,-13.2428 -25.0625,-9.5 -5.087,2.657699 11.659,3.88675 22.75,13.53125 -0.026,2.147797 -26.91525,-6.55905 -27.90625,-1.15625 0.62401,1.5037 28.71025,5.54495 30.78125,9.21875 -10.26899,0.384003 -31.48325,-2.2729 -30.78125,1.125 -2.14599,3.923003 20.03675,1.70725 29.34375,4.90625 2.72801,3.099998 2.46475,5.70425 -2.28125,6.03125 -8.97001,-4.288999 -29.04575,-7.476 -29.09375,-2 0.12199,1.461999 20.74275,0.51075 28.21875,5.46875 -9.979,2.269999 -43.81725,-4.605 -44.03125,-1.25 0.96399,1.566998 6.31825,8.44425 15.53125,8.15625 9.21302,-0.287998 30.52875,3.746 31.96875,6.625004 1.43901,2.87899 -27.65375,-6.057004 -38.59375,-0.875 -10.94001,5.183 31.37125,2.041 38.28125,8.375 6.91001,6.334 -13.8125,-0.59375 -13.8125,-0.59375 1e-5,0 -28.77575,-4.015 -33.09375,-2 -4.31901,2.01599 -9.21875,6.625 -9.21875,6.625 0,0 2.871,5.74475 5.75,4.59375 2.879,-1.152 -0.875,3.46875 -0.875,3.46875 -1e-5,0 40.325,9.76925 49.25,18.40625 8.92499,8.638 -51.25,-13.53125 -51.25,-13.53125 0,-10e-6 -24.1855,8.924 1.4375,9.5 -2.94799,4.313 1.4375,6.90625 1.4375,6.90625 0,0 42.6195,8.93375 46.9375,15.84375 4.319,6.90999 -29.0765,-6.633 -36.5625,-10.375 -7.48501,-3.74301 -28.788,2.311 -28.5,3.75 0.28801,1.44 10.36925,3.4715 10.65625,6.0625 0.288,2.591 -12.40625,3.447 -12.40625,5.75 -1e-5,2.304 53.855,13.533 68.25,25.625 14.39499,12.09199 -42.3125,-14.40625 -42.3125,-14.40625 10e-6,0 3.167,4.31675 0,5.46875 -3.16699,1.151 -14.41775,-16.12175 -32.84375,-5.46875 -3.356,4.383 16.08825,7.86175 21.03125,8.34375 -1.688,4.34 -3.16,5.77575 3.75,10.09375 6.90899,4.319 -13.53125,-6.35625 -13.53125,-5.78125 0,0.57599 1.4375,7.5 1.4375,7.5 -6.379,-5.182 -14.0895,-6.7445 -21.3125,-1.4375 -1e-5,0 -0.2975,5.17675 7.1875,8.34375 -4.087,8.351 4.6185,5.75825 18.4375,13.53125 -20.53899,-5.36801 -22.183,4.60325 -7.5,6.90625 14.68299,2.303 54.999,3.746 64.5,16.125 9.501,12.37999 -13.501,-4.7525 -16.125,-5.1875 -0.57599,0.288 -1.15625,6.34375 -1.15625,6.34375 -6.14201,-3.55502 -11.778,-6.744 -19.125,-8.25 -0.57599,1.15099 -0.45525,2.7865 -1.03125,3.9375 -6.667,-4.80802 -12.47525,-8.18825 -22.15625,-8.65625 -0.38399,1.53599 -0.77225,3.089 -1.15625,4.625 2e-5,-2e-5 -8.07125,-10.077 -23.90625,0 -8.84199,6.33898 33.4025,2.29525 40.3125,9.78125 6.91001,7.48501 1.4375,8.625 1.4375,8.625 -5.75799,-2.11101 -11.492,-4.2015 -17.25,-6.3125 0,0 -20.46075,-3.76225 -26.21875,0.84375 -5.758,4.607 84.06525,15.83875 86.65625,28.21875 1.74701,6.714 -21.104,-7.0305 -40.875,-12.9375 -0.768,2.20699 -1.5445,4.418 -2.3125,6.625 10e-6,-2e-5 -7.8405,-7.89275 -16.6875,-9.21875 -0.28799,0 1.71875,7.78125 1.71875,7.78125 -1e-5,10e-6 -22.147,-10.37625 -33.375,-4.90625 -11.22898,5.47 39.144,8.34825 43.75,13.53125 4.606,5.18199 -15.273,-3.455 -17,0 -1.72801,3.45499 -26.19425,-6.32475 -25.90625,-1.71875 0.28801,4.60698 3.46875,7.1875 3.46875,7.1875 -1e-5,-2e-5 50.9595,4.8915 52.6875,10.9375 1.72701,6.04598 -28.21875,-3.4375 -28.21875,-3.4375 10e-6,0 -2.89675,4.2975 -0.59375,6.3125 2.303,2.01598 -17.25825,-11.51875 -15.53125,-2.59375 -6.34901,-2.52801 -22.7405,-10.3585 -20.4375,-4.3125 2.303,6.04601 46.34375,14.6875 46.34375,14.6875 10e-6,0 -19.3015,1.44875 -18.4375,6.34375 -24.815,-15.11802 -24.16975,-5.4755 -23.59375,-5.1875 0.576,0.288 -31.971,-8.0565 -7.5,5.1875 24.47199,13.24298 13.24325,10.93075 13.53125,11.21875 0.28801,0.28799 2.60725,6.625 2.03125,6.625 -0.576,10e-6 -16.68625,-8.64375 -22.15625,-9.21875 -5.471,-0.57601 -31.389,7.18925 -3.75,19.28125 27.63901,12.09199 44.616,-2.88425 59.875,-1.15625 15.25901,1.72699 22.47025,4.32375 21.03125,9.21875 -1.43999,4.89401 -15.609,-16.0455 -30.5,2.0625 -16.93899,-3.35199 -28.4315,-5.29175 -19.6875,7.15625 -27.66301,-10.33799 -44.55575,3.154 -9.71875,8.625 34.23301,1.009 55.28125,-8.34375 55.28125,-8.34375 0,10e-6 5.775,10.6735 14.125,3.1875 8.349,-7.48502 8.61825,2.875 8.90625,2.875 0.28701,-1e-5 8.0625,-3.46875 8.0625,-3.46875 0.67201,0 1.35925,0 2.03125,0 -10e-6,23.032 0,46.06175 0,69.09375 9.30899,0.096 18.59725,0.18525 27.90625,0.28125 -10e-6,-1e-5 -8.92525,-60.15775 -4.03125,-68.21875 4.895,-8.061 9.5,-6.90625 9.5,-6.90625 -10e-6,0 18.14125,5.45775 20.15625,4.59375 2.01598,-0.864 -0.289,-6.89525 9.5,-6.03125 3.167,-1.15201 1.46475,-6.61825 4.34375,-6.90625 2.87903,-0.288 58.43925,15.5335 70.53125,0.5625 -3.16698,-8.34899 -14.121,-0.56925 -17,-0.28125 -2.59102,0 -13.54,-5.182 -19.875,0 -5.75799,-4.318 -31.9375,-7.1875 -31.9375,-7.1875 -3.45502,-3.455 62.47575,1.716 66.21875,-0.875 7.77302,-7.77399 -14.38875,-6.9035 -17.84375,-4.3125 -6.142,-3.74299 -13.8595,-3.466 -18.5625,-0.875 -2.25501,-5.39402 -23.6625,-3.05775 -35.5625,-4.59375 -3.80903,-2.23399 -3.17475,-3.51625 -0.59375,-4.90625 24.85602,1.05599 49.5855,4.3015 74.5625,3.1875 6.75101,-8.801 -8.49875,-12.12 -17.84375,-4.625 -5.48602,-9.02201 -16.7015,-0.29325 -24.1875,-1.15625 -7.485,-0.864 -4.03125,-10.064 5.46875,-8.625 9.50103,1.44 26.48925,-0.58725 29.65625,-4.90625 3.166,-4.31799 -1.8905,-8.69275 -17.5625,-4.59375 -5.30401,-5.184 -16.9675,-0.008 -22.4375,1.71875 -7.27801,-4.05999 -24.21075,-0.565 -29.96875,0.875 -5.637,-3.50401 29.65625,-9.21875 29.65625,-9.21875 13.62301,-0.241 21.307,-2.598 25.625,-3.75 20.59402,-11.03801 -0.28675,-12.2105 -11.09375,-4.1875 -6.70799,-5.237 -13.079,0.45275 -19.125,2.46875 -6.04597,2.01501 -17.5625,3.45775 -17.5625,2.59375 2e-5,-0.864 16.40625,-10.9375 16.40625,-10.9375 1e-5,-2e-5 20.1565,-1.45525 24.1875,-2.03125 4.03098,-0.576 24.64525,-11.16325 -3.46875,-4.03125 -9.789,0.864 -15.53825,0.30575 -19.28125,0.59375 -21.70502,-2.24402 2.03125,-4.34375 2.03125,-4.34375 -10e-6,10e-6 30.73175,-2.8185 31.09375,-4.3125 0.60303,-11.98199 -25.05575,-6.3125 -25.34375,-6.3125 0.074,-8.56001 -23.90625,0.288 -23.90625,0 -4.58101,-2.69901 2.59375,-5.46875 2.59375,-5.46875 6.33399,-1.53501 15.80425,-2.01425 18.28125,-4.03125 -10e-6,-2e-5 17.877,-0.15725 20,-4.90625 -4.38697,-12.10299 -37.8335,2.1425 -42.3125,4.3125 -6.04601,1e-5 4.0245,-9.7745 4.3125,-10.0625 0.28802,-0.28799 27.63875,-1.437 40.59375,-19 0.90003,-10.69001 -15.25,6.03125 -15.25,6.03125 -1.206,-13.864 -17.5615,0.87925 -27.0625,2.03125 -9.50001,1.15099 -9.77825,-4.3235 -3.15625,-5.1875 6.621,-0.86301 14.10075,-0.298 17.84375,-10.375 3.74203,-10.07701 14.985,0.58675 17,-3.15625 2.01501,-3.743 -4.03125,-6.90625 -4.03125,-6.90625 1e-5,0 8.3435,-8.663 -5.1875,-8.375 -13.53198,0.288 -31.09375,-1.71875 -31.09375,-1.71875 1e-5,-1e-5 14.10075,-5.4755 27.34375,-5.1875 13.244,0.28799 6.043,-9.5 -6.625,-9.5 -12.66699,-1e-5 -19.28125,-4.3125 -19.28125,-4.3125 7.19801,-2.68701 14.39575,-5.3755 21.59375,-8.0625 -0.48001,-2.01501 -0.9575,-4.01625 -1.4375,-6.03125 -10e-6,0 12.6625,-10.08425 -5.1875,-7.78125 -17.85,2.304 -19.875,2.59375 -19.875,2.59375 -10e-6,0 -35.68075,5.46875 -35.96875,5.46875 -0.288,-1e-5 -9.80675,-2.8835 -0.59375,-5.1875 9.21302,-2.303 41.76225,-8.9155 46.65625,-7.1875 4.895,1.72699 -0.601,-12.0845 -17.875,-13.8125 -17.27402,-1.727 -27.90625,4.3125 -27.90625,4.3125 1e-5,0 -11.24,-4.045 -0.875,-7.5 10.36402,-3.45401 26.78125,1.15625 26.78125,1.15625 -10e-6,0 18.41525,-5.47825 3.15625,-7.78125 -15.259,-2.304 -20.0705,2.0715 -27.0625,2.3125 -2.79101,-3.484 23.956,-4.3065 25.625,-7.1875 -2.821,-5.184 -19.3695,0 -29.0625,0 -4.12299,-1.749 -4.39575,-4.59475 0.28125,-6.34375 9.88501,-0.384 19.1775,0.1965 29.0625,-0.1875 -0.28798,-5.278 0.007,-11.534504 -0.28125,-16.812504 -12.538,-2.290996 -27.24225,1.67775 -34.28125,1.34375 1.883,-5.758997 28.95475,-7.2455 31.96875,-8.8125 6.26898,-7.836003 -26.462,0 -26.75,0 -5.71299,-0.844003 -5.367,-4.455 -1.75,-6.625 8.349,-0.960002 27.07225,1.2235 25.65625,-4.4375 -1.08497,-5.304703 -12.981,-2.4645 -17.875,-1.3125 -4.89398,1.151001 -12.09375,0.28125 -12.09375,0.28125 -3.134,-4.219501 28.2245,-2.4949 27.9375,-5.75 -0.40898,-3.737301 -19.878,-1.163 -26.5,-0.875 -5.174,-3.5699 24.86175,-5.93515 25.34375,-6.34375 1.085,-9.570799 -20.1565,0 -24.1875,0 -4.03101,1e-6 -2,-6.03125 -2,-6.03125 1e-5,-2e-6 8.3505,-3.7367 8.0625,-4.3125 -0.288,-0.575797 -6.3615,-2.59375 -6.9375,-2.59375 -0.57499,-2e-6 0,-6.625 0,-6.625 1e-5,0 6.91975,-5.1855 6.34375,-6.625 -0.57601,-1.4396 -8.0625,1.15625 -8.0625,1.15625 0,-1.919399 0,-3.8306 0,-5.75 0,-1e-6 5.4865,-0.5964 6.0625,-3.1875 0.57601,-2.5912 -6.625,-2.875 -6.625,-2.875 -0.95998,-10.076599 -1.915,-20.14215 -2.875,-30.21875 z m -5.125,98.65625 v 4 c 2e-5,-1e-6 -9.87975,-0.4995 -7.46875,-2.1875 2.41099,-1.688002 7.46875,-1.4515 7.46875,-1.8125 z m 9.15625,5.3125 c 0.241,0 14.96401,0.107247 14,2.15625 -0.965,2.050004 -13.75,3.281254 -13.75,3.281254 z m -0.71875,7.843754 c 0.482,0.241 7.74127,0.36149 6.65625,1.6875 -1.085,1.326 -5.91525,1.6875 -6.15625,1.6875 -0.241,0 -0.50001,-3.37501 -0.5,-3.375 z m -35.90625,10.46875 c 4.66641,0.22186 12.449,1.48762 25.0625,4.96875 0,0.361 0.366,5.1835 0.125,5.0625 -0.241,-0.121 -27.968,-8.08875 -30.5,-7.96875 -1.58187,0.0756 -2.46485,-2.43227 5.3125,-2.0625 z m 11.25,11.78125 c 4.18797,-0.39733 16.09375,2.5355 16.09375,2.21875 -10e-6,0.965 0.62125,6.02225 -0.34375,5.78125 -0.96401,-0.241 -18.808,-5.90575 -17,-7.59375 0.226,-0.211 0.65172,-0.34949 1.25,-0.40625 z m 47.5625,11 c 2.13985,0.16387 3.28475,0.59475 2.53125,1.46875 -3.014,3.496 -23.84374,6.37499 -23.84375,6.375 l -0.375,-6.375 c -0.09,0 15.26797,-1.96038 21.6875,-1.46875 z m -63.03125,19.78125 c 3.63175,-0.12063 11.9165,1.87625 30,9.53125 l 0.125,4.59375 c 1e-5,0 -31.1025,-9.433 -32.1875,-11 -0.5425,-0.7835 -1.56925,-3.00438 2.0625,-3.125 z m 60.78125,6.84375 c 1.59371,-0.081 2.3795,0.18625 1.65625,1 -2.894,3.256 -18.4375,6.5 -18.4375,6.5 0,0 0,-4.09775 0,-4.21875 0,0.18075 12.00014,-3.03816 16.78125,-3.28125 z m -67.75,0.5625 c 4.85225,-0.0755 15.4025,2.55375 38.1875,13.34375 -10e-6,0.121 0.246,4.34375 0.125,4.34375 -0.12098,-1e-5 -42.3125,-14.84375 -42.3125,-14.84375 0,0 -0.85225,-2.76825 4,-2.84375 z m 76.5625,18.03125 c 2.4186,-0.18644 3.65325,-2.5e-4 2.71875,0.84375 -3.737,3.375 -27.70551,7.46875 -28.1875,7.46875 -0.482,0 0.21875,-3.85275 0.21875,-4.09375 0.2715,0.2715 17.99422,-3.65944 25.25,-4.21875 z m -67.34375,10.4375 c 8.2575,0.681 28.125,9.86825 28.125,9.6875 -0.12099,0.482 -0.129,4.71375 -0.25,4.59375 -0.11999,-0.121 -30.00875,-12.5225 -31.09375,-11.4375 -0.9925,-2.32576 0.46625,-3.07075 3.21875,-2.84375 z m 61.78125,2.53125 c 2.02872,-0.0791 3.1675,0.049 2.625,0.53125 -2.17,1.929 -22.3125,5.90625 -22.3125,5.90625 0,0 -0.0938,-3.73176 -0.0937,-4.09375 -0.2715,0 13.69509,-2.10652 19.78125,-2.34375 z m -1.84375,12.90625 c 1.81402,-0.0602 2.92751,0.079 2.65625,0.53125 -1.085,1.808 -19.40624,5.65625 -19.40625,5.65625 0,0 -0.46875,-4.09775 -0.46875,-4.21875 0,0.0907 11.77671,-1.7881 17.21875,-1.96875 z m -70.34375,1.03125 c 5.00188,0.23975 15.565,2.51075 37.8125,10.59375 l 0.84375,4.9375 c 1e-5,0 -43.27725,-13.96875 -43.15625,-13.96875 0.06,0 -0.50187,-1.80225 4.5,-1.5625 z m 53.5625,10.71875 c 0,0.121 10.05374,0.34325 8.96875,2.03125 -1.085,1.688 -8.43749,2.3125 -8.4375,2.3125 0,0 -0.36123,-3.30775 -0.53125,-4.34375 z m 18.75,9.6875 c 1.51453,0.177 1.9445,0.76449 0.4375,2 -6.028,4.943 -19.15624,5.90625 -19.15625,5.90625 0,0 1e-5,-5.31752 0,-5.4375 0,0.09 14.17516,-2.99976 18.71875,-2.46875 z m 15.96875,5 c 3.78662,0.12287 2.14949,2.06675 1.125,3.03125 -2.05,1.929 -34.71874,12.28125 -34.71875,12.28125 0,0 -0.24599,-6.86675 -0.125,-7.46875 20.719,-6.279 29.93213,-7.96663 33.71875,-7.84375 z m -23.8125,19.53125 c 3.77063,-0.264 6.76701,-0.15276 5.875,1.21875 -2.795,2.743 -16.37501,3.15625 -16.375,3.15625 v -3.40625 c 2.2055,-0.0745 6.72938,-0.70475 10.5,-0.96875 z m 14.125,5.625 c 2.1116,-0.24674 3.0125,-0.0582 1.65625,0.90625 -5.425,3.857 -25.81249,7.81249 -25.8125,7.8125 0,0 0.25401,-2.772 0.375,-3.375 0.18075,0.0908 17.44647,-4.60355 23.78125,-5.34375 z m 10.875,4.25 c 3.24755,-0.22164 5.74475,0.0623 7.03125,1 0.242,0 -0.93877,4.20123 -6.96875,5.90625 -6.751,-0.603 -35.56649,7.93748 -35.6875,7.9375 -0.12,0 0.34376,-3.50002 0.34375,-3.5 9.22275,-5.5155 25.53861,-10.67883 35.28125,-11.34375 z m -70.84375,16.40625 c 12.297,1.326 16.8895,5.92923 18.1875,7.78125 -2.741,4.81 -26.7335,-7.80925 -18.1875,-7.78125 z m 70.6875,0.84375 c 0.7988,0.0615 1.341,0.43449 1.40625,1.34375 -1.326,2.049 -8.375,1.0625 -8.375,1.0625 0,0.09 4.57236,-2.5909 6.96875,-2.40625 z m -27.84375,13.4375 c 1.00662,-0.10987 1.91544,-0.12999 2.5625,0 0.86275,0.17331 1.26351,0.627 0.78125,1.53125 -1.929,3.617 -10.37499,2.28124 -10.375,2.28125 v -2.53125 c 0.13556,0.13556 4.0114,-0.95165 7.03125,-1.28125 z m -48.59375,9.4375 c 2.56528,-0.0928 4.83175,1.58749 7.1875,2.9375 5.304,-1.085 16.18749,0.84375 16.1875,0.84375 0,0 -10e-6,4.45051 0,4.8125 0,0.241 -13.69123,-0.28026 -16.65625,-2.15625 -2.531,0 -10.13025,-4.08925 -9.40625,-5.65625 0.93825,-0.5 1.83241,-0.75032 2.6875,-0.78125 z m 55.46875,2.40625 c 2.18479,-0.17602 3.15874,0.382 1.53125,2.6875 -4.34,6.148 -15.56249,3.625 -15.5625,3.625 l -0.46875,-3.8125 c 3.86188,0.15062 10.85869,-2.20663 14.5,-2.5 z m -39.46875,12.5 c 3.79013,0.28099 7.25,1.53125 7.25,1.53125 0.121,0.241 2.65699,5.174 0.125,6.5 -2.532,1.326 -14.63376,-1.03625 -15.34375,-5.90625 1.085,-1.14525 2.55766,-1.72855 4.1875,-2 1.22239,-0.20359 2.51788,-0.21867 3.78125,-0.125 z m -46.875,2.40625 c 3.78718,0.50034 7.32675,2.57675 7.21875,2.46875 -1e-5,0.144 -0.15625,4.625 -0.15625,4.625 0,0 -8.2155,-2.29025 -10.8125,-6.90625 1.19026,-0.32451 2.48761,-0.35428 3.75,-0.1875 z m 77.25,0.53125 c 5.53804,0.0284 12.21748,1.57651 10.5,3.65625 -2.291,2.772 -15.31249,0.24998 -15.3125,0.25 v -3.375 c 1.23575,-0.3615 2.96649,-0.54074 4.8125,-0.53125 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#000000;fill-opacity:1" + transform="matrix(0.07059591,0,0,0.07059591,571.0972,609.345)" + id="g931"> + id="defs932" /> + inkscape:window-x="134" + inkscape:window-height="1085" + inkscape:window-width="1404" + inkscape:cy="238.500019" + inkscape:cx="420.999993" + inkscape:zoom="3.07667732" + id="namedview933" /> + inkscape:connector-curvature="0" + id="path934" + d="m 536.00321,-6.377304 c -0.86399,9.4048 -1.72975,18.81395 -2.59375,28.21875 -3.16698,0.479901 -6.333,0.9577 -9.5,1.4375 -10e-6,-1e-6 6.598,3.72605 7.75,7.46875 1.15101,3.742798 -8.0625,2.59375 -8.0625,2.59375 -10e-6,-10e-7 7.4865,6.35295 8.0625,8.65625 0.57501,2.3032 -10.34375,2.875 -10.34375,2.875 0,2e-6 9.20525,6.60105 9.78125,10.34375 0.576,3.7428 0,5.78125 0,5.78125 0,-2e-6 -15.2735,-13.2428 -25.0625,-9.5 -5.087,2.657699 11.659,3.88675 22.75,13.53125 -0.026,2.147797 -26.91525,-6.55905 -27.90625,-1.15625 0.62401,1.5037 28.71025,5.54495 30.78125,9.21875 -10.26899,0.384003 -31.48325,-2.2729 -30.78125,1.125 -2.14599,3.923003 20.03675,1.70725 29.34375,4.90625 2.72801,3.099998 2.46475,5.70425 -2.28125,6.03125 -8.97001,-4.288999 -29.04575,-7.476 -29.09375,-2 0.12199,1.461999 20.74275,0.51075 28.21875,5.46875 -9.979,2.269999 -43.81725,-4.605 -44.03125,-1.25 0.96399,1.566998 6.31825,8.44425 15.53125,8.15625 9.21302,-0.287998 30.52875,3.746 31.96875,6.625004 1.43901,2.87899 -27.65375,-6.057004 -38.59375,-0.875 -10.94001,5.183 31.37125,2.041 38.28125,8.375 6.91001,6.334 -13.8125,-0.59375 -13.8125,-0.59375 1e-5,0 -28.77575,-4.015 -33.09375,-2 -4.31901,2.01599 -9.21875,6.625 -9.21875,6.625 0,0 2.871,5.74475 5.75,4.59375 2.879,-1.152 -0.875,3.46875 -0.875,3.46875 -1e-5,0 40.325,9.76925 49.25,18.40625 8.92499,8.638 -51.25,-13.53125 -51.25,-13.53125 0,-10e-6 -24.1855,8.924 1.4375,9.5 -2.94799,4.313 1.4375,6.90625 1.4375,6.90625 0,0 42.6195,8.93375 46.9375,15.84375 4.319,6.90999 -29.0765,-6.633 -36.5625,-10.375 -7.48501,-3.74301 -28.788,2.311 -28.5,3.75 0.28801,1.44 10.36925,3.4715 10.65625,6.0625 0.288,2.591 -12.40625,3.447 -12.40625,5.75 -1e-5,2.304 53.855,13.533 68.25,25.625 14.39499,12.09199 -42.3125,-14.40625 -42.3125,-14.40625 10e-6,0 3.167,4.31675 0,5.46875 -3.16699,1.151 -14.41775,-16.12175 -32.84375,-5.46875 -3.356,4.383 16.08825,7.86175 21.03125,8.34375 -1.688,4.34 -3.16,5.77575 3.75,10.09375 6.90899,4.319 -13.53125,-6.35625 -13.53125,-5.78125 0,0.57599 1.4375,7.5 1.4375,7.5 -6.379,-5.182 -14.0895,-6.7445 -21.3125,-1.4375 -1e-5,0 -0.2975,5.17675 7.1875,8.34375 -4.087,8.351 4.6185,5.75825 18.4375,13.53125 -20.53899,-5.36801 -22.183,4.60325 -7.5,6.90625 14.68299,2.303 54.999,3.746 64.5,16.125 9.501,12.37999 -13.501,-4.7525 -16.125,-5.1875 -0.57599,0.288 -1.15625,6.34375 -1.15625,6.34375 -6.14201,-3.55502 -11.778,-6.744 -19.125,-8.25 -0.57599,1.15099 -0.45525,2.7865 -1.03125,3.9375 -6.667,-4.80802 -12.47525,-8.18825 -22.15625,-8.65625 -0.38399,1.53599 -0.77225,3.089 -1.15625,4.625 2e-5,-2e-5 -8.07125,-10.077 -23.90625,0 -8.84199,6.33898 33.4025,2.29525 40.3125,9.78125 6.91001,7.48501 1.4375,8.625 1.4375,8.625 -5.75799,-2.11101 -11.492,-4.2015 -17.25,-6.3125 0,0 -20.46075,-3.76225 -26.21875,0.84375 -5.758,4.607 84.06525,15.83875 86.65625,28.21875 1.74701,6.714 -21.104,-7.0305 -40.875,-12.9375 -0.768,2.20699 -1.5445,4.418 -2.3125,6.625 10e-6,-2e-5 -7.8405,-7.89275 -16.6875,-9.21875 -0.28799,0 1.71875,7.78125 1.71875,7.78125 -1e-5,10e-6 -22.147,-10.37625 -33.375,-4.90625 -11.22898,5.47 39.144,8.34825 43.75,13.53125 4.606,5.18199 -15.273,-3.455 -17,0 -1.72801,3.45499 -26.19425,-6.32475 -25.90625,-1.71875 0.28801,4.60698 3.46875,7.1875 3.46875,7.1875 -1e-5,-2e-5 50.9595,4.8915 52.6875,10.9375 1.72701,6.04598 -28.21875,-3.4375 -28.21875,-3.4375 10e-6,0 -2.89675,4.2975 -0.59375,6.3125 2.303,2.01598 -17.25825,-11.51875 -15.53125,-2.59375 -6.34901,-2.52801 -22.7405,-10.3585 -20.4375,-4.3125 2.303,6.04601 46.34375,14.6875 46.34375,14.6875 10e-6,0 -19.3015,1.44875 -18.4375,6.34375 -24.815,-15.11802 -24.16975,-5.4755 -23.59375,-5.1875 0.576,0.288 -31.971,-8.0565 -7.5,5.1875 24.47199,13.24298 13.24325,10.93075 13.53125,11.21875 0.28801,0.28799 2.60725,6.625 2.03125,6.625 -0.576,10e-6 -16.68625,-8.64375 -22.15625,-9.21875 -5.471,-0.57601 -31.389,7.18925 -3.75,19.28125 27.63901,12.09199 44.616,-2.88425 59.875,-1.15625 15.25901,1.72699 22.47025,4.32375 21.03125,9.21875 -1.43999,4.89401 -15.609,-16.0455 -30.5,2.0625 -16.93899,-3.35199 -28.4315,-5.29175 -19.6875,7.15625 -27.66301,-10.33799 -44.55575,3.154 -9.71875,8.625 34.23301,1.009 55.28125,-8.34375 55.28125,-8.34375 0,10e-6 5.775,10.6735 14.125,3.1875 8.349,-7.48502 8.61825,2.875 8.90625,2.875 0.28701,-1e-5 8.0625,-3.46875 8.0625,-3.46875 0.67201,0 1.35925,0 2.03125,0 -10e-6,23.032 0,46.06175 0,69.09375 9.30899,0.096 18.59725,0.18525 27.90625,0.28125 -10e-6,-1e-5 -8.92525,-60.15775 -4.03125,-68.21875 4.895,-8.061 9.5,-6.90625 9.5,-6.90625 -10e-6,0 18.14125,5.45775 20.15625,4.59375 2.01598,-0.864 -0.289,-6.89525 9.5,-6.03125 3.167,-1.15201 1.46475,-6.61825 4.34375,-6.90625 2.87903,-0.288 58.43925,15.5335 70.53125,0.5625 -3.16698,-8.34899 -14.121,-0.56925 -17,-0.28125 -2.59102,0 -13.54,-5.182 -19.875,0 -5.75799,-4.318 -31.9375,-7.1875 -31.9375,-7.1875 -3.45502,-3.455 62.47575,1.716 66.21875,-0.875 7.77302,-7.77399 -14.38875,-6.9035 -17.84375,-4.3125 -6.142,-3.74299 -13.8595,-3.466 -18.5625,-0.875 -2.25501,-5.39402 -23.6625,-3.05775 -35.5625,-4.59375 -3.80903,-2.23399 -3.17475,-3.51625 -0.59375,-4.90625 24.85602,1.05599 49.5855,4.3015 74.5625,3.1875 6.75101,-8.801 -8.49875,-12.12 -17.84375,-4.625 -5.48602,-9.02201 -16.7015,-0.29325 -24.1875,-1.15625 -7.485,-0.864 -4.03125,-10.064 5.46875,-8.625 9.50103,1.44 26.48925,-0.58725 29.65625,-4.90625 3.166,-4.31799 -1.8905,-8.69275 -17.5625,-4.59375 -5.30401,-5.184 -16.9675,-0.008 -22.4375,1.71875 -7.27801,-4.05999 -24.21075,-0.565 -29.96875,0.875 -5.637,-3.50401 29.65625,-9.21875 29.65625,-9.21875 13.62301,-0.241 21.307,-2.598 25.625,-3.75 20.59402,-11.03801 -0.28675,-12.2105 -11.09375,-4.1875 -6.70799,-5.237 -13.079,0.45275 -19.125,2.46875 -6.04597,2.01501 -17.5625,3.45775 -17.5625,2.59375 2e-5,-0.864 16.40625,-10.9375 16.40625,-10.9375 1e-5,-2e-5 20.1565,-1.45525 24.1875,-2.03125 4.03098,-0.576 24.64525,-11.16325 -3.46875,-4.03125 -9.789,0.864 -15.53825,0.30575 -19.28125,0.59375 -21.70502,-2.24402 2.03125,-4.34375 2.03125,-4.34375 -10e-6,10e-6 30.73175,-2.8185 31.09375,-4.3125 0.60303,-11.98199 -25.05575,-6.3125 -25.34375,-6.3125 0.074,-8.56001 -23.90625,0.288 -23.90625,0 -4.58101,-2.69901 2.59375,-5.46875 2.59375,-5.46875 6.33399,-1.53501 15.80425,-2.01425 18.28125,-4.03125 -10e-6,-2e-5 17.877,-0.15725 20,-4.90625 -4.38697,-12.10299 -37.8335,2.1425 -42.3125,4.3125 -6.04601,1e-5 4.0245,-9.7745 4.3125,-10.0625 0.28802,-0.28799 27.63875,-1.437 40.59375,-19 0.90003,-10.69001 -15.25,6.03125 -15.25,6.03125 -1.206,-13.864 -17.5615,0.87925 -27.0625,2.03125 -9.50001,1.15099 -9.77825,-4.3235 -3.15625,-5.1875 6.621,-0.86301 14.10075,-0.298 17.84375,-10.375 3.74203,-10.07701 14.985,0.58675 17,-3.15625 2.01501,-3.743 -4.03125,-6.90625 -4.03125,-6.90625 1e-5,0 8.3435,-8.663 -5.1875,-8.375 -13.53198,0.288 -31.09375,-1.71875 -31.09375,-1.71875 1e-5,-1e-5 14.10075,-5.4755 27.34375,-5.1875 13.244,0.28799 6.043,-9.5 -6.625,-9.5 -12.66699,-1e-5 -19.28125,-4.3125 -19.28125,-4.3125 7.19801,-2.68701 14.39575,-5.3755 21.59375,-8.0625 -0.48001,-2.01501 -0.9575,-4.01625 -1.4375,-6.03125 -10e-6,0 12.6625,-10.08425 -5.1875,-7.78125 -17.85,2.304 -19.875,2.59375 -19.875,2.59375 -10e-6,0 -35.68075,5.46875 -35.96875,5.46875 -0.288,-1e-5 -9.80675,-2.8835 -0.59375,-5.1875 9.21302,-2.303 41.76225,-8.9155 46.65625,-7.1875 4.895,1.72699 -0.601,-12.0845 -17.875,-13.8125 -17.27402,-1.727 -27.90625,4.3125 -27.90625,4.3125 1e-5,0 -11.24,-4.045 -0.875,-7.5 10.36402,-3.45401 26.78125,1.15625 26.78125,1.15625 -10e-6,0 18.41525,-5.47825 3.15625,-7.78125 -15.259,-2.304 -20.0705,2.0715 -27.0625,2.3125 -2.79101,-3.484 23.956,-4.3065 25.625,-7.1875 -2.821,-5.184 -19.3695,0 -29.0625,0 -4.12299,-1.749 -4.39575,-4.59475 0.28125,-6.34375 9.88501,-0.384 19.1775,0.1965 29.0625,-0.1875 -0.28798,-5.278 0.007,-11.534504 -0.28125,-16.812504 -12.538,-2.290996 -27.24225,1.67775 -34.28125,1.34375 1.883,-5.758997 28.95475,-7.2455 31.96875,-8.8125 6.26898,-7.836003 -26.462,0 -26.75,0 -5.71299,-0.844003 -5.367,-4.455 -1.75,-6.625 8.349,-0.960002 27.07225,1.2235 25.65625,-4.4375 -1.08497,-5.304703 -12.981,-2.4645 -17.875,-1.3125 -4.89398,1.151001 -12.09375,0.28125 -12.09375,0.28125 -3.134,-4.219501 28.2245,-2.4949 27.9375,-5.75 -0.40898,-3.737301 -19.878,-1.163 -26.5,-0.875 -5.174,-3.5699 24.86175,-5.93515 25.34375,-6.34375 1.085,-9.570799 -20.1565,0 -24.1875,0 -4.03101,1e-6 -2,-6.03125 -2,-6.03125 1e-5,-2e-6 8.3505,-3.7367 8.0625,-4.3125 -0.288,-0.575797 -6.3615,-2.59375 -6.9375,-2.59375 -0.57499,-2e-6 0,-6.625 0,-6.625 1e-5,0 6.91975,-5.1855 6.34375,-6.625 -0.57601,-1.4396 -8.0625,1.15625 -8.0625,1.15625 0,-1.919399 0,-3.8306 0,-5.75 0,-1e-6 5.4865,-0.5964 6.0625,-3.1875 0.57601,-2.5912 -6.625,-2.875 -6.625,-2.875 -0.95998,-10.076599 -1.915,-20.14215 -2.875,-30.21875 z m -5.125,98.65625 v 4 c 2e-5,-1e-6 -9.87975,-0.4995 -7.46875,-2.1875 2.41099,-1.688002 7.46875,-1.4515 7.46875,-1.8125 z m 9.15625,5.3125 c 0.241,0 14.96401,0.107247 14,2.15625 -0.965,2.050004 -13.75,3.281254 -13.75,3.281254 z m -0.71875,7.843754 c 0.482,0.241 7.74127,0.36149 6.65625,1.6875 -1.085,1.326 -5.91525,1.6875 -6.15625,1.6875 -0.241,0 -0.50001,-3.37501 -0.5,-3.375 z m -35.90625,10.46875 c 4.66641,0.22186 12.449,1.48762 25.0625,4.96875 0,0.361 0.366,5.1835 0.125,5.0625 -0.241,-0.121 -27.968,-8.08875 -30.5,-7.96875 -1.58187,0.0756 -2.46485,-2.43227 5.3125,-2.0625 z m 11.25,11.78125 c 4.18797,-0.39733 16.09375,2.5355 16.09375,2.21875 -10e-6,0.965 0.62125,6.02225 -0.34375,5.78125 -0.96401,-0.241 -18.808,-5.90575 -17,-7.59375 0.226,-0.211 0.65172,-0.34949 1.25,-0.40625 z m 47.5625,11 c 2.13985,0.16387 3.28475,0.59475 2.53125,1.46875 -3.014,3.496 -23.84374,6.37499 -23.84375,6.375 l -0.375,-6.375 c -0.09,0 15.26797,-1.96038 21.6875,-1.46875 z m -63.03125,19.78125 c 3.63175,-0.12063 11.9165,1.87625 30,9.53125 l 0.125,4.59375 c 1e-5,0 -31.1025,-9.433 -32.1875,-11 -0.5425,-0.7835 -1.56925,-3.00438 2.0625,-3.125 z m 60.78125,6.84375 c 1.59371,-0.081 2.3795,0.18625 1.65625,1 -2.894,3.256 -18.4375,6.5 -18.4375,6.5 0,0 0,-4.09775 0,-4.21875 0,0.18075 12.00014,-3.03816 16.78125,-3.28125 z m -67.75,0.5625 c 4.85225,-0.0755 15.4025,2.55375 38.1875,13.34375 -10e-6,0.121 0.246,4.34375 0.125,4.34375 -0.12098,-1e-5 -42.3125,-14.84375 -42.3125,-14.84375 0,0 -0.85225,-2.76825 4,-2.84375 z m 76.5625,18.03125 c 2.4186,-0.18644 3.65325,-2.5e-4 2.71875,0.84375 -3.737,3.375 -27.70551,7.46875 -28.1875,7.46875 -0.482,0 0.21875,-3.85275 0.21875,-4.09375 0.2715,0.2715 17.99422,-3.65944 25.25,-4.21875 z m -67.34375,10.4375 c 8.2575,0.681 28.125,9.86825 28.125,9.6875 -0.12099,0.482 -0.129,4.71375 -0.25,4.59375 -0.11999,-0.121 -30.00875,-12.5225 -31.09375,-11.4375 -0.9925,-2.32576 0.46625,-3.07075 3.21875,-2.84375 z m 61.78125,2.53125 c 2.02872,-0.0791 3.1675,0.049 2.625,0.53125 -2.17,1.929 -22.3125,5.90625 -22.3125,5.90625 0,0 -0.0938,-3.73176 -0.0937,-4.09375 -0.2715,0 13.69509,-2.10652 19.78125,-2.34375 z m -1.84375,12.90625 c 1.81402,-0.0602 2.92751,0.079 2.65625,0.53125 -1.085,1.808 -19.40624,5.65625 -19.40625,5.65625 0,0 -0.46875,-4.09775 -0.46875,-4.21875 0,0.0907 11.77671,-1.7881 17.21875,-1.96875 z m -70.34375,1.03125 c 5.00188,0.23975 15.565,2.51075 37.8125,10.59375 l 0.84375,4.9375 c 1e-5,0 -43.27725,-13.96875 -43.15625,-13.96875 0.06,0 -0.50187,-1.80225 4.5,-1.5625 z m 53.5625,10.71875 c 0,0.121 10.05374,0.34325 8.96875,2.03125 -1.085,1.688 -8.43749,2.3125 -8.4375,2.3125 0,0 -0.36123,-3.30775 -0.53125,-4.34375 z m 18.75,9.6875 c 1.51453,0.177 1.9445,0.76449 0.4375,2 -6.028,4.943 -19.15624,5.90625 -19.15625,5.90625 0,0 1e-5,-5.31752 0,-5.4375 0,0.09 14.17516,-2.99976 18.71875,-2.46875 z m 15.96875,5 c 3.78662,0.12287 2.14949,2.06675 1.125,3.03125 -2.05,1.929 -34.71874,12.28125 -34.71875,12.28125 0,0 -0.24599,-6.86675 -0.125,-7.46875 20.719,-6.279 29.93213,-7.96663 33.71875,-7.84375 z m -23.8125,19.53125 c 3.77063,-0.264 6.76701,-0.15276 5.875,1.21875 -2.795,2.743 -16.37501,3.15625 -16.375,3.15625 v -3.40625 c 2.2055,-0.0745 6.72938,-0.70475 10.5,-0.96875 z m 14.125,5.625 c 2.1116,-0.24674 3.0125,-0.0582 1.65625,0.90625 -5.425,3.857 -25.81249,7.81249 -25.8125,7.8125 0,0 0.25401,-2.772 0.375,-3.375 0.18075,0.0908 17.44647,-4.60355 23.78125,-5.34375 z m 10.875,4.25 c 3.24755,-0.22164 5.74475,0.0623 7.03125,1 0.242,0 -0.93877,4.20123 -6.96875,5.90625 -6.751,-0.603 -35.56649,7.93748 -35.6875,7.9375 -0.12,0 0.34376,-3.50002 0.34375,-3.5 9.22275,-5.5155 25.53861,-10.67883 35.28125,-11.34375 z m -70.84375,16.40625 c 12.297,1.326 16.8895,5.92923 18.1875,7.78125 -2.741,4.81 -26.7335,-7.80925 -18.1875,-7.78125 z m 70.6875,0.84375 c 0.7988,0.0615 1.341,0.43449 1.40625,1.34375 -1.326,2.049 -8.375,1.0625 -8.375,1.0625 0,0.09 4.57236,-2.5909 6.96875,-2.40625 z m -27.84375,13.4375 c 1.00662,-0.10987 1.91544,-0.12999 2.5625,0 0.86275,0.17331 1.26351,0.627 0.78125,1.53125 -1.929,3.617 -10.37499,2.28124 -10.375,2.28125 v -2.53125 c 0.13556,0.13556 4.0114,-0.95165 7.03125,-1.28125 z m -48.59375,9.4375 c 2.56528,-0.0928 4.83175,1.58749 7.1875,2.9375 5.304,-1.085 16.18749,0.84375 16.1875,0.84375 0,0 -10e-6,4.45051 0,4.8125 0,0.241 -13.69123,-0.28026 -16.65625,-2.15625 -2.531,0 -10.13025,-4.08925 -9.40625,-5.65625 0.93825,-0.5 1.83241,-0.75032 2.6875,-0.78125 z m 55.46875,2.40625 c 2.18479,-0.17602 3.15874,0.382 1.53125,2.6875 -4.34,6.148 -15.56249,3.625 -15.5625,3.625 l -0.46875,-3.8125 c 3.86188,0.15062 10.85869,-2.20663 14.5,-2.5 z m -39.46875,12.5 c 3.79013,0.28099 7.25,1.53125 7.25,1.53125 0.121,0.241 2.65699,5.174 0.125,6.5 -2.532,1.326 -14.63376,-1.03625 -15.34375,-5.90625 1.085,-1.14525 2.55766,-1.72855 4.1875,-2 1.22239,-0.20359 2.51788,-0.21867 3.78125,-0.125 z m -46.875,2.40625 c 3.78718,0.50034 7.32675,2.57675 7.21875,2.46875 -1e-5,0.144 -0.15625,4.625 -0.15625,4.625 0,0 -8.2155,-2.29025 -10.8125,-6.90625 1.19026,-0.32451 2.48761,-0.35428 3.75,-0.1875 z m 77.25,0.53125 c 5.53804,0.0284 12.21748,1.57651 10.5,3.65625 -2.291,2.772 -15.31249,0.24998 -15.3125,0.25 v -3.375 c 1.23575,-0.3615 2.96649,-0.54074 4.8125,-0.53125 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#000000;fill-opacity:1" + transform="matrix(0.07059591,0,0,0.07059591,601.0972,614.345)" + id="g935"> + id="defs936" /> + inkscape:window-x="134" + inkscape:window-height="1085" + inkscape:window-width="1404" + inkscape:cy="238.500019" + inkscape:cx="420.999993" + inkscape:zoom="3.07667732" + id="namedview937" /> + inkscape:connector-curvature="0" + id="path938" + d="m 536.00321,-6.377304 c -0.86399,9.4048 -1.72975,18.81395 -2.59375,28.21875 -3.16698,0.479901 -6.333,0.9577 -9.5,1.4375 -10e-6,-1e-6 6.598,3.72605 7.75,7.46875 1.15101,3.742798 -8.0625,2.59375 -8.0625,2.59375 -10e-6,-10e-7 7.4865,6.35295 8.0625,8.65625 0.57501,2.3032 -10.34375,2.875 -10.34375,2.875 0,2e-6 9.20525,6.60105 9.78125,10.34375 0.576,3.7428 0,5.78125 0,5.78125 0,-2e-6 -15.2735,-13.2428 -25.0625,-9.5 -5.087,2.657699 11.659,3.88675 22.75,13.53125 -0.026,2.147797 -26.91525,-6.55905 -27.90625,-1.15625 0.62401,1.5037 28.71025,5.54495 30.78125,9.21875 -10.26899,0.384003 -31.48325,-2.2729 -30.78125,1.125 -2.14599,3.923003 20.03675,1.70725 29.34375,4.90625 2.72801,3.099998 2.46475,5.70425 -2.28125,6.03125 -8.97001,-4.288999 -29.04575,-7.476 -29.09375,-2 0.12199,1.461999 20.74275,0.51075 28.21875,5.46875 -9.979,2.269999 -43.81725,-4.605 -44.03125,-1.25 0.96399,1.566998 6.31825,8.44425 15.53125,8.15625 9.21302,-0.287998 30.52875,3.746 31.96875,6.625004 1.43901,2.87899 -27.65375,-6.057004 -38.59375,-0.875 -10.94001,5.183 31.37125,2.041 38.28125,8.375 6.91001,6.334 -13.8125,-0.59375 -13.8125,-0.59375 1e-5,0 -28.77575,-4.015 -33.09375,-2 -4.31901,2.01599 -9.21875,6.625 -9.21875,6.625 0,0 2.871,5.74475 5.75,4.59375 2.879,-1.152 -0.875,3.46875 -0.875,3.46875 -1e-5,0 40.325,9.76925 49.25,18.40625 8.92499,8.638 -51.25,-13.53125 -51.25,-13.53125 0,-10e-6 -24.1855,8.924 1.4375,9.5 -2.94799,4.313 1.4375,6.90625 1.4375,6.90625 0,0 42.6195,8.93375 46.9375,15.84375 4.319,6.90999 -29.0765,-6.633 -36.5625,-10.375 -7.48501,-3.74301 -28.788,2.311 -28.5,3.75 0.28801,1.44 10.36925,3.4715 10.65625,6.0625 0.288,2.591 -12.40625,3.447 -12.40625,5.75 -1e-5,2.304 53.855,13.533 68.25,25.625 14.39499,12.09199 -42.3125,-14.40625 -42.3125,-14.40625 10e-6,0 3.167,4.31675 0,5.46875 -3.16699,1.151 -14.41775,-16.12175 -32.84375,-5.46875 -3.356,4.383 16.08825,7.86175 21.03125,8.34375 -1.688,4.34 -3.16,5.77575 3.75,10.09375 6.90899,4.319 -13.53125,-6.35625 -13.53125,-5.78125 0,0.57599 1.4375,7.5 1.4375,7.5 -6.379,-5.182 -14.0895,-6.7445 -21.3125,-1.4375 -1e-5,0 -0.2975,5.17675 7.1875,8.34375 -4.087,8.351 4.6185,5.75825 18.4375,13.53125 -20.53899,-5.36801 -22.183,4.60325 -7.5,6.90625 14.68299,2.303 54.999,3.746 64.5,16.125 9.501,12.37999 -13.501,-4.7525 -16.125,-5.1875 -0.57599,0.288 -1.15625,6.34375 -1.15625,6.34375 -6.14201,-3.55502 -11.778,-6.744 -19.125,-8.25 -0.57599,1.15099 -0.45525,2.7865 -1.03125,3.9375 -6.667,-4.80802 -12.47525,-8.18825 -22.15625,-8.65625 -0.38399,1.53599 -0.77225,3.089 -1.15625,4.625 2e-5,-2e-5 -8.07125,-10.077 -23.90625,0 -8.84199,6.33898 33.4025,2.29525 40.3125,9.78125 6.91001,7.48501 1.4375,8.625 1.4375,8.625 -5.75799,-2.11101 -11.492,-4.2015 -17.25,-6.3125 0,0 -20.46075,-3.76225 -26.21875,0.84375 -5.758,4.607 84.06525,15.83875 86.65625,28.21875 1.74701,6.714 -21.104,-7.0305 -40.875,-12.9375 -0.768,2.20699 -1.5445,4.418 -2.3125,6.625 10e-6,-2e-5 -7.8405,-7.89275 -16.6875,-9.21875 -0.28799,0 1.71875,7.78125 1.71875,7.78125 -1e-5,10e-6 -22.147,-10.37625 -33.375,-4.90625 -11.22898,5.47 39.144,8.34825 43.75,13.53125 4.606,5.18199 -15.273,-3.455 -17,0 -1.72801,3.45499 -26.19425,-6.32475 -25.90625,-1.71875 0.28801,4.60698 3.46875,7.1875 3.46875,7.1875 -1e-5,-2e-5 50.9595,4.8915 52.6875,10.9375 1.72701,6.04598 -28.21875,-3.4375 -28.21875,-3.4375 10e-6,0 -2.89675,4.2975 -0.59375,6.3125 2.303,2.01598 -17.25825,-11.51875 -15.53125,-2.59375 -6.34901,-2.52801 -22.7405,-10.3585 -20.4375,-4.3125 2.303,6.04601 46.34375,14.6875 46.34375,14.6875 10e-6,0 -19.3015,1.44875 -18.4375,6.34375 -24.815,-15.11802 -24.16975,-5.4755 -23.59375,-5.1875 0.576,0.288 -31.971,-8.0565 -7.5,5.1875 24.47199,13.24298 13.24325,10.93075 13.53125,11.21875 0.28801,0.28799 2.60725,6.625 2.03125,6.625 -0.576,10e-6 -16.68625,-8.64375 -22.15625,-9.21875 -5.471,-0.57601 -31.389,7.18925 -3.75,19.28125 27.63901,12.09199 44.616,-2.88425 59.875,-1.15625 15.25901,1.72699 22.47025,4.32375 21.03125,9.21875 -1.43999,4.89401 -15.609,-16.0455 -30.5,2.0625 -16.93899,-3.35199 -28.4315,-5.29175 -19.6875,7.15625 -27.66301,-10.33799 -44.55575,3.154 -9.71875,8.625 34.23301,1.009 55.28125,-8.34375 55.28125,-8.34375 0,10e-6 5.775,10.6735 14.125,3.1875 8.349,-7.48502 8.61825,2.875 8.90625,2.875 0.28701,-1e-5 8.0625,-3.46875 8.0625,-3.46875 0.67201,0 1.35925,0 2.03125,0 -10e-6,23.032 0,46.06175 0,69.09375 9.30899,0.096 18.59725,0.18525 27.90625,0.28125 -10e-6,-1e-5 -8.92525,-60.15775 -4.03125,-68.21875 4.895,-8.061 9.5,-6.90625 9.5,-6.90625 -10e-6,0 18.14125,5.45775 20.15625,4.59375 2.01598,-0.864 -0.289,-6.89525 9.5,-6.03125 3.167,-1.15201 1.46475,-6.61825 4.34375,-6.90625 2.87903,-0.288 58.43925,15.5335 70.53125,0.5625 -3.16698,-8.34899 -14.121,-0.56925 -17,-0.28125 -2.59102,0 -13.54,-5.182 -19.875,0 -5.75799,-4.318 -31.9375,-7.1875 -31.9375,-7.1875 -3.45502,-3.455 62.47575,1.716 66.21875,-0.875 7.77302,-7.77399 -14.38875,-6.9035 -17.84375,-4.3125 -6.142,-3.74299 -13.8595,-3.466 -18.5625,-0.875 -2.25501,-5.39402 -23.6625,-3.05775 -35.5625,-4.59375 -3.80903,-2.23399 -3.17475,-3.51625 -0.59375,-4.90625 24.85602,1.05599 49.5855,4.3015 74.5625,3.1875 6.75101,-8.801 -8.49875,-12.12 -17.84375,-4.625 -5.48602,-9.02201 -16.7015,-0.29325 -24.1875,-1.15625 -7.485,-0.864 -4.03125,-10.064 5.46875,-8.625 9.50103,1.44 26.48925,-0.58725 29.65625,-4.90625 3.166,-4.31799 -1.8905,-8.69275 -17.5625,-4.59375 -5.30401,-5.184 -16.9675,-0.008 -22.4375,1.71875 -7.27801,-4.05999 -24.21075,-0.565 -29.96875,0.875 -5.637,-3.50401 29.65625,-9.21875 29.65625,-9.21875 13.62301,-0.241 21.307,-2.598 25.625,-3.75 20.59402,-11.03801 -0.28675,-12.2105 -11.09375,-4.1875 -6.70799,-5.237 -13.079,0.45275 -19.125,2.46875 -6.04597,2.01501 -17.5625,3.45775 -17.5625,2.59375 2e-5,-0.864 16.40625,-10.9375 16.40625,-10.9375 1e-5,-2e-5 20.1565,-1.45525 24.1875,-2.03125 4.03098,-0.576 24.64525,-11.16325 -3.46875,-4.03125 -9.789,0.864 -15.53825,0.30575 -19.28125,0.59375 -21.70502,-2.24402 2.03125,-4.34375 2.03125,-4.34375 -10e-6,10e-6 30.73175,-2.8185 31.09375,-4.3125 0.60303,-11.98199 -25.05575,-6.3125 -25.34375,-6.3125 0.074,-8.56001 -23.90625,0.288 -23.90625,0 -4.58101,-2.69901 2.59375,-5.46875 2.59375,-5.46875 6.33399,-1.53501 15.80425,-2.01425 18.28125,-4.03125 -10e-6,-2e-5 17.877,-0.15725 20,-4.90625 -4.38697,-12.10299 -37.8335,2.1425 -42.3125,4.3125 -6.04601,1e-5 4.0245,-9.7745 4.3125,-10.0625 0.28802,-0.28799 27.63875,-1.437 40.59375,-19 0.90003,-10.69001 -15.25,6.03125 -15.25,6.03125 -1.206,-13.864 -17.5615,0.87925 -27.0625,2.03125 -9.50001,1.15099 -9.77825,-4.3235 -3.15625,-5.1875 6.621,-0.86301 14.10075,-0.298 17.84375,-10.375 3.74203,-10.07701 14.985,0.58675 17,-3.15625 2.01501,-3.743 -4.03125,-6.90625 -4.03125,-6.90625 1e-5,0 8.3435,-8.663 -5.1875,-8.375 -13.53198,0.288 -31.09375,-1.71875 -31.09375,-1.71875 1e-5,-1e-5 14.10075,-5.4755 27.34375,-5.1875 13.244,0.28799 6.043,-9.5 -6.625,-9.5 -12.66699,-1e-5 -19.28125,-4.3125 -19.28125,-4.3125 7.19801,-2.68701 14.39575,-5.3755 21.59375,-8.0625 -0.48001,-2.01501 -0.9575,-4.01625 -1.4375,-6.03125 -10e-6,0 12.6625,-10.08425 -5.1875,-7.78125 -17.85,2.304 -19.875,2.59375 -19.875,2.59375 -10e-6,0 -35.68075,5.46875 -35.96875,5.46875 -0.288,-1e-5 -9.80675,-2.8835 -0.59375,-5.1875 9.21302,-2.303 41.76225,-8.9155 46.65625,-7.1875 4.895,1.72699 -0.601,-12.0845 -17.875,-13.8125 -17.27402,-1.727 -27.90625,4.3125 -27.90625,4.3125 1e-5,0 -11.24,-4.045 -0.875,-7.5 10.36402,-3.45401 26.78125,1.15625 26.78125,1.15625 -10e-6,0 18.41525,-5.47825 3.15625,-7.78125 -15.259,-2.304 -20.0705,2.0715 -27.0625,2.3125 -2.79101,-3.484 23.956,-4.3065 25.625,-7.1875 -2.821,-5.184 -19.3695,0 -29.0625,0 -4.12299,-1.749 -4.39575,-4.59475 0.28125,-6.34375 9.88501,-0.384 19.1775,0.1965 29.0625,-0.1875 -0.28798,-5.278 0.007,-11.534504 -0.28125,-16.812504 -12.538,-2.290996 -27.24225,1.67775 -34.28125,1.34375 1.883,-5.758997 28.95475,-7.2455 31.96875,-8.8125 6.26898,-7.836003 -26.462,0 -26.75,0 -5.71299,-0.844003 -5.367,-4.455 -1.75,-6.625 8.349,-0.960002 27.07225,1.2235 25.65625,-4.4375 -1.08497,-5.304703 -12.981,-2.4645 -17.875,-1.3125 -4.89398,1.151001 -12.09375,0.28125 -12.09375,0.28125 -3.134,-4.219501 28.2245,-2.4949 27.9375,-5.75 -0.40898,-3.737301 -19.878,-1.163 -26.5,-0.875 -5.174,-3.5699 24.86175,-5.93515 25.34375,-6.34375 1.085,-9.570799 -20.1565,0 -24.1875,0 -4.03101,1e-6 -2,-6.03125 -2,-6.03125 1e-5,-2e-6 8.3505,-3.7367 8.0625,-4.3125 -0.288,-0.575797 -6.3615,-2.59375 -6.9375,-2.59375 -0.57499,-2e-6 0,-6.625 0,-6.625 1e-5,0 6.91975,-5.1855 6.34375,-6.625 -0.57601,-1.4396 -8.0625,1.15625 -8.0625,1.15625 0,-1.919399 0,-3.8306 0,-5.75 0,-1e-6 5.4865,-0.5964 6.0625,-3.1875 0.57601,-2.5912 -6.625,-2.875 -6.625,-2.875 -0.95998,-10.076599 -1.915,-20.14215 -2.875,-30.21875 z m -5.125,98.65625 v 4 c 2e-5,-1e-6 -9.87975,-0.4995 -7.46875,-2.1875 2.41099,-1.688002 7.46875,-1.4515 7.46875,-1.8125 z m 9.15625,5.3125 c 0.241,0 14.96401,0.107247 14,2.15625 -0.965,2.050004 -13.75,3.281254 -13.75,3.281254 z m -0.71875,7.843754 c 0.482,0.241 7.74127,0.36149 6.65625,1.6875 -1.085,1.326 -5.91525,1.6875 -6.15625,1.6875 -0.241,0 -0.50001,-3.37501 -0.5,-3.375 z m -35.90625,10.46875 c 4.66641,0.22186 12.449,1.48762 25.0625,4.96875 0,0.361 0.366,5.1835 0.125,5.0625 -0.241,-0.121 -27.968,-8.08875 -30.5,-7.96875 -1.58187,0.0756 -2.46485,-2.43227 5.3125,-2.0625 z m 11.25,11.78125 c 4.18797,-0.39733 16.09375,2.5355 16.09375,2.21875 -10e-6,0.965 0.62125,6.02225 -0.34375,5.78125 -0.96401,-0.241 -18.808,-5.90575 -17,-7.59375 0.226,-0.211 0.65172,-0.34949 1.25,-0.40625 z m 47.5625,11 c 2.13985,0.16387 3.28475,0.59475 2.53125,1.46875 -3.014,3.496 -23.84374,6.37499 -23.84375,6.375 l -0.375,-6.375 c -0.09,0 15.26797,-1.96038 21.6875,-1.46875 z m -63.03125,19.78125 c 3.63175,-0.12063 11.9165,1.87625 30,9.53125 l 0.125,4.59375 c 1e-5,0 -31.1025,-9.433 -32.1875,-11 -0.5425,-0.7835 -1.56925,-3.00438 2.0625,-3.125 z m 60.78125,6.84375 c 1.59371,-0.081 2.3795,0.18625 1.65625,1 -2.894,3.256 -18.4375,6.5 -18.4375,6.5 0,0 0,-4.09775 0,-4.21875 0,0.18075 12.00014,-3.03816 16.78125,-3.28125 z m -67.75,0.5625 c 4.85225,-0.0755 15.4025,2.55375 38.1875,13.34375 -10e-6,0.121 0.246,4.34375 0.125,4.34375 -0.12098,-1e-5 -42.3125,-14.84375 -42.3125,-14.84375 0,0 -0.85225,-2.76825 4,-2.84375 z m 76.5625,18.03125 c 2.4186,-0.18644 3.65325,-2.5e-4 2.71875,0.84375 -3.737,3.375 -27.70551,7.46875 -28.1875,7.46875 -0.482,0 0.21875,-3.85275 0.21875,-4.09375 0.2715,0.2715 17.99422,-3.65944 25.25,-4.21875 z m -67.34375,10.4375 c 8.2575,0.681 28.125,9.86825 28.125,9.6875 -0.12099,0.482 -0.129,4.71375 -0.25,4.59375 -0.11999,-0.121 -30.00875,-12.5225 -31.09375,-11.4375 -0.9925,-2.32576 0.46625,-3.07075 3.21875,-2.84375 z m 61.78125,2.53125 c 2.02872,-0.0791 3.1675,0.049 2.625,0.53125 -2.17,1.929 -22.3125,5.90625 -22.3125,5.90625 0,0 -0.0938,-3.73176 -0.0937,-4.09375 -0.2715,0 13.69509,-2.10652 19.78125,-2.34375 z m -1.84375,12.90625 c 1.81402,-0.0602 2.92751,0.079 2.65625,0.53125 -1.085,1.808 -19.40624,5.65625 -19.40625,5.65625 0,0 -0.46875,-4.09775 -0.46875,-4.21875 0,0.0907 11.77671,-1.7881 17.21875,-1.96875 z m -70.34375,1.03125 c 5.00188,0.23975 15.565,2.51075 37.8125,10.59375 l 0.84375,4.9375 c 1e-5,0 -43.27725,-13.96875 -43.15625,-13.96875 0.06,0 -0.50187,-1.80225 4.5,-1.5625 z m 53.5625,10.71875 c 0,0.121 10.05374,0.34325 8.96875,2.03125 -1.085,1.688 -8.43749,2.3125 -8.4375,2.3125 0,0 -0.36123,-3.30775 -0.53125,-4.34375 z m 18.75,9.6875 c 1.51453,0.177 1.9445,0.76449 0.4375,2 -6.028,4.943 -19.15624,5.90625 -19.15625,5.90625 0,0 1e-5,-5.31752 0,-5.4375 0,0.09 14.17516,-2.99976 18.71875,-2.46875 z m 15.96875,5 c 3.78662,0.12287 2.14949,2.06675 1.125,3.03125 -2.05,1.929 -34.71874,12.28125 -34.71875,12.28125 0,0 -0.24599,-6.86675 -0.125,-7.46875 20.719,-6.279 29.93213,-7.96663 33.71875,-7.84375 z m -23.8125,19.53125 c 3.77063,-0.264 6.76701,-0.15276 5.875,1.21875 -2.795,2.743 -16.37501,3.15625 -16.375,3.15625 v -3.40625 c 2.2055,-0.0745 6.72938,-0.70475 10.5,-0.96875 z m 14.125,5.625 c 2.1116,-0.24674 3.0125,-0.0582 1.65625,0.90625 -5.425,3.857 -25.81249,7.81249 -25.8125,7.8125 0,0 0.25401,-2.772 0.375,-3.375 0.18075,0.0908 17.44647,-4.60355 23.78125,-5.34375 z m 10.875,4.25 c 3.24755,-0.22164 5.74475,0.0623 7.03125,1 0.242,0 -0.93877,4.20123 -6.96875,5.90625 -6.751,-0.603 -35.56649,7.93748 -35.6875,7.9375 -0.12,0 0.34376,-3.50002 0.34375,-3.5 9.22275,-5.5155 25.53861,-10.67883 35.28125,-11.34375 z m -70.84375,16.40625 c 12.297,1.326 16.8895,5.92923 18.1875,7.78125 -2.741,4.81 -26.7335,-7.80925 -18.1875,-7.78125 z m 70.6875,0.84375 c 0.7988,0.0615 1.341,0.43449 1.40625,1.34375 -1.326,2.049 -8.375,1.0625 -8.375,1.0625 0,0.09 4.57236,-2.5909 6.96875,-2.40625 z m -27.84375,13.4375 c 1.00662,-0.10987 1.91544,-0.12999 2.5625,0 0.86275,0.17331 1.26351,0.627 0.78125,1.53125 -1.929,3.617 -10.37499,2.28124 -10.375,2.28125 v -2.53125 c 0.13556,0.13556 4.0114,-0.95165 7.03125,-1.28125 z m -48.59375,9.4375 c 2.56528,-0.0928 4.83175,1.58749 7.1875,2.9375 5.304,-1.085 16.18749,0.84375 16.1875,0.84375 0,0 -10e-6,4.45051 0,4.8125 0,0.241 -13.69123,-0.28026 -16.65625,-2.15625 -2.531,0 -10.13025,-4.08925 -9.40625,-5.65625 0.93825,-0.5 1.83241,-0.75032 2.6875,-0.78125 z m 55.46875,2.40625 c 2.18479,-0.17602 3.15874,0.382 1.53125,2.6875 -4.34,6.148 -15.56249,3.625 -15.5625,3.625 l -0.46875,-3.8125 c 3.86188,0.15062 10.85869,-2.20663 14.5,-2.5 z m -39.46875,12.5 c 3.79013,0.28099 7.25,1.53125 7.25,1.53125 0.121,0.241 2.65699,5.174 0.125,6.5 -2.532,1.326 -14.63376,-1.03625 -15.34375,-5.90625 1.085,-1.14525 2.55766,-1.72855 4.1875,-2 1.22239,-0.20359 2.51788,-0.21867 3.78125,-0.125 z m -46.875,2.40625 c 3.78718,0.50034 7.32675,2.57675 7.21875,2.46875 -1e-5,0.144 -0.15625,4.625 -0.15625,4.625 0,0 -8.2155,-2.29025 -10.8125,-6.90625 1.19026,-0.32451 2.48761,-0.35428 3.75,-0.1875 z m 77.25,0.53125 c 5.53804,0.0284 12.21748,1.57651 10.5,3.65625 -2.291,2.772 -15.31249,0.24998 -15.3125,0.25 v -3.375 c 1.23575,-0.3615 2.96649,-0.54074 4.8125,-0.53125 z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" /> + transform="translate(28.47853,-0.412732)" + id="g952"> + id="path894" + d="m 440.30019,593.07202 -0.13813,17.66171 h 6.63054 l -0.27628,-17.66171 c -0.46045,-1.61354 -1.05904,-3.22708 -3.03899,-3.27069 -2.16414,-0.21805 -3.08505,1.9188 -3.17714,3.27069 z" + style="font-size:12px;fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke-width:3pt" /> - + id="polygon895" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon896" + style="font-size:12px;fill:#ff0000;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - + id="polygon897" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon898" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon899" + style="font-size:12px;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - - + + + sodipodi:arg2="1.4802849" + sodipodi:arg1="0.85196633" + sodipodi:r2="6.6438413" + sodipodi:r1="13.287683" + sodipodi:cy="-217.15552" + sodipodi:cx="220" + sodipodi:sides="5" + id="polygon947" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon948" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + + + sodipodi:arg2="1.4137167" + sodipodi:arg1="0.78539816" + sodipodi:r2="6.1871843" + sodipodi:r1="12.374369" + sodipodi:cy="-259.65552" + sodipodi:cx="217.5" + sodipodi:sides="5" + id="polygon951" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + transform="translate(0.825465)" + id="g966"> + id="path967" + d="m 440.30019,593.07202 -0.13813,17.66171 h 6.63054 l -0.27628,-17.66171 c -0.46045,-1.61354 -1.05904,-3.22708 -3.03899,-3.27069 -2.16414,-0.21805 -3.08505,1.9188 -3.17714,3.27069 z" + style="font-size:12px;fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke-width:3pt" /> - + id="polygon968" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon969" + style="font-size:12px;fill:#ff0000;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - + id="polygon970" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon971" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon972" + style="font-size:12px;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - - + + + sodipodi:arg2="1.4802849" + sodipodi:arg1="0.85196633" + sodipodi:r2="6.6438413" + sodipodi:r1="13.287683" + sodipodi:cy="-217.15552" + sodipodi:cx="220" + sodipodi:sides="5" + id="polygon975" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon976" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + + + sodipodi:arg2="1.4137167" + sodipodi:arg1="0.78539816" + sodipodi:r2="6.1871843" + sodipodi:r1="12.374369" + sodipodi:cy="-259.65552" + sodipodi:cx="217.5" + sodipodi:sides="5" + id="polygon979" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + transform="translate(10.31831)" + id="g980"> + id="path981" + d="m 440.30019,593.07202 -0.13813,17.66171 h 6.63054 l -0.27628,-17.66171 c -0.46045,-1.61354 -1.05904,-3.22708 -3.03899,-3.27069 -2.16414,-0.21805 -3.08505,1.9188 -3.17714,3.27069 z" + style="font-size:12px;fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke-width:3pt" /> - + id="polygon982" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon983" + style="font-size:12px;fill:#ff0000;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - + id="polygon984" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon985" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon986" + style="font-size:12px;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - - + + + sodipodi:arg2="1.4802849" + sodipodi:arg1="0.85196633" + sodipodi:r2="6.6438413" + sodipodi:r1="13.287683" + sodipodi:cy="-217.15552" + sodipodi:cx="220" + sodipodi:sides="5" + id="polygon989" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon990" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + + + sodipodi:arg2="1.4137167" + sodipodi:arg1="0.78539816" + sodipodi:r2="6.1871843" + sodipodi:r1="12.374369" + sodipodi:cy="-259.65552" + sodipodi:cx="217.5" + sodipodi:sides="5" + id="polygon993" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + transform="translate(19.39842)" + id="g994"> + id="path995" + d="m 440.30019,593.07202 -0.13813,17.66171 h 6.63054 l -0.27628,-17.66171 c -0.46045,-1.61354 -1.05904,-3.22708 -3.03899,-3.27069 -2.16414,-0.21805 -3.08505,1.9188 -3.17714,3.27069 z" + style="font-size:12px;fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke-width:3pt" /> - + id="polygon996" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon997" + style="font-size:12px;fill:#ff0000;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - + id="polygon998" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon999" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon1000" + style="font-size:12px;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> - - + + + sodipodi:arg2="1.4802849" + sodipodi:arg1="0.85196633" + sodipodi:r2="6.6438413" + sodipodi:r1="13.287683" + sodipodi:cy="-217.15552" + sodipodi:cx="220" + sodipodi:sides="5" + id="polygon1003" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + id="polygon1004" + style="font-size:12px;fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + + + sodipodi:arg2="1.4137167" + sodipodi:arg1="0.78539816" + sodipodi:r2="6.1871843" + sodipodi:r1="12.374369" + sodipodi:cy="-259.65552" + sodipodi:cx="217.5" + sodipodi:sides="5" + id="polygon1007" + style="font-size:12px;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke-width:3pt" + sodipodi:type="star" /> + Version 15 + style="stroke:none" + id="g1966-1" + transform="translate(10.962332,-1.3889132)"> - P - + id="text989-0" + y="181.31416" + x="101.73354" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:160px;line-height:75px;font-family:Gentium;-inkscape-font-specification:'Gentium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">P - P - + id="text1001-1" + y="181.31416" + x="559.99811" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:160px;line-height:75px;font-family:Gentium;-inkscape-font-specification:'Gentium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;fill:#000000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve">S + IONEER + style="fill:#ffd200;fill-opacity:1;stroke:none" + transform="translate(4.9622993,-6)" + id="g1966"> + P - S - + id="tspan999" + x="559.99811" + y="181.31416">S - S - + id="tspan1003" + x="184.23633" + y="181.31416">IONEER diff -Nru pioneers-15.5/client/gtk/data/themes/ccFlickr/theme.cfg pioneers-15.6/client/gtk/data/themes/ccFlickr/theme.cfg --- pioneers-15.5/client/gtk/data/themes/ccFlickr/theme.cfg 2010-03-11 19:24:36.000000000 +0000 +++ pioneers-15.6/client/gtk/data/themes/ccFlickr/theme.cfg 2018-06-15 22:02:19.000000000 +0000 @@ -6,7 +6,7 @@ forest-tile = lumber.png gold-tile = gold.png desert-tile = desert.png -sea-tile = sea.png +sea-tile = sea.png #ffffff #202020 none #c0c0c0 #ff3030 board-tile = board.png lumber-port-tile = port-lumber.png brick-port-tile = port-brick.png diff -Nru pioneers-15.5/client/gtk/data/themes/Iceland/theme.cfg pioneers-15.6/client/gtk/data/themes/Iceland/theme.cfg --- pioneers-15.5/client/gtk/data/themes/Iceland/theme.cfg 2009-10-15 21:13:08.000000000 +0000 +++ pioneers-15.6/client/gtk/data/themes/Iceland/theme.cfg 2018-06-15 22:02:19.000000000 +0000 @@ -6,7 +6,7 @@ forest-tile = forest_lumber.png none #d0d0d0 none #303030 #ffffff gold-tile = gold.png desert-tile = desert.png -sea-tile = sea.png +sea-tile = sea.png #ffffff #202020 none #c0c0c0 #ff3030 board-tile = board.png chip-bg-color = none chip-fg-color = #202020 diff -Nru pioneers-15.5/client/gtk/data/themes/Tiny/theme.cfg pioneers-15.6/client/gtk/data/themes/Tiny/theme.cfg --- pioneers-15.5/client/gtk/data/themes/Tiny/theme.cfg 2003-12-20 17:02:03.000000000 +0000 +++ pioneers-15.6/client/gtk/data/themes/Tiny/theme.cfg 2018-06-15 22:02:19.000000000 +0000 @@ -8,7 +8,7 @@ forest-tile = lumber-lorindol.png none #ffffff none #33b033 #c03030 desert-tile = desert-lorindol.png gold-tile = gold-lorindol.png none #000000 none #33b033 #ff3030 -sea-tile = sea-lorindol.png +sea-tile = sea-lorindol.png #ffffff #202020 none #c0c0c0 #ff3030 lumber-port-tile = lumber-port.png brick-port-tile = brick-port.png grain-port-tile = grain-port.png diff -Nru pioneers-15.5/client/gtk/develop.c pioneers-15.6/client/gtk/develop.c --- pioneers-15.5/client/gtk/develop.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/develop.c 2018-07-07 20:49:17.000000000 +0000 @@ -129,7 +129,7 @@ /* Caption for list of bought development cards */ _("Development cards")); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_container_add(GTK_CONTAINER(alignment), label); /* Create model */ diff -Nru pioneers-15.5/client/gtk/discard.c pioneers-15.6/client/gtk/discard.c --- pioneers-15.5/client/gtk/discard.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/discard.c 2018-07-07 20:49:17.000000000 +0000 @@ -102,8 +102,7 @@ "You must discard %d resources", num), num); discard.resource_widget = - resource_table_new(text, RESOURCE_TABLE_LESS_IN_HAND, FALSE, - TRUE); + resource_table_new(text, RESOURCE_TABLE_LESS_IN_HAND, FALSE); g_free(text); resource_table_set_total(RESOURCETABLE(discard.resource_widget), /* Label */ @@ -234,7 +233,7 @@ /* Caption for list of player that must discard cards */ _("Waiting for players to discard")); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_container_add(GTK_CONTAINER(alignment), label); scroll_win = gtk_scrolled_window_new(NULL, NULL); diff -Nru pioneers-15.5/client/gtk/frontend.c pioneers-15.6/client/gtk/frontend.c --- pioneers-15.5/client/gtk/frontend.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/frontend.c 2020-05-31 11:54:46.000000000 +0000 @@ -39,11 +39,13 @@ gui->next = FALSE; if (gui->widget != NULL && gui->next != gui->current) { - if (GTK_IS_ACTION(gui->widget)) - gtk_action_set_sensitive(GTK_ACTION(gui->widget), - gui->next); + if (G_IS_ACTION(gui->widget)) + g_simple_action_set_enabled(G_SIMPLE_ACTION + (gui->widget), + gui->next); else - gtk_widget_set_sensitive(gui->widget, gui->next); + gtk_widget_set_sensitive(GTK_WIDGET(gui->widget), + gui->next); } if (gui->next != gui->current) { switch (gui->id) { @@ -181,7 +183,7 @@ G_CALLBACK(destroy_route_event_cb), gui); } -void frontend_gui_register_action(GtkAction * action, GuiEvent id) +void frontend_gui_register_action(GAction * action, GuiEvent id) { GuiWidgetState *gui = gui_new(action, id); gui->signal = NULL; diff -Nru pioneers-15.5/client/gtk/frontend.h pioneers-15.6/client/gtk/frontend.h --- pioneers-15.5/client/gtk/frontend.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/frontend.h 2020-05-31 11:54:46.000000000 +0000 @@ -66,7 +66,7 @@ /* Information about a GUI component */ typedef struct { - GtkWidget *widget; /* the GTK widget */ + GObject *widget; /* the GTK widget */ GuiEvent id; /* widget id */ gboolean destroy_only; /* react to destroy signal */ const gchar *signal; /* signal attached */ @@ -96,7 +96,7 @@ void frontend_gui_register_destroy(GtkWidget * widget, GuiEvent id); /** register an action. */ -void frontend_gui_register_action(GtkAction * action, GuiEvent id); +void frontend_gui_register_action(GAction * action, GuiEvent id); /** register a new "normal" widget. */ void frontend_gui_register(GtkWidget * widget, GuiEvent id, @@ -220,7 +220,7 @@ const gint * they_receive); /* legend.c */ -GtkWidget *legend_create_dlg(void); +GtkWidget *legend_create_dlg(GtkWindow * parent_window); GtkWidget *legend_create_content(void); /* gui_develop.c */ @@ -262,9 +262,9 @@ void player_clear_summary(void); void player_init(void); /** The colour of the player, or spectator */ -GdkColor *player_or_spectator_color(gint player_num); +GdkRGBA *player_or_spectator_color(gint player_num); /** The colour of the player */ -GdkColor *player_color(gint player_num); +GdkRGBA *player_color(gint player_num); /** Create an icon of the player, for player_num, who is connected. * You should unref the pixbuf when it is no longer needed */ @@ -298,7 +298,7 @@ /* settingscreen.c */ void settings_init(void); -GtkWidget *settings_create_dlg(void); +GtkWidget *settings_create_dlg(GtkWindow * parent_window); /* monopoly.c */ Resource monopoly_type(void); @@ -314,16 +314,14 @@ /* gameover.c */ GtkWidget *gameover_create_dlg(gint player_num, gint num_points); -#define PIONEERS_PIXMAP_DICE "pioneers/dice.svg" -#define PIONEERS_PIXMAP_TRADE "pioneers/trade.svg" -#define PIONEERS_PIXMAP_ROAD "pioneers/road.svg" -#define PIONEERS_PIXMAP_SHIP "pioneers/ship.svg" -#define PIONEERS_PIXMAP_SHIP_MOVEMENT "pioneers/ship_move.svg" -#define PIONEERS_PIXMAP_BRIDGE "pioneers/bridge.svg" -#define PIONEERS_PIXMAP_SETTLEMENT "pioneers/settlement.svg" -#define PIONEERS_PIXMAP_CITY "pioneers/city.svg" -#define PIONEERS_PIXMAP_CITY_WALL "pioneers/city_wall.svg" -#define PIONEERS_PIXMAP_DEVELOP "pioneers/develop.svg" -#define PIONEERS_PIXMAP_FINISH "pioneers/finish.svg" +#define ICON_DICE "dice" +#define ICON_TRADE "trade" +#define ICON_ROAD "road" +#define ICON_SHIP "ship" +#define ICON_BRIDGE "bridge" +#define ICON_SETTLEMENT "settlement" +#define ICON_CITY "city" +#define ICON_CITY_WALL "city_wall" +#define ICON_DEVELOP "develop" #endif diff -Nru pioneers-15.5/client/gtk/gold.c pioneers-15.6/client/gtk/gold.c --- pioneers-15.5/client/gtk/gold.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/gold.c 2020-06-13 15:16:56.000000000 +0000 @@ -97,8 +97,7 @@ "You may choose %d resources", num), num); gold.resource_widget = - resource_table_new(text, RESOURCE_TABLE_MORE_IN_HAND, TRUE, - TRUE); + resource_table_new(text, RESOURCE_TABLE_MORE_IN_HAND, TRUE); g_free(text); resource_table_set_total(RESOURCETABLE(gold.resource_widget), /* Text for total in choose gold dialog */ @@ -131,18 +130,18 @@ GdkPixbuf *pixbuf; enum TFindResult found; - /* Search for a place to add information about the player */ + /* Use the order of the server */ found = find_integer_in_tree(GTK_TREE_MODEL(gold_store), &iter, GOLD_COLUMN_PLAYER_NUM, player_num); switch (found) { case FIND_NO_MATCH: - gtk_list_store_append(gold_store, &iter); - break; case FIND_MATCH_INSERT_BEFORE: - gtk_list_store_insert_before(gold_store, &iter, &iter); + gtk_list_store_append(gold_store, &iter); break; case FIND_MATCH_EXACT: + g_error + ("gold_store was not properly cleared before in gold_choose_player_prepare"); break; default: g_error("unknown case in gold_choose_player_prepare"); @@ -164,17 +163,21 @@ GtkTreeIter iter; enum TFindResult found; - /* check if the player was in the list. If not, it is not an error. - * That happens if the player auto-discards. */ + /* check if the player was in the list. If not, report it. */ found = find_integer_in_tree(GTK_TREE_MODEL(gold_store), &iter, GOLD_COLUMN_PLAYER_NUM, player_num); if (found == FIND_MATCH_EXACT) { gtk_list_store_remove(gold_store, &iter); - if (player_num == my_player_num()) { - gtk_widget_destroy(gold.dlg); - gold.dlg = NULL; - } + } else { + g_warning + ("Could not find player %d in the list of players that are choosing gold", + player_num); + } + /* gold.dlg can be NULL when the server auto-selects */ + if (player_num == my_player_num() && gold.dlg != NULL) { + gtk_widget_destroy(gold.dlg); + gold.dlg = NULL; } } @@ -216,7 +219,7 @@ /* Caption for list of player that must choose gold */ _("Waiting for players to choose")); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_container_add(GTK_CONTAINER(alignment), label); scroll_win = gtk_scrolled_window_new(NULL, NULL); diff -Nru pioneers-15.5/client/gtk/gui.c pioneers-15.6/client/gtk/gui.c --- pioneers-15.5/client/gtk/gui.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/gui.c 2020-06-21 11:32:32.000000000 +0000 @@ -45,6 +45,28 @@ #define PIONEERS_ICON_FILE "pioneers.png" +/* Callback functions from the resource file */ +G_MODULE_EXPORT void game_quit_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void game_legend_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void game_histogram_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void game_settings_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void show_admin_interface_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void zoom_normal_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void zoom_center_map_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void toggle_full_screen_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void showhide_toolbar_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void preferences_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void help_about_cb(GObject * gobject, gpointer user_data); +#ifdef HAVE_HELP +G_MODULE_EXPORT void help_manual_cb(GObject * gobject, gpointer user_data); +#endif + static GuiMap *gmap; /* handle to map drawing code */ enum { @@ -73,388 +95,71 @@ static GtkWidget *main_paned; /* Horizontal for 16:9, Vertical for 4:3 mode */ static GtkWidget *chat_panel = NULL; /* Panel for chat, placed below or to the right */ -static GtkUIManager *ui_manager = NULL; /* The manager of the GtkActions */ -static GtkWidget *toolbar = NULL; /* The toolbar */ +static GtkBuilder *builder = NULL; /* The manager of the GUI */ +static GActionGroup *action_group = NULL; /* Global action group */ static gboolean toolbar_show_accelerators = TRUE; static gboolean color_messages_enabled = TRUE; static gboolean legend_page_enabled = TRUE; +static gboolean charity_enabled = FALSE; +static TAutomaticRoll automatic_roll = ROLL_MANUALLY; static GList *rules_callback_list = NULL; -#define PIONEERS_PIXMAP_SPLASH "pioneers/splash.png" - -static const gchar *pioneers_pixmaps[] = { - PIONEERS_PIXMAP_DICE, - PIONEERS_PIXMAP_TRADE, - PIONEERS_PIXMAP_ROAD, - PIONEERS_PIXMAP_SHIP, - PIONEERS_PIXMAP_SHIP_MOVEMENT, - PIONEERS_PIXMAP_BRIDGE, - PIONEERS_PIXMAP_SETTLEMENT, - PIONEERS_PIXMAP_CITY, - PIONEERS_PIXMAP_CITY_WALL, - PIONEERS_PIXMAP_DEVELOP, - PIONEERS_PIXMAP_FINISH -}; - -static void gui_set_toolbar_visible(void); +static void gui_set_toolbar_visible(gboolean visible); static void gui_toolbar_show_accelerators(gboolean show_accelerators); -static void game_new_cb(void) +static void redirect_gui_event_cb(G_GNUC_UNUSED GSimpleAction * action, + G_GNUC_UNUSED GVariant * parameter, + gpointer user_data) { - route_gui_event(GUI_CONNECT); + route_gui_event(g_variant_get_int32(user_data)); } -static void game_leave_cb(void) +static void game_leave_cb(G_GNUC_UNUSED GSimpleAction * action, + G_GNUC_UNUSED GVariant * parameter, + G_GNUC_UNUSED gpointer user_data) { frontend_quote_end(); route_gui_event(GUI_DISCONNECT); } -static void playername_cb(void) -{ - route_gui_event(GUI_CHANGE_NAME); -} - -static void game_quit_cb(void) +void game_quit_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { + guimap_delete(gmap); route_gui_event(GUI_QUIT); } -static void roll_dice_cb(void) -{ - route_gui_event(GUI_ROLL); -} - -static void trade_cb(void) -{ - route_gui_event(GUI_TRADE); -} - -static void undo_cb(void) -{ - route_gui_event(GUI_UNDO); -} - -static void finish_cb(void) -{ - route_gui_event(GUI_FINISH); -} - -static void build_road_cb(void) -{ - route_gui_event(GUI_ROAD); -} - -static void build_ship_cb(void) -{ - route_gui_event(GUI_SHIP); -} - -static void move_ship_cb(void) -{ - route_gui_event(GUI_MOVE_SHIP); -} - -static void build_bridge_cb(void) -{ - route_gui_event(GUI_BRIDGE); -} - -static void build_settlement_cb(void) -{ - route_gui_event(GUI_SETTLEMENT); -} - -static void build_city_cb(void) -{ - route_gui_event(GUI_CITY); -} - -static void buy_development_cb(void) -{ - route_gui_event(GUI_BUY_DEVELOP); -} - -static void build_city_wall_cb(void) +void show_admin_interface_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { - route_gui_event(GUI_CITY_WALL); -} - -static void showhide_toolbar_cb(void); -static void preferences_cb(void); - -static void help_about_cb(void); -static void game_legend_cb(void); -static void game_histogram_cb(void); -static void game_settings_cb(void); -#ifdef HAVE_HELP -static void help_manual_cb(void); +#ifdef ADMIN_GTK + show_admin_interface(); #endif +} -/** Toggles full screen mode. - * @param GtkToggleAction The calling action. - * @param main_window The window to toggle full screen mode. -*/ -static void toggle_full_screen_cb(GtkToggleAction * caller, - gpointer main_window) +void toggle_full_screen_cb(GObject * gobject, gpointer user_data) { - if (gtk_toggle_action_get_active(caller)) { - gtk_window_fullscreen(GTK_WINDOW(main_window)); + if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(gobject))) { + gtk_window_fullscreen(GTK_WINDOW(user_data)); } else { - gtk_window_unfullscreen(GTK_WINDOW(main_window)); + gtk_window_unfullscreen(GTK_WINDOW(user_data)); } } -static void zoom_normal_cb(void) +void zoom_normal_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { guimap_zoom_normal(gmap); } -static void zoom_center_map_cb(void) +void zoom_center_map_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { guimap_zoom_center_map(gmap); } -/* Normal items */ -static GtkActionEntry entries[] = { - {"GameMenu", NULL, - /* Menu entry */ - N_("_Game"), NULL, NULL, NULL}, - {"GameNew", NULL, - /* Menu entry */ - N_("_New Game"), "N", - /* Tooltip for New Game menu entry */ - N_("Start a new game"), game_new_cb}, - {"GameLeave", NULL, - /* Menu entry */ - N_("_Leave Game"), NULL, - /* Tooltip for Leave Game menu entry */ - N_("Leave this game"), game_leave_cb}, -#ifdef ADMIN_GTK - {"GameAdmin", NULL, - /* Menu entry */ - N_("_Admin"), "A", - /* Tooltip for Admin menu entry */ - N_("Administer Pioneers server"), show_admin_interface}, -#endif - {"PlayerName", NULL, - /* Menu entry */ - N_("_Player Name"), "P", - /* Tooltip for Player Name menu entry */ - N_("Change your player name"), playername_cb}, - {"Legend", NULL, - /* Menu entry */ - N_("L_egend"), NULL, - /* Tooltip for Legend menu entry */ - N_("Terrain legend and building costs"), game_legend_cb}, - {"GameSettings", NULL, - /* Menu entry */ - N_("_Game Settings"), NULL, - /* Tooltip for Game Settings menu entry */ - N_("Settings for the current game"), game_settings_cb}, - {"DiceHistogram", NULL, - /* Menu entry */ - N_("_Dice Histogram"), NULL, - /* Tooltip for Dice Histogram menu entry */ - N_("Histogram of dice rolls"), game_histogram_cb}, - {"GameQuit", NULL, - /* Menu entry */ - N_("_Quit"), "Q", - /* Tooltip for Quit menu entry */ - N_("Quit the program"), game_quit_cb}, - {"ActionsMenu", NULL, - /* Menu entry */ - N_("_Actions"), NULL, NULL, NULL}, - {"RollDice", PIONEERS_PIXMAP_DICE, - /* Menu entry */ - N_("Roll Dice"), "F1", - /* Tooltip for Roll Dice menu entry */ - N_("Roll the dice"), roll_dice_cb}, - {"Trade", PIONEERS_PIXMAP_TRADE, - /* Menu entry */ - N_("Trade"), "F2", - /* Tooltip for Trade menu entry */ - N_("Trade"), - trade_cb}, - {"Undo", "edit-undo", - /* Menu entry */ - N_("Undo"), "F3", - /* Tooltip for Undo menu entry */ - N_("Undo"), undo_cb}, - {"Finish", PIONEERS_PIXMAP_FINISH, - /* Menu entry */ - N_("Finish"), "F4", - /* Tooltip for Finish menu entry */ - N_("Finish"), finish_cb}, - {"BuildRoad", PIONEERS_PIXMAP_ROAD, - /* Menu entry */ - N_("Road"), "F5", - /* Tooltip for Road menu entry */ - N_("Build a road"), build_road_cb}, - {"BuildShip", PIONEERS_PIXMAP_SHIP, - /* Menu entry */ - N_("Ship"), "F6", - /* Tooltip for Ship menu entry */ - N_("Build a ship"), build_ship_cb}, - {"MoveShip", PIONEERS_PIXMAP_SHIP_MOVEMENT, - /* Menu entry */ - N_("Move Ship"), "F7", - /* Tooltip for Move Ship menu entry */ - N_("Move a ship"), move_ship_cb}, - {"BuildBridge", PIONEERS_PIXMAP_BRIDGE, - /* Menu entry */ - N_("Bridge"), "F8", - /* Tooltip for Bridge menu entry */ - N_("Build a bridge"), build_bridge_cb}, - {"BuildSettlement", PIONEERS_PIXMAP_SETTLEMENT, - /* Menu entry */ - N_("Settlement"), - "F9", - /* Tooltip for Settlement menu entry */ - N_("Build a settlement"), build_settlement_cb}, - {"BuildCity", PIONEERS_PIXMAP_CITY, - /* Menu entry */ - N_("City"), "F10", - /* Tooltip for City menu entry */ - N_("Build a city"), build_city_cb}, - {"BuyDevelopment", PIONEERS_PIXMAP_DEVELOP, - /* Menu entry */ - N_("Develop"), "F11", - /* Tooltip for Develop menu entry */ - N_("Buy a development card"), buy_development_cb}, - {"BuildCityWall", PIONEERS_PIXMAP_CITY_WALL, - /* Menu entry */ - N_("City Wall"), NULL, - /* Tooltip for City Wall menu entry */ - N_("Build a city wall"), build_city_wall_cb}, - - {"SettingsMenu", NULL, - /* Menu entry */ - N_("_Settings"), NULL, NULL, NULL}, - {"Preferences", NULL, - /* Menu entry */ - N_("Prefere_nces"), NULL, - /* Tooltip for Preferences menu entry */ - N_("Configure the application"), preferences_cb}, - - {"ViewMenu", NULL, - /* Menu entry */ - N_("_View"), NULL, NULL, NULL}, - {"Full", NULL, - /* Menu entry */ - N_("_Reset"), - "0", - /* Tooltip for Reset menu entry */ - N_("View the full map"), zoom_normal_cb}, - {"Center", NULL, - /* Menu entry */ - N_("_Center"), NULL, - /* Tooltip for Center menu entry */ - N_("Center the map"), zoom_center_map_cb}, - - {"HelpMenu", NULL, - /* Menu entry */ - N_("_Help"), NULL, NULL, NULL}, - {"HelpAbout", NULL, - /* Menu entry */ - N_("_About Pioneers"), NULL, - /* Tooltip for About Pioneers menu entry */ - N_("Information about Pioneers"), help_about_cb}, -#ifdef HAVE_HELP - {"HelpManual", NULL, - /* Menu entry */ - N_("_Help"), "H", - /* Tooltip for Help menu entry */ - N_("Show the manual"), help_manual_cb} -#endif -}; - -/* Toggle items */ -static GtkToggleActionEntry toggle_entries[] = { - {"FullScreen", NULL, - /* Menu entry */ - N_("_Fullscreen"), - "Return", - /* Tooltip for Fullscreen menu entry */ - N_("Set window to full screen mode"), - G_CALLBACK(toggle_full_screen_cb), - FALSE}, - {"ShowHideToolbar", NULL, - /* Menu entry */ - N_("_Toolbar"), NULL, - /* Tooltip for Toolbar menu entry */ - N_("Show or hide the toolbar"), showhide_toolbar_cb, TRUE} -}; - -/* *INDENT-OFF* */ -static const char *ui_description = -"" -" " -" " -" " -" " -#ifdef ADMIN_GTK -" " -#endif -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -#ifdef HAVE_HELP -" " -#endif -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -""; -/* *INDENT-ON* */ - GtkWidget *gui_get_dialog_button(GtkDialog * dlg, gint button) { GList *list; @@ -575,7 +280,7 @@ /* Label for messages log */ label = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(label), _("Messages")); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); @@ -631,8 +336,7 @@ { g_assert(legend_page != NULL); gtk_widget_queue_draw(legend_page); - gtk_widget_queue_draw_area(gmap->area, 0, 0, gmap->width, - gmap->height); + gtk_widget_queue_draw(gmap->area); } void gui_show_legend_page(gboolean show) @@ -668,25 +372,16 @@ static GtkWidget *splash_build_page(void) { - GtkWidget *pm; - GtkWidget *viewport; + GtkWidget *image; gchar *filename; filename = g_build_filename(DATADIR, "pixmaps", "pioneers", "splash.png", NULL); - pm = gtk_image_new_from_file(filename); + image = gtk_image_new_from_file(filename); + gtk_widget_show(image); g_free(filename); - /* The viewport avoids that the pixmap is drawn up into the tab area if - * it's too large for the space provided. */ - viewport = gtk_viewport_new(NULL, NULL); - gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), - GTK_SHADOW_NONE); - gtk_widget_show(viewport); - gtk_widget_set_size_request(pm, 1, 1); - gtk_widget_show(pm); - gtk_container_add(GTK_CONTAINER(viewport), pm); - return viewport; + return image; } static GtkWidget *build_map_panel(void) @@ -898,22 +593,16 @@ build_messages_panel(), TRUE, TRUE, 0); set_16_9_layout(config_get_int_with_default - ("settings/layout_16_9", FALSE)); + ("settings/layout_16_9", TRUE)); gtk_paned_pack2(GTK_PANED(hpaned), main_paned, TRUE, TRUE); return hpaned; } -static void quit_cb(G_GNUC_UNUSED GtkWidget * widget, - G_GNUC_UNUSED void *data) +static void theme_change_cb(GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { - guimap_delete(gmap); - frontend_quit(); -} - -static void theme_change_cb(GtkWidget * widget, G_GNUC_UNUSED void *data) -{ - gint idx = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + gint idx = gtk_combo_box_get_active(GTK_COMBO_BOX(gobject)); MapTheme *theme = g_list_nth_data(theme_get_list(), idx); if (theme != theme_get_current()) { config_set_string("settings/theme", theme->name); @@ -995,9 +684,11 @@ set_show_notifications(show_notifications); } -static void showhide_toolbar_cb(void) +void showhide_toolbar_cb(GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { - gui_set_toolbar_visible(); + gui_set_toolbar_visible(gtk_check_menu_item_get_active + (GTK_CHECK_MENU_ITEM(gobject))); } static void toolbar_shortcuts_cb(void) @@ -1005,7 +696,47 @@ gui_toolbar_show_accelerators(!toolbar_show_accelerators); } -static void preferences_cb(void) +gboolean get_charity_enabled(void) +{ + return charity_enabled; +} + +void set_charity_enabled(gboolean new_charity_enabled) +{ + if (new_charity_enabled != charity_enabled) { + charity_enabled = new_charity_enabled; + config_set_int("settings/charity_enabled", + charity_enabled); + } +} + +TAutomaticRoll get_automatic_roll(void) +{ + return automatic_roll; +} + +void set_automatic_roll(TAutomaticRoll new_automatic_roll) +{ + if (new_automatic_roll != automatic_roll) { + automatic_roll = new_automatic_roll; + config_set_int("settings/automatic_roll", automatic_roll); + } +} + +static void automatic_roll_changed_cb(GtkComboBox * widget, + G_GNUC_UNUSED gpointer user_data) +{ + GtkTreeIter iter; + + if (gtk_combo_box_get_active_iter(widget, &iter)) { + gint value; + gtk_tree_model_get(gtk_combo_box_get_model(widget), &iter, + 1, &value, -1); + set_automatic_roll(value); + } +} + +void preferences_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { GtkWidget *silent_mode_widget; GtkWidget *widget; @@ -1013,6 +744,10 @@ GtkWidget *theme_label; GtkWidget *theme_list; GtkWidget *layout; + GtkListStore *auto_roll_list; + GtkCellRenderer *cell; + GtkTreeIter iter; + GtkTreeIter active_iter; guint row; gint color_summary; @@ -1028,7 +763,7 @@ preferences_dlg = gtk_dialog_new_with_buttons(_("" "Pioneers Preferences"), GTK_WINDOW - (app_window), + (user_data), GTK_DIALOG_DESTROY_WITH_PARENT, /* Button text */ _("_Close"), @@ -1047,7 +782,9 @@ gtk_dialog_get_content_area(GTK_DIALOG(preferences_dlg)); gtk_widget_show(dlg_vbox); - layout = gtk_table_new(6, 2, FALSE); + layout = gtk_grid_new(); + gtk_grid_set_row_spacing(GTK_GRID(layout), 3); + gtk_grid_set_column_spacing(GTK_GRID(layout), 5); gtk_widget_show(layout); gtk_box_pack_start(GTK_BOX(dlg_vbox), layout, FALSE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(layout), 5); @@ -1055,9 +792,10 @@ row = 0; theme_list = gtk_combo_box_text_new(); + gtk_widget_set_hexpand(theme_list, TRUE); /* Label for changing the theme, in the preferences dialog */ theme_label = gtk_label_new(_("Theme:")); - gtk_misc_set_alignment(GTK_MISC(theme_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(theme_label), 0.0); gtk_widget_show(theme_list); gtk_widget_show(theme_label); @@ -1073,10 +811,8 @@ g_signal_connect(G_OBJECT(theme_list), "changed", G_CALLBACK(theme_change_cb), NULL); - gtk_table_attach_defaults(GTK_TABLE(layout), theme_label, - 0, 1, row, row + 1); - gtk_table_attach_defaults(GTK_TABLE(layout), theme_list, - 1, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), theme_label, 0, row, 1, 1); + gtk_grid_attach(GTK_GRID(layout), theme_list, 1, row, 1, 1); gtk_widget_set_tooltip_text(theme_list, /* Tooltip for changing the theme in the preferences dialog */ _("Choose one of the themes")); @@ -1089,8 +825,7 @@ legend_page_enabled); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(show_legend_cb), NULL); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); gtk_widget_set_tooltip_text(widget, /* Tooltip for the option to show the legend */ _("" @@ -1100,8 +835,7 @@ /* Label for the option to display log messages in color */ widget = gtk_check_button_new_with_label(_("Messages with color")); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), color_messages_enabled); g_signal_connect(G_OBJECT(widget), "toggled", @@ -1116,8 +850,7 @@ _("" "Chat in color of player")); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), color_chat_enabled); g_signal_connect(G_OBJECT(widget), "toggled", @@ -1131,8 +864,7 @@ /* Label for the option to display the summary with colors */ widget = gtk_check_button_new_with_label(_("Summary with color")); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); color_summary = config_get_int_with_default("settings/color_summary", TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), color_summary); /* @todo RC use correct variable */ @@ -1147,8 +879,7 @@ /* Label for the option to display keyboard accelerators in the toolbar */ gtk_check_button_new_with_label(_("Toolbar with shortcuts")); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), toolbar_show_accelerators); g_signal_connect(G_OBJECT(widget), "toggled", @@ -1163,8 +894,8 @@ /* Label for the option to disable all sounds */ gtk_check_button_new_with_label(_("Silent mode")); gtk_widget_show(silent_mode_widget); - gtk_table_attach_defaults(GTK_TABLE(layout), silent_mode_widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), silent_mode_widget, 0, row, 2, + 1); gtk_widget_set_tooltip_text(silent_mode_widget, /* Tooltip for the option to disable all sounds */ _("" @@ -1175,8 +906,7 @@ /* Label for the option to announce when players/spectators enter */ gtk_check_button_new_with_label(_("Announce new players")); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), get_announce_player()); g_signal_connect(G_OBJECT(widget), "toggled", @@ -1197,8 +927,7 @@ /* Label for the option to use the notifications. */ widget = gtk_check_button_new_with_label(_("Show notifications")); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), get_show_notifications()); g_signal_connect(G_OBJECT(widget), "toggled", @@ -1213,8 +942,7 @@ /* Label for the option to use the 16:9 layout. */ widget = gtk_check_button_new_with_label(_("Use 16:9 layout")); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(layout), widget, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), get_16_9_layout()); g_signal_connect(G_OBJECT(widget), "toggled", @@ -1224,35 +952,92 @@ _("" "Use a 16:9 friendly layout for the window")); row++; + + auto_roll_list = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT); + gtk_list_store_append(auto_roll_list, &iter); + gtk_list_store_set(auto_roll_list, &iter, + 0, _("Roll the dice manually each turn"), + 1, ROLL_MANUALLY, -1); + if (get_automatic_roll() == ROLL_MANUALLY) { + active_iter = iter; + } + gtk_list_store_append(auto_roll_list, &iter); + gtk_list_store_set(auto_roll_list, &iter, + 0, + _("" + "Roll the dice automatically, except when you have a soldier card"), + 1, ROLL_AUTOMATICALLY_EXCEPT_WITH_SOLDIER_CARD, + -1); + if (get_automatic_roll() == + ROLL_AUTOMATICALLY_EXCEPT_WITH_SOLDIER_CARD) { + active_iter = iter; + } + gtk_list_store_append(auto_roll_list, &iter); + gtk_list_store_set(auto_roll_list, &iter, + 0, + _("" + "Roll the dice automatically, except when you have a development card"), + 1, ROLL_AUTOMATICALLY_EXCEPT_WITH_RESOURCE_CARD, + -1); + if (get_automatic_roll() == + ROLL_AUTOMATICALLY_EXCEPT_WITH_RESOURCE_CARD) { + active_iter = iter; + } + gtk_list_store_append(auto_roll_list, &iter); + gtk_list_store_set(auto_roll_list, &iter, + 0, _("Roll the dice automatically"), + 1, ROLL_AUTOMATICALLY, -1); + if (get_automatic_roll() == ROLL_AUTOMATICALLY) { + active_iter = iter; + } + widget = + gtk_combo_box_new_with_model(GTK_TREE_MODEL(auto_roll_list)); + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widget), &active_iter); + + cell = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), cell, TRUE); + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(widget), + cell, "text", 0, NULL); + + gtk_widget_show(widget); + gtk_grid_attach(GTK_GRID(layout), widget, 0, row, 2, 1); + g_signal_connect(G_OBJECT(widget), "changed", + G_CALLBACK(automatic_roll_changed_cb), NULL); + gtk_widget_set_tooltip_text(widget, + /* Tooltip for automatic roll option. */ + _("" + "Automate the rolling of the dice")); + row++; + } -static void help_about_cb(void) +void help_about_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { - aboutbox_display(GTK_WINDOW(app_window), + aboutbox_display(GTK_WINDOW(user_data), /* Caption of about box */ _("About Pioneers")); } -static void game_legend_cb(void) +void game_legend_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { - legend_create_dlg(); + legend_create_dlg(GTK_WINDOW(user_data)); } -static void game_histogram_cb(void) +void game_histogram_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { - histogram_create_dlg(); + histogram_create_dlg(GTK_WINDOW(user_data)); } -static void game_settings_cb(void) +void game_settings_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { - settings_create_dlg(); + settings_create_dlg(GTK_WINDOW(user_data)); } #ifdef HAVE_HELP -static void help_manual_cb(void) +void help_manual_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { GError *error = NULL; - gtk_show_uri_on_window(GTK_WINDOW(app_window), "help:pioneers", + gtk_show_uri_on_window(GTK_WINDOW(user_data), "help:pioneers", GDK_CURRENT_TIME, &error); if (error) { log_message(MSG_ERROR, "%s: %s\n", _("Show the manual"), @@ -1262,11 +1047,9 @@ } #endif -static GtkAction *getAction(GuiEvent id) +static GAction *getAction(GuiEvent id) { const gchar *path = NULL; - gchar *full_path; - GtkAction *action; #ifdef ADMIN_GTK frontend_gui_register_action(gtk_ui_manager_get_action (manager, @@ -1276,49 +1059,49 @@ switch (id) { case GUI_CONNECT: - path = "GameMenu/GameNew"; + path = "action_game_new"; break; case GUI_DISCONNECT: - path = "GameMenu/GameLeave"; + path = "action_game_leave"; break; case GUI_CHANGE_NAME: - path = "GameMenu/PlayerName"; + path = "action_player_name"; break; case GUI_ROLL: - path = "ActionsMenu/RollDice"; + path = "action_roll_dice"; break; case GUI_TRADE: - path = "ActionsMenu/Trade"; + path = "action_trade"; break; case GUI_UNDO: - path = "ActionsMenu/Undo"; + path = "action_undo"; break; case GUI_FINISH: - path = "ActionsMenu/Finish"; + path = "action_finish"; break; case GUI_ROAD: - path = "ActionsMenu/BuildRoad"; + path = "action_build_road"; break; case GUI_SHIP: - path = "ActionsMenu/BuildShip"; + path = "action_build_ship"; break; case GUI_MOVE_SHIP: - path = "ActionsMenu/MoveShip"; + path = "action_move_ship"; break; case GUI_BRIDGE: - path = "ActionsMenu/BuildBridge"; + path = "action_build_bridge"; break; case GUI_SETTLEMENT: - path = "ActionsMenu/BuildSettlement"; + path = "action_build_settlement"; break; case GUI_CITY: - path = "ActionsMenu/BuildCity"; + path = "action_build_city"; break; case GUI_BUY_DEVELOP: - path = "ActionsMenu/BuyDevelopment"; + path = "action_buy_development"; break; case GUI_CITY_WALL: - path = "ActionsMenu/BuildCityWall"; + path = "action_build_city_wall"; break; default: break; @@ -1327,33 +1110,48 @@ if (!path) return NULL; - full_path = g_strdup_printf("ui/MainMenu/%s", path); - action = gtk_ui_manager_get_action(ui_manager, full_path); - g_free(full_path); - return action; + return g_action_map_lookup_action(G_ACTION_MAP(action_group), + path); } /** Set the visibility of the toolbar */ -static void gui_set_toolbar_visible(void) +static void gui_set_toolbar_visible(gboolean visible) { - GSList *list; - gboolean visible; + GtkWidget *toolbar = + GTK_WIDGET(gtk_builder_get_object(builder, "toolbar")); - list = gtk_ui_manager_get_toplevels(ui_manager, - GTK_UI_MANAGER_TOOLBAR); - g_assert(g_slist_length(list) == 1); - visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION - (gtk_ui_manager_get_action - (ui_manager, - "ui/MainMenu/SettingsMenu/ShowHideToolbar"))); if (visible) - gtk_widget_show(GTK_WIDGET(list->data)); + gtk_widget_show(GTK_WIDGET(toolbar)); else - gtk_widget_hide(GTK_WIDGET(list->data)); + gtk_widget_hide(GTK_WIDGET(toolbar)); config_set_int("settings/show_toolbar", visible); - g_slist_free(list); } +/* Note: + * 1. the accelerators are not translated + * 2. the accelerators are duplicated here from the .ui file + * 3. the UI file has Roll Dice\nF1 to ensure the proper initial size + */ +/* *INDENT-OFF* */ +static struct { + const gchar *text; + const gchar *accelerator; +} toolbar_accelerators[] = { + { N_("Roll Dice"), "F1" }, + { N_("Trade"), "F2" }, + { N_("Undo"), "F3" }, + { N_("Finish") , "F4" }, + { N_("Road"), "F5" }, + { N_("Ship"), "F6" }, + { N_("Move Ship"), "F7" }, + { N_("Bridge"), "F8" }, + { N_("Settlement"), "F9" }, + { N_("City"), "F10" }, + { N_("Develop"), "F11" }, + { N_("City Wall"), NULL }, +}; +/* *INDENT-ON* */ + /** Show the accelerators in the toolbar */ static void gui_toolbar_show_accelerators(gboolean show_accelerators) { @@ -1362,7 +1160,8 @@ toolbar_show_accelerators = show_accelerators; - tb = GTK_TOOLBAR(toolbar); + tb = GTK_TOOLBAR(gtk_builder_get_object(builder, "toolbar")); + g_return_if_fail(tb != NULL); n = gtk_toolbar_get_n_items(tb); for (i = 0; i < n; i++) { @@ -1374,58 +1173,36 @@ ti = gtk_toolbar_get_nth_item(tb, i); tbtn = GTK_TOOL_BUTTON(ti); g_assert(tbtn != NULL); - if (gtk_major_version == 2 && gtk_minor_version == 10) { - /* Work around a gtk+ 2.10 bug (#434261) that - * mishandles strings like (Fn) in labels. - */ - /** @todo BW 2007-04-29 Remove this when gtk 2.10 - * is no longer supported. */ - gtk_tool_button_set_use_underline(tbtn, FALSE); - } + text = g_strdup(gtk_tool_button_get_label(tbtn)); if (strchr(text, '\n')) *strchr(text, '\n') = '\0'; /* Find the matching entry */ - for (j = 0; j < G_N_ELEMENTS(entries); j++) { - if (strcmp(text, _(entries[j].label)) == 0) { + for (j = 0; j < G_N_ELEMENTS(toolbar_accelerators); j++) { + if (strcmp(text, _(toolbar_accelerators[j].text)) + == 0) { if (show_accelerators) { gchar *label; - if (entries[j].accelerator == NULL - || - strlen(entries[j].accelerator) - == 0) + if (toolbar_accelerators + [j].accelerator == NULL) label = - g_strdup_printf("%s\n", - text); + g_strdup_printf + ("%s\n", text); else { - gchar *accelerator_text; - guint accelerator_key; - GdkModifierType - accelerator_mods; - gtk_accelerator_parse - (entries - [j].accelerator, - &accelerator_key, - &accelerator_mods); - accelerator_text = - gtk_accelerator_get_label - (accelerator_key, - accelerator_mods); label = g_strdup_printf - ("%s\n(%s)", text, - accelerator_text); - g_free(accelerator_text); + ("%s\n(%s)", + text, + toolbar_accelerators + [j].accelerator); } - gtk_tool_button_set_label(tbtn, - label); + gtk_tool_button_set_label + (tbtn, label); g_free(label); } else { - gtk_tool_button_set_label(tbtn, - _(entries - [j]. - label)); + gtk_tool_button_set_label + (tbtn, text); } break; } @@ -1437,26 +1214,13 @@ } /** Show or hide a button in the toolbar */ -static void gui_toolbar_show_button(const gchar * path, gboolean visible) +static void gui_toolbar_show_button(const gchar * id, gboolean visible) { - gchar *fullpath; - GtkWidget *w; - GtkToolItem *item; - - fullpath = g_strdup_printf("ui/MainToolbar/%s", path); - w = gtk_ui_manager_get_widget(ui_manager, fullpath); - if (w == NULL) { - g_assert(!"Widget not found"); - return; - } - item = GTK_TOOL_ITEM(w); - if (item == NULL) { - g_assert(!"Widget is not a tool button"); - return; - } - gtk_tool_item_set_visible_horizontal(item, visible); + GtkToolItem *item = + GTK_TOOL_ITEM(gtk_builder_get_object(builder, id)); - g_free(fullpath); + g_return_if_fail(item != NULL); + gtk_tool_item_set_visible_horizontal(item, visible); } void gui_rules_register_callback(GCallback callback) @@ -1548,90 +1312,47 @@ static void register_pixmaps(void) { - guint idx; + GtkIconTheme *iconTheme = gtk_icon_theme_get_default(); + gchar *path; - GtkIconFactory *factory = gtk_icon_factory_new(); - - for (idx = 0; idx < G_N_ELEMENTS(pioneers_pixmaps); idx++) { - gchar *filename; - GtkIconSet *icon; - - icon = NULL; - /* determine full path to pixmap file */ - filename = g_build_filename(DATADIR, "pixmaps", - pioneers_pixmaps[idx], NULL); - if (g_file_test(filename, G_FILE_TEST_EXISTS)) { - GdkPixbuf *pixbuf; - GError *error = NULL; - pixbuf = - gdk_pixbuf_new_from_file(filename, &error); - if (error != NULL) { - g_warning("Error loading pixmap %s\n", - filename); - g_error_free(error); - } else { - icon = - gtk_icon_set_new_from_pixbuf(pixbuf); - } - } else { - /* Missing pixmap */ - g_warning("Pixmap not found: %s", filename); - } - - gtk_icon_factory_add(factory, pioneers_pixmaps[idx], icon); - g_free(filename); - gtk_icon_set_unref(icon); - } - - gtk_icon_factory_add_default(factory); - g_object_unref(factory); + path = g_build_filename(DATADIR, "pixmaps", "pioneers", NULL); + gtk_icon_theme_append_search_path(iconTheme, path); + g_free(path); +} + +static void add_guievent_action(GActionGroup * action_group, + const gchar * name, GuiEvent event) +{ + GSimpleAction *action = g_simple_action_new(name, NULL); + g_signal_connect(action, "activate", + G_CALLBACK(redirect_gui_event_cb), + g_variant_new_int32(event)); + g_action_map_add_action(G_ACTION_MAP(action_group), + G_ACTION(action)); } GtkWidget *gui_build_interface(void) { GtkWidget *vbox; - GtkWidget *menubar; - GtkActionGroup *action_group; - GtkAccelGroup *accel_group; - GError *error = NULL; gchar *icon_file; + GSimpleAction *action; player_init(); gmap = guimap_new(); register_pixmaps(); - app_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + + builder = + gtk_builder_new_from_resource + ("/net/sourceforge/pio/client/gtk/client.ui"); + app_window = + GTK_WIDGET(gtk_builder_get_object(builder, "toplevel")); /* The name of the application */ gtk_window_set_title(GTK_WINDOW(app_window), _("Pioneers")); + gtk_builder_connect_signals(builder, app_window); - prepare_gtk_for_close_button_on_tab(); - - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(app_window), vbox); - - action_group = gtk_action_group_new("MenuActions"); - gtk_action_group_set_translation_domain(action_group, PACKAGE); - gtk_action_group_add_actions(action_group, entries, - G_N_ELEMENTS(entries), app_window); - gtk_action_group_add_toggle_actions(action_group, toggle_entries, - G_N_ELEMENTS(toggle_entries), - app_window); - - ui_manager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group(ui_manager, action_group, 0); - - accel_group = gtk_ui_manager_get_accel_group(ui_manager); - gtk_window_add_accel_group(GTK_WINDOW(app_window), accel_group); - - error = NULL; - if (!gtk_ui_manager_add_ui_from_string - (ui_manager, ui_description, -1, &error)) { - g_message("building menus failed: %s", error->message); - g_error_free(error); - return NULL; - } + vbox = GTK_WIDGET(gtk_builder_get_object(builder, "vbox")); icon_file = g_build_filename(DATADIR, "pixmaps", PIONEERS_ICON_FILE, NULL); @@ -1659,31 +1380,60 @@ ("settings/announce_player", TRUE)); set_show_notifications(config_get_int_with_default ("settings/show_notifications", TRUE)); + set_charity_enabled(config_get_int_with_default + ("settings/charity_enabled", FALSE)); + set_automatic_roll(config_get_int_with_default + ("settings/automatic_roll", + get_automatic_roll())); legend_page_enabled = config_get_int_with_default("settings/legend_page", FALSE); - menubar = gtk_ui_manager_get_widget(ui_manager, "/MainMenu"); - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - toolbar = gtk_ui_manager_get_widget(ui_manager, "/MainToolbar"); - gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), build_main_interface(), TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), build_status_bar(), FALSE, FALSE, 0); - gtk_toggle_action_set_active(GTK_TOGGLE_ACTION - (gtk_ui_manager_get_action - (ui_manager, - "ui/MainMenu/SettingsMenu/ShowHideToolbar")), - config_get_int_with_default - ("settings/show_toolbar", TRUE)); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM + (gtk_builder_get_object + (builder, + "toolbar_visible")), + config_get_int_with_default + ("settings/show_toolbar", TRUE)); g_signal_connect(G_OBJECT(app_window), "key_press_event", G_CALLBACK(hotkeys_handler), NULL); gtk_widget_show(app_window); + action_group = G_ACTION_GROUP(g_simple_action_group_new()); + add_guievent_action(action_group, "action_game_new", GUI_CONNECT); + action = g_simple_action_new("action_game_leave", NULL); + g_signal_connect(action, "activate", + G_CALLBACK(game_leave_cb), NULL); + g_action_map_add_action(G_ACTION_MAP(action_group), + G_ACTION(action)); + add_guievent_action(action_group, "action_player_name", + GUI_CHANGE_NAME); + add_guievent_action(action_group, "action_roll_dice", GUI_ROLL); + add_guievent_action(action_group, "action_trade", GUI_TRADE); + add_guievent_action(action_group, "action_undo", GUI_UNDO); + add_guievent_action(action_group, "action_finish", GUI_FINISH); + add_guievent_action(action_group, "action_build_road", GUI_ROAD); + add_guievent_action(action_group, "action_build_ship", GUI_SHIP); + add_guievent_action(action_group, "action_move_ship", + GUI_MOVE_SHIP); + add_guievent_action(action_group, "action_build_bridge", + GUI_BRIDGE); + add_guievent_action(action_group, + "action_build_settlement", GUI_SETTLEMENT); + add_guievent_action(action_group, "action_build_city", GUI_CITY); + add_guievent_action(action_group, "action_buy_development", + GUI_BUY_DEVELOP); + add_guievent_action(action_group, "action_build_city_wall", + GUI_CITY_WALL); + gtk_widget_insert_action_group(app_window, "win", action_group); + frontend_gui_register_action(getAction(GUI_CONNECT), GUI_CONNECT); frontend_gui_register_action(getAction(GUI_DISCONNECT), GUI_DISCONNECT); @@ -1693,6 +1443,9 @@ (manager, "ui/MainMenu/GameMenu/GameAdmin"), GUI_ADMIN); + gtk_menu_item_set_visible(GTK_MENU_ITEM + (gtk_builder_get_object + (builder, "admin")), TRUE); #endif frontend_gui_register_action(getAction(GUI_CHANGE_NAME), GUI_CHANGE_NAME); @@ -1716,19 +1469,25 @@ frontend_gui_register_destroy(gtk_ui_manager_get_action (manager, "GameQuit"), GUI_QUIT); #endif +#ifdef HAVE_HELP + gtk_widget_set_visible(GTK_WIDGET + (gtk_builder_get_object + (builder, "help_manual")), TRUE); +#endif + gui_toolbar_show_button("BuildShip", FALSE); gui_toolbar_show_button("MoveShip", FALSE); gui_toolbar_show_button("BuildBridge", FALSE); + gui_toolbar_show_button("BuildCityWall", FALSE); gui_toolbar_show_accelerators(config_get_int_with_default ("settings/toolbar_show_accelerators", TRUE)); - gtk_ui_manager_ensure_update(ui_manager); gtk_widget_show(app_window); g_signal_connect(G_OBJECT(app_window), "delete_event", - G_CALLBACK(quit_cb), NULL); + G_CALLBACK(game_quit_cb), NULL); return app_window; } diff -Nru pioneers-15.5/client/gtk/gui.h pioneers-15.6/client/gtk/gui.h --- pioneers-15.5/client/gtk/gui.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/gui.h 2020-06-21 11:32:32.000000000 +0000 @@ -71,7 +71,7 @@ extern GtkWidget *app_window; /* main application window */ /* gui states */ -typedef void (*GuiState) (GuiEvent event); +typedef void (*GuiState)(GuiEvent event); #define set_gui_state(A) do \ { debug("New GUI_state: %s %p\n", #A, A); \ @@ -85,4 +85,17 @@ void gui_set_show_no_setup_nodes(gboolean show); +gboolean get_charity_enabled(void); +void set_charity_enabled(gboolean new_charity_enabled); + +typedef enum { + ROLL_MANUALLY = 0, + ROLL_AUTOMATICALLY_EXCEPT_WITH_SOLDIER_CARD = 1, + ROLL_AUTOMATICALLY_EXCEPT_WITH_RESOURCE_CARD = 2, + ROLL_AUTOMATICALLY = 3 +} TAutomaticRoll; + +TAutomaticRoll get_automatic_roll(void); +void set_automatic_roll(TAutomaticRoll automatic_roll); + #endif diff -Nru pioneers-15.5/client/gtk/histogram.c pioneers-15.6/client/gtk/histogram.c --- pioneers-15.5/client/gtk/histogram.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/histogram.c 2020-04-18 16:20:38.000000000 +0000 @@ -67,7 +67,7 @@ */ static gboolean draw_histogram_cb(GtkWidget * widget, cairo_t * cr, - gpointer terrain) + G_GNUC_UNUSED gpointer user_data) { gint w; gint h; @@ -93,8 +93,7 @@ gint CHIT_RADIUS; GdkPixbuf *pixbuf; GtkAllocation allocation; - - pixbuf = theme_get_terrain_pixbuf(GPOINTER_TO_INT(terrain)); + MapTheme *theme; cairo_set_line_width(cr, 1.0); @@ -143,7 +142,7 @@ gdouble y = grid_offset_y + grid_height - 0.5 - (gdouble) i * grid_height / GRID_DIVISIONS; - gdk_cairo_set_source_color(cr, &lightblue); + gdk_cairo_set_source_rgba(cr, &lightblue); cairo_move_to(cr, grid_offset_x, y); cairo_line_to(cr, w - SPACING_AROUND, y); cairo_stroke(cr); @@ -153,7 +152,7 @@ pango_layout_set_text(layout, buff, -1); pango_layout_get_pixel_size(layout, &width, &height); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); cairo_move_to(cr, label_width - width + SPACING_AROUND, y - height / 2.0); @@ -164,6 +163,33 @@ bar_width = (grid_width - 12 * BAR_SEPARATION) / 11.0; grid_offset_x += BAR_SEPARATION; + /* the filling of the bars */ + theme = theme_get_current(); + if (gdk_pixbuf_get_has_alpha + (theme_get_terrain_pixbuf(SEA_TERRAIN))) { + GdkPixbuf *p; + int w; + int h; + + /* The image has transparency, so it is probably a hexagon. + Take the middle rectangle. + It doesn't tile the best, but it is better than tiling the hexagon. + */ + w = gdk_pixbuf_get_width(theme->scaledata + [SEA_TERRAIN].native_image); + h = gdk_pixbuf_get_height(theme->scaledata + [SEA_TERRAIN].native_image); + p = gdk_pixbuf_new_subpixbuf(theme->scaledata + [SEA_TERRAIN].native_image, 0, + h / 4, w, h / 2); + pixbuf = gdk_pixbuf_copy(p); + g_object_unref(p); + } else { + pixbuf = + gdk_pixbuf_copy(theme-> + scaledata[SEA_TERRAIN].native_image); + } + /* histogram bars */ for (i = 2; i <= 12; i++) { gdouble bh = @@ -171,7 +197,8 @@ max + 0.5; gdouble x = grid_offset_x + (i - 2) * (bar_width + BAR_SEPARATION); - gdk_cairo_set_source_pixbuf(cr, pixbuf, 0.0, 0.0); + gdk_cairo_set_source_pixbuf(cr, pixbuf, grid_offset_x, + grid_offset_y); cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT); cairo_rectangle(cr, x, grid_height + grid_offset_y - bh, @@ -183,7 +210,7 @@ pango_layout_set_markup(layout, buff, -1); pango_layout_get_pixel_size(layout, &width, &height); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); cairo_move_to(cr, x + (bar_width - width) / 2, grid_height + grid_offset_y - bh - height); @@ -195,6 +222,7 @@ i, SEA_TERRAIN, i == last_roll); } } + g_object_unref(pixbuf); /* expected value */ seven_thrown = histogram_dice_retrieve(7) != 0; @@ -214,7 +242,7 @@ mi = le + 5 * (bar_width + BAR_SEPARATION); ri = mi + 5 * (bar_width + BAR_SEPARATION); - gdk_cairo_set_source_color(cr, &red); + gdk_cairo_set_source_rgba(cr, &red); cairo_move_to(cr, le, expected_low_y); cairo_line_to(cr, mi - (seven_thrown ? 0 : bar_width + BAR_SEPARATION), @@ -236,7 +264,7 @@ gtk_widget_destroyed(widget, arg); } -GtkWidget *histogram_create_dlg(void) +GtkWidget *histogram_create_dlg(GtkWindow * parent_window) { GtkWidget *dlg_vbox; @@ -246,7 +274,7 @@ /* Dialog caption */ histogram_dlg = gtk_dialog_new_with_buttons(_("Dice Histogram"), - GTK_WINDOW(app_window), + parent_window, GTK_DIALOG_DESTROY_WITH_PARENT, /* Button text */ _("_Close"), @@ -262,8 +290,7 @@ histogram_area = gtk_drawing_area_new(); g_signal_connect(G_OBJECT(histogram_area), "draw", - G_CALLBACK(draw_histogram_cb), - GINT_TO_POINTER(SEA_TERRAIN)); + G_CALLBACK(draw_histogram_cb), NULL); gtk_box_pack_start(GTK_BOX(dlg_vbox), histogram_area, TRUE, TRUE, SPACING_AROUND); gtk_widget_show(histogram_area); diff -Nru pioneers-15.5/client/gtk/histogram.h pioneers-15.6/client/gtk/histogram.h --- pioneers-15.5/client/gtk/histogram.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/histogram.h 2020-04-15 17:35:10.000000000 +0000 @@ -24,7 +24,7 @@ void histogram_dice_rolled(gint roll, gint playernum); -GtkWidget *histogram_create_dlg(void); +GtkWidget *histogram_create_dlg(GtkWindow * parent_window); void histogram_init(void); void histogram_reset(void); #endif diff -Nru pioneers-15.5/client/gtk/identity.c pioneers-15.6/client/gtk/identity.c --- pioneers-15.5/client/gtk/identity.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/identity.c 2020-06-20 10:52:00.000000000 +0000 @@ -45,7 +45,7 @@ FIRST_BUILD_TYPE + 1]; typedef struct { - void (*get_polygon) (const GuiMap * gmap, Polygon * poly); + void (*get_polygon)(const GuiMap * gmap, Polygon * poly); gint(*stock_num) (void); GuiEvent gui_event; } TypeData; @@ -84,14 +84,14 @@ } static const TypeData TYPE_DATA[LAST_BUILD_TYPE - FIRST_BUILD_TYPE + 1] = { - {identity_get_road_polygon, stock_num_roads, GUI_ROAD}, - {identity_get_bridge_polygon, stock_num_bridges, GUI_BRIDGE}, - {identity_get_ship_polygon, stock_num_ships, GUI_SHIP}, - {identity_get_settlement_polygon, stock_num_settlements, - GUI_SETTLEMENT}, - {identity_get_city_polygon, stock_num_cities, GUI_CITY}, - {identity_get_city_wall_polygon, stock_num_city_walls, - GUI_CITY_WALL}, + { identity_get_road_polygon, stock_num_roads, GUI_ROAD }, + { identity_get_bridge_polygon, stock_num_bridges, GUI_BRIDGE }, + { identity_get_ship_polygon, stock_num_ships, GUI_SHIP }, + { identity_get_settlement_polygon, stock_num_settlements, + GUI_SETTLEMENT }, + { identity_get_city_polygon, stock_num_cities, GUI_CITY }, + { identity_get_city_wall_polygon, stock_num_city_walls, + GUI_CITY_WALL }, }; static gint calculate_width(GtkWidget * area, BuildType build_type) @@ -201,38 +201,38 @@ } static void show_die(cairo_t * cr, gint x_offset, gint num, - GdkColor * die_border_color, GdkColor * die_color, - GdkColor * die_dots_color) + GdkRGBA * die_border_color, GdkRGBA * die_color, + GdkRGBA * die_dots_color) { static GdkPoint die_points[4] = { - {0, 0}, {30, 0}, {30, 30}, {0, 30} + { 0, 0 }, { 30, 0 }, { 30, 30 }, { 0, 30 } }; static Polygon die_shape = { die_points, G_N_ELEMENTS(die_points) }; static GdkPoint dot_pos[7] = { - {7, 7}, {22, 7}, - {7, 15}, {15, 15}, {22, 15}, - {7, 22}, {22, 22} + { 7, 7 }, { 22, 7 }, + { 7, 15 }, { 15, 15 }, { 22, 15 }, + { 7, 22 }, { 22, 22 } }; static gint draw_list[6][7] = { - {0, 0, 0, 1, 0, 0, 0}, - {0, 1, 0, 0, 0, 1, 0}, - {1, 0, 0, 1, 0, 0, 1}, - {1, 1, 0, 0, 0, 1, 1}, - {1, 1, 0, 1, 0, 1, 1}, - {1, 1, 1, 0, 1, 1, 1} + { 0, 0, 0, 1, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 1, 0 }, + { 1, 0, 0, 1, 0, 0, 1 }, + { 1, 1, 0, 0, 0, 1, 1 }, + { 1, 1, 0, 1, 0, 1, 1 }, + { 1, 1, 1, 0, 1, 1, 1 } }; gint y_offset; gint *list = draw_list[num - 1]; gint idx; y_offset = IDENTITY_BORDER; poly_offset(&die_shape, x_offset, y_offset); - gdk_cairo_set_source_color(cr, die_color); + gdk_cairo_set_source_rgba(cr, die_color); poly_draw(cr, TRUE, &die_shape); - gdk_cairo_set_source_color(cr, die_border_color); + gdk_cairo_set_source_rgba(cr, die_border_color); poly_draw(cr, FALSE, &die_shape); poly_offset(&die_shape, -x_offset, -y_offset); - gdk_cairo_set_source_color(cr, die_dots_color); + gdk_cairo_set_source_rgba(cr, die_dots_color); for (idx = 0; idx < 7; idx++) { if (list[idx] == 0) continue; @@ -254,7 +254,7 @@ static gint draw_identity_area_cb(GtkWidget * widget, cairo_t * cr, G_GNUC_UNUSED gpointer user_data) { - GdkColor *colour; + GdkRGBA *colour; const GameParams *game_params; gint i; GtkAllocation allocation; @@ -267,7 +267,7 @@ cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); cairo_set_line_width(cr, 1.0); colour = player_or_spectator_color(my_player_num()); - gdk_cairo_set_source_color(cr, colour); + gdk_cairo_set_source_rgba(cr, colour); gtk_widget_get_allocation(widget, &allocation); cairo_rectangle(cr, 0, 0, allocation.width, allocation.height); cairo_fill(cr); @@ -275,7 +275,7 @@ colour = &white; else colour = &black; - gdk_cairo_set_source_color(cr, colour); + gdk_cairo_set_source_rgba(cr, colour); game_params = get_game_params(); if (game_params == NULL) return TRUE; diff -Nru pioneers-15.5/client/gtk/interface.c pioneers-15.6/client/gtk/interface.c --- pioneers-15.5/client/gtk/interface.c 2018-03-14 15:16:58.000000000 +0000 +++ pioneers-15.6/client/gtk/interface.c 2020-06-21 11:32:32.000000000 +0000 @@ -429,7 +429,44 @@ set_gui_state(frontend_state_turn); play_sound(SOUND_TURN); /* Notification */ - notification_send(_("It is your turn."), PIONEERS_PIXMAP_DICE); + notification_send(_("It is your turn."), ICON_DICE); + + if (!have_rolled_dice()) { + gboolean have_resource_card; + gboolean have_soldier_card; + guint i; + const Deck *deck = get_devel_deck(); + TAutomaticRoll automatic_roll = get_automatic_roll(); + + have_soldier_card = FALSE; + for (i = 0; i < deck_count(deck); i++) { + DevelType cardtype = deck_get_guint(deck, i); + if (cardtype == DEVEL_SOLDIER + && can_play_develop(i)) { + have_soldier_card = TRUE; + break; + } + } + have_resource_card = (deck_count(deck) != 0); + + switch (automatic_roll) { + case ROLL_MANUALLY: + break; + case ROLL_AUTOMATICALLY_EXCEPT_WITH_SOLDIER_CARD: + if (!have_soldier_card) { + cb_roll(); + } + break; + case ROLL_AUTOMATICALLY_EXCEPT_WITH_RESOURCE_CARD: + if (!have_resource_card) { + cb_roll(); + } + break; + case ROLL_AUTOMATICALLY: + cb_roll(); + break; + } + } } /* development card actions */ @@ -916,6 +953,5 @@ set_gui_state(frontend_mode_setup); play_sound(SOUND_TURN); /* Notification */ - notification_send(_("It is your turn to setup."), - PIONEERS_PIXMAP_SETTLEMENT); + notification_send(_("It is your turn to setup."), ICON_SETTLEMENT); } diff -Nru pioneers-15.5/client/gtk/legend.c pioneers-15.6/client/gtk/legend.c --- pioneers-15.5/client/gtk/legend.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/legend.c 2020-05-31 11:54:46.000000000 +0000 @@ -47,66 +47,50 @@ static void legend_theme_changed(void); static void legend_rules_changed(void); -static void add_legend_terrain(GtkWidget * table, guint row, guint col, +static void add_legend_terrain(GtkWidget * grid, guint row, guint col, Terrain terrain, Resource resource) { GtkWidget *label; - gtk_table_attach(GTK_TABLE(table), terrain_icon_new(terrain), - col, col + 1, row, row + 1, - (GtkAttachOptions) GTK_FILL, - (GtkAttachOptions) GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), terrain_icon_new(terrain), col, + row, 1, 1); label = gtk_label_new(_(terrain_names[terrain])); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, - col + 1, col + 2, row, row + 1, - (GtkAttachOptions) GTK_FILL, - (GtkAttachOptions) GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, col + 1, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); if (resource < NO_RESOURCE) { label = resource_view_new_single_resource(resource); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, - col + 2, col + 3, row, row + 1, - (GtkAttachOptions) GTK_FILL, - (GtkAttachOptions) GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, col + 2, row, 1, 1); label = gtk_label_new(resource_name(resource, TRUE)); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, - col + 3, col + 4, row, row + 1, - (GtkAttachOptions) GTK_FILL, - (GtkAttachOptions) GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, col + 3, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); } } -static void add_legend_cost(GtkWidget * table, guint row, +static void add_legend_cost(GtkWidget * grid, guint row, const gchar * iconname, const gchar * item, const gint * cost) { GtkWidget *label; GtkWidget *icon; - icon = gtk_image_new_from_stock(iconname, GTK_ICON_SIZE_MENU); + icon = gtk_image_new_from_icon_name(iconname, GTK_ICON_SIZE_MENU); gtk_widget_show(icon); - gtk_table_attach(GTK_TABLE(table), icon, 0, 1, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), icon, 0, row, 1, 1); label = gtk_label_new(item); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 1, 2, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, 1, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); label = resource_view_new(); resource_view_set(RESOURCE_VIEW(label), cost); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 2, 3, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, 2, row, 1, 1); } static GtkWidget *legend_create_content_with_scrolling(gboolean @@ -115,7 +99,7 @@ GtkWidget *hbox; GtkWidget *vbox; GtkWidget *label; - GtkWidget *table; + GtkWidget *grid; GtkWidget *vsep; GtkWidget *alignment; guint num_rows; @@ -130,7 +114,7 @@ label = gtk_label_new(NULL); /* Label */ gtk_label_set_markup(GTK_LABEL(label), _("Terrain yield")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); @@ -139,31 +123,30 @@ gtk_widget_show(alignment); gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0); - table = gtk_table_new(4, 9, FALSE); - gtk_widget_show(table); - gtk_container_add(GTK_CONTAINER(alignment), table); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - - add_legend_terrain(table, 0, 0, HILL_TERRAIN, BRICK_RESOURCE); - add_legend_terrain(table, 1, 0, FIELD_TERRAIN, GRAIN_RESOURCE); - add_legend_terrain(table, 2, 0, MOUNTAIN_TERRAIN, ORE_RESOURCE); - add_legend_terrain(table, 3, 0, PASTURE_TERRAIN, WOOL_RESOURCE); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_container_add(GTK_CONTAINER(alignment), grid); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); + + add_legend_terrain(grid, 0, 0, HILL_TERRAIN, BRICK_RESOURCE); + add_legend_terrain(grid, 1, 0, FIELD_TERRAIN, GRAIN_RESOURCE); + add_legend_terrain(grid, 2, 0, MOUNTAIN_TERRAIN, ORE_RESOURCE); + add_legend_terrain(grid, 3, 0, PASTURE_TERRAIN, WOOL_RESOURCE); vsep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); gtk_widget_show(vsep); - gtk_table_attach(GTK_TABLE(table), vsep, 4, 5, 0, 4, - GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), vsep, 4, 0, 1, 4); - add_legend_terrain(table, 0, 5, FOREST_TERRAIN, LUMBER_RESOURCE); - add_legend_terrain(table, 1, 5, GOLD_TERRAIN, GOLD_RESOURCE); - add_legend_terrain(table, 2, 5, DESERT_TERRAIN, NO_RESOURCE); - add_legend_terrain(table, 3, 5, SEA_TERRAIN, NO_RESOURCE); + add_legend_terrain(grid, 0, 5, FOREST_TERRAIN, LUMBER_RESOURCE); + add_legend_terrain(grid, 1, 5, GOLD_TERRAIN, GOLD_RESOURCE); + add_legend_terrain(grid, 2, 5, DESERT_TERRAIN, NO_RESOURCE); + add_legend_terrain(grid, 3, 5, SEA_TERRAIN, NO_RESOURCE); label = gtk_label_new(NULL); /* Label */ gtk_label_set_markup(GTK_LABEL(label), _("Building costs")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); @@ -172,37 +155,29 @@ gtk_widget_show(alignment); gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0); - num_rows = 4; - if (have_ships()) - num_rows++; - if (have_bridges()) - num_rows++; - if (have_city_walls()) - num_rows++; - table = gtk_table_new(num_rows, 3, FALSE); - gtk_widget_show(table); - gtk_container_add(GTK_CONTAINER(alignment), table); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 5); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_container_add(GTK_CONTAINER(alignment), grid); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); num_rows = 0; - add_legend_cost(table, num_rows++, PIONEERS_PIXMAP_ROAD, _("Road"), + add_legend_cost(grid, num_rows++, ICON_ROAD, _("Road"), cost_road()); if (have_ships()) - add_legend_cost(table, num_rows++, PIONEERS_PIXMAP_SHIP, - _("Ship"), cost_ship()); + add_legend_cost(grid, num_rows++, ICON_SHIP, _("Ship"), + cost_ship()); if (have_bridges()) - add_legend_cost(table, num_rows++, PIONEERS_PIXMAP_BRIDGE, - _("Bridge"), cost_bridge()); - add_legend_cost(table, num_rows++, PIONEERS_PIXMAP_SETTLEMENT, - _("Settlement"), cost_settlement()); - add_legend_cost(table, num_rows++, PIONEERS_PIXMAP_CITY, _("City"), + add_legend_cost(grid, num_rows++, ICON_BRIDGE, _("Bridge"), + cost_bridge()); + add_legend_cost(grid, num_rows++, ICON_SETTLEMENT, _("Settlement"), + cost_settlement()); + add_legend_cost(grid, num_rows++, ICON_CITY, _("City"), cost_upgrade_settlement()); if (have_city_walls()) - add_legend_cost(table, num_rows++, - PIONEERS_PIXMAP_CITY_WALL, _("City wall"), - cost_city_wall()); - add_legend_cost(table, num_rows++, PIONEERS_PIXMAP_DEVELOP, + add_legend_cost(grid, num_rows++, ICON_CITY_WALL, + _("City wall"), cost_city_wall()); + add_legend_cost(grid, num_rows++, ICON_DEVELOP, _("Development card"), cost_development()); gtk_widget_show(vbox); @@ -235,7 +210,7 @@ return legend_create_content_with_scrolling(TRUE); } -GtkWidget *legend_create_dlg(void) +GtkWidget *legend_create_dlg(GtkWindow * parent_window) { GtkWidget *dlg_vbox; GtkWidget *vbox; @@ -247,7 +222,7 @@ /* Dialog caption */ legend_dlg = gtk_dialog_new_with_buttons(_("Legend"), - GTK_WINDOW(app_window), + parent_window, GTK_DIALOG_DESTROY_WITH_PARENT, /* Button text */ _("_Close"), diff -Nru pioneers-15.5/client/gtk/Makefile.am pioneers-15.6/client/gtk/Makefile.am --- pioneers-15.5/client/gtk/Makefile.am 2012-02-02 10:14:55.000000000 +0000 +++ pioneers-15.6/client/gtk/Makefile.am 2020-05-31 11:54:46.000000000 +0000 @@ -33,10 +33,20 @@ ADMIN_GTK_FILES_INACTIVE = client/gtk/admin-gtk.c endif -pioneers_CPPFLAGS = -I$(top_srcdir)/client -I$(top_srcdir)/client/common $(LIBNOTIFY_CFLAGS) $(gtk_cflags) $(ADMIN_GTK) $(avahi_cflags) +pioneers_CPPFLAGS = -I$(top_srcdir)/client -I$(top_srcdir)/client/common $(LIBNOTIFY_CFLAGS) $(gtk_cflags) $(ADMIN_GTK) $(avahi_cflags) $(LIBCANBERRA_CFLAGS) EXTRA_pioneers_SOURCES = $(ADMIN_GTK_FILES_INACTIVE) +client_resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/client/gtk/client.gresource.xml) +client/gtk/client-resources.c: client/gtk/client.gresource.xml $(client_resource_files) + $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name client $(srcdir)/client/gtk/client.gresource.xml +client/gtk/client-resources.h: client/gtk/client.gresource.xml $(client_resource_files) + $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name client $(srcdir)/client/gtk/client.gresource.xml + +pioneers_BUILT_RESOURCES = \ + client/gtk/client-resources.c \ + client/gtk/client-resources.h + pioneers_SOURCES = \ $(ADMIN_GTK_FILES_ACTIVE) \ client/callback.h \ @@ -82,9 +92,17 @@ client/gtk/resource-table.h \ client/gtk/settingscreen.c \ client/gtk/state.c \ - client/gtk/trade.c + client/gtk/trade.c \ + $(pioneers_BUILT_RESOURCES) + +EXTRA_DIST += \ + $(client_resource_files) \ + client/gtk/client.gresource.xml + +CLEANFILES += \ + $(pioneers_BUILT_RESOURCES) -pioneers_LDADD = libpioneersclient.a $(gtk_libs) $(avahi_libs) $(LIBNOTIFY_LIBS) +pioneers_LDADD = libpioneersclient.a $(gtk_libs) $(avahi_libs) $(LIBNOTIFY_LIBS) $(LIBCANBERRA_LIBS) # Include the data here, not at the top, # it can add extra resources to the executable diff -Nru pioneers-15.5/client/gtk/monopoly.c pioneers-15.6/client/gtk/monopoly.c --- pioneers-15.5/client/gtk/monopoly.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/monopoly.c 2018-07-07 20:49:17.000000000 +0000 @@ -107,7 +107,7 @@ "monopolize.")); gtk_widget_show(lbl); gtk_box_pack_start(GTK_BOX(vbox), lbl, TRUE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(lbl), 0.0); monop_grp = add_resource_btn(vbox, monop_grp, BRICK_RESOURCE); monop_grp = add_resource_btn(vbox, monop_grp, GRAIN_RESOURCE); diff -Nru pioneers-15.5/client/gtk/name.c pioneers-15.6/client/gtk/name.c --- pioneers-15.5/client/gtk/name.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/name.c 2018-07-07 20:49:17.000000000 +0000 @@ -93,12 +93,12 @@ g_free(dialog->current_style); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dialog->check_btn))) { - GdkColor c1; - GdkColor c2; + GdkRGBA c1; + GdkRGBA c2; guint variant; - gtk_color_button_get_color(GTK_COLOR_BUTTON + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER (dialog->color_btn1), &c1); - gtk_color_button_get_color(GTK_COLOR_BUTTON + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER (dialog->color_btn2), &c2); variant = gtk_range_get_value(GTK_RANGE(dialog->variant_btn)) - @@ -125,7 +125,7 @@ GtkWidget *dlg_vbox; GtkWidget *hbox; GtkWidget *lbl; - GdkColor face_color, variant_color; + GdkRGBA face_color, variant_color; guint variant; gboolean parse_ok; gint width; @@ -172,7 +172,7 @@ lbl = gtk_label_new(_("Player name:")); gtk_widget_show(lbl); gtk_box_pack_start(GTK_BOX(hbox), lbl, FALSE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(lbl), 1.0); name_dialog.name_entry = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(name_dialog.name_entry), @@ -235,11 +235,10 @@ gtk_widget_show(lbl); gtk_box_pack_start(GTK_BOX(name_dialog.style_hbox), lbl, FALSE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(lbl), 1.0); - name_dialog.color_btn1 = gtk_color_button_new(); - gtk_color_button_set_color(GTK_COLOR_BUTTON - (name_dialog.color_btn1), &face_color); + name_dialog.color_btn1 = + gtk_color_button_new_with_rgba(&face_color); gtk_widget_show(name_dialog.color_btn1); gtk_box_pack_start(GTK_BOX(name_dialog.style_hbox), name_dialog.color_btn1, FALSE, TRUE, 0); @@ -251,12 +250,10 @@ gtk_widget_show(lbl); gtk_box_pack_start(GTK_BOX(name_dialog.style_hbox), lbl, FALSE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(lbl), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(lbl), 1.0); - name_dialog.color_btn2 = gtk_color_button_new(); - gtk_color_button_set_color(GTK_COLOR_BUTTON - (name_dialog.color_btn2), - &variant_color); + name_dialog.color_btn2 = + gtk_color_button_new_with_rgba(&variant_color); gtk_widget_show(name_dialog.color_btn2); gtk_box_pack_start(GTK_BOX(name_dialog.style_hbox), name_dialog.color_btn2, FALSE, TRUE, 0); diff -Nru pioneers-15.5/client/gtk/notification.c pioneers-15.6/client/gtk/notification.c --- pioneers-15.5/client/gtk/notification.c 2013-06-10 07:45:57.000000000 +0000 +++ pioneers-15.6/client/gtk/notification.c 2020-05-31 11:54:46.000000000 +0000 @@ -42,14 +42,17 @@ #ifdef HAVE_NOTIFY notification_close(); if (show_notifications) { - gchar *filename; + GdkPixbuf *pixbuf; - filename = - g_build_filename(DATADIR, "pixmaps", icon, NULL); + pixbuf = + gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + icon, 24, 0, NULL); notification = notify_notification_new(g_get_application_name(), text, - filename); - g_free(filename); + NULL); + notify_notification_set_image_from_pixbuf(notification, + pixbuf); + g_object_unref(pixbuf); notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW); notify_notification_show(notification, NULL); diff -Nru pioneers-15.5/client/gtk/offline.c pioneers-15.6/client/gtk/offline.c --- pioneers-15.5/client/gtk/offline.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/offline.c 2020-06-21 09:18:27.000000000 +0000 @@ -21,7 +21,6 @@ */ #include "config.h" -#include #include "frontend.h" #include "common_gtk.h" #include "config-gnome.h" @@ -47,28 +46,28 @@ static gboolean show_version = FALSE; static GOptionEntry commandline_entries[] = { - /* Commandline option of client: hostname of the server */ - {"server", 's', 0, G_OPTION_ARG_STRING, &server, N_("Server host"), - PIONEERS_DEFAULT_GAME_HOST}, + { "server", 's', 0, G_OPTION_ARG_STRING, &server, + /* Commandline option of client: hostname of the server */ + N_("Server host"), PIONEERS_DEFAULT_GAME_HOST }, /* Commandline option of client: port of the server */ - {"port", 'p', 0, G_OPTION_ARG_STRING, &port, N_("Server port"), - PIONEERS_DEFAULT_GAME_PORT}, + { "port", 'p', 0, G_OPTION_ARG_STRING, &port, N_("Server port"), + PIONEERS_DEFAULT_GAME_PORT }, /* Commandline option of client: name of the player */ - {"name", 'n', 0, G_OPTION_ARG_STRING, &name, N_("Player name"), - NULL}, - /* Commandline option of client: do we want to be a spectator */ - {"spectator", 'v', 0, G_OPTION_ARG_NONE, &spectator, - N_("Connect as a spectator"), NULL}, - /* Commandline option of client: hostname of the metaserver */ - {"metaserver", 'm', 0, G_OPTION_ARG_STRING, &metaserver, - N_("Metaserver Host"), PIONEERS_DEFAULT_METASERVER}, - {"debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, + { "name", 'n', 0, G_OPTION_ARG_STRING, &name, N_("Player name"), + NULL }, + { "spectator", 'v', 0, G_OPTION_ARG_NONE, &spectator, + /* Commandline option of client: do we want to be a spectator */ + N_("Connect as a spectator"), NULL }, + { "metaserver", 'm', 0, G_OPTION_ARG_STRING, &metaserver, + /* Commandline option of client: hostname of the metaserver */ + N_("Metaserver Host"), PIONEERS_DEFAULT_METASERVER }, + { "debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, /* Commandline option of client: enable debug logging */ - N_("Enable debug messages"), NULL}, - {"version", '\0', 0, G_OPTION_ARG_NONE, &show_version, + N_("Enable debug messages"), NULL }, + { "version", '\0', 0, G_OPTION_ARG_NONE, &show_version, /* Commandline option of client: version */ - N_("Show version information"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Show version information"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; static void frontend_offline_start_connect_cb(void) @@ -199,12 +198,6 @@ g_print("\n"); exit(0); } -#if ENABLE_NLS - /* Gtk+ handles the locale, we must bind the translations */ - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif /* Name of the application */ g_set_application_name(_("Pioneers")); diff -Nru pioneers-15.5/client/gtk/player.c pioneers-15.6/client/gtk/player.c --- pioneers-15.5/client/gtk/player.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/player.c 2020-06-20 10:52:00.000000000 +0000 @@ -33,36 +33,36 @@ gboolean connected, GtkTreeIter * iter); -static GdkColor ps_settlement = { 0, 0xbb00, 0x0000, 0x0000 }; -static GdkColor ps_city = { 0, 0xff00, 0x0000, 0x0000 }; -static GdkColor ps_city_wall = { 0, 0xff00, 0x0000, 0x0000 }; -static GdkColor ps_largest = { 0, 0x1c00, 0xb500, 0xed00 }; -static GdkColor ps_soldier = { 0, 0xe500, 0x8f00, 0x1600 }; -static GdkColor ps_resource = { 0, 0x0000, 0x0000, 0xFF00 }; -static GdkColor ps_development = { 0, 0xc600, 0xc600, 0x1300 }; -static GdkColor ps_building = { 0, 0x0b00, 0xed00, 0x8900 }; +static GdkRGBA ps_settlement = { 0.73, 0.00, 0.00, 1.0 }; +static GdkRGBA ps_city = { 1.00, 0.00, 0.00, 1.0 }; +static GdkRGBA ps_city_wall = { 1.00, 0.00, 0.00, 1.0 }; +static GdkRGBA ps_largest = { 0.11, 0.71, 0.93, 1.0 }; +static GdkRGBA ps_soldier = { 0.90, 0.56, 0.09, 1.0 }; +static GdkRGBA ps_resource = { 0.00, 0.00, 1.00, 1.0 }; +static GdkRGBA ps_development = { 0.78, 0.78, 0.07, 1.0 }; +static GdkRGBA ps_building = { 0.04, 0.93, 0.54, 1.0 }; typedef struct { const gchar *singular; const gchar *plural; - GdkColor *textcolor; + GdkRGBA *textcolor; } Statistic; static Statistic statistics[] = { - {N_("Settlement"), N_("Settlements"), &ps_settlement}, - {N_("City"), N_("Cities"), &ps_city}, - {N_("City wall"), N_("City walls"), &ps_city_wall}, - {N_("Largest army"), NULL, &ps_largest}, - {N_("Longest road"), NULL, &ps_largest}, - {N_("Chapel"), N_("Chapels"), &ps_building}, - {N_("Pioneer university"), N_("Pioneer universities"), - &ps_building}, - {N_("Governor's house"), N_("Governor's houses"), &ps_building}, - {N_("Library"), N_("Libraries"), &ps_building}, - {N_("Market"), N_("Markets"), &ps_building}, - {N_("Soldier"), N_("Soldiers"), &ps_soldier}, - {N_("Resource card"), N_("Resource cards"), &ps_resource}, - {N_("Development card"), N_("Development cards"), &ps_development} + { N_("Settlement"), N_("Settlements"), &ps_settlement }, + { N_("City"), N_("Cities"), &ps_city }, + { N_("City wall"), N_("City walls"), &ps_city_wall }, + { N_("Largest army"), NULL, &ps_largest }, + { N_("Longest road"), NULL, &ps_largest }, + { N_("Chapel"), N_("Chapels"), &ps_building }, + { N_("Pioneer university"), N_("Pioneer universities"), + &ps_building }, + { N_("Governor's house"), N_("Governor's houses"), &ps_building }, + { N_("Library"), N_("Libraries"), &ps_building }, + { N_("Market"), N_("Markets"), &ps_building }, + { N_("Soldier"), N_("Soldiers"), &ps_soldier }, + { N_("Resource card"), N_("Resource cards"), &ps_resource }, + { N_("Development card"), N_("Development cards"), &ps_development } }; enum { @@ -108,12 +108,12 @@ playericon_init(); } -GdkColor *player_color(gint player_num) +GdkRGBA *player_color(gint player_num) { return colors_get_player(player_num); } -GdkColor *player_or_spectator_color(gint player_num) +GdkRGBA *player_or_spectator_color(gint player_num) { if (player_is_spectator(player_num)) { /* spectator color is always black */ @@ -558,13 +558,13 @@ /* Caption for the overview of the points and card of other players */ gtk_label_set_markup(GTK_LABEL(label), _("Player summary")); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_container_add(GTK_CONTAINER(alignment), label); summary_store = gtk_list_store_new(SUMMARY_COLUMN_LAST, GDK_TYPE_PIXBUF, /* player icon */ G_TYPE_INT, /* player number */ G_TYPE_STRING, /* text */ - GDK_TYPE_COLOR, /* text colour */ + GDK_TYPE_RGBA, /* text colour */ G_TYPE_STRING, /* score */ G_TYPE_INT, /* statistic */ G_TYPE_INT); /* points */ @@ -584,7 +584,7 @@ gtk_cell_renderer_text_new (), "text", SUMMARY_COLUMN_TEXT, - "foreground-gdk", + "foreground-rgba", SUMMARY_COLUMN_TEXT_COLOUR, NULL); gtk_tree_view_column_set_sizing(column, @@ -597,7 +597,7 @@ renderer, "text", SUMMARY_COLUMN_SCORE, - "foreground-gdk", + "foreground-rgba", SUMMARY_COLUMN_TEXT_COLOUR, NULL); g_object_set(renderer, "xalign", 1.0f, NULL); @@ -633,12 +633,12 @@ gtk_widget_get_allocation(widget, &allocation); offset = 0; for (idx = 0; idx < num_players(); idx++) { - gdk_cairo_set_source_color(cr, player_color(idx)); + gdk_cairo_set_source_rgba(cr, player_color(idx)); cairo_rectangle(cr, offset, 0, turn_area_icon_width, allocation.height); cairo_fill(cr); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); if (idx == current_player()) { cairo_set_line_width(cr, 3.0); cairo_rectangle(cr, offset + 1.5, 1.5, diff -Nru pioneers-15.5/client/gtk/plenty.c pioneers-15.6/client/gtk/plenty.c --- pioneers-15.5/client/gtk/plenty.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/plenty.c 2018-05-30 09:56:57.000000000 +0000 @@ -96,8 +96,7 @@ } else str = _("The bank is empty"); plenty.resource_widget = - resource_table_new(str, RESOURCE_TABLE_MORE_IN_HAND, TRUE, - TRUE); + resource_table_new(str, RESOURCE_TABLE_MORE_IN_HAND, TRUE); resource_table_set_total(RESOURCETABLE(plenty.resource_widget), /* Text for total in year of plenty dialog */ _("Total resources"), total); diff -Nru pioneers-15.5/client/gtk/quote.c pioneers-15.6/client/gtk/quote.c --- pioneers-15.5/client/gtk/quote.c 2015-05-30 17:32:06.000000000 +0000 +++ pioneers-15.6/client/gtk/quote.c 2020-06-06 12:39:19.000000000 +0000 @@ -35,6 +35,8 @@ static GtkWidget *delete_btn; static GtkWidget *reject_btn; static GtkWidget *quoteview; +/** Enable charity */ +static GtkWidget *charity_enabled_checkbutton; static GtkWidget *want_table; static GtkWidget *give_table; @@ -54,17 +56,29 @@ { gint want_quote[NO_RESOURCE]; gint give_quote[NO_RESOURCE]; + gint amount_want; + gint amount_give; resource_table_get_amount(RESOURCETABLE(want_table), want_quote); resource_table_get_amount(RESOURCETABLE(give_table), give_quote); - if (resource_count(want_quote) == 0 - && resource_count(give_quote) == 0) - return FALSE; + amount_want = resource_count(want_quote); + amount_give = resource_count(give_quote); - return !quote_view_trade_exists(QUOTEVIEW(quoteview), give_quote, + /* The quote is valid when all applies: + * 1) at least one resource type is requested + * 2) the quote doesn't already exist + * 3) the player is not a spectator + * 4) either + * a. the trade is not a donation + * b. the trade is a donation, and charity is allowed + */ + return !(amount_want == 0 && amount_give == 0) + && !quote_view_trade_exists(QUOTEVIEW(quoteview), give_quote, want_quote) - && !player_is_spectator(my_player_num()); + && !player_is_spectator(my_player_num()) + && (amount_want != 0 + || (amount_want == 0 && get_charity_enabled())); } gboolean can_delete_quote(void) @@ -216,7 +230,7 @@ /* Notification */ _("New offer from %s."), player_name(player_num, FALSE)); - notification_send(msg, PIONEERS_PIXMAP_TRADE); + notification_send(msg, ICON_TRADE); g_free(msg); } @@ -235,13 +249,16 @@ quote_update(); set_resource_tables_filter(we_receive, we_supply); frontend_gui_update(); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON + (charity_enabled_checkbutton), + get_charity_enabled()); /* finally, show the page so the user can see it */ gui_show_quote_page(TRUE); msg = g_strdup_printf( /* Notification */ _("Offer from %s."), player_name(player_num, FALSE)); - notification_send(msg, PIONEERS_PIXMAP_TRADE); + notification_send(msg, ICON_TRADE); g_free(msg); } @@ -268,6 +285,14 @@ frontend_gui_update(); } +static void charity_enabled_cb(GtkToggleButton * widget, + G_GNUC_UNUSED gpointer user_data) +{ + gboolean charity_enabled = gtk_toggle_button_get_active(widget); + set_charity_enabled(charity_enabled); + frontend_gui_update(); +} + GtkWidget *quote_build_page(void) { GtkWidget *scroll_win; @@ -301,7 +326,7 @@ desc_lbl = gtk_label_new(""); gtk_widget_show(desc_lbl); gtk_box_pack_start(GTK_BOX(hbox), desc_lbl, TRUE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(desc_lbl), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(desc_lbl), 0.0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show(hbox); @@ -315,7 +340,7 @@ /* Label */ _("I want"), RESOURCE_TABLE_MORE_IN_HAND, - FALSE, FALSE); + FALSE); gtk_widget_show(want_table); gtk_box_pack_start(GTK_BOX(vbox), want_table, FALSE, TRUE, 0); g_signal_connect(G_OBJECT(want_table), "change", @@ -325,7 +350,7 @@ /* Label */ _("Give them"), RESOURCE_TABLE_LESS_IN_HAND, - FALSE, FALSE); + FALSE); gtk_widget_show(give_table); gtk_box_pack_start(GTK_BOX(vbox), give_table, FALSE, TRUE, 0); g_signal_connect(G_OBJECT(give_table), "change", @@ -347,6 +372,22 @@ gtk_widget_show(delete_btn); gtk_container_add(GTK_CONTAINER(bbox), delete_btn); + /* Label text, trade: charity */ + charity_enabled_checkbutton = + gtk_check_button_new_with_label(_("Enable Charity")); + gtk_widget_show(charity_enabled_checkbutton); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON + (charity_enabled_checkbutton), + get_charity_enabled()); + g_signal_connect(G_OBJECT(charity_enabled_checkbutton), "toggled", + G_CALLBACK(charity_enabled_cb), NULL); + gtk_box_pack_start(GTK_BOX(vbox), charity_enabled_checkbutton, + FALSE, TRUE, 0); + gtk_widget_set_tooltip_text(charity_enabled_checkbutton, + /* Tooltip for the option to enable charity */ + _("" + "When checked, a resource can be given away without receiving anything back")); + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3); gtk_widget_show(vbox); gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0); diff -Nru pioneers-15.5/client/gtk/quote-view.c pioneers-15.6/client/gtk/quote-view.c --- pioneers-15.5/client/gtk/quote-view.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/quote-view.c 2020-03-27 21:15:34.000000000 +0000 @@ -59,8 +59,8 @@ LAST_SIGNAL }; -static void quote_view_class_init(QuoteViewClass * klass); -static void quote_view_init(QuoteView * qv); +static void quote_view_class_init(gpointer g_class, gpointer class_data); +static void quote_view_init(GTypeInstance * instance, gpointer g_class); static gint quote_click_cb(GtkWidget * widget, GdkEventButton * event, gpointer user_data); @@ -85,12 +85,12 @@ sizeof(QuoteViewClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) quote_view_class_init, + quote_view_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof(QuoteView), 0, - (GInstanceInitFunc) quote_view_init, + quote_view_init, NULL }; rt_type = @@ -105,12 +105,13 @@ * 'selection-changed' when the selection changes. * 'selection-activated' when the selection is double-clicked */ -static void quote_view_class_init(QuoteViewClass * klass) +static void quote_view_class_init(gpointer g_class, + G_GNUC_UNUSED gpointer class_data) { quote_view_signals[SELECTION_CHANGED] = g_signal_new("selection-changed", G_TYPE_FROM_CLASS - (klass), + (g_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET @@ -120,7 +121,7 @@ quote_view_signals[SELECTION_ACTIVATED] = g_signal_new("selection-activated", G_TYPE_FROM_CLASS - (klass), + (g_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET @@ -130,9 +131,11 @@ } /* Initialise the composite widget */ -static void quote_view_init(QuoteView * qv) +static void quote_view_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkTreeViewColumn *column; + QuoteView *qv = QUOTEVIEW(instance); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW (qv), GTK_SHADOW_IN); @@ -280,7 +283,7 @@ CAIRO_EXTEND_REPEAT); cairo_rectangle(cr, 0, 0, width, height); cairo_fill(cr); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); cairo_set_line_width(cr, 1.0); cairo_rectangle(cr, 0.5, 0.5, width - 1, height - 1); cairo_stroke(cr); @@ -720,7 +723,7 @@ CAIRO_EXTEND_REPEAT); cairo_rectangle(cr, 0, 0, width, height); cairo_fill(cr); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); cairo_set_line_width(cr, 1.0); cairo_rectangle(cr, 0.5, 0.5, width - 1, height - 1); cairo_stroke(cr); @@ -742,7 +745,9 @@ } /* Add all of the maritime trades that can be performed */ - check_maritime_trades(qv); + if (qv->quote_list != NULL) { + check_maritime_trades(qv); + } } gboolean quote_view_trade_exists(QuoteView * qv, const gint * supply, diff -Nru pioneers-15.5/client/gtk/quote-view.h pioneers-15.6/client/gtk/quote-view.h --- pioneers-15.5/client/gtk/quote-view.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/quote-view.h 2020-06-20 10:52:00.000000000 +0000 @@ -73,8 +73,8 @@ struct _QuoteViewClass { GtkScrolledWindowClass parent_class; - void (*selection_changed) (QuoteView * qv); - void (*selection_activated) (QuoteView * qv); + void (*selection_changed)(QuoteView * qv); + void (*selection_activated)(QuoteView * qv); }; GType quote_view_get_type(void); diff -Nru pioneers-15.5/client/gtk/resource.c pioneers-15.6/client/gtk/resource.c --- pioneers-15.5/client/gtk/resource.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/resource.c 2018-07-07 20:49:17.000000000 +0000 @@ -37,47 +37,47 @@ resource_asset(type)); } -static void create_resource_image(GtkTable * table, Resource type, +static void create_resource_image(GtkGrid * grid, Resource type, guint column, guint row) { GtkWidget *box; resource[type] = box = resource_view_new(); gtk_widget_show(box); - gtk_table_attach(table, box, column, column + 1, row, row + 1, - GTK_EXPAND | GTK_FILL, GTK_FILL, 3, 0); + gtk_grid_attach(grid, box, column, row, 1, 1); } GtkWidget *resource_build_panel(void) { - GtkWidget *table; + GtkWidget *grid; GtkWidget *label; GtkWidget *alignment; GtkWidget *total; PangoLayout *layout; gint width_00, height_00; - table = gtk_table_new(4, 2, TRUE); - gtk_widget_show(table); - gtk_table_set_col_spacings(GTK_TABLE(table), 5); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); + gtk_grid_set_column_homogeneous(GTK_GRID(grid), TRUE); alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), 0, 0, 3, 3); gtk_widget_show(alignment); - gtk_table_attach_defaults(GTK_TABLE(table), alignment, 0, 2, 0, 1); + gtk_grid_attach(GTK_GRID(grid), alignment, 0, 0, 2, 1); label = gtk_label_new(NULL); /* Caption for overview of the resources of the player */ gtk_label_set_markup(GTK_LABEL(label), _("Resources")); gtk_widget_show(label); gtk_container_add(GTK_CONTAINER(alignment), label); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); - create_resource_image(GTK_TABLE(table), BRICK_RESOURCE, 0, 1); - create_resource_image(GTK_TABLE(table), GRAIN_RESOURCE, 0, 2); - create_resource_image(GTK_TABLE(table), ORE_RESOURCE, 0, 3); - create_resource_image(GTK_TABLE(table), WOOL_RESOURCE, 1, 1); - create_resource_image(GTK_TABLE(table), LUMBER_RESOURCE, 1, 2); + create_resource_image(GTK_GRID(grid), BRICK_RESOURCE, 0, 1); + create_resource_image(GTK_GRID(grid), GRAIN_RESOURCE, 0, 2); + create_resource_image(GTK_GRID(grid), ORE_RESOURCE, 0, 3); + create_resource_image(GTK_GRID(grid), WOOL_RESOURCE, 1, 1); + create_resource_image(GTK_GRID(grid), LUMBER_RESOURCE, 1, 2); total = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show(total); @@ -86,7 +86,7 @@ label = gtk_label_new(_("Total")); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(total), label, TRUE, TRUE, 3); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); asset_total_label = label = gtk_label_new("-"); /* Measure the size of '00' to avoid resizing problems */ @@ -96,13 +96,11 @@ gtk_widget_set_size_request(label, width_00, height_00); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(total), label, TRUE, TRUE, 3); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); - gtk_table_attach(GTK_TABLE(table), total, 1, 2, 3, 4, - (GtkAttachOptions) GTK_EXPAND | GTK_FILL, - (GtkAttachOptions) GTK_FILL, 3, 0); + gtk_grid_attach(GTK_GRID(grid), total, 1, 3, 1, 1);; - return table; + return grid; } void frontend_resource_change(Resource type, G_GNUC_UNUSED gint new_amount) @@ -112,7 +110,7 @@ snprintf(buff, sizeof(buff), "%d", resource_total()); gtk_label_set_text(GTK_LABEL(asset_total_label), buff); - /* Force resize of the table, this is needed because + /* Force resize of the grid, this is needed because * GTK does not correctly redraw a label when the amounts * cross the barrier of 1 or 2 positions. */ diff -Nru pioneers-15.5/client/gtk/resource-table.c pioneers-15.6/client/gtk/resource-table.c --- pioneers-15.5/client/gtk/resource-table.c 2014-02-25 09:43:07.000000000 +0000 +++ pioneers-15.6/client/gtk/resource-table.c 2020-03-25 17:52:23.000000000 +0000 @@ -23,12 +23,12 @@ LAST_SIGNAL }; -static void resource_table_class_init(ResourceTableClass * klass); -static void resource_table_init(ResourceTable * rt); +static void resource_table_class_init(gpointer g_class, + gpointer class_data); +static void resource_table_init(GTypeInstance * instance, + gpointer g_class); static void resource_table_update(ResourceTable * rt); -static void less_resource_cb(GtkButton * widget, gpointer user_data); -static void more_resource_cb(GtkButton * widget, gpointer user_data); static void value_changed_cb(GtkSpinButton * widget, gpointer user_data); /* All signals */ @@ -44,16 +44,16 @@ sizeof(ResourceTableClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) resource_table_class_init, + resource_table_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof(ResourceTable), 0, - (GInstanceInitFunc) resource_table_init, + resource_table_init, NULL }; rt_type = - g_type_register_static(GTK_TYPE_TABLE, "ResourceTable", + g_type_register_static(GTK_TYPE_GRID, "ResourceTable", &rt_info, 0); } return rt_type; @@ -63,11 +63,12 @@ * ResourceTable will emit this signal: * 'change' when any change in the amount occurs. */ -static void resource_table_class_init(ResourceTableClass * klass) +static void resource_table_class_init(gpointer g_class, + G_GNUC_UNUSED gpointer class_data) { resource_table_signals[CHANGE] = g_signal_new("change", G_TYPE_FROM_CLASS - (klass), + (g_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET @@ -78,9 +79,11 @@ } /* Initialise the composite widget */ -static void resource_table_init(ResourceTable * rt) +static void resource_table_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { gint i; + ResourceTable *rt = RESOURCETABLE(instance); for (i = 0; i < NO_RESOURCE; i++) { rt->row[i].hand = 0; @@ -89,8 +92,6 @@ rt->row[i].hand_widget = NULL; rt->row[i].bank_widget = NULL; rt->row[i].amount_widget = NULL; - rt->row[i].less_widget = NULL; - rt->row[i].more_widget = NULL; } rt->total_target = 0; rt->total_current = 0; @@ -100,7 +101,6 @@ rt->with_bank = FALSE; rt->with_total = FALSE; rt->direction = RESOURCE_TABLE_MORE_IN_HAND; - } static void resource_table_set_limit(ResourceTable * rt, gint row) @@ -125,7 +125,7 @@ /* Create a new ResourceTable */ GtkWidget *resource_table_new(const gchar * title, ResourceTableDirection direction, - gboolean with_bank, gboolean with_total) + gboolean with_bank) { ResourceTable *rt; @@ -142,20 +142,17 @@ /* Don't set rt->with_total yet, wait for _set_total */ rt->bank_offset = with_bank ? 1 : 0; - gtk_table_resize(GTK_TABLE(rt), - NO_RESOURCE + 1 + with_total ? 1 : 0, - 5 + rt->bank_offset); - gtk_table_set_row_spacings(GTK_TABLE(rt), 3); - gtk_table_set_col_spacings(GTK_TABLE(rt), 6); + gtk_grid_set_row_spacing(GTK_GRID(rt), 3); + gtk_grid_set_column_spacing(GTK_GRID(rt), 5); temp = g_strconcat("", title, "", NULL); widget = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(widget), temp); g_free(temp); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 0, 5 + rt->bank_offset, 0, 1); - gtk_misc_set_alignment(GTK_MISC(widget), 0, 0.5); + gtk_grid_attach(GTK_GRID(rt), widget, 0, 0, 3 + rt->bank_offset, + 1); + gtk_label_set_xalign(GTK_LABEL(widget), 0.0); row = 1; for (i = 0; i < NO_RESOURCE; i++) { @@ -164,14 +161,12 @@ widget = rt->row[i].label_widget = gtk_label_new(resource_name(i, TRUE)); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 0, 1, row, row + 1); - gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_grid_attach(GTK_GRID(rt), widget, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(widget), 0.0); widget = rt->row[i].hand_widget = gtk_entry_new(); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 1, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(rt), widget, 1, row, 1, 1); gtk_entry_set_width_chars(GTK_ENTRY(widget), 3); gtk_widget_set_sensitive(widget, FALSE); gtk_entry_set_alignment(GTK_ENTRY(widget), 1.0); @@ -180,27 +175,13 @@ _("Amount in hand")); rt->row[i].hand = resource_asset(i); - widget = rt->row[i].less_widget = - /* Button for decreasing the selected amount */ - gtk_button_new_with_label(_("row[i]); - gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 2, 3, row, row + 1); - gtk_widget_set_tooltip_text(widget, - /* Tooltip for decreasing the selected amount */ - _("" - "Decrease the selected amount")); if (with_bank) { rt->row[i].bank = get_bank()[i]; widget = rt->row[i].bank_widget = gtk_entry_new(); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 3, 4, row, row + 1); + gtk_grid_attach(GTK_GRID(rt), widget, 2, row, 1, + 1); gtk_entry_set_width_chars(GTK_ENTRY(widget), 3); gtk_widget_set_sensitive(widget, FALSE); gtk_entry_set_alignment(GTK_ENTRY(widget), 1.0); @@ -209,30 +190,12 @@ _("" "Amount in the bank")); } - widget = rt->row[i].more_widget = - /* Button for increasing the selected amount */ - gtk_button_new_with_label(_("more>")); - gtk_widget_set_sensitive(widget, FALSE); - g_signal_connect(G_OBJECT(widget), "clicked", - G_CALLBACK(more_resource_cb), - &rt->row[i]); - gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 3 + rt->bank_offset, - 4 + rt->bank_offset, row, - row + 1); - gtk_widget_set_tooltip_text(widget, - /* Tooltip for increasing the selected amount */ - _("" - "Increase the selected amount")); widget = rt->row[i].amount_widget = gtk_spin_button_new_with_range(0, 99, 1); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 4 + rt->bank_offset, - 5 + rt->bank_offset, row, - row + 1); + gtk_grid_attach(GTK_GRID(rt), widget, 2 + rt->bank_offset, + row, 1, 1); gtk_entry_set_width_chars(GTK_ENTRY(widget), 3); gtk_entry_set_alignment(GTK_ENTRY(widget), 1.0); g_signal_connect(G_OBJECT(widget), "value-changed", @@ -270,16 +233,15 @@ widget = gtk_label_new(text); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 0, 4 + rt->bank_offset, row, row + 1); - gtk_misc_set_alignment(GTK_MISC(widget), 1.0, 0.5); + gtk_grid_attach(GTK_GRID(rt), widget, 0, row, 2 + rt->bank_offset, + 1); + gtk_label_set_xalign(GTK_LABEL(widget), 1.0); widget = rt->total_widget = gtk_spin_button_new_with_range(0, total, 1); gtk_widget_show(widget); - gtk_table_attach_defaults(GTK_TABLE(rt), widget, - 4 + rt->bank_offset, 5 + rt->bank_offset, - row, row + 1); + gtk_grid_attach(GTK_GRID(rt), widget, 2 + rt->bank_offset, row, 1, + 1); gtk_entry_set_width_chars(GTK_ENTRY(widget), 3); gtk_widget_set_sensitive(widget, FALSE); gtk_entry_set_alignment(GTK_ENTRY(widget), 1.0); @@ -361,38 +323,16 @@ } gtk_widget_set_sensitive(row->label_widget, !row->filter); - gtk_widget_set_sensitive(row->less_widget, less_enabled - && !row->filter); - gtk_widget_set_sensitive(row->more_widget, more_enabled - && !row->filter); gtk_widget_set_sensitive(row->amount_widget, (less_enabled || more_enabled) && !row->filter); + gtk_spin_button_set_range(GTK_SPIN_BUTTON + (row->amount_widget), 0, + more_enabled ? row-> + limit : row->amount); } } -static void less_resource_cb(GtkButton * widget, gpointer user_data) -{ - struct _ResourceRow *row = user_data; - ResourceTable *rt = - RESOURCETABLE(gtk_widget_get_parent(GTK_WIDGET(widget))); - - row->amount--; - resource_table_update(rt); - g_signal_emit(G_OBJECT(rt), resource_table_signals[CHANGE], 0); -} - -static void more_resource_cb(GtkButton * widget, gpointer user_data) -{ - struct _ResourceRow *row = user_data; - ResourceTable *rt = - RESOURCETABLE(gtk_widget_get_parent(GTK_WIDGET(widget))); - - row->amount++; - resource_table_update(rt); - g_signal_emit(G_OBJECT(rt), resource_table_signals[CHANGE], 0); -} - static void value_changed_cb(GtkSpinButton * widget, gpointer user_data) { struct _ResourceRow *row = user_data; diff -Nru pioneers-15.5/client/gtk/resource-table.h pioneers-15.6/client/gtk/resource-table.h --- pioneers-15.5/client/gtk/resource-table.h 2012-12-18 12:39:00.000000000 +0000 +++ pioneers-15.6/client/gtk/resource-table.h 2020-06-20 10:52:00.000000000 +0000 @@ -38,8 +38,6 @@ GtkWidget *amount_widget; gint limit; - GtkWidget *less_widget; - GtkWidget *more_widget; }; enum _ResourceTableDirection { @@ -49,7 +47,7 @@ typedef enum _ResourceTableDirection ResourceTableDirection; struct _ResourceTable { - GtkTable table; + GtkGrid grid; struct _ResourceRow row[NO_RESOURCE]; @@ -65,15 +63,15 @@ }; struct _ResourceTableClass { - GtkTableClass parent_class; + GtkGridClass parent_class; - void (*change) (ResourceTable * rt); + void (*change)(ResourceTable * rt); }; GType resource_table_get_type(void); GtkWidget *resource_table_new(const gchar * title, ResourceTableDirection direction, - gboolean with_bank, gboolean with_total); + gboolean with_bank); void resource_table_limit_bank(ResourceTable * rt, gboolean limit); void resource_table_set_total(ResourceTable * rt, const gchar * text, diff -Nru pioneers-15.5/client/gtk/resource-view.c pioneers-15.6/client/gtk/resource-view.c --- pioneers-15.5/client/gtk/resource-view.c 2018-03-14 16:02:15.000000000 +0000 +++ pioneers-15.6/client/gtk/resource-view.c 2020-08-02 12:59:36.000000000 +0000 @@ -69,18 +69,18 @@ #line 104 "client/gtk/resource-view.gob" static void resource_view_calculate_size (ResourceView * self, gint * width, gint * height) G_GNUC_UNUSED; #line 72 "resource-view.c" -#line 183 "client/gtk/resource-view.gob" +#line 180 "client/gtk/resource-view.gob" static gboolean resource_view_allocate (GtkWidget * self, GtkAllocation * allocation, gpointer user_data) G_GNUC_UNUSED; #line 75 "resource-view.c" -#line 195 "client/gtk/resource-view.gob" +#line 192 "client/gtk/resource-view.gob" static gboolean resource_view_draw (GtkWidget * self, cairo_t * cr, gpointer user_data) G_GNUC_UNUSED; #line 78 "resource-view.c" -#line 245 "client/gtk/resource-view.gob" +#line 240 "client/gtk/resource-view.gob" static gboolean resource_view_expose (GtkWidget * self, GdkEvent * event, gpointer user_data) G_GNUC_UNUSED; #line 81 "resource-view.c" /* pointer to the class of our parent */ -static GtkMiscClass *parent_class = NULL; +static GtkImageClass *parent_class = NULL; /* Short form macros */ #define self_new resource_view_new @@ -110,7 +110,7 @@ NULL }; - type = g_type_register_static (GTK_TYPE_MISC, "ResourceView", &info, (GTypeFlags)0); + type = g_type_register_static (GTK_TYPE_IMAGE, "ResourceView", &info, (GTypeFlags)0); } return type; @@ -155,7 +155,7 @@ g_type_class_add_private(klass,sizeof(ResourceViewPrivate)); - parent_class = g_type_class_ref (GTK_TYPE_MISC); + parent_class = g_type_class_ref (GTK_TYPE_IMAGE); g_object_class->finalize = ___finalize; { @@ -275,8 +275,6 @@ gint i; gint num_res; gint tot_res; - gint xpad; - gint ypad; gint size; num_res = tot_res = 0; @@ -304,30 +302,29 @@ } /* Set the optimal size as a request */ - gtk_misc_get_padding(GTK_MISC(self), &xpad, &ypad); if (width != NULL) { - *width = size * tot_res + xpad * 2; + *width = size * tot_res; } if (height != NULL) { - *height = size + ypad * 2; + *height = size; } }} -#line 316 "resource-view.c" +#line 313 "resource-view.c" #undef __GOB_FUNCTION__ -#line 146 "client/gtk/resource-view.gob" +#line 143 "client/gtk/resource-view.gob" void resource_view_set (ResourceView * self, const gint * resource) { -#line 323 "resource-view.c" +#line 320 "resource-view.c" #define __GOB_FUNCTION__ "Resource:View::set" -#line 146 "client/gtk/resource-view.gob" +#line 143 "client/gtk/resource-view.gob" g_return_if_fail (self != NULL); -#line 146 "client/gtk/resource-view.gob" +#line 143 "client/gtk/resource-view.gob" g_return_if_fail (RESOURCE_IS_VIEW (self)); -#line 329 "resource-view.c" +#line 326 "resource-view.c" { -#line 146 "client/gtk/resource-view.gob" +#line 143 "client/gtk/resource-view.gob" gint i; gchar *tooltip; @@ -345,22 +342,22 @@ gtk_widget_set_tooltip_text(GTK_WIDGET(self), tooltip); g_free(tooltip); }} -#line 349 "resource-view.c" +#line 346 "resource-view.c" #undef __GOB_FUNCTION__ -#line 164 "client/gtk/resource-view.gob" +#line 161 "client/gtk/resource-view.gob" void resource_view_set_amount_of_single_resource (ResourceView * self, Resource type, gint amount) { -#line 356 "resource-view.c" +#line 353 "resource-view.c" #define __GOB_FUNCTION__ "Resource:View::set_amount_of_single_resource" -#line 164 "client/gtk/resource-view.gob" +#line 161 "client/gtk/resource-view.gob" g_return_if_fail (self != NULL); -#line 164 "client/gtk/resource-view.gob" +#line 161 "client/gtk/resource-view.gob" g_return_if_fail (RESOURCE_IS_VIEW (self)); -#line 362 "resource-view.c" +#line 359 "resource-view.c" { -#line 165 "client/gtk/resource-view.gob" +#line 162 "client/gtk/resource-view.gob" gchar *tooltip; @@ -378,56 +375,53 @@ gtk_widget_set_tooltip_text(GTK_WIDGET(self), tooltip); g_free(tooltip); }} -#line 382 "resource-view.c" +#line 379 "resource-view.c" #undef __GOB_FUNCTION__ -#line 183 "client/gtk/resource-view.gob" +#line 180 "client/gtk/resource-view.gob" static gboolean resource_view_allocate (GtkWidget * self, GtkAllocation * allocation, gpointer user_data) { -#line 389 "resource-view.c" +#line 386 "resource-view.c" #define __GOB_FUNCTION__ "Resource:View::allocate" { -#line 185 "client/gtk/resource-view.gob" +#line 182 "client/gtk/resource-view.gob" /* Remove compiler warning */ - user_data = user_data; + (void)user_data; RESOURCE_VIEW(self)->_priv->max_width = allocation->width; resource_view_calculate_size(RESOURCE_VIEW(self), NULL, NULL); return FALSE; }} -#line 402 "resource-view.c" +#line 399 "resource-view.c" #undef __GOB_FUNCTION__ -#line 195 "client/gtk/resource-view.gob" +#line 192 "client/gtk/resource-view.gob" static gboolean resource_view_draw (GtkWidget * self, cairo_t * cr, gpointer user_data) { -#line 409 "resource-view.c" +#line 406 "resource-view.c" #define __GOB_FUNCTION__ "Resource:View::draw" { -#line 196 "client/gtk/resource-view.gob" +#line 193 "client/gtk/resource-view.gob" gint i; GtkRequisition r; GtkRequisition r2; GtkAllocation allocation; - gfloat xalign; - gfloat yalign; gdouble xoffset; gdouble yoffset; /* Remove compiler warnings */ - user_data = user_data; + (void)user_data; gtk_widget_get_preferred_size(GTK_WIDGET(self), &r, &r2); gtk_widget_get_allocation(GTK_WIDGET(self), &allocation); - gtk_misc_get_alignment(GTK_MISC(self), &xalign, &yalign); - - yoffset = (gfloat) (allocation.height - r.height) * yalign; + /* Center alignment */ + yoffset = (gfloat) (allocation.height - r.height) * 0.5; if (allocation.width != -1) { r.width = allocation.width; @@ -436,6 +430,7 @@ r.height = allocation.height; } + /* Left alignment */ xoffset = 0; for (i = 0; i < NO_RESOURCE; i++) { gint n; @@ -457,17 +452,17 @@ return TRUE; }} -#line 461 "resource-view.c" +#line 456 "resource-view.c" #undef __GOB_FUNCTION__ -#line 245 "client/gtk/resource-view.gob" +#line 240 "client/gtk/resource-view.gob" static gboolean resource_view_expose (GtkWidget * self, GdkEvent * event, gpointer user_data) { -#line 468 "resource-view.c" +#line 463 "resource-view.c" #define __GOB_FUNCTION__ "Resource:View::expose" { -#line 246 "client/gtk/resource-view.gob" +#line 241 "client/gtk/resource-view.gob" cairo_t *cr; @@ -476,7 +471,7 @@ } /* Remove compiler warnings */ - event = event; + (void)event; cr = gdk_cairo_create(gtk_widget_get_window (GTK_WIDGET(self))); @@ -484,5 +479,5 @@ cairo_destroy(cr); return TRUE; }} -#line 488 "resource-view.c" +#line 483 "resource-view.c" #undef __GOB_FUNCTION__ diff -Nru pioneers-15.5/client/gtk/resource-view.gob pioneers-15.6/client/gtk/resource-view.gob --- pioneers-15.5/client/gtk/resource-view.gob 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/resource-view.gob 2018-11-22 21:35:05.000000000 +0000 @@ -35,7 +35,7 @@ #include "frontend.h" %} -class Resource:View from Gtk:Misc { +class Resource:View from Gtk:Image { private gint resource[NO_RESOURCE]; private gdouble distance; private gint max_width; @@ -105,8 +105,6 @@ gint i; gint num_res; gint tot_res; - gint xpad; - gint ypad; gint size; num_res = tot_res = 0; @@ -134,12 +132,11 @@ } /* Set the optimal size as a request */ - gtk_misc_get_padding(GTK_MISC(self), &xpad, &ypad); if (width != NULL) { - *width = size * tot_res + xpad * 2; + *width = size * tot_res; } if (height != NULL) { - *height = size + ypad * 2; + *height = size; } } @@ -184,7 +181,7 @@ GtkAllocation * allocation, gpointer user_data) { /* Remove compiler warning */ - user_data = user_data; + (void)user_data; RESOURCE_VIEW(self)->_priv->max_width = allocation->width; resource_view_calculate_size(RESOURCE_VIEW(self), NULL, @@ -198,20 +195,17 @@ GtkRequisition r; GtkRequisition r2; GtkAllocation allocation; - gfloat xalign; - gfloat yalign; gdouble xoffset; gdouble yoffset; /* Remove compiler warnings */ - user_data = user_data; + (void)user_data; gtk_widget_get_preferred_size(GTK_WIDGET(self), &r, &r2); gtk_widget_get_allocation(GTK_WIDGET(self), &allocation); - gtk_misc_get_alignment(GTK_MISC(self), &xalign, &yalign); - - yoffset = (gfloat) (allocation.height - r.height) * yalign; + /* Center alignment */ + yoffset = (gfloat) (allocation.height - r.height) * 0.5; if (allocation.width != -1) { r.width = allocation.width; @@ -220,6 +214,7 @@ r.height = allocation.height; } + /* Left alignment */ xoffset = 0; for (i = 0; i < NO_RESOURCE; i++) { gint n; @@ -251,7 +246,7 @@ } /* Remove compiler warnings */ - event = event; + (void)event; cr = gdk_cairo_create(gtk_widget_get_window (GTK_WIDGET(self))); diff -Nru pioneers-15.5/client/gtk/resource-view.h pioneers-15.6/client/gtk/resource-view.h --- pioneers-15.5/client/gtk/resource-view.h 2018-03-14 16:02:15.000000000 +0000 +++ pioneers-15.6/client/gtk/resource-view.h 2020-08-02 12:59:36.000000000 +0000 @@ -62,7 +62,7 @@ typedef struct _ResourceView ResourceView; #endif struct _ResourceView { - GtkMisc __parent__; + GtkImage __parent__; /*< private >*/ ResourceViewPrivate *_priv; }; @@ -72,7 +72,7 @@ */ typedef struct _ResourceViewClass ResourceViewClass; struct _ResourceViewClass { - GtkMiscClass __parent__; + GtkImageClass __parent__; cairo_surface_t * surface[NO_RESOURCE]; }; @@ -87,11 +87,11 @@ #line 74 "client/gtk/resource-view.gob" GtkWidget * resource_view_new_single_resource (Resource resource); #line 90 "resource-view.h" -#line 146 "client/gtk/resource-view.gob" +#line 143 "client/gtk/resource-view.gob" void resource_view_set (ResourceView * self, const gint * resource); #line 94 "resource-view.h" -#line 164 "client/gtk/resource-view.gob" +#line 161 "client/gtk/resource-view.gob" void resource_view_set_amount_of_single_resource (ResourceView * self, Resource type, gint amount); diff -Nru pioneers-15.5/client/gtk/settingscreen.c pioneers-15.6/client/gtk/settingscreen.c --- pioneers-15.5/client/gtk/settingscreen.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/settingscreen.c 2020-05-31 11:54:46.000000000 +0000 @@ -31,33 +31,31 @@ TYPE_STRING }; -static void add_setting_desc(GtkWidget * table, guint row, guint col, +static void add_setting_desc(GtkWidget * grid, guint row, guint col, const gchar * desc) { GtkWidget *label; label = gtk_label_new(desc); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, - row + 1, GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5f); + gtk_grid_attach(GTK_GRID(grid), label, col, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); } -static void add_setting_desc_with_image(GtkWidget * table, guint row, +static void add_setting_desc_with_image(GtkWidget * grid, guint row, guint col, const gchar * desc, const gchar * iconname) { GtkWidget *icon; - icon = gtk_image_new_from_stock(iconname, GTK_ICON_SIZE_MENU); + icon = gtk_image_new_from_icon_name(iconname, GTK_ICON_SIZE_MENU); gtk_widget_show(icon); - gtk_table_attach(GTK_TABLE(table), icon, col, col + 1, row, - row + 1, GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), icon, col, row, 1, 1); - add_setting_desc(table, row, col + 1, desc); + add_setting_desc(grid, row, col + 1, desc); } -static void add_setting_val(GtkWidget * table, guint row, guint col, +static void add_setting_val(GtkWidget * grid, guint row, guint col, gint type, gint int_val, const gchar * char_val, gboolean right_aligned) { @@ -91,11 +89,9 @@ label = gtk_label_new(label_var); g_free(label_var); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, - col, col + 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), - (right_aligned ? 1.0 : 0.0), 0.5f); + gtk_grid_attach(GTK_GRID(grid), label, col, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), + (right_aligned ? 1.0 : 0.0)); } static GtkWidget *settings_create_content(void) @@ -105,7 +101,7 @@ GtkWidget *alignment; GtkWidget *vbox; GtkWidget *hbox; - GtkWidget *table; + GtkWidget *grid; GtkWidget *label; gchar *sevens_desc; gchar *island_bonus; @@ -131,7 +127,7 @@ /* Label */ _("General settings")); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(dlg_vbox), label, FALSE, TRUE, 0); alignment = gtk_alignment_new(0.0, 0.0, 0.0, 0.0); @@ -139,42 +135,42 @@ gtk_widget_show(alignment); gtk_box_pack_start(GTK_BOX(dlg_vbox), alignment, FALSE, FALSE, 0); - table = gtk_table_new(13, 2, FALSE); - gtk_widget_show(table); - gtk_container_add(GTK_CONTAINER(alignment), table); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_container_add(GTK_CONTAINER(alignment), grid); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); row = 0; - add_setting_desc(table, row, 0, _("Number of players:")); - add_setting_val(table, row, 1, TYPE_NUM, game_params->num_players, + add_setting_desc(grid, row, 0, _("Number of players:")); + add_setting_val(grid, row, 1, TYPE_NUM, game_params->num_players, NULL, FALSE); row++; - add_setting_desc(table, row, 0, _("Victory point target:")); - add_setting_val(table, row, 1, TYPE_NUM, + add_setting_desc(grid, row, 0, _("Victory point target:")); + add_setting_val(grid, row, 1, TYPE_NUM, game_params->victory_points, NULL, FALSE); row++; - add_setting_desc(table, row, 0, _("Random terrain:")); - add_setting_val(table, row, 1, TYPE_BOOL, + add_setting_desc(grid, row, 0, _("Random terrain:")); + add_setting_val(grid, row, 1, TYPE_BOOL, game_params->random_terrain, NULL, FALSE); row++; - add_setting_desc(table, row, 0, _("Allow trade between players:")); - add_setting_val(table, row, 1, TYPE_BOOL, + add_setting_desc(grid, row, 0, _("Allow trade between players:")); + add_setting_val(grid, row, 1, TYPE_BOOL, game_params->domestic_trade, NULL, FALSE); row++; - add_setting_desc(table, row, 0, + add_setting_desc(grid, row, 0, _("Allow trade only before building or buying:")); - add_setting_val(table, row, 1, TYPE_BOOL, - game_params->strict_trade, NULL, FALSE); + add_setting_val(grid, row, 1, TYPE_BOOL, game_params->strict_trade, + NULL, FALSE); row++; - add_setting_desc(table, row, 0, + add_setting_desc(grid, row, 0, _("Check victory only at end of turn:")); - add_setting_val(table, row, 1, TYPE_BOOL, + add_setting_val(grid, row, 1, TYPE_BOOL, game_params->check_victory_at_end_of_turn, NULL, FALSE); row++; - add_setting_desc(table, row, 0, _("Amount of each resource:")); - add_setting_val(table, row, 1, TYPE_NUM, + add_setting_desc(grid, row, 0, _("Amount of each resource:")); + add_setting_val(grid, row, 1, TYPE_NUM, game_params->resource_count, NULL, FALSE); if (game_params->sevens_rule == 0) { @@ -187,32 +183,32 @@ sevens_desc = g_strdup(_("Unknown")); } row++; - add_setting_desc(table, row, 0, _("Sevens rule:")); - add_setting_val(table, row, 1, TYPE_STRING, 0, sevens_desc, FALSE); + add_setting_desc(grid, row, 0, _("Sevens rule:")); + add_setting_val(grid, row, 1, TYPE_STRING, 0, sevens_desc, FALSE); g_free(sevens_desc); row++; - add_setting_desc(table, row, 0, + add_setting_desc(grid, row, 0, _("Use dice deck instead of dice:")); - add_setting_val(table, row, 1, TYPE_BOOL, + add_setting_val(grid, row, 1, TYPE_BOOL, game_params->use_dice_deck, NULL, FALSE); row++; - add_setting_desc(table, row, 0, _("Number of dice decks:")); - add_setting_val(table, row, 1, TYPE_NUM, + add_setting_desc(grid, row, 0, _("Number of dice decks:")); + add_setting_val(grid, row, 1, TYPE_NUM, game_params->num_dice_decks, NULL, FALSE); row++; - add_setting_desc(table, row, 0, + add_setting_desc(grid, row, 0, _("" "Number of dice cards removed after shuffling:")); - add_setting_val(table, row, 1, TYPE_NUM, + add_setting_val(grid, row, 1, TYPE_NUM, game_params->num_removed_dice_cards, NULL, FALSE); row++; - add_setting_desc(table, row, 0, + add_setting_desc(grid, row, 0, _("Use the pirate to block ships:")); - add_setting_val(table, row, 1, TYPE_BOOL, game_params->use_pirate, + add_setting_val(grid, row, 1, TYPE_BOOL, game_params->use_pirate, NULL, FALSE); if (game_params->island_discovery_bonus) { @@ -240,9 +236,8 @@ island_bonus = g_strdup(_("No")); } row++; - add_setting_desc(table, row, 0, _("Island discovery bonuses:")); - add_setting_val(table, row, 1, TYPE_STRING, 0, island_bonus, - FALSE); + add_setting_desc(grid, row, 0, _("Island discovery bonuses:")); + add_setting_val(grid, row, 1, TYPE_STRING, 0, island_bonus, FALSE); g_free(island_bonus); /* Double space, otherwise the columns are too close */ @@ -259,7 +254,7 @@ /* Label */ _("Building quotas")); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); alignment = gtk_alignment_new(0.0, 0.0, 0.0, 0.0); @@ -267,46 +262,43 @@ gtk_widget_show(alignment); gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, TRUE, 0); - table = gtk_table_new(6, 3, FALSE); - gtk_widget_show(table); - gtk_container_add(GTK_CONTAINER(alignment), table); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_container_add(GTK_CONTAINER(alignment), grid); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); row = 0; - add_setting_desc_with_image(table, row, 0, _("Roads:"), - PIONEERS_PIXMAP_ROAD); - add_setting_val(table, row, 2, TYPE_NUM, + add_setting_desc_with_image(grid, row, 0, _("Roads:"), ICON_ROAD); + add_setting_val(grid, row, 2, TYPE_NUM, game_params->num_build_type[BUILD_ROAD], NULL, TRUE); row++; - add_setting_desc_with_image(table, row, 0, _("Settlements:"), - PIONEERS_PIXMAP_SETTLEMENT); - add_setting_val(table, row, 2, TYPE_NUM, + add_setting_desc_with_image(grid, row, 0, _("Settlements:"), + ICON_SETTLEMENT); + add_setting_val(grid, row, 2, TYPE_NUM, game_params->num_build_type[BUILD_SETTLEMENT], NULL, TRUE); row++; - add_setting_desc_with_image(table, row, 0, _("Cities:"), - PIONEERS_PIXMAP_CITY); - add_setting_val(table, row, 2, TYPE_NUM, + add_setting_desc_with_image(grid, row, 0, _("Cities:"), ICON_CITY); + add_setting_val(grid, row, 2, TYPE_NUM, game_params->num_build_type[BUILD_CITY], NULL, TRUE); row++; - add_setting_desc_with_image(table, row, 0, _("City walls:"), - PIONEERS_PIXMAP_CITY_WALL); - add_setting_val(table, row, 2, TYPE_NUM, + add_setting_desc_with_image(grid, row, 0, _("City walls:"), + ICON_CITY_WALL); + add_setting_val(grid, row, 2, TYPE_NUM, game_params->num_build_type[BUILD_CITY_WALL], NULL, TRUE); row++; - add_setting_desc_with_image(table, row, 0, _("Ships:"), - PIONEERS_PIXMAP_SHIP); - add_setting_val(table, row, 2, TYPE_NUM, + add_setting_desc_with_image(grid, row, 0, _("Ships:"), ICON_SHIP); + add_setting_val(grid, row, 2, TYPE_NUM, game_params->num_build_type[BUILD_SHIP], NULL, TRUE); row++; - add_setting_desc_with_image(table, row, 0, _("Bridges:"), - PIONEERS_PIXMAP_BRIDGE); - add_setting_val(table, row, 2, TYPE_NUM, + add_setting_desc_with_image(grid, row, 0, _("Bridges:"), + ICON_BRIDGE); + add_setting_val(grid, row, 2, TYPE_NUM, game_params->num_build_type[BUILD_BRIDGE], NULL, TRUE); @@ -319,7 +311,7 @@ /* Label */ _("Development card deck")); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); alignment = gtk_alignment_new(0.0, 0.0, 0.0, 0.0); @@ -327,46 +319,46 @@ gtk_widget_show(alignment); gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, TRUE, 0); - table = gtk_table_new(9, 2, FALSE); - gtk_widget_show(table); - gtk_container_add(GTK_CONTAINER(alignment), table); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_container_add(GTK_CONTAINER(alignment), grid); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); - add_setting_desc(table, 0, 0, _("Road building cards:")); - add_setting_val(table, 0, 1, TYPE_NUM, + add_setting_desc(grid, 0, 0, _("Road building cards:")); + add_setting_val(grid, 0, 1, TYPE_NUM, game_params->num_develop_type[DEVEL_ROAD_BUILDING], NULL, TRUE); - add_setting_desc(table, 1, 0, _("Monopoly cards:")); - add_setting_val(table, 1, 1, TYPE_NUM, + add_setting_desc(grid, 1, 0, _("Monopoly cards:")); + add_setting_val(grid, 1, 1, TYPE_NUM, game_params->num_develop_type[DEVEL_MONOPOLY], NULL, TRUE); - add_setting_desc(table, 2, 0, _("Year of plenty cards:")); - add_setting_val(table, 2, 1, TYPE_NUM, + add_setting_desc(grid, 2, 0, _("Year of plenty cards:")); + add_setting_val(grid, 2, 1, TYPE_NUM, game_params->num_develop_type [DEVEL_YEAR_OF_PLENTY], NULL, TRUE); - add_setting_desc(table, 3, 0, _("Chapel cards:")); - add_setting_val(table, 3, 1, TYPE_NUM, + add_setting_desc(grid, 3, 0, _("Chapel cards:")); + add_setting_val(grid, 3, 1, TYPE_NUM, game_params->num_develop_type[DEVEL_CHAPEL], NULL, TRUE); - add_setting_desc(table, 4, 0, _("Pioneer university cards:")); - add_setting_val(table, 4, 1, TYPE_NUM, + add_setting_desc(grid, 4, 0, _("Pioneer university cards:")); + add_setting_val(grid, 4, 1, TYPE_NUM, game_params->num_develop_type[DEVEL_UNIVERSITY], NULL, TRUE); - add_setting_desc(table, 5, 0, _("Governor's house cards:")); - add_setting_val(table, 5, 1, TYPE_NUM, + add_setting_desc(grid, 5, 0, _("Governor's house cards:")); + add_setting_val(grid, 5, 1, TYPE_NUM, game_params->num_develop_type [DEVEL_GOVERNORS_HOUSE], NULL, TRUE); - add_setting_desc(table, 6, 0, _("Library cards:")); - add_setting_val(table, 6, 1, TYPE_NUM, + add_setting_desc(grid, 6, 0, _("Library cards:")); + add_setting_val(grid, 6, 1, TYPE_NUM, game_params->num_develop_type[DEVEL_LIBRARY], NULL, TRUE); - add_setting_desc(table, 7, 0, _("Market cards:")); - add_setting_val(table, 7, 1, TYPE_NUM, + add_setting_desc(grid, 7, 0, _("Market cards:")); + add_setting_val(grid, 7, 1, TYPE_NUM, game_params->num_develop_type[DEVEL_MARKET], NULL, TRUE); - add_setting_desc(table, 8, 0, _("Soldier cards:")); - add_setting_val(table, 8, 1, TYPE_NUM, + add_setting_desc(grid, 8, 0, _("Soldier cards:")); + add_setting_val(grid, 8, 1, TYPE_NUM, game_params->num_develop_type[DEVEL_SOLDIER], NULL, TRUE); @@ -394,7 +386,7 @@ } } -GtkWidget *settings_create_dlg(void) +GtkWidget *settings_create_dlg(GtkWindow * parent_window) { GtkWidget *dlg_vbox; GtkWidget *vbox; @@ -406,8 +398,7 @@ /* Dialog caption */ _("" "Current Game Settings"), - GTK_WINDOW - (app_window), + parent_window, GTK_DIALOG_DESTROY_WITH_PARENT, /* Button text */ _("_Close"), diff -Nru pioneers-15.5/client/gtk/trade.c pioneers-15.6/client/gtk/trade.c --- pioneers-15.5/client/gtk/trade.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/client/gtk/trade.c 2020-08-02 12:14:34.000000000 +0000 @@ -44,7 +44,6 @@ static gint active_supply_request[NO_RESOURCE]; static gint active_receive_request[NO_RESOURCE]; -static gboolean trade_since_selection_changed; /** This button can be hidden in games without interplayer trade */ static GtkWidget *call_btn; @@ -52,17 +51,21 @@ static GtkWidget *we_receive_frame; /** The last quote that is called */ static GtkWidget *active_quote_label; +/** Prevent charity, can be hidden in games without interplayer trade */ +static GtkWidget *charity_enabled_checkbutton; /** @return TRUE is we can accept this domestic quote */ static gboolean is_good_quote(const QuoteInfo * quote) { gint idx; gboolean interested; + gboolean have_we_receive; g_assert(quote != NULL); g_assert(quote->is_domestic); interested = FALSE; + have_we_receive = FALSE; for (idx = 0; idx < NO_RESOURCE; idx++) { gint we_supply = quote->var.d.receive[idx]; gint we_receive = quote->var.d.supply[idx]; @@ -76,8 +79,10 @@ if (we_receive > 0 && we_receive_rows[idx].enabled) { interested = TRUE; } + have_we_receive = have_we_receive || (we_receive > 0); } - return interested; + /* We also also interested if we allow giving away resources */ + return interested || (!have_we_receive && get_charity_enabled()); } /** @return TRUE if at least one resource is asked/offered */ @@ -87,6 +92,7 @@ gboolean have_we_receive; gboolean have_we_supply; gboolean different_call; + gboolean is_charity; different_call = FALSE; have_we_receive = have_we_supply = FALSE; @@ -102,11 +108,20 @@ if (we_supply_rows[idx].enabled) have_we_supply = TRUE; } - /* don't require both supply and receive, for resources may be - * given away for free */ + is_charity = !have_we_receive || !have_we_supply; + + /* Trade is allowed when all applies: + * 1) at least one resource type is requested + * 2) domestic trade is allowed + * 3) the request differs from the active request + * 4) either + * a. the trade is not a donation + * b. the trade is a donation, and charity is allowed + */ return (have_we_receive || have_we_supply) && can_trade_domestic() - && (different_call || trade_since_selection_changed); + && different_call + && (!is_charity || (is_charity && get_charity_enabled())); } /** @return the current quote */ @@ -234,7 +249,6 @@ active_supply_request[idx] = we_supply_rows[idx].enabled; active_receive_request[idx] = we_receive_rows[idx].enabled; } - trade_since_selection_changed = FALSE; resource_format_type(we_supply_desc, active_supply_request); resource_format_type(we_receive_desc, active_receive_request); @@ -265,7 +279,7 @@ } /** Add a row with widgets for a resource */ -static void add_trade_row(GtkWidget * table, TradeRow * row, +static void add_trade_row(GtkWidget * grid, TradeRow * row, Resource resource) { gint col; @@ -277,9 +291,7 @@ g_signal_connect(G_OBJECT(row->chk), "toggled", G_CALLBACK(toggled_cb), row); gtk_widget_show(row->chk); - gtk_table_attach(GTK_TABLE(table), row->chk, - col, col + 1, resource, resource + 1, - GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), row->chk, col, resource, 1, 1); col++; row->curr = gtk_entry_new(); @@ -287,9 +299,7 @@ gtk_entry_set_alignment(GTK_ENTRY(row->curr), 1.0); gtk_widget_set_sensitive(row->curr, FALSE); gtk_widget_show(row->curr); - gtk_table_attach(GTK_TABLE(table), row->curr, - col, col + 1, resource, resource + 1, - GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), row->curr, col, resource, 1, 1); } /** Set the sensitivity of the row, and update the assets when applicable */ @@ -347,7 +357,7 @@ /* Notification */ _("Quote received from %s."), player_name(player_num, FALSE)); - notification_send(msg, PIONEERS_PIXMAP_TRADE); + notification_send(msg, ICON_TRADE); g_free(msg); } @@ -397,11 +407,16 @@ gtk_widget_hide(we_receive_frame); gtk_widget_hide(call_btn); gtk_widget_hide(active_quote_label); + gtk_widget_hide(charity_enabled_checkbutton); } else { gtk_widget_show(we_receive_frame); gtk_widget_show(call_btn); gtk_widget_show(active_quote_label); gtk_label_set_text(GTK_LABEL(active_quote_label), ""); + gtk_widget_show(charity_enabled_checkbutton); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON + (charity_enabled_checkbutton), + get_charity_enabled()); } quote_view_clear_selected_quote(QUOTEVIEW(quoteview)); update_rows(); /* Always update */ @@ -422,6 +437,15 @@ frontend_gui_update(); } +static void charity_enabled_cb(GtkToggleButton * widget, + G_GNUC_UNUSED gpointer user_data) +{ + gboolean charity_enabled = gtk_toggle_button_get_active(widget); + set_charity_enabled(charity_enabled); + trade_update(); + frontend_gui_update(); +} + /** Build a trade resources composite widget. * @param title The title for the composite widget. * @param trade_rows Pointer to TradeRow to store each row's data. @@ -433,13 +457,13 @@ /* vbox */ /* label */ /* alignment */ - /* table */ + /* grid */ /* trade rows */ GtkWidget *vbox; GtkWidget *label; GtkWidget *alignment; - GtkWidget *table; + GtkWidget *grid; gchar *title_with_markup; gint idx; @@ -452,7 +476,7 @@ gtk_label_set_markup(GTK_LABEL(label), title_with_markup); g_free(title_with_markup); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); alignment = gtk_alignment_new(0.0, 0.0, 0.0, 0.0); @@ -461,16 +485,16 @@ gtk_widget_show(alignment); gtk_box_pack_start(GTK_BOX(vbox), alignment, FALSE, FALSE, 0); - table = gtk_table_new(NO_RESOURCE, 2, FALSE); - gtk_widget_show(table); - gtk_container_add(GTK_CONTAINER(alignment), table); - gtk_container_set_border_width(GTK_CONTAINER(table), 0); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 3); + grid = gtk_grid_new(); + gtk_widget_show(grid); + gtk_container_add(GTK_CONTAINER(alignment), grid); + gtk_container_set_border_width(GTK_CONTAINER(grid), 0); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 3); /* trade rows, one for each resource */ for (idx = 0; idx < NO_RESOURCE; ++idx) - add_trade_row(table, trade_rows + idx, idx); + add_trade_row(grid, trade_rows + idx, idx); return vbox; } @@ -487,6 +511,7 @@ /* trade_resources_frame */ /* hbox - bbox */ /* call_btn */ + /* charity */ /* vbox */ /* active_quote_label */ /* quoteview */ @@ -541,13 +566,29 @@ gtk_widget_show(call_btn); gtk_container_add(GTK_CONTAINER(bbox), call_btn); + /* Label text, trade: charity */ + charity_enabled_checkbutton = + gtk_check_button_new_with_label(_("Enable Charity")); + gtk_widget_show(charity_enabled_checkbutton); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON + (charity_enabled_checkbutton), + get_charity_enabled()); + g_signal_connect(G_OBJECT(charity_enabled_checkbutton), "toggled", + G_CALLBACK(charity_enabled_cb), NULL); + gtk_box_pack_start(GTK_BOX(vbox), charity_enabled_checkbutton, + FALSE, TRUE, 0); + gtk_widget_set_tooltip_text(charity_enabled_checkbutton, + /* Tooltip for the option to enable charity */ + _("" + "When checked, a resource can be given away without receiving anything back")); + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show(vbox); gtk_box_pack_start(GTK_BOX(panel_mainbox), vbox, TRUE, TRUE, 0); active_quote_label = gtk_label_new(""); gtk_widget_show(active_quote_label); - gtk_misc_set_alignment(GTK_MISC(active_quote_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(active_quote_label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), active_quote_label, FALSE, FALSE, 0); @@ -599,5 +640,4 @@ set_row_sensitive(we_supply_rows + idx); } quote_view_check_validity_of_trades(QUOTEVIEW(quoteview)); - trade_since_selection_changed = TRUE; } diff -Nru pioneers-15.5/client/help/Makefile.in pioneers-15.6/client/help/Makefile.in --- pioneers-15.5/client/help/Makefile.in 2018-03-14 16:02:12.000000000 +0000 +++ pioneers-15.6/client/help/Makefile.in 2020-08-02 12:59:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -150,6 +150,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ +ARFLAGS = @ARFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -212,6 +213,8 @@ ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBCANBERRA_CFLAGS = @LIBCANBERRA_CFLAGS@ +LIBCANBERRA_LIBS = @LIBCANBERRA_LIBS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ @@ -388,8 +391,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -413,7 +416,10 @@ cscope cscopelist: -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru pioneers-15.5/common/deck.c pioneers-15.6/common/deck.c --- pioneers-15.5/common/deck.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/deck.c 2020-03-26 07:55:39.000000000 +0000 @@ -27,7 +27,7 @@ GPtrArray *array; }; -Deck *deck_new() +Deck *deck_new(void) { Deck *deck = g_malloc0(sizeof(*deck)); deck->array = g_ptr_array_new(); diff -Nru pioneers-15.5/common/driver.h pioneers-15.6/common/driver.h --- pioneers-15.5/common/driver.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/driver.h 2020-06-20 10:52:00.000000000 +0000 @@ -25,17 +25,17 @@ typedef struct { /* function for clearing the event queue */ - void (*event_queue) (void); + void (*event_queue)(void); /* Function to write logs and data to the system display */ LogFunc log_write; /* ==> void log_write( gint msg_type, gchar *text ); */ /* callbacks for the server */ - void (*player_added) (void *player); /* these really should be ... */ - void (*player_renamed) (void *player); /* ... `Player *player', but */ - void (*player_removed) (void *player); /* that requires more headers */ + void (*player_added)(void *player); /* these really should be ... */ + void (*player_renamed)(void *player); /* ... `Player *player', but */ + void (*player_removed)(void *player); /* that requires more headers */ - void (*player_change) (void *game); /* Should be Game *game */ + void (*player_change)(void *game); /* Should be Game *game */ } UIDriver; diff -Nru pioneers-15.5/common/game.c pioneers-15.6/common/game.c --- pioneers-15.5/common/game.c 2013-05-31 08:36:24.000000000 +0000 +++ pioneers-15.6/common/game.c 2020-06-20 10:52:00.000000000 +0000 @@ -828,12 +828,11 @@ ClientVersionType type; const gchar *string; } client_version_type_conversions[] = { - { - V15, "15"}, { - V14, "14"}, { - V0_12, "0.12"}, { - V0_11, "0.11"}, { - V0_10, "0.10"} + { V15, "15" }, + { V14, "14" }, + { V0_12, "0.12" }, + { V0_11, "0.11" }, + { V0_10, "0.10" } }; ClientVersionType client_version_type_from_string(const gchar * cvt) diff -Nru pioneers-15.5/common/game.h pioneers-15.6/common/game.h --- pioneers-15.5/common/game.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/game.h 2020-06-20 10:52:00.000000000 +0000 @@ -134,10 +134,10 @@ } PlayerType; #define NUM_PLAYER_TYPES (PLAYER_UNKNOWN + 1) -typedef void (*WriteLineFunc) (gpointer user_data, const gchar *); +typedef void (*WriteLineFunc)(gpointer user_data, const gchar *); /** Default style for a player. */ -const gchar *default_player_style; +extern const gchar *default_player_style; GameParams *params_new(void); GameParams *params_copy(const GameParams * params); diff -Nru pioneers-15.5/common/game-list.c pioneers-15.6/common/game-list.c --- pioneers-15.5/common/game-list.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/game-list.c 2020-07-26 09:45:51.000000000 +0000 @@ -159,4 +159,5 @@ games = g_slist_next(games); } g_slist_free(_game_list); + _game_list = NULL; } diff -Nru pioneers-15.5/common/gettext.c pioneers-15.6/common/gettext.c --- pioneers-15.5/common/gettext.c 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/common/gettext.c 2020-06-20 10:52:00.000000000 +0000 @@ -0,0 +1,55 @@ +/* Pioneers - Implementation of the excellent Settlers of Catan board game. + * Go buy a copy. + * + * Copyright (C) 2020 Roland Clobus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" +#ifdef ENABLE_NLS +#include +#include +#ifdef HAVE_SETLOCALE +#include +#endif +#endif + +#include "gettext.h" + +void gettext_init(void) +{ +#ifdef ENABLE_NLS +#ifdef HAVE_SETLOCALE + setlocale(LC_ALL, ""); +#endif +#ifdef G_OS_WIN32 + gchar *root_glib_encoding = + g_win32_get_package_installation_directory_of_module(NULL); + gchar *full_path_glib_encoding = + g_build_filename(root_glib_encoding, LOCALEDIR, NULL); + gchar *full_path_local_encoding = + g_win32_locale_filename_from_utf8(full_path_glib_encoding); + bindtextdomain(PACKAGE, full_path_local_encoding); + g_free(full_path_local_encoding); + g_free(full_path_glib_encoding); + g_free(root_glib_encoding); +#else + bindtextdomain(PACKAGE, LOCALEDIR); +#endif + textdomain(PACKAGE); + bind_textdomain_codeset(PACKAGE, "UTF-8"); +#endif /* ENABLE_NLS */ +} diff -Nru pioneers-15.5/common/gettext.h pioneers-15.6/common/gettext.h --- pioneers-15.5/common/gettext.h 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/common/gettext.h 2020-06-20 10:14:16.000000000 +0000 @@ -0,0 +1,26 @@ +/* Pioneers - Implementation of the excellent Settlers of Catan board game. + * Go buy a copy. + * + * Copyright (C) 2020 Roland Clobus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __gettext_h +#define __gettext_h + +void gettext_init(void); + +#endif diff -Nru pioneers-15.5/common/gtk/colors.c pioneers-15.6/common/gtk/colors.c --- pioneers-15.5/common/gtk/colors.c 2014-02-25 09:43:07.000000000 +0000 +++ pioneers-15.6/common/gtk/colors.c 2020-06-20 10:52:00.000000000 +0000 @@ -25,32 +25,32 @@ #include "colors.h" #include "game.h" -GdkColor black = { 0, 0, 0, 0 }; -GdkColor white = { 0, 0xff00, 0xff00, 0xff00 }; -GdkColor red = { 0, 0xff00, 0, 0 }; -GdkColor green = { 0, 0, 0xff00, 0 }; -GdkColor blue = { 0, 0, 0, 0xff00 }; -GdkColor lightblue = { 0, 0xbe00, 0xbe00, 0xff00 }; +GdkRGBA black = { 0.0, 0.0, 0.0, 1.0 }; +GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 }; +GdkRGBA red = { 1.0, 0.0, 0.0, 1.0 }; +GdkRGBA green = { 0.0, 1.0, 0.0, 1.0 }; +GdkRGBA blue = { 0.0, 0.0, 1.0, 1.0 }; +GdkRGBA lightblue = { 0.75, 0.75, 1.0, 1.0 }; -GdkColor ck_die_red = { 0, 0x8800, 0x0200, 0x0200 }; -GdkColor ck_die_yellow = { 0, 0xab00, 0xbd00, 0x1300 }; +GdkRGBA ck_die_red = { 0.53, 0.01, 0.01, 1.0 }; +GdkRGBA ck_die_yellow = { 0.67, 0.74, 0.07, 1.0 }; -static GdkColor token_colors[MAX_PLAYERS] = { - {0, 0xCD00, 0x0000, 0x0000}, /* red */ - {0, 0x1E00, 0x9000, 0xFF00}, /* blue */ - {0, 0xE800, 0xE800, 0xE800}, /* white */ - {0, 0xFF00, 0x7F00, 0x0000}, /* orange */ - {0, 0xEE00, 0xEE00, 0x0000}, /* yellow */ - {0, 0x8E00, 0xE500, 0xEE00}, /* cyan */ - {0, 0xD100, 0x5F00, 0xEE00}, /* magenta */ - {0, 0x0000, 0xEE00, 0x7600} /* green */ +static GdkRGBA token_colors[MAX_PLAYERS] = { + { 0.80, 0.00, 0.00, 1.0 }, /* red */ + { 0.12, 0.57, 1.00, 1.0 }, /* blue */ + { 0.91, 0.91, 0.91, 1.0 }, /* white */ + { 1.00, 0.50, 0.00, 1.0 }, /* orange */ + { 0.93, 0.93, 0.00, 1.0 }, /* yellow */ + { 0.55, 0.90, 0.93, 1.0 }, /* cyan */ + { 0.82, 0.37, 0.93, 1.0 }, /* magenta */ + { 0.00, 0.93, 0.46, 1.0 } /* green */ }; void colors_init(void) { } -GdkColor *colors_get_player(gint player_num) +GdkRGBA *colors_get_player(gint player_num) { g_assert(player_num >= 0); g_assert(player_num < MAX_PLAYERS); diff -Nru pioneers-15.5/common/gtk/colors.h pioneers-15.6/common/gtk/colors.h --- pioneers-15.5/common/gtk/colors.h 2011-02-05 19:22:08.000000000 +0000 +++ pioneers-15.6/common/gtk/colors.h 2018-06-15 22:02:19.000000000 +0000 @@ -23,18 +23,18 @@ #include -extern GdkColor black; -extern GdkColor white; -extern GdkColor red; -extern GdkColor green; -extern GdkColor blue; -extern GdkColor lightblue; +extern GdkRGBA black; +extern GdkRGBA white; +extern GdkRGBA red; +extern GdkRGBA green; +extern GdkRGBA blue; +extern GdkRGBA lightblue; -extern GdkColor ck_die_red; -extern GdkColor ck_die_yellow; +extern GdkRGBA ck_die_red; +extern GdkRGBA ck_die_yellow; void colors_init(void); -GdkColor *colors_get_player(gint player_num); +GdkRGBA *colors_get_player(gint player_num); #endif diff -Nru pioneers-15.5/common/gtk/common_gtk.c pioneers-15.6/common/gtk/common_gtk.c --- pioneers-15.5/common/gtk/common_gtk.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/common_gtk.c 2018-07-07 20:49:17.000000000 +0000 @@ -27,7 +27,6 @@ #include "common_gtk.h" #include "cards.h" -static GtkCssProvider *small_button_style_provider; static GtkWidget *message_txt; static GtkWidget *message_container; static gboolean msg_colors = TRUE; @@ -332,23 +331,6 @@ g_free(point_specification); } -void prepare_gtk_for_close_button_on_tab(void) -{ - /* The code for adding the button is based on the code on - * http://www.micahcarrick.com/gtk-notebook-tabs-with-close-button.html - * by Micah Carrick - */ - const gchar *data = ".button {\n" - "-GtkButton-default-border : 0px;\n" - "-GtkButton-default-outside-border : 0px;\n" - "-GtkButton-inner-border: 0px;\n" - "-GtkWidget-focus-line-width : 0px;\n" - "-GtkWidget-focus-padding : 0px;\n" "padding: 0px;\n" "}"; - small_button_style_provider = gtk_css_provider_new(); - gtk_css_provider_load_from_data(small_button_style_provider, data, - -1, NULL); -} - GtkWidget *create_label_with_close_button(const gchar * label_text, const gchar * tooltip_text, GtkWidget ** button) @@ -371,13 +353,6 @@ gtk_widget_set_tooltip_text(*button, tooltip_text); gtk_box_pack_start(GTK_BOX(hbox), *button, FALSE, FALSE, 0); - /* Apply the style, to make the button smaller */ - gtk_style_context_add_provider(gtk_widget_get_style_context - (*button), - GTK_STYLE_PROVIDER - (small_button_style_provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - gtk_widget_show_all(hbox); return hbox; } @@ -405,7 +380,7 @@ title_with_markup = g_strdup_printf("%s", title); gtk_label_set_markup(GTK_LABEL(label), title_with_markup); g_free(title_with_markup); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 0); diff -Nru pioneers-15.5/common/gtk/common_gtk.h pioneers-15.6/common/gtk/common_gtk.h --- pioneers-15.5/common/gtk/common_gtk.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/common_gtk.h 2018-04-27 18:19:04.000000000 +0000 @@ -54,11 +54,6 @@ extern UIDriver GTK_Driver; -/** Prepare Gtk for close buttons on tabs. - * Needs to be called once -*/ -void prepare_gtk_for_close_button_on_tab(void); - /** Create a label with a close button. * @param label_text Text for the label * @param tooltip_text Tooltip for the close button diff -Nru pioneers-15.5/common/gtk/game-rules.c pioneers-15.6/common/gtk/game-rules.c --- pioneers-15.5/common/gtk/game-rules.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/game-rules.c 2018-07-07 20:49:17.000000000 +0000 @@ -40,7 +40,7 @@ NULL }; gp_type = - g_type_register_static(GTK_TYPE_TABLE, + g_type_register_static(GTK_TYPE_GRID, "GameRules", &gp_info, 0); } return gp_type; @@ -54,8 +54,7 @@ check_btn = gtk_check_button_new_with_label(name); gtk_widget_show(check_btn); - gtk_table_attach_defaults(GTK_TABLE(gr), check_btn, - 0, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(gr), check_btn, 0, row, 2, 1); *check = GTK_CHECK_BUTTON(check_btn); gtk_widget_set_tooltip_text(check_btn, tooltip); @@ -71,18 +70,17 @@ gint idx; guint row; - gtk_table_resize(GTK_TABLE(gr), show_all_rules ? 6 : 3, 2); - gtk_table_set_row_spacings(GTK_TABLE(gr), 3); - gtk_table_set_col_spacings(GTK_TABLE(gr), 5); + gtk_grid_set_row_spacing(GTK_GRID(gr), 3); + gtk_grid_set_column_spacing(GTK_GRID(gr), 5); row = 0; /* Label */ label = gtk_label_new(_("Sevens rule")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(gr), label, 0, 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_grid_attach(GTK_GRID(gr), label, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.0); gr->radio_sevens[0] = gtk_radio_button_new_with_label(NULL, /* Sevens rule: normal */ @@ -122,8 +120,8 @@ gtk_box_pack_start(GTK_BOX(vbox_sevens), gr->radio_sevens[idx], TRUE, TRUE, 0); } - gtk_table_attach(GTK_TABLE(gr), vbox_sevens, 1, 2, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(gr), vbox_sevens, 1, row, 1, 1); + gtk_widget_set_hexpand(vbox_sevens, TRUE); row++; add_row(gr, _("Randomize terrain"), _("Randomize the terrain"), @@ -154,9 +152,8 @@ /* Label */ label = gtk_label_new(_("Number of dice decks")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(gr), label, 0, 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(gr), label, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gr->num_dice_decks = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range (1, 5, 1)); @@ -170,18 +167,16 @@ gtk_widget_set_tooltip_text(GTK_WIDGET(gr->num_dice_decks), _ ("The number of dice decks (of 36 cards each)")); - gtk_table_attach(GTK_TABLE(gr), - GTK_WIDGET(gr->num_dice_decks), 1, 2, row, - row + 1, GTK_FILL, GTK_EXPAND | GTK_FILL, - 0, 0); + gtk_grid_attach(GTK_GRID(gr), + GTK_WIDGET(gr->num_dice_decks), 1, row, 1, + 1); row++; /* Label */ label = gtk_label_new(_("Number of removed dice cards")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(gr), label, 0, 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(gr), label, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gr->num_removed_dice_cards = GTK_SPIN_BUTTON(gtk_spin_button_new_with_range (0, 30, 1)); @@ -197,18 +192,16 @@ (gr->num_removed_dice_cards), _ ("The number of dice cards that are removed after shuffling the deck")); - gtk_table_attach(GTK_TABLE(gr), - GTK_WIDGET(gr->num_removed_dice_cards), 1, - 2, row, row + 1, GTK_FILL, - GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(gr), + GTK_WIDGET(gr->num_removed_dice_cards), 1, + row, 1, 1); row++; /* Label */ label = gtk_label_new(_("Island discovery bonuses")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(gr), label, 0, 1, row, row + 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(gr), label, 0, row, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); @@ -238,9 +231,8 @@ "discovery bonuses")); gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, FALSE, 0); - gtk_table_attach(GTK_TABLE(gr), GTK_WIDGET(hbox), 1, 2, - row, row + 1, GTK_FILL, - GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(gr), GTK_WIDGET(hbox), 1, row, 1, + 1); row++; } else { gr->use_pirate = NULL; @@ -438,5 +430,6 @@ bonuses = game_rules_get_island_discovery_bonus(gr); game_rules_set_island_discovery_bonus(gr, bonuses); - g_array_free(bonuses, TRUE); + if (bonuses != NULL) + g_array_free(bonuses, TRUE); } diff -Nru pioneers-15.5/common/gtk/game-rules.h pioneers-15.6/common/gtk/game-rules.h --- pioneers-15.5/common/gtk/game-rules.h 2014-02-25 09:43:07.000000000 +0000 +++ pioneers-15.6/common/gtk/game-rules.h 2018-05-23 10:51:57.000000000 +0000 @@ -16,7 +16,7 @@ typedef struct _GameRulesClass GameRulesClass; struct _GameRules { - GtkTable table; + GtkGrid grid; GtkCheckButton *random_terrain; GtkWidget *radio_sevens[3]; /* radio buttons for sevens rules */ @@ -31,7 +31,7 @@ }; struct _GameRulesClass { - GtkTableClass parent_class; + GtkGridClass parent_class; }; GType game_rules_get_type(void); diff -Nru pioneers-15.5/common/gtk/game-settings.c pioneers-15.6/common/gtk/game-settings.c --- pioneers-15.5/common/gtk/game-settings.c 2015-05-30 17:32:06.000000000 +0000 +++ pioneers-15.6/common/gtk/game-settings.c 2020-08-02 07:03:10.000000000 +0000 @@ -22,8 +22,9 @@ LAST_SIGNAL }; -static void game_settings_class_init(GameSettingsClass * klass); -static void game_settings_init(GameSettings * sg); +static void game_settings_class_init(gpointer g_class, + gpointer class_data); +static void game_settings_init(GTypeInstance * instance, gpointer g_class); static void game_settings_change_players(GtkSpinButton * widget, GameSettings * gs); static void game_settings_change_victory_points(GtkSpinButton * widget, @@ -44,16 +45,16 @@ sizeof(GameSettingsClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) game_settings_class_init, + game_settings_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof(GameSettings), 0, - (GInstanceInitFunc) game_settings_init, + game_settings_init, NULL }; gs_type = - g_type_register_static(GTK_TYPE_TABLE, "GameSettings", + g_type_register_static(GTK_TYPE_GRID, "GameSettings", &gs_info, 0); } return gs_type; @@ -64,11 +65,12 @@ * 'change' when any change to one of the controls occurs. * 'change-players' when the amount of player has changed. */ -static void game_settings_class_init(GameSettingsClass * klass) +static void game_settings_class_init(gpointer g_class, + G_GNUC_UNUSED gpointer class_data) { game_settings_signals[CHANGE] = g_signal_new("change", G_TYPE_FROM_CLASS - (klass), + (g_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET @@ -77,13 +79,13 @@ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); game_settings_signals[CHANGE_PLAYERS] = - g_signal_new("change-players", G_TYPE_FROM_CLASS(klass), + g_signal_new("change-players", G_TYPE_FROM_CLASS(g_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET(GameSettingsClass, change_players), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); game_settings_signals[CHECK] = - g_signal_new("check", G_TYPE_FROM_CLASS(klass), + g_signal_new("check", G_TYPE_FROM_CLASS(g_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET(GameSettingsClass, check), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, @@ -91,32 +93,33 @@ } /* Build the composite widget */ -static void game_settings_init(GameSettings * gs) +static void game_settings_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkWidget *label; GtkWidget *hbox; GtkAdjustment *adj; + GameSettings *gs = GAMESETTINGS(instance); - gtk_table_resize(GTK_TABLE(gs), 4, 2); - gtk_table_set_row_spacings(GTK_TABLE(gs), 3); - gtk_table_set_col_spacings(GTK_TABLE(gs), 5); + gtk_grid_set_row_spacing(GTK_GRID(gs), 3); + gtk_grid_set_column_spacing(GTK_GRID(gs), 5); + gtk_widget_set_hexpand(GTK_WIDGET(gs), FALSE); /* Label text for customising a game */ label = gtk_label_new(_("Number of players")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(gs), label, 0, 1, 1, 2, - GTK_FILL, GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5f); + gtk_grid_attach(GTK_GRID(gs), label, 0, 1, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 2, MAX_PLAYERS, 1, 4, 0)); gs->players_spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0); gtk_entry_set_alignment(GTK_ENTRY(gs->players_spin), 1.0); gtk_widget_show(gs->players_spin); + gtk_widget_set_hexpand(gs->players_spin, TRUE); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(gs->players_spin), TRUE); - gtk_table_attach(GTK_TABLE(gs), gs->players_spin, 1, 2, 1, 2, - GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(gs), gs->players_spin, 1, 1, 1, 1); g_signal_connect(G_OBJECT(gs->players_spin), "value-changed", G_CALLBACK(game_settings_change_players), gs); gtk_widget_set_tooltip_text(gs->players_spin, @@ -126,9 +129,8 @@ /* Label for customising a game */ label = gtk_label_new(_("Victory point target")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(gs), label, 0, 1, 2, 3, - GTK_FILL, GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5f); + gtk_grid_attach(GTK_GRID(gs), label, 0, 2, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3); @@ -160,8 +162,7 @@ /* Tooltip for the check button */ _("Is it possible to win this game?")); - gtk_table_attach(GTK_TABLE(gs), hbox, 1, 2, 2, 3, - GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(gs), hbox, 1, 2, 1, 1); gtk_widget_show(hbox); gs->players = 4; @@ -251,7 +252,7 @@ gtk_spin_button_set_value(GTK_SPIN_BUTTON(gs->victory_spin), gs->victory_points); - /* Reenable the signals */ + /* Re-enable the signals */ g_signal_handlers_unblock_matched(G_OBJECT(gs->players_spin), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, gs); diff -Nru pioneers-15.5/common/gtk/game-settings.h pioneers-15.6/common/gtk/game-settings.h --- pioneers-15.5/common/gtk/game-settings.h 2009-08-29 11:00:09.000000000 +0000 +++ pioneers-15.6/common/gtk/game-settings.h 2020-06-20 10:52:00.000000000 +0000 @@ -24,7 +24,7 @@ typedef struct _GameSettingsClass GameSettingsClass; struct _GameSettings { - GtkTable table; + GtkGrid grid; GtkWidget *victory_spin; /* victory point target */ GtkWidget *players_spin; /* number of players */ @@ -35,11 +35,11 @@ }; struct _GameSettingsClass { - GtkTableClass parent_class; + GtkGridClass parent_class; - void (*change) (GameSettings * gs); - void (*change_players) (GameSettings * gs); - void (*check) (GameSettings * gs); + void (*change)(GameSettings * gs); + void (*change_players)(GameSettings * gs); + void (*check)(GameSettings * gs); }; GType game_settings_get_type(void); diff -Nru pioneers-15.5/common/gtk/guimap.c pioneers-15.6/common/gtk/guimap.c --- pioneers-15.5/common/gtk/guimap.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/guimap.c 2020-06-20 10:52:00.000000000 +0000 @@ -153,11 +153,9 @@ } static gint configure_map_cb(GtkWidget * area, - G_GNUC_UNUSED GdkEventConfigure * event, - gpointer user_data) + GdkEventConfigure * event, gpointer user_data) { GuiMap *gmap = user_data; - GtkAllocation allocation; if (gtk_widget_get_window(area) == NULL || gmap->map == NULL) return FALSE; @@ -166,8 +164,7 @@ cairo_surface_destroy(gmap->surface); gmap->surface = NULL; } - gtk_widget_get_allocation(area, &allocation); - guimap_scale_to_size(gmap, allocation.width, allocation.height); + guimap_scale_to_size(gmap, event->width, event->height); gtk_widget_queue_draw(area); return FALSE; @@ -212,38 +209,37 @@ gpointer user_data) { GuiMap *gmap = user_data; - GtkAllocation allocation; gint radius; + gdouble old_width; + gdouble old_height; if (gtk_widget_get_window(area) == NULL || gmap->map == NULL) return FALSE; radius = gmap->hex_radius; + old_width = gmap->width; + old_height = gmap->height; + gmap->is_custom_view = TRUE; if (event->direction == GDK_SCROLL_UP) { radius += ZOOM_AMOUNT; - - gmap->x_margin -= (event->x - gmap->x_margin) * - ZOOM_AMOUNT / radius; - gmap->y_margin -= (event->y - gmap->y_margin) * - ZOOM_AMOUNT / radius; - } else if (event->direction == GDK_SCROLL_DOWN) { - gint old_radius = radius; radius -= ZOOM_AMOUNT; if (radius < MIN_HEX_RADIUS) radius = MIN_HEX_RADIUS; + } - gmap->x_margin += (event->x - gmap->x_margin) * - (old_radius - radius) / radius; - gmap->y_margin += (event->y - gmap->y_margin) * - (old_radius - radius) / radius; + guimap_scale_with_radius(gmap, radius); - } - gmap->hex_radius = radius; - gtk_widget_get_allocation(gmap->area, &allocation); - guimap_scale_to_size(gmap, allocation.width, allocation.height); + gmap->x_margin = + event->x - (event->x - + gmap->x_margin) / old_width * + (gdouble) gmap->width; + gmap->y_margin = + event->y - (event->y - + gmap->y_margin) / old_height * + (gdouble) gmap->height; guimap_display(gmap); gtk_widget_queue_draw(gmap->area); @@ -263,7 +259,8 @@ gtk_widget_set_events(gmap->area, GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK - | GDK_POINTER_MOTION_HINT_MASK); + | GDK_POINTER_MOTION_HINT_MASK + | GDK_SCROLL_MASK); gtk_widget_set_size_request(gmap->area, width, height); g_signal_connect(G_OBJECT(gmap->area), "draw", @@ -282,8 +279,8 @@ } static GdkPoint settlement_points[] = { - {20, 20}, {20, -8}, {0, -28}, {-20, -8}, - {-20, 20}, {20, 20} + { 20, 20 }, { 20, -8 }, { 0, -28 }, { -20, -8 }, + { -20, 20 }, { 20, 20 } }; static Polygon settlement_poly = { @@ -292,8 +289,8 @@ }; static GdkPoint city_points[] = { - {40, 20}, {40, -16}, {2, -16}, {2, -28}, - {-19, -48}, {-40, -28}, {-40, 20}, {40, 20} + { 40, 20 }, { 40, -16 }, { 2, -16 }, { 2, -28 }, + { -19, -48 }, { -40, -28 }, { -40, 20 }, { 40, 20 } }; static Polygon city_poly = { @@ -302,7 +299,7 @@ }; static GdkPoint city_wall_points[] = { - {50, 36}, {50, -64}, {-50, -64}, {-50, 36} + { 50, 36 }, { 50, -64 }, { -50, -64 }, { -50, 36 } }; static Polygon city_wall_poly = { @@ -311,8 +308,8 @@ }; static GdkPoint nosetup_points[] = { - {0, 30}, {26, 15}, {26, -15}, {0, -30}, - {-26, -15}, {-26, 15}, {0, 30} + { 0, 30 }, { 26, 15 }, { 26, -15 }, { 0, -30 }, + { -26, -15 }, { -26, 15 }, { 0, 30 } }; static Polygon nosetup_poly = { @@ -327,10 +324,10 @@ #define NODE_MAX_Y 36 static GdkPoint largest_node_points[] = { - {NODE_MIN_X, NODE_MIN_Y}, - {NODE_MIN_X, NODE_MAX_Y}, - {NODE_MAX_X, NODE_MAX_Y}, - {NODE_MAX_X, NODE_MIN_Y} + { NODE_MIN_X, NODE_MIN_Y }, + { NODE_MIN_X, NODE_MAX_Y }, + { NODE_MAX_X, NODE_MAX_Y }, + { NODE_MAX_X, NODE_MIN_Y } }; static Polygon largest_node_poly = { @@ -339,8 +336,8 @@ }; static GdkPoint road_points[] = { - {10, 40}, {10, -40}, {-10, -40}, {-10, 40}, - {10, 40} + { 10, 40 }, { 10, -40 }, { -10, -40 }, { -10, 40 }, + { 10, 40 } }; static Polygon road_poly = { @@ -349,10 +346,10 @@ }; static GdkPoint ship_points[] = { - {10, 32}, {10, 8}, {24, 18}, {42, 8}, - {48, 0}, {50, -12}, {10, -12}, {10, -32}, - {2, -32}, {-6, -26}, {-10, -16}, {-10, 16}, - {-6, 26}, {2, 32}, {10, 32} + { 10, 32 }, { 10, 8 }, { 24, 18 }, { 42, 8 }, + { 48, 0 }, { 50, -12 }, { 10, -12 }, { 10, -32 }, + { 2, -32 }, { -6, -26 }, { -10, -16 }, { -10, 16 }, + { -6, 26 }, { 2, 32 }, { 10, 32 } }; static Polygon ship_poly = { @@ -361,9 +358,9 @@ }; static GdkPoint bridge_points[] = { - {13, 40}, {-14, 40}, {-14, 30}, {-1, 15}, - {-1, -15}, {-14, -30}, {-14, -40}, {13, -40}, - {13, 40} + { 13, 40 }, { -14, 40 }, { -14, 30 }, { -1, 15 }, + { -1, -15 }, { -14, -30 }, { -14, -40 }, { 13, -40 }, + { 13, 40 } }; static Polygon bridge_poly = { @@ -378,10 +375,10 @@ #define EDGE_MAX_Y 40 static GdkPoint largest_edge_points[] = { - {EDGE_MIN_X, EDGE_MIN_Y}, - {EDGE_MIN_X, EDGE_MAX_Y}, - {EDGE_MAX_X, EDGE_MAX_Y}, - {EDGE_MAX_X, EDGE_MIN_Y} + { EDGE_MIN_X, EDGE_MIN_Y }, + { EDGE_MIN_X, EDGE_MAX_Y }, + { EDGE_MAX_X, EDGE_MAX_Y }, + { EDGE_MAX_X, EDGE_MIN_Y } }; static Polygon largest_edge_poly = { @@ -390,11 +387,11 @@ }; static GdkPoint robber_points[] = { - {30, 60}, {30, 4}, {28, -6}, {22, -15}, - {12, -20}, {22, -32}, {22, -48}, {10, -60}, - {-10, -60}, {-22, -48}, {-22, -32}, {-12, -20}, - {-22, -15}, {-28, -6}, {-30, 4}, {-30, 60}, - {30, 60} + { 30, 60 }, { 30, 4 }, { 28, -6 }, { 22, -15 }, + { 12, -20 }, { 22, -32 }, { 22, -48 }, { 10, -60 }, + { -10, -60 }, { -22, -48 }, { -22, -32 }, { -12, -20 }, + { -22, -15 }, { -28, -6 }, { -30, 4 }, { -30, 60 }, + { 30, 60 } }; static Polygon robber_poly = { @@ -403,10 +400,10 @@ }; static GdkPoint pirate_points[] = { - {42, 15}, {18, 15}, {28, 1}, {18, -17}, - {10, -23}, {-2, -25}, {-2, 15}, {-22, 15}, - {-22, 23}, {-16, 31}, {-6, 35}, {26, 35}, - {36, 31}, {42, 23}, {42, 15} + { 42, 15 }, { 18, 15 }, { 28, 1 }, { 18, -17 }, + { 10, -23 }, { -2, -25 }, { -2, 15 }, { -22, 15 }, + { -22, 23 }, { -16, 31 }, { -6, 35 }, { 26, 35 }, + { 36, 31 }, { 42, 23 }, { 42, 15 } }; static Polygon pirate_poly = { @@ -710,9 +707,9 @@ typeind = TRUE; drawit = TRUE; } else if (!theme->colors[TC_PORT_BG].transparent) { - gdk_cairo_set_source_color(cr, - &theme->colors - [TC_PORT_BG].color); + gdk_cairo_set_source_rgba(cr, + &theme->colors + [TC_PORT_BG].color); typeind = FALSE; drawit = TRUE; } else { @@ -727,9 +724,9 @@ /* Outline port indicator */ if (!theme->colors[TC_PORT_BD].transparent) { - gdk_cairo_set_source_color(cr, - &theme->colors - [TC_PORT_BD].color); + gdk_cairo_set_source_rgba(cr, + &theme->colors + [TC_PORT_BD].color); cairo_arc(cr, x_offset, y_offset, chit_radius, 0.0, 2 * M_PI); cairo_stroke(cr); @@ -774,9 +771,9 @@ pango_layout_set_markup(layout, str, -1); pango_layout_get_pixel_size(layout, &width, &height); - gdk_cairo_set_source_color(cr, - &theme->colors - [TC_PORT_FG].color); + gdk_cairo_set_source_rgba(cr, + &theme->colors + [TC_PORT_FG].color); cairo_move_to(cr, x_offset - width / 2, y_offset - height / 2); pango_cairo_show_layout(cr, layout); @@ -808,14 +805,14 @@ col = highlight ? TC_CHIP_H_BG : TC_CHIP_BG; tcol = col_or_ovr(terrain, col); if (!tcol->transparent) { - gdk_cairo_set_source_color(cr, &(tcol->color)); + gdk_cairo_set_source_rgba(cr, &(tcol->color)); cairo_move_to(cr, x_offset + radius, y_offset); cairo_arc(cr, x_offset, y_offset, radius, 0.0, 2 * M_PI); cairo_fill(cr); } tcol = col_or_ovr(terrain, TC_CHIP_BD); if (!tcol->transparent) { - gdk_cairo_set_source_color(cr, &(tcol->color)); + gdk_cairo_set_source_rgba(cr, &(tcol->color)); cairo_move_to(cr, x_offset + radius, y_offset); cairo_arc(cr, x_offset, y_offset, radius, 0.0, 2 * M_PI); cairo_stroke(cr); @@ -826,7 +823,7 @@ sprintf(num, "%d", n); pango_layout_set_markup(layout, num, -1); pango_layout_get_pixel_size(layout, &width, &height); - gdk_cairo_set_source_color(cr, &(tcol->color)); + gdk_cairo_set_source_rgba(cr, &(tcol->color)); cairo_move_to(cr, x_offset - width / 2, y_offset - height / 2); pango_cairo_show_layout(cr, layout); @@ -875,9 +872,8 @@ /* Draw border around hex */ if (!theme->colors[TC_HEX_BD].transparent) { - gdk_cairo_set_source_color(gmap->cr, - &theme-> - colors[TC_HEX_BD].color); + gdk_cairo_set_source_rgba(gmap->cr, + &theme->colors[TC_HEX_BD].color); poly_draw(gmap->cr, FALSE, &poly); } @@ -896,7 +892,7 @@ const double dashes[] = { 4.0 }; /* Draw lines from port to shore */ - gdk_cairo_set_source_color(gmap->cr, &white); + gdk_cairo_set_source_rgba(gmap->cr, &white); cairo_set_dash(gmap->cr, dashes, G_N_ELEMENTS(dashes), 0.0); cairo_move_to(gmap->cr, x_offset, y_offset); @@ -935,15 +931,15 @@ g_assert_not_reached(); break; } - gdk_cairo_set_source_color(gmap->cr, - colors_get_player(edge->owner)); + gdk_cairo_set_source_rgba(gmap->cr, + colors_get_player(edge->owner)); poly_draw_with_border(gmap->cr, &black, &poly); } /* Draw all buildings */ for (idx = 0; idx < G_N_ELEMENTS(hex->nodes); idx++) { const Node *node = hex->nodes[idx]; - const GdkColor *color; + const GdkRGBA *color; if (node->owner < 0 && !gmap->show_nosetup_nodes) continue; @@ -962,8 +958,7 @@ poly.num_points = G_N_ELEMENTS(points); guimap_city_wall_polygon(gmap, node, &poly); - gdk_cairo_set_source_color(gmap->cr, - color); + gdk_cairo_set_source_rgba(gmap->cr, color); poly_draw_with_border(gmap->cr, &black, &poly); } @@ -976,7 +971,7 @@ guimap_settlement_polygon(gmap, node, &poly); } - gdk_cairo_set_source_color(gmap->cr, color); + gdk_cairo_set_source_rgba(gmap->cr, color); poly_draw_with_border(gmap->cr, &black, &poly); } @@ -986,15 +981,15 @@ guimap_robber_polygon(gmap, hex, &poly); cairo_set_line_width(gmap->cr, 1.0); if (!theme->colors[TC_ROBBER_FG].transparent) { - gdk_cairo_set_source_color(gmap->cr, - &theme->colors - [TC_ROBBER_FG].color); + gdk_cairo_set_source_rgba(gmap->cr, + &theme->colors + [TC_ROBBER_FG].color); poly_draw(gmap->cr, TRUE, &poly); } if (!theme->colors[TC_ROBBER_BD].transparent) { - gdk_cairo_set_source_color(gmap->cr, - &theme->colors - [TC_ROBBER_BD].color); + gdk_cairo_set_source_rgba(gmap->cr, + &theme->colors + [TC_ROBBER_BD].color); poly_draw(gmap->cr, FALSE, &poly); } } @@ -1005,15 +1000,15 @@ guimap_pirate_polygon(gmap, hex, &poly); cairo_set_line_width(gmap->cr, 1.0); if (!theme->colors[TC_ROBBER_FG].transparent) { - gdk_cairo_set_source_color(gmap->cr, - &theme->colors - [TC_ROBBER_FG].color); + gdk_cairo_set_source_rgba(gmap->cr, + &theme->colors + [TC_ROBBER_FG].color); poly_draw(gmap->cr, TRUE, &poly); } if (!theme->colors[TC_ROBBER_BD].transparent) { - gdk_cairo_set_source_color(gmap->cr, - &theme->colors - [TC_ROBBER_BD].color); + gdk_cairo_set_source_rgba(gmap->cr, + &theme->colors + [TC_ROBBER_BD].color); poly_draw(gmap->cr, FALSE, &poly); } } @@ -1030,8 +1025,6 @@ gmap->x_point = radius * cos(M_PI / 6.0); gmap->y_point = radius * sin(M_PI / 6.0); - gmap->x_margin = gmap->y_margin = 0; - if (gmap->map == NULL) return; @@ -1064,13 +1057,7 @@ gint height_radius; if (gmap->is_custom_view) { - gint x_margin = gmap->x_margin; - gint y_margin = gmap->y_margin; guimap_scale_with_radius(gmap, gmap->hex_radius); - gmap->x_margin = x_margin; - gmap->y_margin = y_margin; - gmap->width = width; - gmap->height = height; return; } @@ -1087,11 +1074,8 @@ else guimap_scale_with_radius(gmap, height_radius); - gmap->x_margin += (width - gmap->width) / 2; - gmap->y_margin += (height - gmap->height) / 2; - - gmap->width = width; - gmap->height = height; + gmap->x_margin = (width - gmap->width) / 2; + gmap->y_margin = (height - gmap->height) / 2; } /** @return The radius of the chit for the current font size */ @@ -1128,6 +1112,7 @@ PangoContext *pc; PangoFontDescription *pfd; gint font_size; + cairo_rectangle_t extents; if (gmap->surface == NULL) return; @@ -1143,7 +1128,8 @@ [BOARD_TILE], 0, 0); cairo_pattern_set_extend(cairo_get_source(gmap->cr), CAIRO_EXTEND_REPEAT); - cairo_rectangle(gmap->cr, 0, 0, gmap->width, gmap->height); + cairo_recording_surface_get_extents(gmap->surface, &extents); + cairo_rectangle(gmap->cr, 0, 0, extents.width, extents.height); cairo_fill(gmap->cr); if (gmap->layout != NULL) @@ -1205,25 +1191,10 @@ void guimap_zoom_center_map(GuiMap * gmap) { GtkAllocation allocation; - gint width; - gint height; - - if (!gmap->is_custom_view) - return; - width = gmap->map->x_size * 2 * gmap->x_point + gmap->x_point; - if (gmap->map->shrink_left) - width -= gmap->x_point; - if (gmap->map->shrink_right) - width -= gmap->x_point; gtk_widget_get_allocation(gmap->area, &allocation); - gmap->x_margin = allocation.width / 2 - width / 2; - - height = (gmap->map->y_size - 1) * - (gmap->hex_radius + gmap->y_point) - + 2 * gmap->hex_radius; - - gmap->y_margin = allocation.height / 2 - height / 2; + gmap->x_margin = allocation.width / 2 - gmap->width / 2; + gmap->y_margin = allocation.height / 2 - gmap->height / 2; guimap_display(gmap); gtk_widget_queue_draw(gmap->area); @@ -1358,7 +1329,7 @@ g_return_if_fail(gmap->cursor.pointer != NULL); cairo_set_line_width(gmap->cr, 3.0); - gdk_cairo_set_source_color(gmap->cr, colors_get_player(owner)); + gdk_cairo_set_source_rgba(gmap->cr, colors_get_player(owner)); poly_draw_with_border(gmap->cr, &green, poly); poly_bound_rect(poly, 1, &rect); @@ -1583,7 +1554,7 @@ poly_bound_rect(&poly, 1, &rect); cairo_set_line_width(gmap->cr, 2.0); - gdk_cairo_set_source_color(gmap->cr, &green); + gdk_cairo_set_source_rgba(gmap->cr, &green); poly_draw(gmap->cr, FALSE, &poly); gdk_window_invalidate_rect(gtk_widget_get_window(gmap->area), @@ -1654,23 +1625,23 @@ } typedef struct { - void (*find) (GuiMap * gmap, MapElement * element); - void (*erase_cursor) (GuiMap * gmap); - void (*draw_cursor) (GuiMap * gmap); + void (*find)(GuiMap * gmap, MapElement * element); + void (*erase_cursor)(GuiMap * gmap); + void (*draw_cursor)(GuiMap * gmap); } ModeCursor; /* This array must follow the enum CursorType */ static ModeCursor cursors[] = { - {NULL, NULL, NULL}, /* NO_CURSOR */ - {find_edge, erase_edge_cursor, draw_road_cursor}, /* ROAD_CURSOR */ - {find_edge, erase_edge_cursor, draw_ship_cursor}, /* SHIP_CURSOR */ - {find_edge, erase_edge_cursor, draw_bridge_cursor}, /* BRIDGE_CURSOR */ - {find_node, erase_node_cursor, draw_settlement_cursor}, /* SETTLEMENT_CURSOR */ - {find_node, erase_node_cursor, draw_city_cursor}, /* CITY_CURSOR */ - {find_node, erase_node_cursor, draw_city_wall_cursor}, /* CITY_WALL_CURSOR */ - {find_node, erase_node_cursor, draw_steal_building_cursor}, /* STEAL_BUILDING_CURSOR */ - {find_edge, erase_edge_cursor, draw_steal_ship_cursor}, /* STEAL_SHIP_CURSOR */ - {find_hex, erase_robber_cursor, draw_robber_cursor} /* ROBBER_CURSOR */ + { NULL, NULL, NULL }, /* NO_CURSOR */ + { find_edge, erase_edge_cursor, draw_road_cursor }, /* ROAD_CURSOR */ + { find_edge, erase_edge_cursor, draw_ship_cursor }, /* SHIP_CURSOR */ + { find_edge, erase_edge_cursor, draw_bridge_cursor }, /* BRIDGE_CURSOR */ + { find_node, erase_node_cursor, draw_settlement_cursor }, /* SETTLEMENT_CURSOR */ + { find_node, erase_node_cursor, draw_city_cursor }, /* CITY_CURSOR */ + { find_node, erase_node_cursor, draw_city_wall_cursor }, /* CITY_WALL_CURSOR */ + { find_node, erase_node_cursor, draw_steal_building_cursor }, /* STEAL_BUILDING_CURSOR */ + { find_edge, erase_edge_cursor, draw_steal_ship_cursor }, /* STEAL_SHIP_CURSOR */ + { find_hex, erase_robber_cursor, draw_robber_cursor } /* ROBBER_CURSOR */ }; gboolean roadM, shipM, bridgeM, settlementM, cityM, cityWallM, shipMoveM; diff -Nru pioneers-15.5/common/gtk/guimap.h pioneers-15.6/common/gtk/guimap.h --- pioneers-15.5/common/gtk/guimap.h 2014-03-09 15:40:37.000000000 +0000 +++ pioneers-15.6/common/gtk/guimap.h 2020-06-20 10:52:00.000000000 +0000 @@ -58,9 +58,9 @@ typedef gboolean(*CheckFunc) (const MapElement element, gint owner, const MapElement user_data); -typedef void (*SelectFunc) (const MapElement obj, - const MapElement user_data); -typedef void (*CancelFunc) (void); +typedef void (*SelectFunc)(const MapElement obj, + const MapElement user_data); +typedef void (*CancelFunc)(void); typedef struct _Mode Mode; typedef struct { @@ -91,8 +91,8 @@ gint y_point; /**< y offset of node 0 from centre */ gboolean is_custom_view; /**< false if all hexes are shown and centered */ - gint x_margin; /**< margin to leave empty */ - gint y_margin; /**< margin to leave empty */ + gdouble x_margin; /**< margin to leave empty */ + gdouble y_margin; /**< margin to leave empty */ gint width; /**< pixel width of map */ gint height; /**< pixel height of map */ gint player_num; /**< player displaying this map */ diff -Nru pioneers-15.5/common/gtk/map-icons.c pioneers-15.6/common/gtk/map-icons.c --- pioneers-15.5/common/gtk/map-icons.c 2014-02-25 09:43:07.000000000 +0000 +++ pioneers-15.6/common/gtk/map-icons.c 2020-04-08 09:32:02.000000000 +0000 @@ -36,18 +36,35 @@ { MapTheme *theme = theme_get_current(); GdkPixbuf *p; - gint height; GtkAllocation allocation; Terrain terrain = GPOINTER_TO_INT(terrain_data); gtk_widget_get_allocation(widget, &allocation); - height = allocation.width / theme->scaledata[terrain].aspect; - p = gdk_pixbuf_scale_simple(theme->scaledata[terrain].native_image, - allocation.width, height, - GDK_INTERP_BILINEAR); - - gdk_cairo_set_source_pixbuf(cr, p, 0, 0); - cairo_rectangle(cr, 0, 0, allocation.width, height); + if (theme->scaling == NEVER) { + p = gdk_pixbuf_copy(theme-> + scaledata[terrain].native_image); + gdk_cairo_set_source_pixbuf(cr, p, 0, 0); + cairo_pattern_set_extend(cairo_get_source(cr), + CAIRO_EXTEND_REPEAT); + } else { + /* Scale to fit in the allocated space */ + gint width = allocation.width; + gint height = allocation.height; + if (height > width / theme->scaledata[terrain].aspect) { + height = width / theme->scaledata[terrain].aspect; + } else { + width = height * theme->scaledata[terrain].aspect; + } + p = gdk_pixbuf_scale_simple(theme->scaledata + [terrain].native_image, width, + height, GDK_INTERP_BILINEAR); + gdk_cairo_set_source_pixbuf(cr, p, + (allocation.width - + width) / 2.0, + (allocation.height - + height) / 2.0); + } + cairo_rectangle(cr, 0, 0, allocation.width, allocation.height); cairo_fill(cr); g_object_unref(p); @@ -59,15 +76,8 @@ GtkWidget *area; gint width; gint height; - MapTheme *theme = theme_get_current(); gtk_icon_size_lookup(GTK_ICON_SIZE_DND, &width, &height); - if (height > width / theme->scaledata[terrain].aspect) { - height = width / theme->scaledata[terrain].aspect; - } else { - width = height * theme->scaledata[terrain].aspect; - } - area = gtk_drawing_area_new(); gtk_widget_show(area); gtk_widget_set_size_request(area, width, height); diff -Nru pioneers-15.5/common/gtk/metaserver.c pioneers-15.6/common/gtk/metaserver.c --- pioneers-15.5/common/gtk/metaserver.c 2014-02-25 09:43:07.000000000 +0000 +++ pioneers-15.6/common/gtk/metaserver.c 2020-03-25 17:52:23.000000000 +0000 @@ -27,8 +27,7 @@ #include "metaserver.h" -static void metaserver_class_init(MetaServerClass * klass); -static void metaserver_init(MetaServer * ms); +static void metaserver_init(GTypeInstance * instance, gpointer g_class); /* Register the class */ GType metaserver_get_type(void) @@ -40,33 +39,31 @@ sizeof(MetaServerClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) metaserver_class_init, + NULL, /* class_init */ NULL, /* class_finalize */ NULL, /* class_data */ sizeof(MetaServer), 0, - (GInstanceInitFunc) metaserver_init, + metaserver_init, NULL }; sg_type = - g_type_register_static(GTK_TYPE_TABLE, "MetaServer", + g_type_register_static(GTK_TYPE_GRID, "MetaServer", &sg_info, 0); } return sg_type; } -static void metaserver_class_init(G_GNUC_UNUSED MetaServerClass * klass) -{ -} - /* Build the composite widget */ -static void metaserver_init(MetaServer * ms) +static void metaserver_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkTreeIter iter; GtkCellRenderer *cell; gchar *default_metaserver_name; gchar *custom_metaserver_name; gboolean novar; + MetaServer *ms = METASERVER(instance); /* Create model */ ms->data = gtk_list_store_new(1, G_TYPE_STRING); @@ -80,12 +77,11 @@ cell, "text", 0, NULL); gtk_widget_show(ms->combo_box); + gtk_widget_set_hexpand(ms->combo_box, TRUE); gtk_widget_set_tooltip_text(ms->combo_box, /* Tooltip for the list of metaservers */ _("Select a metaserver")); - gtk_table_resize(GTK_TABLE(ms), 1, 1); - gtk_table_attach_defaults(GTK_TABLE(ms), ms->combo_box, - 0, 1, 0, 1); + gtk_grid_attach(GTK_GRID(ms), ms->combo_box, 0, 0, 1, 1); /* Default metaserver */ default_metaserver_name = get_metaserver_name(TRUE); diff -Nru pioneers-15.5/common/gtk/metaserver.h pioneers-15.6/common/gtk/metaserver.h --- pioneers-15.5/common/gtk/metaserver.h 2009-08-29 11:00:09.000000000 +0000 +++ pioneers-15.6/common/gtk/metaserver.h 2018-05-23 10:51:57.000000000 +0000 @@ -36,14 +36,14 @@ typedef struct _MetaServerClass MetaServerClass; struct _MetaServer { - GtkTable table; + GtkGrid grid; GtkWidget *combo_box; GtkListStore *data; }; struct _MetaServerClass { - GtkComboBoxClass parent_class; + GtkGridClass parent_class; }; GType metaserver_get_type(void); diff -Nru pioneers-15.5/common/gtk/player-icon.c pioneers-15.6/common/gtk/player-icon.c --- pioneers-15.5/common/gtk/player-icon.c 2016-07-05 16:29:21.000000000 +0000 +++ pioneers-15.6/common/gtk/player-icon.c 2018-06-15 22:02:19.000000000 +0000 @@ -30,11 +30,11 @@ static gboolean load_pixbuf(const gchar * name, GdkPixbuf ** pixbuf); static void replace_colors(GdkPixbuf * pixbuf, - const GdkColor * replace_this, - const GdkColor * replace_with); + const GdkRGBA * replace_this, + const GdkRGBA * replace_with); -GdkColor default_face_color = { 0, 0xd500, 0x7f00, 0x2000 }; -GdkColor default_variant_color = { 0, 0, 0, 0 }; +GdkRGBA default_face_color = { 0.84, 0.50, 0.12, 1.0 }; +GdkRGBA default_variant_color = { 0.00, 0.00, 0.00, 1.0 }; GSList *player_avatar; gpointer ai_avatar_data; @@ -132,8 +132,8 @@ */ static gchar *replace_colors_in_svg_data(gconstpointer original_data, gsize size, - const GdkColor * replace_this, - const GdkColor * replace_with) + const GdkRGBA * replace_this, + const GdkRGBA * replace_with) { gchar *replace_here; gchar *data; @@ -145,13 +145,13 @@ memcpy(data, original_data, size); color_old = g_strdup_printf("fill:#%02x%02x%02x", - (replace_this->red >> 8) & 0xFF, - (replace_this->green >> 8) & 0xFF, - (replace_this->blue >> 8) & 0xFF); + (unsigned) (replace_this->red * 255), + (unsigned) (replace_this->green * 255), + (unsigned) (replace_this->blue * 255)); color_new = g_strdup_printf("fill:#%02x%02x%02x", - (replace_with->red >> 8) & 0xFF, - (replace_with->green >> 8) & 0xFF, - (replace_with->blue >> 8) & 0xFF); + (unsigned) (replace_with->red * 255), + (unsigned) (replace_with->green * 255), + (unsigned) (replace_with->blue * 255)); g_assert(strlen(color_old) == 12); g_assert(strlen(color_new) == 12); @@ -172,8 +172,8 @@ } static void replace_colors(GdkPixbuf * pixbuf, - const GdkColor * replace_this, - const GdkColor * replace_with) + const GdkRGBA * replace_this, + const GdkRGBA * replace_with) { gint i; guint new_color; @@ -187,13 +187,13 @@ pixel = (guint *) gdk_pixbuf_get_pixels(pixbuf); new_color = 0xff000000 | - ((replace_with->red >> 8) & 0xff) | - ((replace_with->green >> 8) & 0xff) << 8 | - ((replace_with->blue >> 8) & 0xff) << 16; + (unsigned) (replace_with->red * 255) | + (unsigned) (replace_with->green * 255) << 8 | + (unsigned) (replace_with->blue * 255) << 16; old_color = 0xff000000 | - ((replace_this->red >> 8) & 0xff) | - ((replace_this->green >> 8) & 0xff) << 8 | - ((replace_this->blue >> 8) & 0xff) << 16; + (unsigned) (replace_this->red * 255) | + (unsigned) (replace_this->green * 255) << 8 | + (unsigned) (replace_this->blue * 255) << 16; for (i = 0; i < (gdk_pixbuf_get_rowstride(pixbuf) / 4 * @@ -205,7 +205,7 @@ } cairo_surface_t *playericon_create_icon(const gchar * style, - GdkColor * color, + GdkRGBA * color, gboolean spectator, gboolean connected, gdouble width, gdouble height) @@ -266,33 +266,33 @@ case PLAYER_HUMAN:{ /* Draw a bust */ guint variant; - GdkColor face_color; + GdkRGBA face_color; gdouble face_radius; - GdkColor variant_color; + GdkRGBA variant_color; GdkPixbuf *pixbuf; GdkPixbuf *pixbuf_scaled; playericon_parse_human_style(style, &face_color, &variant, &variant_color); - gdk_cairo_set_source_color(cr, color); + gdk_cairo_set_source_rgba(cr, color); cairo_set_line_width(cr, 1.0); cairo_arc_negative(cr, width / 2, height, width / 2, 0.0, M_PI); cairo_fill(cr); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); cairo_arc_negative(cr, width / 2, height, width / 2, 0.0, M_PI); cairo_move_to(cr, 0.0, height - 0.5); cairo_line_to(cr, width, height - 0.5); cairo_stroke(cr); - gdk_cairo_set_source_color(cr, &face_color); + gdk_cairo_set_source_rgba(cr, &face_color); face_radius = 25.0 / 64.0 * height / 2.0; cairo_arc(cr, width / 2 + 0.5, height / 2 - face_radius, face_radius, 0.0, 2 * M_PI); cairo_fill(cr); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); cairo_arc(cr, width / 2 + 0.5, height / 2 - face_radius, face_radius, 0.0, 2 * M_PI); @@ -324,11 +324,11 @@ cairo_rectangle(cr, 0, 0, width, height); cairo_fill(cr); } else { - gdk_cairo_set_source_color(cr, color); + gdk_cairo_set_source_rgba(cr, color); cairo_rectangle(cr, 0, 0, width, height); cairo_fill(cr); - gdk_cairo_set_source_color(cr, &black); + gdk_cairo_set_source_rgba(cr, &black); cairo_set_line_width(cr, 1.0); cairo_rectangle(cr, 0.5, 0.5, width - 1, height - 1); @@ -352,7 +352,7 @@ cairo_arc(cr, width * 3 / 4, height / 4, width / 4, 0.0, 2 * M_PI); cairo_fill(cr); - gdk_cairo_set_source_color(cr, &white); + gdk_cairo_set_source_rgba(cr, &white); cairo_rectangle(cr, width / 2 + 2, height / 4 - height / 16, width / 2 - 4, height / 8); @@ -363,9 +363,9 @@ return surface; } -gchar *playericon_create_human_style(const GdkColor * face_color, +gchar *playericon_create_human_style(const GdkRGBA * face_color, gint variant, - const GdkColor * variant_color) + const GdkRGBA * variant_color) { gchar *c1; gchar *c2; @@ -382,9 +382,9 @@ } gboolean playericon_parse_human_style(const gchar * style, - GdkColor * face_color, + GdkRGBA * face_color, guint * variant, - GdkColor * variant_color) + GdkRGBA * variant_color) { gchar **style_parts; gboolean parse_ok; @@ -421,30 +421,24 @@ } -gboolean string_to_color(const gchar * spec, GdkColor * color) +gboolean string_to_color(const gchar * spec, GdkRGBA * color) { PangoColor pango_color; if (pango_color_parse(&pango_color, spec)) { - color->red = pango_color.red; - color->green = pango_color.green; - color->blue = pango_color.blue; + color->red = pango_color.red / 255.0 / 256; + color->green = pango_color.green / 255.0 / 256; + color->blue = pango_color.blue / 255.0 / 256; + color->alpha = 1.0; return TRUE; } return FALSE; } -gchar *color_to_string(GdkColor color) +gchar *color_to_string(GdkRGBA color) { - return g_strdup_printf("#%04x%04x%04x", color.red, color.green, - color.blue); -/** @todo RC Enable this code when the minimum Gtk+ version is high enough - PangoColor pango_color; - - pango_color.red = color.red; - pango_color.green = color.green; - pango_color.blue = color.blue; - - return pango_color_to_string(&pango_color); -*/ + return g_strdup_printf("#%04x%04x%04x", + (unsigned) (color.red * 255 * 256), + (unsigned) (color.green * 255 * 256), + (unsigned) (color.blue * 255 * 256)); } diff -Nru pioneers-15.5/common/gtk/player-icon.h pioneers-15.6/common/gtk/player-icon.h --- pioneers-15.5/common/gtk/player-icon.h 2016-07-05 16:29:21.000000000 +0000 +++ pioneers-15.6/common/gtk/player-icon.h 2018-06-15 22:02:19.000000000 +0000 @@ -40,7 +40,7 @@ * when not needed anymore. */ cairo_surface_t *playericon_create_icon(const gchar * style, - GdkColor * color, + GdkRGBA * color, gboolean spectator, gboolean connected, gdouble width, gdouble height); @@ -51,9 +51,9 @@ * @param variant_color The color of the variant * @return The style string. Call g_free() when not needed anymore. */ -gchar *playericon_create_human_style(const GdkColor * face_color, +gchar *playericon_create_human_style(const GdkRGBA * face_color, gint variant, - const GdkColor * variant_color); + const GdkRGBA * variant_color); /** Parse the style string in its components. * @param style The style @@ -63,9 +63,9 @@ * @return TRUE if the style could be parsed. When FALSE, the return values contain the default values */ gboolean playericon_parse_human_style(const gchar * style, - GdkColor * face_color, + GdkRGBA * face_color, guint * variant, - GdkColor * variant_color); + GdkRGBA * variant_color); /** Convert a string to a color. * The color is allocated in the system colormap. @@ -73,13 +73,13 @@ * @retval color The color * @return TRUE if the conversion succeeded. */ -gboolean string_to_color(const gchar * spec, GdkColor * color); +gboolean string_to_color(const gchar * spec, GdkRGBA * color); /** Convert a color to a string. * After use, the string must be freed with g_free() * @param color The color * @return the string */ -gchar *color_to_string(GdkColor color); +gchar *color_to_string(GdkRGBA color); #endif diff -Nru pioneers-15.5/common/gtk/polygon.c pioneers-15.6/common/gtk/polygon.c --- pioneers-15.5/common/gtk/polygon.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/polygon.c 2018-06-15 22:02:19.000000000 +0000 @@ -83,10 +83,10 @@ } void poly_draw_with_border(cairo_t * cr, - const GdkColor * border_color, + const GdkRGBA * border_color, const Polygon * poly) { poly_draw(cr, TRUE, poly); - gdk_cairo_set_source_color(cr, border_color); + gdk_cairo_set_source_rgba(cr, border_color); poly_draw(cr, FALSE, poly); } diff -Nru pioneers-15.5/common/gtk/polygon.h pioneers-15.6/common/gtk/polygon.h --- pioneers-15.5/common/gtk/polygon.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/polygon.h 2018-06-15 22:02:19.000000000 +0000 @@ -31,7 +31,7 @@ void poly_offset(Polygon * poly, gint x_offset, gint y_offset); void poly_bound_rect(const Polygon * poly, int pad, GdkRectangle * rect); void poly_draw(cairo_t * cr, gboolean filled, const Polygon * poly); -void poly_draw_with_border(cairo_t * cr, const GdkColor * border_color, +void poly_draw_with_border(cairo_t * cr, const GdkRGBA * border_color, const Polygon * poly); #endif diff -Nru pioneers-15.5/common/gtk/select-game.c pioneers-15.6/common/gtk/select-game.c --- pioneers-15.5/common/gtk/select-game.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/select-game.c 2020-03-25 17:52:23.000000000 +0000 @@ -25,8 +25,8 @@ static const gint MAP_WIDTH = 64; static const gint MAP_HEIGHT = 48; -static void select_game_class_init(SelectGameClass * klass); -static void select_game_init(SelectGame * sg); +static void select_game_class_init(gpointer g_class, gpointer class_data); +static void select_game_init(GTypeInstance * instance, gpointer g_class); static void select_game_finalize(GObject * object); static void select_game_item_changed(GtkWidget * widget, SelectGame * sg); @@ -43,16 +43,16 @@ sizeof(SelectGameClass), NULL, /* base_init */ NULL, /* base_finalize */ - (GClassInitFunc) select_game_class_init, + select_game_class_init, NULL, /* class_finalize */ NULL, /* class_data */ sizeof(SelectGame), 0, - (GInstanceInitFunc) select_game_init, + select_game_init, NULL }; sg_type = - g_type_register_static(GTK_TYPE_TABLE, "SelectGame", + g_type_register_static(GTK_TYPE_GRID, "SelectGame", &sg_info, 0); } return sg_type; @@ -85,13 +85,14 @@ * SelectGame will emit one signal: 'activate' with the text of the * active game in user_data */ -static void select_game_class_init(SelectGameClass * klass) +static void select_game_class_init(gpointer g_class, + G_GNUC_UNUSED gpointer class_data) { - GObjectClass *object_class = G_OBJECT_CLASS(klass); + GObjectClass *object_class = G_OBJECT_CLASS(g_class); select_game_signals[ACTIVATE] = g_signal_new("activate", G_TYPE_FROM_CLASS - (klass), + (g_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET @@ -104,9 +105,11 @@ } /* Build the composite widget */ -static void select_game_init(SelectGame * sg) +static void select_game_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkCellRenderer *cell; + SelectGame *sg = SELECTGAME(instance); /* Create model */ sg->data = @@ -133,9 +136,7 @@ gtk_widget_set_tooltip_text(sg->combo_box, /* Tooltip for the list of games */ _("Select a game")); - gtk_table_resize(GTK_TABLE(sg), 1, 1); - gtk_table_attach_defaults(GTK_TABLE(sg), sg->combo_box, - 0, 1, 0, 1); + gtk_grid_attach(GTK_GRID(sg), sg->combo_box, 0, 0, 1, 1); sg->default_game = g_strdup("Default"); g_signal_connect(G_OBJECT(sg->combo_box), "changed", G_CALLBACK(select_game_item_changed), sg); @@ -213,8 +214,8 @@ guimap_display(gmap); pixbuf = - gdk_pixbuf_get_from_surface(gmap->surface, 0, 0, gmap->width, - gmap->height); + gdk_pixbuf_get_from_surface(gmap->surface, 0, 0, MAP_WIDTH, + MAP_HEIGHT); guimap_delete(gmap); return pixbuf; diff -Nru pioneers-15.5/common/gtk/select-game.h pioneers-15.6/common/gtk/select-game.h --- pioneers-15.5/common/gtk/select-game.h 2013-05-31 08:36:24.000000000 +0000 +++ pioneers-15.6/common/gtk/select-game.h 2020-06-20 10:52:00.000000000 +0000 @@ -24,7 +24,7 @@ typedef struct _SelectGameClass SelectGameClass; struct _SelectGame { - GtkTable table; + GtkGrid grid; GtkWidget *combo_box; GtkListStore *data; @@ -33,9 +33,9 @@ }; struct _SelectGameClass { - GtkTableClass parent_class; + GtkGridClass parent_class; - void (*activate) (SelectGame * sg); + void (*activate)(SelectGame * sg); }; GType select_game_get_type(void); diff -Nru pioneers-15.5/common/gtk/theme.c pioneers-15.6/common/gtk/theme.c --- pioneers-15.5/common/gtk/theme.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/theme.c 2020-06-20 10:52:00.000000000 +0000 @@ -70,6 +70,9 @@ The order is bg, fg, bd, hi-bg, hi-fg. Sorry, you can't skip definitions at the beginning... + The chip colors for SEA_TILE are used in the GUI to display stand-alone + chips. Transparency should not be used here. + Normally, all pixmaps are used in their native size and repeat over their area as needed (tiling). This doesn't look good for photo-like images, so you can add "scaling = always" in that case. Then images will always be @@ -80,23 +83,20 @@ */ -#define TCOL_INIT(r,g,b) { TRUE, FALSE, { 0, r, g, b } } -#define TCOL_TRANSP() { TRUE, TRUE, { 0, 0, 0, 0 } } -#define TCOL_UNSET() { FALSE, FALSE, { 0, 0, 0, 0 } } -#define TSCALE { NULL, NULL, 0, 0.0 } +#define TCOL_INIT(r,g,b) { TRUE, FALSE, { r, g, b, 1.0 } } static TColor default_colors[] = { - TCOL_INIT(0xff00, 0xda00, 0xb900), - TCOL_INIT(0, 0, 0), - TCOL_INIT(0, 0, 0), - TCOL_INIT(0, 0xff00, 0), - TCOL_INIT(0xff00, 0, 0), - TCOL_INIT(0, 0, 0xff00), - TCOL_INIT(0xff00, 0xff00, 0xff00), - TCOL_INIT(0, 0, 0), - TCOL_INIT(0, 0, 0), - TCOL_INIT(0xff00, 0xff00, 0xff00), - TCOL_INIT(0xff00, 0xda00, 0xb900) + TCOL_INIT(1.00, 0.85, 0.72), + TCOL_INIT(0.00, 0.00, 0.00), + TCOL_INIT(0.00, 0.00, 0.00), + TCOL_INIT(0.00, 1.00, 0.00), + TCOL_INIT(1.00, 0.00, 0.00), + TCOL_INIT(0.00, 0.00, 1.00), + TCOL_INIT(1.00, 1.00, 1.00), + TCOL_INIT(0.00, 0.00, 0.00), + TCOL_INIT(0.00, 0.00, 0.00), + TCOL_INIT(1.00, 1.00, 1.00), + TCOL_INIT(1.00, 0.85, 0.72) }; #define offs(elem) ((size_t)(&(((MapTheme *)0)->elem))) @@ -111,54 +111,50 @@ int override; size_t offset; } theme_vars[] = { - { - "name", TRUE, STR, -1, offs(name)}, { - "hill-tile", FALSE, FNAME, HILL_TILE, - offs(terrain_tile_names[HILL_TILE])}, { - "field-tile", FALSE, FNAME, FIELD_TILE, - offs(terrain_tile_names[FIELD_TILE])}, { - "mountain-tile", FALSE, FNAME, MOUNTAIN_TILE, - offs(terrain_tile_names[MOUNTAIN_TILE])}, { - "pasture-tile", FALSE, FNAME, PASTURE_TILE, - offs(terrain_tile_names[PASTURE_TILE])}, { - "forest-tile", FALSE, FNAME, FOREST_TILE, - offs(terrain_tile_names[FOREST_TILE])}, { - "desert-tile", FALSE, FNAME, -1, - offs(terrain_tile_names[DESERT_TILE])}, { - "sea-tile", FALSE, FNAME, -1, offs(terrain_tile_names[SEA_TILE])}, - { - "gold-tile", FALSE, FNAME, GOLD_TILE, - offs(terrain_tile_names[GOLD_TILE])}, { - "board-tile", FALSE, FNAME, -1, - offs(terrain_tile_names[BOARD_TILE])}, { - "brick-port-tile", TRUE, FNAME, -1, - offs(port_tile_names[HILL_PORT_TILE])}, { - "grain-port-tile", TRUE, FNAME, -1, - offs(port_tile_names[FIELD_PORT_TILE])}, { - "ore-port-tile", TRUE, FNAME, -1, - offs(port_tile_names[MOUNTAIN_PORT_TILE])}, { - "wool-port-tile", TRUE, FNAME, -1, - offs(port_tile_names[PASTURE_PORT_TILE])}, { - "lumber-port-tile", TRUE, FNAME, -1, - offs(port_tile_names[FOREST_PORT_TILE])}, { - "nores-port-tile", TRUE, FNAME, -1, - offs(port_tile_names[ANY_PORT_TILE])}, { - "chip-bg-color", TRUE, COL, -1, offs(colors[TC_CHIP_BG])}, { - "chip-fg-color", TRUE, COL, -1, offs(colors[TC_CHIP_FG])}, { - "chip-bd-color", TRUE, COL, -1, offs(colors[TC_CHIP_BD])}, { - "chip-hi-bg-color", TRUE, COL, -1, offs(colors[TC_CHIP_H_BG])}, - { - "chip-hi-fg-color", TRUE, COL, -1, offs(colors[TC_CHIP_H_FG])}, - { - "port-bg-color", TRUE, COL, -1, offs(colors[TC_PORT_BG])}, { - "port-fg-color", TRUE, COL, -1, offs(colors[TC_PORT_FG])}, { - "port-bd-color", TRUE, COL, -1, offs(colors[TC_PORT_BD])}, { - "robber-fg-color", TRUE, COL, -1, offs(colors[TC_ROBBER_FG])}, - { - "robber-bd-color", TRUE, COL, -1, offs(colors[TC_ROBBER_BD])}, - { - "hex-bd-color", TRUE, COL, -1, offs(colors[TC_HEX_BD])}, { - "scaling", FALSE, SCMODE, -1, offs(scaling)} + { "name", TRUE, STR, -1, offs(name) }, + { "hill-tile", FALSE, FNAME, HILL_TILE, + offs(terrain_tile_names[HILL_TILE]) }, + { "field-tile", FALSE, FNAME, FIELD_TILE, + offs(terrain_tile_names[FIELD_TILE]) }, + { "mountain-tile", FALSE, FNAME, MOUNTAIN_TILE, + offs(terrain_tile_names[MOUNTAIN_TILE]) }, + { "pasture-tile", FALSE, FNAME, PASTURE_TILE, + offs(terrain_tile_names[PASTURE_TILE]) }, + { "forest-tile", FALSE, FNAME, FOREST_TILE, + offs(terrain_tile_names[FOREST_TILE]) }, + { "desert-tile", FALSE, FNAME, -1, + offs(terrain_tile_names[DESERT_TILE]) }, + { "sea-tile", FALSE, FNAME, SEA_TILE, + offs(terrain_tile_names[SEA_TILE]) }, + { "gold-tile", FALSE, FNAME, GOLD_TILE, + offs(terrain_tile_names[GOLD_TILE]) }, + { "board-tile", FALSE, FNAME, -1, + offs(terrain_tile_names[BOARD_TILE]) }, + { "brick-port-tile", TRUE, FNAME, -1, + offs(port_tile_names[HILL_PORT_TILE]) }, + { "grain-port-tile", TRUE, FNAME, -1, + offs(port_tile_names[FIELD_PORT_TILE]) }, + { "ore-port-tile", TRUE, FNAME, -1, + offs(port_tile_names[MOUNTAIN_PORT_TILE]) }, + { "wool-port-tile", TRUE, FNAME, -1, + offs(port_tile_names[PASTURE_PORT_TILE]) }, + { "lumber-port-tile", TRUE, FNAME, -1, + offs(port_tile_names[FOREST_PORT_TILE]) }, + { "nores-port-tile", TRUE, FNAME, -1, + offs(port_tile_names[ANY_PORT_TILE]) }, + { "chip-bg-color", TRUE, COL, -1, offs(colors[TC_CHIP_BG]) }, + { "chip-fg-color", TRUE, COL, -1, offs(colors[TC_CHIP_FG]) }, + { "chip-bd-color", TRUE, COL, -1, offs(colors[TC_CHIP_BD]) }, + { "chip-hi-bg-color", TRUE, COL, -1, offs(colors[TC_CHIP_H_BG]) }, + + { "chip-hi-fg-color", TRUE, COL, -1, offs(colors[TC_CHIP_H_FG]) }, + { "port-bg-color", TRUE, COL, -1, offs(colors[TC_PORT_BG]) }, + { "port-fg-color", TRUE, COL, -1, offs(colors[TC_PORT_FG]) }, + { "port-bd-color", TRUE, COL, -1, offs(colors[TC_PORT_BD]) }, + { "robber-fg-color", TRUE, COL, -1, offs(colors[TC_ROBBER_FG]) }, + { "robber-bd-color", TRUE, COL, -1, offs(colors[TC_ROBBER_BD]) }, + { "hex-bd-color", TRUE, COL, -1, offs(colors[TC_HEX_BD]) }, + { "scaling", FALSE, SCMODE, -1, offs(scaling) } }; static GList *theme_list = NULL; @@ -562,7 +558,7 @@ return TRUE; } tc->transparent = FALSE; - if (!gdk_color_parse(p, &tc->color)) { + if (!gdk_rgba_parse(&tc->color, p)) { ERR1("invalid color: %s", p); return FALSE; } diff -Nru pioneers-15.5/common/gtk/theme.h pioneers-15.6/common/gtk/theme.h --- pioneers-15.5/common/gtk/theme.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/gtk/theme.h 2018-06-15 22:02:19.000000000 +0000 @@ -27,7 +27,7 @@ typedef struct { gboolean set; gboolean transparent; - GdkColor color; + GdkRGBA color; } TColor; typedef struct { diff -Nru pioneers-15.5/common/log.h pioneers-15.6/common/log.h --- pioneers-15.5/common/log.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/log.h 2020-06-20 10:52:00.000000000 +0000 @@ -27,7 +27,7 @@ #include /** Type of logging functions */ -typedef void (*LogFunc) (gint msg_type, const gchar * text); +typedef void (*LogFunc)(gint msg_type, const gchar * text); /* Message Types */ #define MSG_ERROR 1 diff -Nru pioneers-15.5/common/Makefile.am pioneers-15.6/common/Makefile.am --- pioneers-15.5/common/Makefile.am 2018-02-23 07:27:20.000000000 +0000 +++ pioneers-15.6/common/Makefile.am 2020-06-20 10:14:16.000000000 +0000 @@ -45,6 +45,8 @@ common/game.h \ common/game-list.c \ common/game-list.h \ + common/gettext.c \ + common/gettext.h \ common/log.c \ common/log.h \ common/map.c \ diff -Nru pioneers-15.5/common/map_query.c pioneers-15.6/common/map_query.c --- pioneers-15.5/common/map_query.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/map_query.c 2020-08-02 07:03:10.000000000 +0000 @@ -397,7 +397,7 @@ * 2 - Edge must be adjacent to a land hex. * 3 - Edge must be adjacent to a building that is owned by the * specified player, or must be adjacent to another road segment - * owned by the specifed player, but not separated by a building + * owned by the specified player, but not separated by a building * owned by a different player. */ gboolean can_road_be_built(const Edge * edge, gint owner) @@ -415,7 +415,7 @@ * 2 - Edge must be adjacent to a sea hex. * 3 - Edge must be adjacent to a building that is owned by the * specified player, or must be adjacent to another ship segment - * owned by the specifed player, but not separated by a building + * owned by the specified player, but not separated by a building * owned by a different player. */ gboolean can_ship_be_built(const Edge * edge, gint owner) @@ -487,7 +487,7 @@ * 2 - Edge must not be adjacent to a land hex. * 3 - Edge must be adjacent to a building that is owned by the * specified player, or must be adjacent to another road/bridge - * segment owned by the specifed player, but not separated by a + * segment owned by the specified player, but not separated by a * building owned by a different player. */ gboolean can_bridge_be_built(const Edge * edge, gint owner) diff -Nru pioneers-15.5/common/network.c pioneers-15.6/common/network.c --- pioneers-15.5/common/network.c 2018-01-05 10:53:40.000000000 +0000 +++ pioneers-15.6/common/network.c 2020-03-27 21:32:49.000000000 +0000 @@ -28,6 +28,11 @@ #include "network.h" #include "log.h" +/* Add support for versions of glib before 2.58 */ +#ifndef G_SOURCE_FUNC +#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f)) +#endif + struct _Service { GSocketListener *listener; GCancellable *cancellable; @@ -351,8 +356,8 @@ (G_IO_STREAM (ses->connection))), ses->input_cancel); - g_source_set_callback(input_source, (GSourceFunc) input_ready, ses, - NULL); + g_source_set_callback(input_source, G_SOURCE_FUNC(input_ready), + ses, NULL); g_source_attach(input_source, NULL); g_source_unref(input_source); } diff -Nru pioneers-15.5/common/network.h pioneers-15.6/common/network.h --- pioneers-15.5/common/network.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/network.h 2020-06-20 10:52:00.000000000 +0000 @@ -34,8 +34,8 @@ typedef struct _Service Service; typedef struct _Session Session; -typedef void (*NetNotifyFunc) (Session * ses, NetEvent event, - const gchar * line, gpointer user_data); +typedef void (*NetNotifyFunc)(Session * ses, NetEvent event, + const gchar * line, gpointer user_data); /** Initialize the network drivers */ void net_init(void); diff -Nru pioneers-15.5/common/set.h pioneers-15.6/common/set.h --- pioneers-15.5/common/set.h 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/set.h 2020-06-20 10:52:00.000000000 +0000 @@ -77,7 +77,7 @@ */ void set_free(Set * set); -typedef void (*SetForEachFunc) (gpointer element, gpointer user_data); +typedef void (*SetForEachFunc)(gpointer element, gpointer user_data); /** Iterate through all elements in the Set. * @memberof _Set diff -Nru pioneers-15.5/common/state.c pioneers-15.6/common/state.c --- pioneers-15.5/common/state.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/common/state.c 2020-01-02 13:57:18.000000000 +0000 @@ -325,9 +325,8 @@ static void push_new_state(StateMachine * sm) { - ++sm->stack_ptr; /* check for stack overflows */ - if (sm->stack_ptr >= (gint) G_N_ELEMENTS(sm->stack)) { + if (sm->stack_ptr + 1 >= (gint) G_N_ELEMENTS(sm->stack)) { log_message(MSG_ERROR, /* Error message */ _("" @@ -335,6 +334,7 @@ sm_stack_dump(sm); g_error("State stack overflow"); } + ++sm->stack_ptr; sm->stack[sm->stack_ptr] = NULL; sm->stack_name[sm->stack_ptr] = NULL; } diff -Nru pioneers-15.5/common/version.h pioneers-15.6/common/version.h --- pioneers-15.5/common/version.h 2018-03-14 16:02:15.000000000 +0000 +++ pioneers-15.6/common/version.h 2020-08-02 12:59:36.000000000 +0000 @@ -1 +1 @@ -#define FULL_VERSION "15.5" +#define FULL_VERSION "15.6" diff -Nru pioneers-15.5/compile pioneers-15.6/compile --- pioneers-15.5/compile 2018-03-14 16:02:12.000000000 +0000 +++ pioneers-15.6/compile 2020-08-02 12:59:32.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru pioneers-15.5/config.h.in pioneers-15.6/config.h.in --- pioneers-15.5/config.h.in 2018-03-14 16:02:12.000000000 +0000 +++ pioneers-15.6/config.h.in 2020-08-02 12:59:32.000000000 +0000 @@ -15,6 +15,9 @@ /* Define if AVAHI available */ #undef HAVE_AVAHI +/* Defined if libcanberra is present */ +#undef HAVE_CANBERRA + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff -Nru pioneers-15.5/configure pioneers-15.6/configure --- pioneers-15.5/configure 2018-03-14 16:02:11.000000000 +0000 +++ pioneers-15.6/configure 2020-08-02 12:59:31.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pioneers 15.5. +# Generated by GNU Autoconf 2.69 for pioneers 15.6. # # Report bugs to . # @@ -590,12 +590,13 @@ # Identity of this package. PACKAGE_NAME='pioneers' PACKAGE_TARNAME='pioneers' -PACKAGE_VERSION='15.5' -PACKAGE_STRING='pioneers 15.5' +PACKAGE_VERSION='15.6' +PACKAGE_STRING='pioneers 15.6' PACKAGE_BUGREPORT='pio-develop@lists.sourceforge.net' PACKAGE_URL='' ac_unique_file="client" +: "${ARFLAGS=cr} ${AR_FLAGS=cr}" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -695,6 +696,8 @@ AVAHI_GLIB_CFLAGS AVAHI_CLIENT_LIBS AVAHI_CLIENT_CFLAGS +LIBCANBERRA_LIBS +LIBCANBERRA_CFLAGS HAVE_GTK_FALSE HAVE_GTK_TRUE GTK_OPTIMAL_VERSION_LIBS @@ -762,7 +765,6 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -781,6 +783,7 @@ build_cpu build LIBTOOL +ARFLAGS MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -851,7 +854,8 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -874,6 +878,7 @@ with_gtk with_avahi with_notify +with_sound with_help_dir enable_admin_gtk enable_protocol @@ -906,6 +911,8 @@ GTK_LIBS GTK_OPTIMAL_VERSION_CFLAGS GTK_OPTIMAL_VERSION_LIBS +LIBCANBERRA_CFLAGS +LIBCANBERRA_LIBS AVAHI_CLIENT_CFLAGS AVAHI_CLIENT_LIBS AVAHI_GLIB_CFLAGS @@ -1460,7 +1467,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pioneers 15.5 to adapt to many kinds of systems. +\`configure' configures pioneers 15.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1531,7 +1538,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pioneers 15.5:";; + short | recursive ) echo "Configuration of pioneers 15.6:";; esac cat <<\_ACEOF @@ -1578,6 +1585,7 @@ --with-gtk Use GTK+ for the graphical programs. --with-avahi Use AVAHI for discovering games. --with-notify Use LIBNOTIFY to notify the player during the game. + --with-sound Use libcanberra to play sounds. --with-help-dir=DIR path where help files are installed Some influential environment variables: @@ -1617,6 +1625,10 @@ C compiler flags for GTK_OPTIMAL_VERSION, overriding pkg-config GTK_OPTIMAL_VERSION_LIBS linker flags for GTK_OPTIMAL_VERSION, overriding pkg-config + LIBCANBERRA_CFLAGS + C compiler flags for LIBCANBERRA, overriding pkg-config + LIBCANBERRA_LIBS + linker flags for LIBCANBERRA, overriding pkg-config AVAHI_CLIENT_CFLAGS C compiler flags for AVAHI_CLIENT, overriding pkg-config AVAHI_CLIENT_LIBS @@ -1692,7 +1704,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pioneers configure 15.5 +pioneers configure 15.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2115,7 +2127,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pioneers $as_me 15.5, which was +It was created by pioneers $as_me 15.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2493,7 +2505,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.15' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2979,7 +2991,7 @@ # Define the identity of the package. PACKAGE='pioneers' - VERSION='15.5' + VERSION='15.6' cat >>confdefs.h <<_ACEOF @@ -3009,8 +3021,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3061,7 +3073,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3116,6 +3128,17 @@ +# Work-around for the bug in automake +# ar: `u' modifier ignored since `D' is the default (see `U') +# +# Use 'cr' instead of 'cru' for the default ARFLAGS +# See also https://bugzilla.redhat.com/show_bug.cgi?id=1155273 +# This fix was found in https://sources.debian.org/src/cinnamon/4.4.8-2/configure.ac + +# Also export this variable +ARFLAGS="${ARFLAGS}" + + case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -3285,45 +3308,45 @@ ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -5827,7 +5850,7 @@ fi : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} @@ -6328,11 +6351,8 @@ test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -7551,8 +7571,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR cr libconftest.a conftest.o" >&5 + $AR cr libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -8681,6 +8701,12 @@ lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -13486,6 +13512,19 @@ fi + +# Check whether --with-sound was given. +if test "${with_sound+set}" = set; then : + withval=$with_sound; case "${withval}" in + yes) with_sound=yes ;; + "") with_sound=yes ;; + *) with_sound=no ;; +esac +else + with_sound=yes +fi + + if test "x$GCC" = xyes && test $enable_hardening = yes; then if test "$pioneers_is_windows_port" = "no"; then # Flags from Debian hardening (dpkg-buildflags --get CFLAGS) @@ -14066,8 +14105,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB2" >&5 -$as_echo_n "checking for GLIB2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= $GLIB_REQUIRED_VERSION" >&5 +$as_echo_n "checking for glib-2.0 >= $GLIB_REQUIRED_VERSION... " >&6; } if test -n "$GLIB2_CFLAGS"; then pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS" @@ -14107,7 +14146,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14134,7 +14173,7 @@ and GLIB2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -14157,8 +14196,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT2" >&5 -$as_echo_n "checking for GOBJECT2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0 >= $GLIB_REQUIRED_VERSION" >&5 +$as_echo_n "checking for gobject-2.0 >= $GLIB_REQUIRED_VERSION... " >&6; } if test -n "$GOBJECT2_CFLAGS"; then pkg_cv_GOBJECT2_CFLAGS="$GOBJECT2_CFLAGS" @@ -14198,7 +14237,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14225,7 +14264,7 @@ and GOBJECT2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -14248,8 +14287,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO2" >&5 -$as_echo_n "checking for GIO2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= $GIO_REQUIRED_VERSION" >&5 +$as_echo_n "checking for gio-2.0 >= $GIO_REQUIRED_VERSION... " >&6; } if test -n "$GIO2_CFLAGS"; then pkg_cv_GIO2_CFLAGS="$GIO2_CFLAGS" @@ -14289,7 +14328,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14316,7 +14355,7 @@ and GIO2_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -14346,8 +14385,8 @@ else pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 -$as_echo_n "checking for LIBNOTIFY... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnotify >= $LIBNOTIFY_REQUIRED_VERSION" >&5 +$as_echo_n "checking for libnotify >= $LIBNOTIFY_REQUIRED_VERSION... " >&6; } if test -n "$LIBNOTIFY_CFLAGS"; then pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" @@ -14387,7 +14426,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14405,7 +14444,7 @@ have_libnotify="no, libnotify not installed or too old" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_libnotify="no, libnotify not installed or too old" else @@ -14427,21 +14466,22 @@ if test $with_gtk = no; then have_gtk="no, disabled in configure" else + # gmodule-2.0 is required for gtk_builder pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 -$as_echo_n "checking for GTK... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0" >&5 +$as_echo_n "checking for gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0... " >&6; } if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14453,12 +14493,12 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED_VERSION gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -14470,7 +14510,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14479,9 +14519,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 @@ -14500,7 +14540,7 @@ $as_echo "$have_gtk" >&6; } elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 @@ -14526,8 +14566,8 @@ if test "$have_gtk" = "yes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_OPTIMAL_VERSION" >&5 -$as_echo_n "checking for GTK_OPTIMAL_VERSION... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= $GTK_OPTIMAL_VERSION" >&5 +$as_echo_n "checking for gtk+-3.0 >= $GTK_OPTIMAL_VERSION... " >&6; } if test -n "$GTK_OPTIMAL_VERSION_CFLAGS"; then pkg_cv_GTK_OPTIMAL_VERSION_CFLAGS="$GTK_OPTIMAL_VERSION_CFLAGS" @@ -14567,7 +14607,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14587,7 +14627,7 @@ $as_echo "#define HAVE_OLD_GTK 1" >>confdefs.h elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } $as_echo "#define HAVE_OLD_GTK 1" >>confdefs.h @@ -14611,14 +14651,102 @@ fi +# +# Check for sound support +# +if test $with_sound = no; then + have_libcanberra="no, disabled in configure" +else + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcanberra" >&5 +$as_echo_n "checking for libcanberra... " >&6; } + +if test -n "$LIBCANBERRA_CFLAGS"; then + pkg_cv_LIBCANBERRA_CFLAGS="$LIBCANBERRA_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcanberra") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBCANBERRA_CFLAGS=`$PKG_CONFIG --cflags "libcanberra" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBCANBERRA_LIBS"; then + pkg_cv_LIBCANBERRA_LIBS="$LIBCANBERRA_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcanberra\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libcanberra") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBCANBERRA_LIBS=`$PKG_CONFIG --libs "libcanberra" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBCANBERRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcanberra" 2>&1` + else + LIBCANBERRA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcanberra" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBCANBERRA_PKG_ERRORS" >&5 + + have_libcanberra="no, libcanberra not installed" +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_libcanberra="no, libcanberra not installed" +else + LIBCANBERRA_CFLAGS=$pkg_cv_LIBCANBERRA_CFLAGS + LIBCANBERRA_LIBS=$pkg_cv_LIBCANBERRA_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_libcanberra=yes +fi + if test "$have_gtk" = "yes"; then + if test "$have_libcanberra" = "yes"; then + +$as_echo "#define HAVE_CANBERRA 1" >>confdefs.h + + fi + else + have_libcanberra="no, GTK+ is not enabled" + fi +fi + # Avahi support if test $with_avahi = no; then have_avahi="no, disabled in configure" else pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI_CLIENT" >&5 -$as_echo_n "checking for AVAHI_CLIENT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi-client" >&5 +$as_echo_n "checking for avahi-client... " >&6; } if test -n "$AVAHI_CLIENT_CFLAGS"; then pkg_cv_AVAHI_CLIENT_CFLAGS="$AVAHI_CLIENT_CFLAGS" @@ -14658,7 +14786,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14678,7 +14806,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_avahi" >&5 $as_echo "$have_avahi" >&6; } elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_avahi="no, avahi-client is missing" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_avahi" >&5 @@ -14690,8 +14818,8 @@ $as_echo "yes" >&6; } pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI_GLIB" >&5 -$as_echo_n "checking for AVAHI_GLIB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi-glib" >&5 +$as_echo_n "checking for avahi-glib... " >&6; } if test -n "$AVAHI_GLIB_CFLAGS"; then pkg_cv_AVAHI_GLIB_CFLAGS="$AVAHI_GLIB_CFLAGS" @@ -14731,7 +14859,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -14751,7 +14879,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_avahi" >&5 $as_echo "$have_avahi" >&6; } elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_avahi="no, avahi-glib is missing" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_avahi" >&5 @@ -15944,16 +16072,17 @@ # No console window for the graphical applications GTK_LIBS="$GTK_LIBS -mwindows" - # Don't use bin, lib and share subdirectories + # Don't use the share subdirectory for themes and pixmaps datadir='${prefix}' + # Don't use bin subdirectories bindir='${prefix}' - libdir='${prefix}' + # Use a relative path, to make the executable relocatable pioneers_datadir=. pioneers_iconthemedir=$datadir/share/icons/hicolor + # Use a flat hierarchy for the themes pioneers_themedir=$datadir/themes pioneers_themedir_embed=themes - pioneers_localedir=locale - DATADIRNAME=. + pioneers_localedir=share/locale else pioneers_datadir=$datadir pioneers_iconthemedir=$datadir/icons/hicolor @@ -16046,8 +16175,6 @@ ac_config_files="$ac_config_files Doxyfile" -ac_config_files="$ac_config_files MinGW/pioneers.nsi" - ac_config_files="$ac_config_files po/Makefile.in" ac_config_files="$ac_config_files client/help/Makefile" @@ -16631,7 +16758,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pioneers $as_me 15.5, which was +This file was extended by pioneers $as_me 15.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16697,7 +16824,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pioneers config.status 15.5 +pioneers config.status 15.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16816,7 +16943,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -17115,7 +17242,6 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "pioneers.spec") CONFIG_FILES="$CONFIG_FILES pioneers.spec" ;; "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;; - "MinGW/pioneers.nsi") CONFIG_FILES="$CONFIG_FILES MinGW/pioneers.nsi" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "client/help/Makefile") CONFIG_FILES="$CONFIG_FILES client/help/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -17718,29 +17844,35 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17758,53 +17890,50 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) @@ -18423,6 +18552,7 @@ Build help $pioneers_help AVAHI support $have_avahi LIBNOTIFY support $have_libnotify + LIBCANBERRA support $have_libcanberra Developers only: Use compiler warnings $pioneers_warnings Add debug information $pioneers_debug @@ -18444,6 +18574,7 @@ Build help $pioneers_help AVAHI support $have_avahi LIBNOTIFY support $have_libnotify + LIBCANBERRA support $have_libcanberra Developers only: Use compiler warnings $pioneers_warnings Add debug information $pioneers_debug diff -Nru pioneers-15.5/configure.ac pioneers-15.6/configure.ac --- pioneers-15.5/configure.ac 2018-03-07 15:59:54.000000000 +0000 +++ pioneers-15.6/configure.ac 2020-06-24 11:57:03.000000000 +0000 @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA AC_PREREQ([2.68]) -AC_INIT([pioneers],[15.5],[pio-develop@lists.sourceforge.net]) +AC_INIT([pioneers],[15.6],[pio-develop@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([1.11]) @@ -45,6 +45,16 @@ AM_MAINTAINER_MODE +# Work-around for the bug in automake +# ar: `u' modifier ignored since `D' is the default (see `U') +# +# Use 'cr' instead of 'cru' for the default ARFLAGS +# See also https://bugzilla.redhat.com/show_bug.cgi?id=1155273 +# This fix was found in https://sources.debian.org/src/cinnamon/4.4.8-2/configure.ac +m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"]) +# Also export this variable +AC_SUBST(ARFLAGS, "${ARFLAGS}") + LT_INIT AC_PATH_PROG(ECHO, echo) @@ -176,6 +186,16 @@ esac], [with_notify=yes]) +AC_ARG_WITH([sound], + AS_HELP_STRING([--with-sound], + [Use libcanberra to play sounds.]), +[case "${withval}" in + yes) with_sound=yes ;; + "") with_sound=yes ;; + *) with_sound=no ;; +esac], + [with_sound=yes]) + if test "x$GCC" = xyes && test $enable_hardening = yes; then if test "$pioneers_is_windows_port" = "no"; then # Flags from Debian hardening (dpkg-buildflags --get CFLAGS) @@ -311,7 +331,8 @@ if test $with_gtk = no; then have_gtk="no, disabled in configure" else - PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED_VERSION, + # gmodule-2.0 is required for gtk_builder + PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED_VERSION gmodule-2.0, have_gtk=yes, [PKG_CHECK_EXISTS(gtk+-3.0, [have_gtk="no, GTK+ version too old"], @@ -329,6 +350,25 @@ have_graphical=$have_gtk; AM_CONDITIONAL(HAVE_GTK, [test "$have_graphical" = "yes"]) +# +# Check for sound support +# +if test $with_sound = no; then + have_libcanberra="no, disabled in configure" +else + PKG_CHECK_MODULES(LIBCANBERRA, libcanberra, + [have_libcanberra=yes], + [have_libcanberra="no, libcanberra not installed"]) + if test "$have_gtk" = "yes"; then + if test "$have_libcanberra" = "yes"; then + AC_DEFINE(HAVE_CANBERRA, 1, + [Defined if libcanberra is present]) + fi + else + have_libcanberra="no, GTK+ is not enabled" + fi +fi + # Avahi support if test $with_avahi = no; then have_avahi="no, disabled in configure" @@ -421,16 +461,17 @@ if test $pioneers_is_mingw_port = yes; then # No console window for the graphical applications AC_SUBST(GTK_LIBS, "$GTK_LIBS -mwindows") - # Don't use bin, lib and share subdirectories + # Don't use the share subdirectory for themes and pixmaps datadir='${prefix}' + # Don't use bin subdirectories bindir='${prefix}' - libdir='${prefix}' + # Use a relative path, to make the executable relocatable pioneers_datadir=. pioneers_iconthemedir=$datadir/share/icons/hicolor + # Use a flat hierarchy for the themes pioneers_themedir=$datadir/themes pioneers_themedir_embed=themes - pioneers_localedir=locale - DATADIRNAME=. + pioneers_localedir=share/locale else pioneers_datadir=$datadir pioneers_iconthemedir=$datadir/icons/hicolor @@ -478,7 +519,6 @@ AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([pioneers.spec]) AC_CONFIG_FILES([Doxyfile]) -AC_CONFIG_FILES([MinGW/pioneers.nsi]) AC_CONFIG_FILES([po/Makefile.in]) AC_CONFIG_FILES([client/help/Makefile]) @@ -499,6 +539,7 @@ Build help $pioneers_help AVAHI support $have_avahi LIBNOTIFY support $have_libnotify + LIBCANBERRA support $have_libcanberra Developers only: Use compiler warnings $pioneers_warnings Add debug information $pioneers_debug diff -Nru pioneers-15.5/debian/changelog pioneers-15.6/debian/changelog --- pioneers-15.5/debian/changelog 2018-03-14 16:44:00.000000000 +0000 +++ pioneers-15.6/debian/changelog 2020-08-02 13:39:59.000000000 +0000 @@ -1,3 +1,20 @@ +pioneers (15.6-1) unstable; urgency=medium + + * New upstream release. + * Replaced beep by libcanberra. + * Fixed FTBFS for gcc-10. (closes: #957687) + * The game uses the Gentium font. + * Upgrade standards version to 4.5.0. + Supply /usr/share/doc/package/NEWS.gz instead of changelog.gz + * Kept Lintian warning 'missing-systemd-service-for-init.d-script': + According to section 9.3.1, a systemd service unit should be included. + If it has not been written yet, an init script is encouraged. + * Explicitly added CC-BY-SA-3.0 and 4.0 licenses in copyright. + * Fixed Lintian warning file-contains-trailing-whitespace. + * Pass-along all arguments to dh_auto_configure. (closes: #893586) + + -- Roland Clobus Sun, 02 Aug 2020 15:39:59 +0200 + pioneers (15.5-1) unstable; urgency=medium * New upstream release. diff -Nru pioneers-15.5/debian/control pioneers-15.6/debian/control --- pioneers-15.5/debian/control 2018-03-14 15:32:36.000000000 +0000 +++ pioneers-15.6/debian/control 2020-08-02 08:27:23.000000000 +0000 @@ -11,6 +11,7 @@ intltool, libavahi-client-dev, libavahi-glib-dev, + libcanberra-dev, libgtk-3-dev, libnotify-dev, librsvg2-bin, @@ -18,19 +19,20 @@ po-debconf, xfonts-scalable, yelp-tools -Standards-Version: 4.1.3 +Standards-Version: 4.5.0 Homepage: http://pio.sourceforge.net/ Vcs-Svn: https://svn.code.sf.net/p/pio/code/trunk/pioneers Vcs-Browser: https://sourceforge.net/p/pio/code/HEAD/tree/trunk/pioneers/ Package: pioneers Architecture: any -Depends: librsvg2-common, +Depends: fonts-sil-gentium, + librsvg2-common, pioneers-console (=${binary:Version}), pioneers-data (=${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Recommends: beep, yelp +Recommends: yelp Suggests: pioneers-metaserver Description: Settlers of Catan board game Pioneers is a computer implementation of the Settlers of Catan board game. diff -Nru pioneers-15.5/debian/copyright pioneers-15.6/debian/copyright --- pioneers-15.5/debian/copyright 2018-03-07 15:58:25.000000000 +0000 +++ pioneers-15.6/debian/copyright 2020-08-02 08:26:32.000000000 +0000 @@ -70,12 +70,431 @@ License: CC-BY-SA-4.0 License: CC-BY-SA-4.0 - This work is licensed under the terms of Creative Commons Attribution-Share - Alike 4.0 License. + Attribution-ShareAlike 4.0 International . - To view a copy of the CC-BY-SA licence, visit - http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative - Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA. + ======================================================================= + . + Creative Commons Corporation ("Creative Commons") is not a law firm and + does not provide legal services or legal advice. Distribution of + Creative Commons public licenses does not create a lawyer-client or + other relationship. Creative Commons makes its licenses and related + information available on an "as-is" basis. Creative Commons gives no + warranties regarding its licenses, any material licensed under their + terms and conditions, or any related information. Creative Commons + disclaims all liability for damages resulting from their use to the + fullest extent possible. + . + Using Creative Commons Public Licenses + . + Creative Commons public licenses provide a standard set of terms and + conditions that creators and other rights holders may use to share + original works of authorship and other material subject to copyright + and certain other rights specified in the public license below. The + following considerations are for informational purposes only, are not + exhaustive, and do not form part of our licenses. + . + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + . + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + . + ======================================================================= + . + Creative Commons Attribution-ShareAlike 4.0 International Public + License + . + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution-ShareAlike 4.0 International Public License ("Public + License"). To the extent this Public License may be interpreted as a + contract, You are granted the Licensed Rights in consideration of Your + acceptance of these terms and conditions, and the Licensor grants You + such rights in consideration of benefits the Licensor receives from + making the Licensed Material available under these terms and + conditions. + . + . + Section 1 -- Definitions. + . + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + . + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + . + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + . + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + . + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + . + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + . + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + . + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + . + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + . + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + . + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + . + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + . + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + . + . + Section 2 -- Scope. + . + a. License grant. + . + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + . + a. reproduce and Share the Licensed Material, in whole or + in part; and + . + b. produce, reproduce, and Share Adapted Material. + . + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + . + 3. Term. The term of this Public License is specified in Section + 6(a). + . + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + . + 5. Downstream recipients. + . + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + . + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + . + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + . + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + . + b. Other rights. + . + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + . + 2. Patent and trademark rights are not licensed under this + Public License. + . + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + . + . + Section 3 -- License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + a. Attribution. + . + 1. If You Share the Licensed Material (including in modified + form), You must: + . + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + . + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + . + ii. a copyright notice; + . + iii. a notice that refers to this Public License; + . + iv. a notice that refers to the disclaimer of + warranties; + . + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + . + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + . + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + . + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + . + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + . + b. ShareAlike. + . + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + . + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + . + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + . + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + . + . + Section 4 -- Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + . + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + . + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + . + For the avoidance of doubt, this Section 4 supplements and does not + replace Your obligations under this Public License where the Licensed + Rights include other Copyright and Similar Rights. + . + . + Section 5 -- Disclaimer of Warranties and Limitation of Liability. + . + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + . + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + . + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + . + . + Section 6 -- Term and Termination. + . + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + . + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + . + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + . + 2. upon express reinstatement by the Licensor. + . + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + . + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + . + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + . + . + Section 7 -- Other Terms and Conditions. + . + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + . + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + . + . + Section 8 -- Interpretation. + . + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + . + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + . + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + . + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + . + . + ======================================================================= + . + Creative Commons is not a party to its public licenses. + Notwithstanding, Creative Commons may elect to apply one of its public + licenses to material it publishes and in those instances will be + considered the "Licensor." Except for the limited purpose of indicating + that material is shared under a Creative Commons public license or as + otherwise permitted by the Creative Commons policies published at + creativecommons.org/policies, Creative Commons does not authorize the + use of the trademark "Creative Commons" or any other trademark or logo + of Creative Commons without its prior written consent including, + without limitation, in connection with any unauthorized modifications + to any of its public licenses or any other arrangements, + understandings, or agreements concerning use of licensed material. For + the avoidance of doubt, this paragraph does not form part of the public + licenses. + . + Creative Commons may be contacted at creativecommons.org. Files: client/gtk/data/pioneers.svg @@ -86,8 +505,379 @@ Files: client/gtk/data/themes/ccFlickr/* Copyright: Aaron Williamson -License: CC-BY-SA - The images in this theme are licensed under the terms of Creative Commons - Attribution-Share Alike License. +License: CC-BY-SA-3.0 + Creative Commons Attribution-ShareAlike 3.0 Unported + . + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION + ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE + INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + ITS USE. + . + License + . + THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE + COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY + COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS + AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + . + BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE + TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY + BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS + CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND + CONDITIONS. + . + 1. Definitions + . + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, derivative + work, arrangement of music or other alterations of a literary or + artistic work, or phonogram or performance and includes cinematographic + adaptations or any other form in which the Work may be recast, + transformed, or adapted including in any form recognizably derived from + the original, except that a work that constitutes a Collection will not + be considered an Adaptation for the purpose of this License. For the + avoidance of doubt, where the Work is a musical work, performance or + phonogram, the synchronization of the Work in timed-relation with a + moving image ("synching") will be considered an Adaptation for the + purpose of this License. + . + b. "Collection" means a collection of literary or artistic works, such + as encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed in + Section 1(f) below, which, by reason of the selection and arrangement of + their contents, constitute intellectual creations, in which the Work is + included in its entirety in unmodified form along with one or more other + contributions, each constituting separate and independent works in + themselves, which together are assembled into a collective whole. A work + that constitutes a Collection will not be considered an Adaptation (as + defined below) for the purposes of this License. + . + c. "Creative Commons Compatible License" means a license that is listed + at https://creativecommons.org/compatiblelicenses that has been approved + by Creative Commons as being essentially equivalent to this License, + including, at a minimum, because that license: (i) contains terms that + have the same purpose, meaning and effect as the License Elements of + this License; and, (ii) explicitly permits the relicensing of + adaptations of works made available under that license under this + License or a Creative Commons jurisdiction license with the same License + Elements as this License. + . + d. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or other + transfer of ownership. + . + e. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + . + f. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + . + g. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work or + if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + . + h. "Work" means the literary and/or artistic work offered under the + terms of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, pamphlet + and other writing; a lecture, address, sermon or other work of the same + nature; a dramatic or dramatico-musical work; a choreographic work or + entertainment in dumb show; a musical composition with or without words; + a cinematographic work to which are assimilated works expressed by a + process analogous to cinematography; a work of drawing, painting, + architecture, sculpture, engraving or lithography; a photographic work + to which are assimilated works expressed by a process analogous to + photography; a work of applied art; an illustration, map, plan, sketch + or three-dimensional work relative to geography, topography, + architecture or science; a performance; a broadcast; a phonogram; a + compilation of data to the extent it is protected as a copyrightable + work; or a work performed by a variety or circus performer to the extent + it is not otherwise considered a literary or artistic work. + . + i. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + . + j. "Publicly Perform" means to perform public recitations of the Work + and to communicate to the public those public recitations, by any means + or process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a place + individually chosen by them; to perform the Work to the public by any + means or process and the communication to the public of the performances + of the Work, including by public digital performance; to broadcast and + rebroadcast the Work by any means including signs, sounds or images. + . + k. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + . + 2. Fair Dealing Rights. Nothing in this License is intended to reduce, + limit, or restrict any uses free from copyright or rights arising from + limitations or exceptions that are provided for in connection with the + copyright protection under copyright law or other applicable laws. + . + 3. License Grant. Subject to the terms and conditions of this License, + Licensor hereby grants You a worldwide, royalty-free, non-exclusive, + perpetual (for the duration of the applicable copyright) license to + exercise the rights in the Work as stated below: + . + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + . + b. to create and Reproduce Adaptations provided that any such + Adaptation, including any translation in any medium, takes reasonable + steps to clearly label, demarcate or otherwise identify that changes + were made to the original Work. For example, a translation could be + marked "The original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + . + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + . + d. to Distribute and Publicly Perform Adaptations. + . + e. For the avoidance of doubt: + . + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or compulsory + licensing scheme cannot be waived, the Licensor reserves the exclusive + right to collect such royalties for any exercise by You of the rights + granted under this License; + . + ii. Waivable Compulsory License Schemes. In those jurisdictions in which + the right to collect royalties through any statutory or compulsory + licensing scheme can be waived, the Licensor waives the exclusive right + to collect such royalties for any exercise by You of the rights granted + under this License; and, + . + iii. Voluntary License Schemes. The Licensor waives the right to collect + royalties, whether individually or, in the event that the Licensor is a + member of a collecting society that administers voluntary licensing + schemes, via that society, from any exercise by You of the rights + granted under this License. + . + The above rights may be exercised in all media and formats whether now + known or hereafter devised. The above rights include the right to make + such modifications as are technically necessary to exercise the rights + in other media and formats. Subject to Section 8(f), all rights not + expressly granted by Licensor are hereby reserved. + . + 4. Restrictions. The license granted in Section 3 above is expressly + made subject to and limited by the following restrictions: + . + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms on + the Work that restrict the terms of this License or the ability of the + recipient of the Work to exercise the rights granted to that recipient + under the terms of the License. You may not sublicense the Work. You + must keep intact all notices that refer to this License and to the + disclaimer of warranties with every copy of the Work You Distribute or + Publicly Perform. When You Distribute or Publicly Perform the Work, You + may not impose any effective technological measures on the Work that + restrict the ability of a recipient of the Work from You to exercise the + rights granted to that recipient under the terms of the License. This + Section 4(a) applies to the Work as incorporated in a Collection, but + this does not require the Collection apart from the Work itself to be + made subject to the terms of this License. If You create a Collection, + upon notice from any Licensor You must, to the extent practicable, + remove from the Collection any credit as required by Section 4(c), as + requested. If You create an Adaptation, upon notice from any Licensor + You must, to the extent practicable, remove from the Adaptation any + credit as required by Section 4(c), as requested. + . + b. You may Distribute or Publicly Perform an Adaptation only under the + terms of: (i) this License; (ii) a later version of this License with + the same License Elements as this License; (iii) a Creative Commons + jurisdiction license (either this or a later license version) that + contains the same License Elements as this License (e.g., + Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible + License. If you license the Adaptation under one of the licenses + mentioned in (iv), you must comply with the terms of that license. If + you license the Adaptation under the terms of any of the licenses + mentioned in (i), (ii) or (iii) (the "Applicable License"), you must + comply with the terms of the Applicable License generally and the + following provisions: (I) You must include a copy of, or the URI for, + the Applicable License with every copy of each Adaptation You Distribute + or Publicly Perform; (II) You may not offer or impose any terms on the + Adaptation that restrict the terms of the Applicable License or the + ability of the recipient of the Adaptation to exercise the rights + granted to that recipient under the terms of the Applicable License; + (III) You must keep intact all notices that refer to the Applicable + License and to the disclaimer of warranties with every copy of the Work + as included in the Adaptation You Distribute or Publicly Perform; (IV) + when You Distribute or Publicly Perform the Adaptation, You may not + impose any effective technological measures on the Adaptation that + restrict the ability of a recipient of the Adaptation from You to + exercise the rights granted to that recipient under the terms of the + Applicable License. This Section 4(b) applies to the Adaptation as + incorporated in a Collection, but this does not require the Collection + apart from the Adaptation itself to be made subject to the terms of the + Applicable License. + . + c. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party or + parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party or + parties; (ii) the title of the Work if supplied; (iii) to the extent + reasonably practicable, the URI, if any, that Licensor specifies to be + associated with the Work, unless such URI does not refer to the + copyright notice or licensing information for the Work; and (iv) , + consistent with Ssection 3(b), in the case of an Adaptation, a credit + identifying the use of the Work in the Adaptation (e.g., "French + translation of the Work by Original Author," or "Screenplay based on + original Work by Original Author"). The credit required by this Section + 4(c) may be implemented in any reasonable manner; provided, however, + that in the case of a Adaptation or Collection, at a minimum such credit + will appear, if a credit for all contributing authors of the Adaptation + or Collection appears, then as part of these credits and in a manner at + least as prominent as the credits for the other contributing authors. + For the avoidance of doubt, You may only use the credit required by this + Section for the purpose of attribution in the manner set out above and, + by exercising Your rights under this License, You may not implicitly or + explicitly assert or imply any connection with, sponsorship or + endorsement by the Original Author, Licensor and/or Attribution Parties, + as appropriate, of You or Your use of the Work, without the separate, + express prior written permission of the Original Author, Licensor and/or + Attribution Parties. + . + d. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any Adaptations + or Collections, You must not distort, mutilate, modify or take other + derogatory action in relation to the Work which would be prejudicial to + the Original Author's honor or reputation. Licensor agrees that in those + jurisdictions (e.g. Japan), in which any exercise of the right granted + in Section 3(b) of this License (the right to make Adaptations) would be + deemed to be a distortion, mutilation, modification or other derogatory + action prejudicial to the Original Author's honor and reputation, the + Licensor will waive or not assert, as appropriate, this Section, to the + fullest extent permitted by the applicable national law, to enable You + to reasonably exercise Your right under Section 3(b) of this License + (right to make Adaptations) but not otherwise. + . + 5. Representations, Warranties and Disclaimer + . + UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR + OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY + KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, + FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF + LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, + WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + . + 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE + LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR + ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES + ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS + BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + . + 7. Termination + . + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + . + b. Subject to the above terms and conditions, the license granted here + is perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + . + 8. Miscellaneous + . + a. Each time You Distribute or Publicly Perform the Work or a + Collection, the Licensor offers to the recipient a license to the Work + on the same terms and conditions as the license granted to You under + this License. + . + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same terms + and conditions as the license granted to You under this License. + . + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + . + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + . + e. This License constitutes the entire agreement between the parties + with respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that may + appear in any communication from You. This License may not be modified + without the mutual written agreement of the Licensor and You. + . + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and + the Universal Copyright Convention (as revised on July 24, 1971). These + rights and subject matter take effect in the relevant jurisdiction in + which the License terms are sought to be enforced according to the + corresponding provisions of the implementation of those treaty + provisions in the applicable national law. If the standard suite of + rights granted under applicable copyright law includes additional rights + not granted under this License, such additional rights are deemed to be + included in the License; this License is not intended to restrict the + license of any rights under applicable law. + . + Creative Commons Notice + . + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + . + Except for the limited purpose of indicating to the public that the Work + is licensed under the CCPL, Creative Commons does not authorize the use + by either party of the trademark "Creative Commons" or any related + trademark or logo of Creative Commons without the prior written consent + of Creative Commons. Any permitted use will be in compliance with + Creative Commons' then-current trademark usage guidelines, as may be + published on its website or otherwise made available upon request from + time to time. For the avoidance of doubt, this trademark restriction + does not form part of the License. . - See client/gtk/data/themes/ccFlickr/ATTRIB for the details. + Creative Commons may be contacted at https://creativecommons.org/. diff -Nru pioneers-15.5/debian/pioneers-builddep pioneers-15.6/debian/pioneers-builddep --- pioneers-15.5/debian/pioneers-builddep 2018-03-14 16:43:54.000000000 +0000 +++ pioneers-15.6/debian/pioneers-builddep 2020-08-02 13:39:55.000000000 +0000 @@ -9,12 +9,12 @@ Section: misc Priority: optional Homepage: http://pio.sourceforge.net/ -Vcs-Svn: svn://svn.code.sf.net/p/pio/code/trunk/pioneers +Vcs-Svn: https://svn.code.sf.net/p/pio/code/trunk/pioneers Vcs-Browser: https://sourceforge.net/p/pio/code/HEAD/tree/trunk/pioneers/ -Standards-Version: 4.1.3 +Standards-Version: 4.5.0 Package: pioneers-builddep -Version: 15.5-1 +Version: 15.6-1 Maintainer: Roland Clobus # Provides: # Replaces: @@ -44,6 +44,7 @@ subversion Recommends: libgtk-3-dev, libnotify-dev, + libcanberra-dev, librsvg2-bin, netpbm, xfonts-scalable, @@ -63,6 +64,8 @@ libc6-dbg, libcairo2-dbgsym, libcairo2-doc, + libcanberra0-dbgsym, + libcanberra-doc, libgdk-pixbuf2.0-0-dbgsym, libgdk-pixbuf2.0-doc, libglib2.0-0-dbgsym, diff -Nru pioneers-15.5/debian/pioneers-data.install pioneers-15.6/debian/pioneers-data.install --- pioneers-15.5/debian/pioneers-data.install 2018-03-07 15:58:25.000000000 +0000 +++ pioneers-15.6/debian/pioneers-data.install 2020-08-02 08:29:58.000000000 +0000 @@ -1,8 +1,8 @@ debian/tmp/usr/share/games/pioneers/themes debian/tmp/usr/share/help debian/tmp/usr/share/icons/hicolor -debian/tmp/usr/share/pixmaps/pioneers/*.png -debian/tmp/usr/share/pixmaps/pioneers/*.svg debian/tmp/usr/share/pixmaps/pioneers-editor.png debian/tmp/usr/share/pixmaps/pioneers-server.png debian/tmp/usr/share/pixmaps/pioneers.png +debian/tmp/usr/share/pixmaps/pioneers/*.png +debian/tmp/usr/share/pixmaps/pioneers/*.svg diff -Nru pioneers-15.5/debian/release-checklist pioneers-15.6/debian/release-checklist --- pioneers-15.5/debian/release-checklist 2014-10-19 08:04:52.000000000 +0000 +++ pioneers-15.6/debian/release-checklist 2020-08-02 11:54:00.000000000 +0000 @@ -2,7 +2,7 @@ # What to do for a release of a new version in Debian: #- Read about the changes in the policy -sensible-browser file:///usr/share/doc/debian-policy/upgrading-checklist-1.html +sensible-browser file:///usr/share/doc/debian-policy/policy.html/upgrading-checklist.html #- Get released tarball cd "`dirname "$0"`"/.. @@ -24,7 +24,10 @@ cd "$dir/$pdir" -#- update the version number in the builddep package +#- Update the builddep package +# - update the version number (remove ~local1) +# - update Standards-Version +# vim debian/pioneers-builddep #- dch, mark bugs as closed @@ -44,7 +47,7 @@ # sign cd .. -debsign -k627CCF95 *changes +debsign -kA61495BD *changes #- install, test sudo dpkg -i *deb @@ -58,7 +61,11 @@ piuparts *deb #- upload +#dput mentors pioneers_15.6-1_amd64.changes + #- update subversion debian directory +# Copy the debian directory in $dir/$pdir to a folder which is controlled by svn +# Commit #- svn copy https://svn.code.sf.net/p/pio/code/trunk/pioneers/debian \ -# https://svn.code.sf.net/p/pio/code/tags/debian-release-15.1-1 \ -# -m "tag debian release" +# https://svn.code.sf.net/p/pio/code/tags/debian-release-15.6-1 \ +# -m "tag debian release 15.6-1" diff -Nru pioneers-15.5/debian/rules pioneers-15.6/debian/rules --- pioneers-15.5/debian/rules 2018-03-07 15:58:25.000000000 +0000 +++ pioneers-15.6/debian/rules 2020-08-02 11:44:01.000000000 +0000 @@ -8,14 +8,23 @@ %: dh $@ +override_dh_update_autotools_config: + NOCONFIGURE=1 ./autogen.sh + dh_update_autotools_config + override_dh_auto_configure: - ./autogen.sh --prefix=/usr --bindir=/usr/games --mandir=/usr/share/man \ + dh_auto_configure -- \ + --bindir=/usr/games \ --enable-warnings \ - --disable-dependency-tracking \ --disable-deprecation-checks override_dh_clean: -rm ltmain.sh config.sub config.guess aclocal.m4 - debconf-updatepo + debconf-updatepo dh_clean +override_dh_installdocs: + dh_installdocs --all NEWS + +override_dh_installchangelogs: + dh_installchangelogs -XChangeLog diff -Nru pioneers-15.5/depcomp pioneers-15.6/depcomp --- pioneers-15.5/depcomp 2018-03-14 16:02:12.000000000 +0000 +++ pioneers-15.6/depcomp 2020-08-02 12:59:32.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru pioneers-15.5/Doxyfile pioneers-15.6/Doxyfile --- pioneers-15.5/Doxyfile 2018-03-14 16:02:15.000000000 +0000 +++ pioneers-15.6/Doxyfile 2020-08-02 12:59:35.000000000 +0000 @@ -32,7 +32,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 15.5 +PROJECT_NUMBER = 15.6 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff -Nru pioneers-15.5/editor/gtk/editor.c pioneers-15.6/editor/gtk/editor.c --- pioneers-15.5/editor/gtk/editor.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/editor/gtk/editor.c 2020-08-02 07:03:10.000000000 +0000 @@ -2,7 +2,7 @@ * Go buy a copy. * * Copyright (C) 2005 Brian Wellington - * Copyright (C) 2005,2011 Roland Clobus + * Copyright (C) 2005,2011,2020 Roland Clobus * Copyright (C) 2005,2006 Bas Wijnen * Copyright (C) 2011-2013 Micah Bunting * @@ -23,11 +23,8 @@ #include "config.h" #include "version.h" -#ifdef HAVE_LOCALE_H -#include -#endif - #include +#include #include "aboutbox.h" #include "config-gnome.h" #include "game.h" @@ -44,6 +41,7 @@ #include "common_gtk.h" #include "cards.h" #include "network.h" +#include "gettext.h" #define MAINICON_FILE "pioneers-editor.png" @@ -53,6 +51,26 @@ #define BUTTON_HEIGHT 24 /* height of the toolbar buttons */ #define TERRAIN_BUTTON_WIDTH 27 /* width of the terrain toolbar buttons */ +/* Callback functions from the resource file */ +G_MODULE_EXPORT void new_game_menu_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void load_game_menu_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void save_as_menu_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void save_game_menu_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void change_title_menu_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void check_vp_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void exit_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void about_menu_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void toggle_full_screen_cb(GObject * gobject, + gpointer user_data); +G_MODULE_EXPORT void zoom_normal_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void zoom_center_map_cb(GObject * gobject, + gpointer user_data); + static GtkWidget *toplevel; static gchar *default_game; static gchar *window_title; @@ -161,7 +179,6 @@ N_("South East|SE") }; -static void check_vp_cb(GObject * caller, gpointer main_window); static void set_window_title(const gchar * title); static void error_dialog(const char *fmt, ...) @@ -206,6 +223,15 @@ } } +static gboolean terrain_has_chit(Terrain terrain) +{ + if (terrain == HILL_TERRAIN || terrain == FIELD_TERRAIN || + terrain == MOUNTAIN_TERRAIN || terrain == PASTURE_TERRAIN || + terrain == FOREST_TERRAIN || terrain == GOLD_TERRAIN) + return TRUE; + return FALSE; +} + static void canonicalize_map(Map * map) { Hex *hex; @@ -221,25 +247,25 @@ hex = map->grid[y][x]; if (hex == NULL) continue; - if (hex->roll > 0) { + if (terrain_has_chit(hex->terrain)) { + if (hex->roll <= 0) { + /* Should not happen, but we do not want to throw away the work of the user, so correct and continue */ + g_warning + ("The dice roll is corrected for hex %d,%d", + hex->x, hex->y); + hex->roll = 2; + } g_array_append_val(map->chits, hex->roll); hex->chit_pos = sequence_number++; } else if (hex->terrain == DESERT_TERRAIN) { hex->chit_pos = sequence_number++; + } else { + hex->chit_pos = -1; } } } } -static gboolean terrain_has_chit(Terrain terrain) -{ - if (terrain == HILL_TERRAIN || terrain == FIELD_TERRAIN || - terrain == MOUNTAIN_TERRAIN || terrain == PASTURE_TERRAIN || - terrain == FOREST_TERRAIN || terrain == GOLD_TERRAIN) - return TRUE; - return FALSE; -} - /** Changes the terrain of a hex to terrain. * @param hex The hex to change the terrain of. * @param terrain The terrain to change the hex terrain to. @@ -253,14 +279,13 @@ return; hex->terrain = terrain; - if (terrain_has_chit(terrain)) { - if (hex->roll == 0) - hex->roll = 2; - } else + if (terrain_has_chit(terrain) && (hex->roll == 0)) { + hex->roll = 2; + } else { hex->roll = 0; - - if (terrain != SEA_TERRAIN) - hex->resource = NO_RESOURCE; + } + hex->resource = NO_RESOURCE; + hex->facing = 0; /* If terrain is not land, * remove all ports on adjacent hexes that point to hex */ @@ -293,8 +318,8 @@ layout = gtk_widget_create_pango_layout(widget, ""); draw_dice_roll(layout, cr, - 12, 10, 15, GPOINTER_TO_INT(chip_number), - GOLD_TERRAIN, FALSE); + BUTTON_HEIGHT / 2, BUTTON_HEIGHT / 2, BUTTON_HEIGHT, + GPOINTER_TO_INT(chip_number), SEA_TERRAIN, FALSE); g_object_unref(layout); return TRUE; } @@ -319,15 +344,18 @@ width = gdk_pixbuf_get_width(theme->terrain_tiles[SEA_TERRAIN]); height = gdk_pixbuf_get_height(theme->terrain_tiles[SEA_TERRAIN]); gdk_cairo_set_source_pixbuf(cr, theme->terrain_tiles[SEA_TERRAIN], - BUTTON_HEIGHT / 2 - width / 2, - BUTTON_HEIGHT / 2 - height / 2); + gtk_widget_get_allocated_width(widget) + / 2 - width / 2, + gtk_widget_get_allocated_height(widget) + / 2 - height / 2); cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT); cairo_paint(cr); - draw_port_indicator(layout, cr, BUTTON_HEIGHT / 2, - BUTTON_HEIGHT / 2, 11, - GPOINTER_TO_INT(port_type)); + draw_port_indicator(layout, cr, + gtk_widget_get_allocated_width(widget) / 2, + gtk_widget_get_allocated_height(widget) / 2, + 11, GPOINTER_TO_INT(port_type)); g_object_unref(layout); return TRUE; @@ -343,7 +371,7 @@ cairo_t * cr, G_GNUC_UNUSED gpointer user_data) { - gdk_cairo_set_source_color(cr, &white); + gdk_cairo_set_source_rgba(cr, &white); cairo_paint(cr); return TRUE; @@ -408,20 +436,26 @@ }; /** Builds toolbars for selecting terrains, chits, and ports. Places toolbar in - * the table at the top. - * @param table The table to place toolbar in. + * the grid at the top. + * @param grid The grid to place the toolbar in. */ -static void build_select_bars(GtkWidget * table) +static void build_select_bars(GtkWidget * grid) { + GtkWidget *flowbox; GtkWidget *box; GtkWidget *area; GtkWidget *button; GSList *group; - GtkWidget *vsep; gint i; ToolbarButtonData *toolbar_button_data; - box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); /* upper bar */ + flowbox = gtk_flow_box_new(); + gtk_flow_box_set_column_spacing(GTK_FLOW_BOX(flowbox), 10); + gtk_flow_box_set_homogeneous(GTK_FLOW_BOX(flowbox), FALSE); + gtk_flow_box_set_selection_mode(GTK_FLOW_BOX(flowbox), + GTK_SELECTION_NONE); + + box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); area = gtk_drawing_area_new(); gtk_widget_show(area); @@ -433,6 +467,7 @@ button = GTK_WIDGET(gtk_radio_tool_button_new(NULL)); gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), area); gtk_box_pack_start(GTK_BOX(box), button, FALSE, TRUE, 0); + gtk_widget_set_margin_end(button, 10); gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(button), _ ("Select the terrain type with the context " "menu on the left click or toggle a node to " @@ -450,12 +485,6 @@ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(button), TRUE); - /* Line between unselect and terrains */ - vsep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); - gtk_widget_show(vsep); - gtk_widget_set_size_request(vsep, 10, 0); - gtk_box_pack_start(GTK_BOX(box), vsep, FALSE, TRUE, 0); - /* terrain toolbar buttons */ for (i = 0; i <= LAST_TERRAIN; i++) { area = terrain_icon_new(i); @@ -481,10 +510,9 @@ } - gtk_table_attach(GTK_TABLE(table), box, 0, 2, 0, 1, - GTK_FILL, GTK_FILL, 0, 0); + gtk_container_add(GTK_CONTAINER(flowbox), box); - box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); /* lower bar */ + box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); /* chit toolbar buttons */ for (i = 2; i <= 12; i++) { @@ -519,11 +547,9 @@ toolbar_button_data); } - /* Line between chit and port */ - vsep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); - gtk_widget_show(vsep); - gtk_widget_set_size_request(vsep, 10, 0); - gtk_box_pack_start(GTK_BOX(box), vsep, FALSE, TRUE, 0); + gtk_container_add(GTK_CONTAINER(flowbox), box); + + box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); /* port toolbar buttons */ for (i = 0; i <= ANY_RESOURCE; i++) { @@ -556,11 +582,14 @@ toolbar_button_data); } - gtk_table_attach(GTK_TABLE(table), box, 0, 2, 1, 2, - GTK_FILL, GTK_FILL, 0, 0); + gtk_widget_set_hexpand(box, TRUE); /* Fill remaining space */ + gtk_container_add(GTK_CONTAINER(flowbox), box); + + gtk_widget_set_hexpand(flowbox, TRUE); /* Fill remaining space */ + gtk_grid_attach(GTK_GRID(grid), flowbox, 0, 0, 2, 1); } -static void build_map_resize(GtkWidget * table, guint col, guint row, +static void build_map_resize(GtkWidget * grid, gint col, gint row, GtkOrientation dir, GtkWidget ** buttons, GCallback resize_callback) { @@ -602,8 +631,7 @@ } gtk_box_pack_start(GTK_BOX(box), gtk_fixed_new(), TRUE, TRUE, 0); - gtk_table_attach(GTK_TABLE(table), box, col, col + 1, row, row + 1, - GTK_FILL, GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), box, col, row, 1, 1); } static void scale_map(GuiMap * gmap) @@ -621,7 +649,7 @@ { if (event->mode != GDK_CROSSING_GTK_UNGRAB) { /* Do not grab the focus when a ScrollableTextView - * is focussed on another tab page */ + * is focused on another tab page */ gtk_widget_grab_focus(widget); } return FALSE; @@ -641,6 +669,8 @@ if (gtk_widget_get_window(area) == NULL || gmap->map == NULL) return FALSE; + gmap->last_x = event->x; + gmap->last_y = event->y; current_hex = guimap_get_current_hex(gmap); if (current_hex == NULL) return TRUE; @@ -764,9 +794,10 @@ menu = port_menu; } - if (menu != NULL) - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, - event->button, event->time); + if (menu != NULL) { + gtk_menu_popup_at_pointer(GTK_MENU(menu), + (GdkEvent *) event); + } return TRUE; } @@ -925,10 +956,10 @@ static GtkWidget *build_map(void) { - GtkWidget *table; + GtkWidget *grid; GtkWidget *area; - table = gtk_table_new(4, 2, FALSE); + grid = gtk_grid_new(); gmap = guimap_new(); guimap_set_show_no_setup_nodes(gmap, TRUE); @@ -944,17 +975,17 @@ G_CALLBACK(button_press_map_cb), gmap); g_signal_connect(G_OBJECT(gmap->area), "key_press_event", G_CALLBACK(key_press_map_cb), gmap); - gtk_table_attach(GTK_TABLE(table), gmap->area, 0, 1, 2, 3, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, - 0); + gtk_grid_attach(GTK_GRID(grid), gmap->area, 0, 1, 1, 1); + gtk_widget_set_hexpand(gmap->area, TRUE); + gtk_widget_set_vexpand(gmap->area, TRUE); - build_select_bars(table); - build_map_resize(table, 1, 2, GTK_ORIENTATION_VERTICAL, + build_select_bars(grid); + build_map_resize(grid, 1, 1, GTK_ORIENTATION_VERTICAL, vresize_buttons, G_CALLBACK(change_height)); - build_map_resize(table, 0, 3, GTK_ORIENTATION_HORIZONTAL, + build_map_resize(grid, 0, 2, GTK_ORIENTATION_HORIZONTAL, hresize_buttons, G_CALLBACK(change_width)); - return table; + return grid; } static gboolean update_title(GtkWidget * widget, @@ -977,7 +1008,7 @@ /* Label */ widget = gtk_label_new_with_mnemonic(_("_Title")); gtk_widget_show(widget); - gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(widget), 0.0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 0); game_title = gtk_entry_new(); @@ -990,7 +1021,7 @@ /* Label */ widget = gtk_label_new_with_mnemonic(_("_Description")); gtk_widget_show(widget); - gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(widget), 0.0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 0); game_description = scrollable_text_view_new(); @@ -1008,7 +1039,7 @@ /* Label */ widget = gtk_label_new_with_mnemonic(_("_Comments")); gtk_widget_show(widget); - gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(widget), 0.0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, FALSE, 0); game_comments = scrollable_text_view_new(); @@ -1035,45 +1066,32 @@ gint i; GtkWidget *menu; GtkWidget *item; - GdkPixbuf *pixbuf; + GtkWidget *box; GtkWidget *image; - gint width; - gint height; - MapTheme *theme = theme_get_current(); + GtkWidget *label; menu = gtk_menu_new(); for (i = 0; i <= LAST_TERRAIN; i++) { - item = - gtk_image_menu_item_new_with_mnemonic(gettext - (terrain_names - [i])); + item = gtk_menu_item_new(); + box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + label = + gtk_label_new_with_mnemonic(gettext(terrain_names[i])); + if (i == LAST_TERRAIN) { + image = gtk_drawing_area_new(); + } else { + image = terrain_icon_new(i); + } + gtk_widget_set_size_request(image, BUTTON_HEIGHT, + BUTTON_HEIGHT); + gtk_container_add(GTK_CONTAINER(box), image); + gtk_container_add(GTK_CONTAINER(box), label); + gtk_container_add(GTK_CONTAINER(item), box); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(select_terrain_cb), GINT_TO_POINTER(i)); - - if (i == LAST_TERRAIN) - continue; - - /* Use the default size, or smaller */ - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - if (height > width / theme->scaledata[i].aspect) { - height = width / theme->scaledata[i].aspect; - } else { - width = height * theme->scaledata[i].aspect; - } - - pixbuf = - gdk_pixbuf_scale_simple(theme-> - scaledata[i].native_image, - width, height, - GDK_INTERP_BILINEAR); - - image = gtk_image_new_from_pixbuf(pixbuf); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - image); } gtk_widget_show_all(menu); @@ -1102,7 +1120,8 @@ gchar buffer[128]; MapTheme *theme = theme_get_current(); THEME_COLOR tcolor; - GdkColor *color; + GdkRGBA *colorFG; + GdkRGBA *colorBG; GtkWidget *item; GtkWidget *label; @@ -1113,10 +1132,23 @@ continue; tcolor = (i == 6 || i == 8) ? TC_CHIP_H_FG : TC_CHIP_FG; - color = &theme->colors[tcolor].color; + colorFG = + theme->ovr_colors[SEA_TERRAIN][tcolor]. + set ? &theme->ovr_colors[SEA_TERRAIN][tcolor]. + color : &theme->colors[tcolor].color; + tcolor = TC_CHIP_BG; + colorBG = + theme->ovr_colors[SEA_TERRAIN][tcolor]. + set ? &theme->ovr_colors[SEA_TERRAIN][tcolor]. + color : &theme->colors[tcolor].color; sprintf(buffer, - "%d", - color->red, color->green, color->blue, i); + "%d", + (unsigned) (colorFG->red * 255 * 256), + (unsigned) (colorFG->green * 255 * 256), + (unsigned) (colorFG->blue * 255 * 256), + (unsigned) (colorBG->red * 255 * 256), + (unsigned) (colorBG->green * 255 * 256), + (unsigned) (colorBG->blue * 255 * 256), i); item = gtk_check_menu_item_new(); label = gtk_label_new(""); @@ -1182,32 +1214,33 @@ { gint i; GtkWidget *item; - GdkPixbuf *pixbuf; + GtkWidget *box; GtkWidget *image; + GtkWidget *label; GtkWidget *menu; - MapTheme *theme = theme_get_current(); menu = gtk_menu_new(); for (i = 0; i <= ANY_RESOURCE; i++) { - item = - gtk_image_menu_item_new_with_mnemonic(gettext - (port_names[i])); + item = gtk_menu_item_new(); + box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + label = + gtk_label_new_with_mnemonic(gettext(port_names[i])); + + image = gtk_drawing_area_new(); + gtk_widget_set_size_request(image, BUTTON_HEIGHT, + BUTTON_HEIGHT); + g_signal_connect(G_OBJECT(image), "draw", + G_CALLBACK(draw_port_cb), + GINT_TO_POINTER(i)); + gtk_container_add(GTK_CONTAINER(box), image); + gtk_container_add(GTK_CONTAINER(box), label); + gtk_container_add(GTK_CONTAINER(item), box); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(select_port_resource_cb), GINT_TO_POINTER(i)); - - if (i >= NO_RESOURCE) - continue; - pixbuf = theme->port_tiles[i]; - if (pixbuf == NULL) - continue; - - image = gtk_image_new_from_pixbuf(pixbuf); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - image); } gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new()); @@ -1432,6 +1465,8 @@ params = params_load_file(gamefile); if (params == NULL) { error_dialog(_("Failed to load '%s'"), file); + if (!is_reload) + load_game(NULL, TRUE); return; } @@ -1477,15 +1512,25 @@ static void save_game(const gchar * file) { GameParams *params = get_params(); + GameParams *reloaded_params; canonicalize_map(params->map); if (!params_write_file(params, file)) error_dialog(_("Failed to save to '%s'"), file); - else - config_set_string("editor/last-game", file); + else { + reloaded_params = params_load_file(file); + if (reloaded_params != NULL) { + config_set_string("editor/last-game", file); + } else { + error_dialog + ("You found a bug.The saved game could not be loaded."); + } + params_free(reloaded_params); + } params_free(params); } -static void new_game_menu_cb(void) +void new_game_menu_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { load_game(NULL, TRUE); } @@ -1507,7 +1552,25 @@ gtk_file_chooser_add_filter(file_chooser, filter); } -static void load_game_menu_cb(void) +static gchar *prepare_local_games_folder(void) +{ + gchar *directory; + + if (g_strcmp0(g_get_user_data_dir(), g_get_user_config_dir()) == 0) { + directory = + g_build_filename(g_get_user_data_dir(), + "pioneers_games", NULL); + } else { + directory = + g_build_filename(g_get_user_data_dir(), "pioneers", + NULL); + } + g_mkdir_with_parents(directory, S_IRWXU); + + return directory; +} + +void load_game_menu_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { GtkWidget *dialog; gchar *directory; @@ -1515,7 +1578,7 @@ dialog = gtk_file_chooser_dialog_new( /* Dialog caption */ _("Open Game"), - GTK_WINDOW(toplevel), + GTK_WINDOW(user_data), GTK_FILE_CHOOSER_ACTION_OPEN, /* Button text */ _("_Cancel"), @@ -1523,8 +1586,7 @@ /* Button text */ _("_Open"), GTK_RESPONSE_OK, NULL); - directory = - g_build_filename(g_get_user_data_dir(), "pioneers", NULL); + directory = prepare_local_games_folder(); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), directory); gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), @@ -1548,7 +1610,7 @@ gtk_widget_destroy(dialog); } -static void save_as_menu_cb(void) +void save_as_menu_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { GtkWidget *dialog; gchar *directory; @@ -1556,7 +1618,7 @@ dialog = gtk_file_chooser_dialog_new( /* Dialog caption */ _("Save As..."), - GTK_WINDOW(toplevel), + GTK_WINDOW(user_data), GTK_FILE_CHOOSER_ACTION_SAVE, /* Button text */ _("_Cancel"), @@ -1565,8 +1627,7 @@ _("Save _As"), GTK_RESPONSE_ACCEPT, NULL); - directory = - g_build_filename(g_get_user_data_dir(), "pioneers", NULL); + directory = prepare_local_games_folder(); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), directory); gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), @@ -1589,22 +1650,23 @@ gtk_widget_destroy(dialog); } -static void save_game_menu_cb(void) +void save_game_menu_cb(GObject * gobject, gpointer user_data) { if (open_filename == NULL) - save_as_menu_cb(); + save_as_menu_cb(gobject, user_data); else save_game(open_filename); } -static void change_title_menu_cb(void) +void change_title_menu_cb(G_GNUC_UNUSED GObject * gobject, + gpointer user_data) { GtkWidget *dialog, *vbox, *hbox, *label, *entry; dialog = gtk_dialog_new_with_buttons( /* Dialog caption */ _("Change Title"), - GTK_WINDOW(toplevel), + GTK_WINDOW(user_data), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, /* Button text */ @@ -1630,7 +1692,7 @@ /* Label */ label = gtk_label_new(_("New title:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); /* Update the window_title before is it shown */ set_window_title(gtk_entry_get_text(GTK_ENTRY(game_title))); @@ -1648,212 +1710,73 @@ gtk_widget_destroy(dialog); } -static void check_vp_cb(G_GNUC_UNUSED GObject * caller, - gpointer main_window) +void check_vp_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { GameParams *params; params = get_params(); - check_victory_points(params, main_window); + check_victory_points(params, GTK_WINDOW(user_data)); params_free(params); } -static void exit_cb(void) +void exit_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { gtk_main_quit(); } -#ifdef HAVE_HELP -/* Commented out, until the help is written -static void contents_menu_cb(void) +void about_menu_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { - GtkWidget *dialog; - - dialog = gtk_message_dialog_new(GTK_WINDOW(toplevel), - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CLOSE, - _("There is no help")); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); -} -*/ -#endif - -static void about_menu_cb(void) -{ - aboutbox_display(GTK_WINDOW(toplevel), + aboutbox_display(GTK_WINDOW(user_data), /* Caption of about box */ _("About Pioneers Game Editor")); } /** Toggles full screen mode. - * @param GtkToggleAction The calling action. - * @param main_window The window to toggle full screen mode. */ -static void toggle_full_screen_cb(GtkToggleAction * caller, - gpointer main_window) +void toggle_full_screen_cb(GObject * gobject, gpointer user_data) { - if (gtk_toggle_action_get_active(caller)) { - gtk_window_fullscreen(GTK_WINDOW(main_window)); + if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(gobject))) { + gtk_window_fullscreen(GTK_WINDOW(user_data)); } else { - gtk_window_unfullscreen(GTK_WINDOW(main_window)); + gtk_window_unfullscreen(GTK_WINDOW(user_data)); } } -static void zoom_normal_cb(void) +void zoom_normal_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { guimap_zoom_normal(gmap); } -static void zoom_center_map_cb(void) +void zoom_center_map_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { guimap_zoom_center_map(gmap); } -static GtkActionEntry entries[] = { - {"FileMenu", NULL, - /* Menu entry */ - N_("_File"), NULL, NULL, NULL}, - {"ViewMenu", NULL, - /* Menu entry */ - N_("_View"), NULL, NULL, NULL}, - {"HelpMenu", NULL, - /* Menu entry */ - N_("_Help"), NULL, NULL, NULL}, - - {"New", NULL, - /* Menu entry */ - N_("_New"), "N", - N_("Create a new game"), new_game_menu_cb}, - {"Open", NULL, - /* Menu entry */ - N_("_Open..."), "O", - /* Tooltip for Open menu entry */ - N_("Open an existing game"), load_game_menu_cb}, - {"Save", NULL, - /* Menu entry */ - N_("_Save"), "S", - /* Tooltip for Save menu entry */ - N_("Save game"), save_game_menu_cb}, - {"SaveAs", NULL, - /* Menu entry */ - N_("Save _As..."), - "S", - /* Tooltip for Save As menu entry */ - N_("Save as"), save_as_menu_cb}, - {"ChangeTitle", NULL, - /* Menu entry */ - N_("Change _Title"), "T", - /* Tooltip for Change Title menu entry */ - N_("Change game title"), change_title_menu_cb}, - {"CheckVP", NULL, - /* Menu entry */ - N_("_Check Victory Point Target"), - NULL, - /* Tooltip for Check Victory Point Target menu entry */ - N_("Check whether the game can be won"), G_CALLBACK(check_vp_cb)}, - {"Quit", NULL, - /* Menu entry */ - N_("_Quit"), "Q", - /* Tooltip for Quit menu entry */ - N_("Quit"), exit_cb}, - - {"Full", NULL, - /* Menu entry */ - N_("_Reset"), - "0", - /* Tooltip for Reset menu entry */ - N_("View the full map"), zoom_normal_cb}, - {"Center", NULL, - /* Menu entry */ - N_("_Center"), NULL, - /* Tooltip for Center menu entry */ - N_("Center the map"), zoom_center_map_cb}, - -#ifdef HAVE_HELP - /* Disable this item, until the help is written - {"Contents", NULL, N_("_Contents"), "F1", - N_("Contents"), contents_menu_cb}, - */ -#endif - {"About", NULL, - /* Menu entry */ - N_("_About Pioneers Editor"), NULL, - /* Tooltip for About Pioneers Editor menu entry */ - N_("Information about Pioneers Editor"), about_menu_cb}, -}; - -static GtkToggleActionEntry toggle_entries[] = { - {"FullScreen", NULL, - /* Menu entry */ - N_("_Fullscreen"), - "Return", - /* Tooltip for Fullscreen menu entry */ - N_("Set window to full screen mode"), - G_CALLBACK(toggle_full_screen_cb), FALSE} -}; - -/* *INDENT-OFF* */ -static const char *ui_description = -"" -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -#ifdef HAVE_HELP -/* Disable this menu item, until the help is written -" " -" " -*/ -#endif -" " -" " -" " -""; -/* *INDENT-ON* */ - gchar **filenames; gboolean show_version = FALSE; static GOptionEntry commandline_entries[] = { - {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, + { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, /* Long help for commandline option (editor): filename */ N_("Open this file"), /* Commandline option for editor: filename */ - N_("filename")}, - {"version", '\0', 0, G_OPTION_ARG_NONE, &show_version, + N_("filename") }, + { "version", '\0', 0, G_OPTION_ARG_NONE, &show_version, /* Commandline option of editor: version */ - N_("Show version information"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Show version information"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; int main(int argc, char *argv[]) { + GtkBuilder *builder; gchar *filename; gboolean default_used; GtkWidget *notebook; - GtkActionGroup *action_group; - GtkUIManager *ui_manager; - GtkWidget *vbox; - GtkWidget *menubar; - GtkAccelGroup *accel_group; GError *error = NULL; gchar *icon_file; GOptionContext *context; @@ -1864,13 +1787,8 @@ /* set the UI driver to GTK_Driver, since we're using gtk */ set_ui_driver(>K_Driver); -#if ENABLE_NLS - /* Gtk+ handles the locale, we must bind the translations */ - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif + /* Initialize translations */ + gettext_init(); context = /* Long description in the command line: --help */ @@ -1897,32 +1815,14 @@ else filename = NULL; - toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL); + builder = + gtk_builder_new_from_resource + ("/net/sourceforge/pio/editor/gtk/editor.ui"); + toplevel = GTK_WIDGET(gtk_builder_get_object(builder, "toplevel")); + gtk_builder_connect_signals(builder, toplevel); g_signal_connect(G_OBJECT(toplevel), "delete_event", G_CALLBACK(exit_cb), NULL); - action_group = gtk_action_group_new("MenuActions"); - gtk_action_group_set_translation_domain(action_group, PACKAGE); - gtk_action_group_add_actions(action_group, entries, - G_N_ELEMENTS(entries), toplevel); - gtk_action_group_add_toggle_actions(action_group, toggle_entries, - G_N_ELEMENTS(toggle_entries), - toplevel); - - ui_manager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group(ui_manager, action_group, 0); - - accel_group = gtk_ui_manager_get_accel_group(ui_manager); - gtk_window_add_accel_group(GTK_WINDOW(toplevel), accel_group); - - error = NULL; - if (!gtk_ui_manager_add_ui_from_string(ui_manager, ui_description, - -1, &error)) { - g_message(_("Building menus failed: %s"), error->message); - g_error_free(error); - return 1; - } - config_init("pioneers-editor"); icon_file = @@ -1938,9 +1838,7 @@ themes_init(); colors_init(); - notebook = gtk_notebook_new(); - gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_TOP); - + notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), build_map(), /* Tab page name */ gtk_label_new(_("Map"))); @@ -1957,13 +1855,6 @@ roll_menu = build_roll_menu(); port_menu = build_port_menu(); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add(GTK_CONTAINER(toplevel), vbox); - - menubar = gtk_ui_manager_get_widget(ui_manager, "/MainMenu"); - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); - if (filename == NULL) { filename = config_get_string("editor/last-game", &default_used); diff -Nru pioneers-15.5/editor/gtk/editor.gresource.xml pioneers-15.6/editor/gtk/editor.gresource.xml --- pioneers-15.5/editor/gtk/editor.gresource.xml 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/editor/gtk/editor.gresource.xml 2020-04-13 19:15:48.000000000 +0000 @@ -0,0 +1,6 @@ + + + + editor/gtk/editor.ui + + diff -Nru pioneers-15.5/editor/gtk/editor-resources.c pioneers-15.6/editor/gtk/editor-resources.c --- pioneers-15.5/editor/gtk/editor-resources.c 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/editor/gtk/editor-resources.c 2020-08-02 12:59:36.000000000 +0000 @@ -0,0 +1,1350 @@ +#include + +#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) +# define SECTION __attribute__ ((section (".gresource.editor"), aligned (8))) +#else +# define SECTION +#endif + +#ifdef _MSC_VER +static const SECTION union { const guint8 data[9433]; const double alignment; void * const ptr;} editor_resource_data = { { + 0107, 0126, 0141, 0162, 0151, 0141, 0156, 0164, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, + 0030, 0000, 0000, 0000, 0344, 0000, 0000, 0000, 0000, 0000, 0000, 0050, 0007, 0000, 0000, 0000, + 0000, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 0003, 0000, 0000, 0000, 0004, 0000, 0000, 0000, + 0005, 0000, 0000, 0000, 0006, 0000, 0000, 0000, 0006, 0000, 0000, 0000, 0137, 0025, 0074, 0342, + 0006, 0000, 0000, 0000, 0344, 0000, 0000, 0000, 0004, 0000, 0114, 0000, 0350, 0000, 0000, 0000, + 0354, 0000, 0000, 0000, 0164, 0175, 0161, 0023, 0005, 0000, 0000, 0000, 0354, 0000, 0000, 0000, + 0004, 0000, 0114, 0000, 0360, 0000, 0000, 0000, 0364, 0000, 0000, 0000, 0112, 0216, 0217, 0013, + 0003, 0000, 0000, 0000, 0364, 0000, 0000, 0000, 0004, 0000, 0114, 0000, 0370, 0000, 0000, 0000, + 0374, 0000, 0000, 0000, 0324, 0265, 0002, 0000, 0377, 0377, 0377, 0377, 0374, 0000, 0000, 0000, + 0001, 0000, 0114, 0000, 0000, 0001, 0000, 0000, 0004, 0001, 0000, 0000, 0362, 0227, 0260, 0153, + 0000, 0000, 0000, 0000, 0004, 0001, 0000, 0000, 0011, 0000, 0166, 0000, 0020, 0001, 0000, 0000, + 0271, 0044, 0000, 0000, 0135, 0337, 0307, 0275, 0002, 0000, 0000, 0000, 0271, 0044, 0000, 0000, + 0014, 0000, 0114, 0000, 0310, 0044, 0000, 0000, 0314, 0044, 0000, 0000, 0352, 0271, 0302, 0054, + 0001, 0000, 0000, 0000, 0314, 0044, 0000, 0000, 0007, 0000, 0114, 0000, 0324, 0044, 0000, 0000, + 0330, 0044, 0000, 0000, 0147, 0164, 0153, 0057, 0004, 0000, 0000, 0000, 0160, 0151, 0157, 0057, + 0006, 0000, 0000, 0000, 0156, 0145, 0164, 0057, 0005, 0000, 0000, 0000, 0057, 0000, 0000, 0000, + 0002, 0000, 0000, 0000, 0145, 0144, 0151, 0164, 0157, 0162, 0056, 0165, 0151, 0000, 0000, 0000, + 0231, 0043, 0000, 0000, 0000, 0000, 0000, 0000, 0074, 0077, 0170, 0155, 0154, 0040, 0166, 0145, + 0162, 0163, 0151, 0157, 0156, 0075, 0042, 0061, 0056, 0060, 0042, 0040, 0145, 0156, 0143, 0157, + 0144, 0151, 0156, 0147, 0075, 0042, 0125, 0124, 0106, 0055, 0070, 0042, 0077, 0076, 0012, 0074, + 0041, 0055, 0055, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0164, 0145, 0144, 0040, 0167, 0151, + 0164, 0150, 0040, 0147, 0154, 0141, 0144, 0145, 0040, 0063, 0056, 0062, 0062, 0056, 0062, 0040, + 0012, 0012, 0160, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0055, 0145, 0144, 0151, 0164, 0157, + 0162, 0040, 0055, 0040, 0115, 0141, 0151, 0156, 0040, 0167, 0151, 0156, 0144, 0157, 0167, 0012, + 0103, 0157, 0160, 0171, 0162, 0151, 0147, 0150, 0164, 0040, 0050, 0103, 0051, 0040, 0062, 0060, + 0062, 0060, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, 0142, 0165, 0163, + 0012, 0012, 0124, 0150, 0151, 0163, 0040, 0160, 0162, 0157, 0147, 0162, 0141, 0155, 0040, 0151, + 0163, 0040, 0146, 0162, 0145, 0145, 0040, 0163, 0157, 0146, 0164, 0167, 0141, 0162, 0145, 0073, + 0040, 0171, 0157, 0165, 0040, 0143, 0141, 0156, 0040, 0162, 0145, 0144, 0151, 0163, 0164, 0162, + 0151, 0142, 0165, 0164, 0145, 0040, 0151, 0164, 0040, 0141, 0156, 0144, 0057, 0157, 0162, 0012, + 0155, 0157, 0144, 0151, 0146, 0171, 0040, 0151, 0164, 0040, 0165, 0156, 0144, 0145, 0162, 0040, + 0164, 0150, 0145, 0040, 0164, 0145, 0162, 0155, 0163, 0040, 0157, 0146, 0040, 0164, 0150, 0145, + 0040, 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0154, 0040, 0120, 0165, 0142, + 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0012, 0141, 0163, 0040, 0160, + 0165, 0142, 0154, 0151, 0163, 0150, 0145, 0144, 0040, 0142, 0171, 0040, 0164, 0150, 0145, 0040, + 0106, 0162, 0145, 0145, 0040, 0123, 0157, 0146, 0164, 0167, 0141, 0162, 0145, 0040, 0106, 0157, + 0165, 0156, 0144, 0141, 0164, 0151, 0157, 0156, 0073, 0040, 0145, 0151, 0164, 0150, 0145, 0162, + 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, 0040, 0062, 0012, 0157, 0146, 0040, 0164, 0150, + 0145, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0054, 0040, 0157, 0162, 0040, 0050, 0141, + 0164, 0040, 0171, 0157, 0165, 0162, 0040, 0157, 0160, 0164, 0151, 0157, 0156, 0051, 0040, 0141, + 0156, 0171, 0040, 0154, 0141, 0164, 0145, 0162, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, + 0056, 0012, 0012, 0124, 0150, 0151, 0163, 0040, 0160, 0162, 0157, 0147, 0162, 0141, 0155, 0040, + 0151, 0163, 0040, 0144, 0151, 0163, 0164, 0162, 0151, 0142, 0165, 0164, 0145, 0144, 0040, 0151, + 0156, 0040, 0164, 0150, 0145, 0040, 0150, 0157, 0160, 0145, 0040, 0164, 0150, 0141, 0164, 0040, + 0151, 0164, 0040, 0167, 0151, 0154, 0154, 0040, 0142, 0145, 0040, 0165, 0163, 0145, 0146, 0165, + 0154, 0054, 0012, 0142, 0165, 0164, 0040, 0127, 0111, 0124, 0110, 0117, 0125, 0124, 0040, 0101, + 0116, 0131, 0040, 0127, 0101, 0122, 0122, 0101, 0116, 0124, 0131, 0073, 0040, 0167, 0151, 0164, + 0150, 0157, 0165, 0164, 0040, 0145, 0166, 0145, 0156, 0040, 0164, 0150, 0145, 0040, 0151, 0155, + 0160, 0154, 0151, 0145, 0144, 0040, 0167, 0141, 0162, 0162, 0141, 0156, 0164, 0171, 0040, 0157, + 0146, 0012, 0115, 0105, 0122, 0103, 0110, 0101, 0116, 0124, 0101, 0102, 0111, 0114, 0111, 0124, + 0131, 0040, 0157, 0162, 0040, 0106, 0111, 0124, 0116, 0105, 0123, 0123, 0040, 0106, 0117, 0122, + 0040, 0101, 0040, 0120, 0101, 0122, 0124, 0111, 0103, 0125, 0114, 0101, 0122, 0040, 0120, 0125, + 0122, 0120, 0117, 0123, 0105, 0056, 0040, 0040, 0123, 0145, 0145, 0040, 0164, 0150, 0145, 0012, + 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0154, 0040, 0120, 0165, 0142, 0154, + 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0040, 0146, 0157, 0162, 0040, 0155, + 0157, 0162, 0145, 0040, 0144, 0145, 0164, 0141, 0151, 0154, 0163, 0056, 0012, 0012, 0131, 0157, + 0165, 0040, 0163, 0150, 0157, 0165, 0154, 0144, 0040, 0150, 0141, 0166, 0145, 0040, 0162, 0145, + 0143, 0145, 0151, 0166, 0145, 0144, 0040, 0141, 0040, 0143, 0157, 0160, 0171, 0040, 0157, 0146, + 0040, 0164, 0150, 0145, 0040, 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0154, + 0040, 0120, 0165, 0142, 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0012, + 0141, 0154, 0157, 0156, 0147, 0040, 0167, 0151, 0164, 0150, 0040, 0164, 0150, 0151, 0163, 0040, + 0160, 0162, 0157, 0147, 0162, 0141, 0155, 0073, 0040, 0151, 0146, 0040, 0156, 0157, 0164, 0054, + 0040, 0167, 0162, 0151, 0164, 0145, 0040, 0164, 0157, 0040, 0164, 0150, 0145, 0040, 0106, 0162, + 0145, 0145, 0040, 0123, 0157, 0146, 0164, 0167, 0141, 0162, 0145, 0012, 0106, 0157, 0165, 0156, + 0144, 0141, 0164, 0151, 0157, 0156, 0054, 0040, 0111, 0156, 0143, 0056, 0054, 0040, 0065, 0061, + 0040, 0106, 0162, 0141, 0156, 0153, 0154, 0151, 0156, 0040, 0123, 0164, 0162, 0145, 0145, 0164, + 0054, 0040, 0106, 0151, 0146, 0164, 0150, 0040, 0106, 0154, 0157, 0157, 0162, 0054, 0040, 0102, + 0157, 0163, 0164, 0157, 0156, 0054, 0040, 0115, 0101, 0040, 0040, 0060, 0062, 0061, 0061, 0060, + 0055, 0061, 0063, 0060, 0061, 0054, 0040, 0125, 0123, 0101, 0056, 0012, 0012, 0101, 0165, 0164, + 0150, 0157, 0162, 0072, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, 0142, + 0165, 0163, 0012, 0012, 0055, 0055, 0076, 0012, 0074, 0151, 0156, 0164, 0145, 0162, 0146, 0141, + 0143, 0145, 0076, 0074, 0162, 0145, 0161, 0165, 0151, 0162, 0145, 0163, 0040, 0154, 0151, 0142, + 0075, 0042, 0147, 0164, 0153, 0053, 0042, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, 0075, + 0042, 0063, 0056, 0062, 0060, 0042, 0057, 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, 0164, + 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0154, 0151, 0143, 0145, 0156, 0163, 0145, 0055, 0164, + 0171, 0160, 0145, 0040, 0147, 0160, 0154, 0166, 0062, 0040, 0055, 0055, 0076, 0074, 0041, 0055, + 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0156, 0141, 0155, 0145, + 0040, 0160, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0055, 0145, 0144, 0151, 0164, 0157, 0162, + 0040, 0055, 0055, 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, + 0143, 0145, 0055, 0144, 0145, 0163, 0143, 0162, 0151, 0160, 0164, 0151, 0157, 0156, 0040, 0115, + 0141, 0151, 0156, 0040, 0167, 0151, 0156, 0144, 0157, 0167, 0040, 0055, 0055, 0076, 0074, 0041, + 0055, 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0143, 0157, 0160, + 0171, 0162, 0151, 0147, 0150, 0164, 0040, 0062, 0060, 0062, 0060, 0040, 0122, 0157, 0154, 0141, + 0156, 0144, 0040, 0103, 0154, 0157, 0142, 0165, 0163, 0040, 0055, 0055, 0076, 0074, 0041, 0055, + 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0141, 0165, 0164, 0150, + 0157, 0162, 0163, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, 0142, 0165, + 0163, 0040, 0055, 0055, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, + 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0127, 0151, 0156, 0144, 0157, 0167, 0042, 0040, 0151, + 0144, 0075, 0042, 0164, 0157, 0160, 0154, 0145, 0166, 0145, 0154, 0042, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, + 0171, 0160, 0145, 0075, 0042, 0164, 0151, 0164, 0154, 0145, 0142, 0141, 0162, 0042, 0076, 0074, + 0160, 0154, 0141, 0143, 0145, 0150, 0157, 0154, 0144, 0145, 0162, 0057, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0102, 0157, + 0170, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, + 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0157, 0162, 0151, 0145, 0156, 0164, 0141, 0164, 0151, 0157, + 0156, 0042, 0076, 0166, 0145, 0162, 0164, 0151, 0143, 0141, 0154, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, + 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, + 0145, 0156, 0165, 0102, 0141, 0162, 0042, 0040, 0151, 0144, 0075, 0042, 0155, 0141, 0151, 0156, + 0055, 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, + 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, + 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, + 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, + 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, + 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0137, 0106, 0151, 0154, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, + 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0163, 0165, 0142, 0155, 0145, + 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, + 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, + 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, + 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, + 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, + 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, + 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0116, 0145, 0167, 0040, + 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0103, 0162, 0145, 0141, + 0164, 0145, 0040, 0141, 0040, 0156, 0145, 0167, 0040, 0147, 0141, 0155, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0143, 0145, 0154, 0137, 0160, 0141, + 0164, 0150, 0042, 0076, 0046, 0154, 0164, 0073, 0106, 0151, 0154, 0145, 0046, 0147, 0164, 0073, + 0057, 0116, 0145, 0167, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, + 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, + 0116, 0145, 0167, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, + 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, + 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0156, 0145, 0167, + 0137, 0147, 0141, 0155, 0145, 0137, 0155, 0145, 0156, 0165, 0137, 0143, 0142, 0042, 0040, 0163, + 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, + 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0156, + 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, + 0104, 0113, 0137, 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, + 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, + 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, + 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, + 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, + 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, + 0117, 0160, 0145, 0156, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0117, 0160, 0145, 0156, 0040, 0141, 0156, 0040, 0145, 0170, 0151, 0163, 0164, 0151, 0156, + 0147, 0040, 0147, 0141, 0155, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0137, 0117, 0160, 0145, 0156, 0056, 0056, 0056, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, + 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, + 0162, 0075, 0042, 0154, 0157, 0141, 0144, 0137, 0147, 0141, 0155, 0145, 0137, 0155, 0145, 0156, + 0165, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, + 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, + 0040, 0153, 0145, 0171, 0075, 0042, 0157, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, + 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, + 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0103, 0117, 0116, 0124, 0122, 0117, + 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, + 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, + 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, + 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, + 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, + 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, + 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, + 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0123, 0141, 0166, 0145, 0040, 0155, 0145, 0156, 0165, + 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0123, 0141, 0166, 0145, 0040, 0147, 0141, 0155, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, + 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, + 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0123, 0141, 0166, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, + 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, + 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, + 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0163, 0141, 0166, 0145, 0137, + 0147, 0141, 0155, 0145, 0137, 0155, 0145, 0156, 0165, 0137, 0143, 0142, 0042, 0040, 0163, 0167, + 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, + 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0163, 0042, + 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, + 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, + 0113, 0137, 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, + 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, + 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0123, + 0141, 0166, 0145, 0040, 0101, 0163, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0123, 0141, 0166, 0145, 0040, 0141, 0163, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, + 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, + 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, + 0164, 0162, 0171, 0042, 0076, 0123, 0141, 0166, 0145, 0040, 0137, 0101, 0163, 0056, 0056, 0056, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, + 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, + 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0163, 0141, 0166, 0145, 0137, 0141, + 0163, 0137, 0155, 0145, 0156, 0165, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, + 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, + 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0163, 0042, 0040, 0163, 0151, + 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, + 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0123, + 0110, 0111, 0106, 0124, 0137, 0115, 0101, 0123, 0113, 0040, 0174, 0040, 0107, 0104, 0113, 0137, + 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0123, 0145, 0160, 0141, 0162, 0141, 0164, + 0157, 0162, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, + 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, + 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, + 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, + 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, + 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, + 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0103, 0150, 0141, + 0156, 0147, 0145, 0040, 0124, 0151, 0164, 0154, 0145, 0040, 0155, 0145, 0156, 0165, 0040, 0145, + 0156, 0164, 0162, 0171, 0042, 0076, 0103, 0150, 0141, 0156, 0147, 0145, 0040, 0147, 0141, 0155, + 0145, 0040, 0164, 0151, 0164, 0154, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0103, 0150, 0141, 0156, 0147, 0145, 0040, 0137, 0124, 0151, 0164, 0154, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, + 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, + 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0143, 0150, 0141, 0156, 0147, 0145, 0137, + 0164, 0151, 0164, 0154, 0145, 0137, 0155, 0145, 0156, 0165, 0137, 0143, 0142, 0042, 0040, 0163, + 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, + 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, + 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, + 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, 0164, + 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, + 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0124, + 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0103, 0150, 0145, 0143, 0153, + 0040, 0126, 0151, 0143, 0164, 0157, 0162, 0171, 0040, 0120, 0157, 0151, 0156, 0164, 0040, 0124, + 0141, 0162, 0147, 0145, 0164, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0103, 0150, 0145, 0143, 0153, 0040, 0167, 0150, 0145, 0164, 0150, 0145, 0162, 0040, + 0164, 0150, 0145, 0040, 0147, 0141, 0155, 0145, 0040, 0143, 0141, 0156, 0040, 0142, 0145, 0040, + 0167, 0157, 0156, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, + 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, + 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, + 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0103, + 0150, 0145, 0143, 0153, 0040, 0126, 0151, 0143, 0164, 0157, 0162, 0171, 0040, 0120, 0157, 0151, + 0156, 0164, 0040, 0124, 0141, 0162, 0147, 0145, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, + 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, + 0162, 0075, 0042, 0143, 0150, 0145, 0143, 0153, 0137, 0166, 0160, 0137, 0143, 0142, 0042, 0040, + 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, + 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, + 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0123, 0145, 0160, 0141, 0162, 0141, 0164, 0157, + 0162, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, + 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, + 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, + 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, + 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, + 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, + 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, 0145, 0170, + 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, + 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0121, 0165, 0151, 0164, + 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0121, 0165, 0151, + 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, + 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, + 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, + 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0121, 0165, 0151, + 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, + 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, + 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, + 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0145, 0170, 0151, 0164, 0137, + 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, + 0057, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, + 0145, 0171, 0075, 0042, 0161, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, + 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, + 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, + 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, + 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, + 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, + 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, + 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, + 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, + 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, + 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0137, 0126, 0151, 0145, 0167, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, + 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, + 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0163, 0165, 0142, 0155, 0145, + 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0042, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, + 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, + 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, + 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0103, 0150, 0145, 0143, 0153, 0115, 0145, 0156, + 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, + 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, + 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, + 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, + 0040, 0106, 0165, 0154, 0154, 0163, 0143, 0162, 0145, 0145, 0156, 0040, 0155, 0145, 0156, 0165, + 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0123, 0145, 0164, 0040, 0167, 0151, 0156, 0144, + 0157, 0167, 0040, 0164, 0157, 0040, 0146, 0165, 0154, 0154, 0040, 0163, 0143, 0162, 0145, 0145, + 0156, 0040, 0155, 0157, 0144, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0137, 0106, 0165, 0154, 0154, 0163, 0143, 0162, 0145, 0145, 0156, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, + 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0164, 0157, 0147, 0147, 0154, 0145, 0144, 0042, 0040, 0150, 0141, 0156, 0144, + 0154, 0145, 0162, 0075, 0042, 0164, 0157, 0147, 0147, 0154, 0145, 0137, 0146, 0165, 0154, 0154, + 0137, 0163, 0143, 0162, 0145, 0145, 0156, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, + 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, 0145, 0154, + 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0122, 0145, 0164, 0165, + 0162, 0156, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, + 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, + 0042, 0107, 0104, 0113, 0137, 0115, 0117, 0104, 0061, 0137, 0115, 0101, 0123, 0113, 0042, 0057, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, + 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, + 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0122, + 0145, 0163, 0145, 0164, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0126, 0151, 0145, 0167, 0040, 0164, 0150, 0145, 0040, 0146, 0165, 0154, 0154, 0040, 0155, + 0141, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, + 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, + 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, + 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0122, 0145, + 0163, 0145, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, + 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, + 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0172, 0157, 0157, + 0155, 0137, 0156, 0157, 0162, 0155, 0141, 0154, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, + 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, 0145, + 0154, 0145, 0162, 0141, 0164, 0157, 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0060, 0042, 0040, + 0163, 0151, 0147, 0156, 0141, 0154, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, + 0042, 0040, 0155, 0157, 0144, 0151, 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, 0113, + 0137, 0103, 0117, 0116, 0124, 0122, 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, 0076, + 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, + 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, + 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, + 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, + 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, + 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, + 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0103, 0145, + 0156, 0164, 0145, 0162, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0103, 0145, 0156, 0164, 0145, 0162, 0040, 0164, 0150, 0145, 0040, 0155, 0141, 0160, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, + 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, + 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, + 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0103, 0145, 0156, 0164, 0145, + 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, + 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, + 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, + 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0172, 0157, 0157, 0155, 0137, + 0143, 0145, 0156, 0164, 0145, 0162, 0137, 0155, 0141, 0160, 0137, 0143, 0142, 0042, 0040, 0163, + 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, + 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, + 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, + 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, + 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, + 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, + 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, + 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0110, 0145, 0154, 0160, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, + 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, + 0042, 0163, 0165, 0142, 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, + 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, + 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, + 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, + 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, + 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, + 0151, 0160, 0137, 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, + 0162, 0040, 0101, 0142, 0157, 0165, 0164, 0040, 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, + 0040, 0105, 0144, 0151, 0164, 0157, 0162, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, + 0162, 0171, 0042, 0076, 0111, 0156, 0146, 0157, 0162, 0155, 0141, 0164, 0151, 0157, 0156, 0040, + 0141, 0142, 0157, 0165, 0164, 0040, 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0040, 0105, + 0144, 0151, 0164, 0157, 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0141, 0143, 0143, 0145, 0154, 0137, 0160, 0141, 0164, 0150, 0042, 0076, 0046, 0154, 0164, 0073, + 0110, 0145, 0154, 0160, 0046, 0147, 0164, 0073, 0057, 0101, 0142, 0157, 0165, 0164, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, + 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, + 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, + 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0101, 0142, 0157, 0165, 0164, 0040, + 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0040, 0105, 0144, 0151, 0164, 0157, 0162, 0074, + 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, + 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, + 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, + 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0141, 0142, 0157, 0165, 0164, 0137, 0155, + 0145, 0156, 0165, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, + 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, + 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, + 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, + 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, + 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, + 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0146, 0151, 0154, 0154, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0160, 0157, 0163, 0151, 0164, 0151, 0157, 0156, + 0042, 0076, 0060, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, + 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0116, 0157, 0164, 0145, 0142, 0157, 0157, + 0153, 0042, 0040, 0151, 0144, 0075, 0042, 0156, 0157, 0164, 0145, 0142, 0157, 0157, 0153, 0042, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, + 0165, 0163, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, + 0153, 0151, 0156, 0147, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0145, 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, + 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0146, 0151, 0154, + 0154, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0160, 0157, 0163, 0151, 0164, 0151, 0157, 0156, 0042, 0076, 0061, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, + 0147, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, + 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0076, + 0012, 0000, 0000, 0050, 0165, 0165, 0141, 0171, 0051, 0163, 0157, 0165, 0162, 0143, 0145, 0146, + 0157, 0162, 0147, 0145, 0057, 0000, 0000, 0000, 0001, 0000, 0000, 0000, 0145, 0144, 0151, 0164, + 0157, 0162, 0057, 0000, 0000, 0000, 0000, 0000 +} }; +#else /* _MSC_VER */ +static const SECTION union { const guint8 data[9433]; const double alignment; void * const ptr;} editor_resource_data = { + "\107\126\141\162\151\141\156\164\000\000\000\000\000\000\000\000" + "\030\000\000\000\344\000\000\000\000\000\000\050\007\000\000\000" + "\000\000\000\000\002\000\000\000\003\000\000\000\004\000\000\000" + "\005\000\000\000\006\000\000\000\006\000\000\000\137\025\074\342" + "\006\000\000\000\344\000\000\000\004\000\114\000\350\000\000\000" + "\354\000\000\000\164\175\161\023\005\000\000\000\354\000\000\000" + "\004\000\114\000\360\000\000\000\364\000\000\000\112\216\217\013" + "\003\000\000\000\364\000\000\000\004\000\114\000\370\000\000\000" + "\374\000\000\000\324\265\002\000\377\377\377\377\374\000\000\000" + "\001\000\114\000\000\001\000\000\004\001\000\000\362\227\260\153" + "\000\000\000\000\004\001\000\000\011\000\166\000\020\001\000\000" + "\271\044\000\000\135\337\307\275\002\000\000\000\271\044\000\000" + "\014\000\114\000\310\044\000\000\314\044\000\000\352\271\302\054" + "\001\000\000\000\314\044\000\000\007\000\114\000\324\044\000\000" + "\330\044\000\000\147\164\153\057\004\000\000\000\160\151\157\057" + "\006\000\000\000\156\145\164\057\005\000\000\000\057\000\000\000" + "\002\000\000\000\145\144\151\164\157\162\056\165\151\000\000\000" + "\231\043\000\000\000\000\000\000\074\077\170\155\154\040\166\145" + "\162\163\151\157\156\075\042\061\056\060\042\040\145\156\143\157" + "\144\151\156\147\075\042\125\124\106\055\070\042\077\076\012\074" + "\041\055\055\040\107\145\156\145\162\141\164\145\144\040\167\151" + "\164\150\040\147\154\141\144\145\040\063\056\062\062\056\062\040" + "\012\012\160\151\157\156\145\145\162\163\055\145\144\151\164\157" + "\162\040\055\040\115\141\151\156\040\167\151\156\144\157\167\012" + "\103\157\160\171\162\151\147\150\164\040\050\103\051\040\062\060" + "\062\060\040\122\157\154\141\156\144\040\103\154\157\142\165\163" + "\012\012\124\150\151\163\040\160\162\157\147\162\141\155\040\151" + "\163\040\146\162\145\145\040\163\157\146\164\167\141\162\145\073" + "\040\171\157\165\040\143\141\156\040\162\145\144\151\163\164\162" + "\151\142\165\164\145\040\151\164\040\141\156\144\057\157\162\012" + "\155\157\144\151\146\171\040\151\164\040\165\156\144\145\162\040" + "\164\150\145\040\164\145\162\155\163\040\157\146\040\164\150\145" + "\040\107\116\125\040\107\145\156\145\162\141\154\040\120\165\142" + "\154\151\143\040\114\151\143\145\156\163\145\012\141\163\040\160" + "\165\142\154\151\163\150\145\144\040\142\171\040\164\150\145\040" + "\106\162\145\145\040\123\157\146\164\167\141\162\145\040\106\157" + "\165\156\144\141\164\151\157\156\073\040\145\151\164\150\145\162" + "\040\166\145\162\163\151\157\156\040\062\012\157\146\040\164\150" + "\145\040\114\151\143\145\156\163\145\054\040\157\162\040\050\141" + "\164\040\171\157\165\162\040\157\160\164\151\157\156\051\040\141" + "\156\171\040\154\141\164\145\162\040\166\145\162\163\151\157\156" + "\056\012\012\124\150\151\163\040\160\162\157\147\162\141\155\040" + "\151\163\040\144\151\163\164\162\151\142\165\164\145\144\040\151" + "\156\040\164\150\145\040\150\157\160\145\040\164\150\141\164\040" + "\151\164\040\167\151\154\154\040\142\145\040\165\163\145\146\165" + "\154\054\012\142\165\164\040\127\111\124\110\117\125\124\040\101" + "\116\131\040\127\101\122\122\101\116\124\131\073\040\167\151\164" + "\150\157\165\164\040\145\166\145\156\040\164\150\145\040\151\155" + "\160\154\151\145\144\040\167\141\162\162\141\156\164\171\040\157" + "\146\012\115\105\122\103\110\101\116\124\101\102\111\114\111\124" + "\131\040\157\162\040\106\111\124\116\105\123\123\040\106\117\122" + "\040\101\040\120\101\122\124\111\103\125\114\101\122\040\120\125" + "\122\120\117\123\105\056\040\040\123\145\145\040\164\150\145\012" + "\107\116\125\040\107\145\156\145\162\141\154\040\120\165\142\154" + "\151\143\040\114\151\143\145\156\163\145\040\146\157\162\040\155" + "\157\162\145\040\144\145\164\141\151\154\163\056\012\012\131\157" + "\165\040\163\150\157\165\154\144\040\150\141\166\145\040\162\145" + "\143\145\151\166\145\144\040\141\040\143\157\160\171\040\157\146" + "\040\164\150\145\040\107\116\125\040\107\145\156\145\162\141\154" + "\040\120\165\142\154\151\143\040\114\151\143\145\156\163\145\012" + "\141\154\157\156\147\040\167\151\164\150\040\164\150\151\163\040" + "\160\162\157\147\162\141\155\073\040\151\146\040\156\157\164\054" + "\040\167\162\151\164\145\040\164\157\040\164\150\145\040\106\162" + "\145\145\040\123\157\146\164\167\141\162\145\012\106\157\165\156" + "\144\141\164\151\157\156\054\040\111\156\143\056\054\040\065\061" + "\040\106\162\141\156\153\154\151\156\040\123\164\162\145\145\164" + "\054\040\106\151\146\164\150\040\106\154\157\157\162\054\040\102" + "\157\163\164\157\156\054\040\115\101\040\040\060\062\061\061\060" + "\055\061\063\060\061\054\040\125\123\101\056\012\012\101\165\164" + "\150\157\162\072\040\122\157\154\141\156\144\040\103\154\157\142" + "\165\163\012\012\055\055\076\012\074\151\156\164\145\162\146\141" + "\143\145\076\074\162\145\161\165\151\162\145\163\040\154\151\142" + "\075\042\147\164\153\053\042\040\166\145\162\163\151\157\156\075" + "\042\063\056\062\060\042\057\076\074\041\055\055\040\151\156\164" + "\145\162\146\141\143\145\055\154\151\143\145\156\163\145\055\164" + "\171\160\145\040\147\160\154\166\062\040\055\055\076\074\041\055" + "\055\040\151\156\164\145\162\146\141\143\145\055\156\141\155\145" + "\040\160\151\157\156\145\145\162\163\055\145\144\151\164\157\162" + "\040\055\055\076\074\041\055\055\040\151\156\164\145\162\146\141" + "\143\145\055\144\145\163\143\162\151\160\164\151\157\156\040\115" + "\141\151\156\040\167\151\156\144\157\167\040\055\055\076\074\041" + "\055\055\040\151\156\164\145\162\146\141\143\145\055\143\157\160" + "\171\162\151\147\150\164\040\062\060\062\060\040\122\157\154\141" + "\156\144\040\103\154\157\142\165\163\040\055\055\076\074\041\055" + "\055\040\151\156\164\145\162\146\141\143\145\055\141\165\164\150" + "\157\162\163\040\122\157\154\141\156\144\040\103\154\157\142\165" + "\163\040\055\055\076\074\157\142\152\145\143\164\040\143\154\141" + "\163\163\075\042\107\164\153\127\151\156\144\157\167\042\040\151" + "\144\075\042\164\157\160\154\145\166\145\154\042\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\143\150\151\154\144\040\164" + "\171\160\145\075\042\164\151\164\154\145\142\141\162\042\076\074" + "\160\154\141\143\145\150\157\154\144\145\162\057\076\074\057\143" + "\150\151\154\144\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\102\157" + "\170\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146" + "\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\157\162\151\145\156\164\141\164\151\157" + "\156\042\076\166\145\162\164\151\143\141\154\074\057\160\162\157" + "\160\145\162\164\171\076\074\143\150\151\154\144\076\074\157\142" + "\152\145\143\164\040\143\154\141\163\163\075\042\107\164\153\115" + "\145\156\165\102\141\162\042\040\151\144\075\042\155\141\151\156" + "\055\155\145\156\165\042\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076" + "\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143" + "\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\143\150\151\154\144" + "\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075\042" + "\107\164\153\115\145\156\165\111\164\145\155\042\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163" + "\151\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076" + "\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076" + "\137\106\151\154\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\165\163\145\137\165\156\144\145\162\154\151\156\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\143" + "\150\151\154\144\040\164\171\160\145\075\042\163\165\142\155\145" + "\156\165\042\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\115\145\156\165\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151" + "\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154" + "\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145\155" + "\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157" + "\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145\170" + "\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042" + "\124\157\157\154\164\151\160\040\146\157\162\040\116\145\167\040" + "\155\145\156\165\040\145\156\164\162\171\042\076\103\162\145\141" + "\164\145\040\141\040\156\145\167\040\147\141\155\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\141\143\143\145\154\137\160\141" + "\164\150\042\076\046\154\164\073\106\151\154\145\046\147\164\073" + "\057\116\145\167\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154" + "\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076\137" + "\116\145\167\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\165\163" + "\145\137\165\156\144\145\162\154\151\156\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\163\151\147" + "\156\141\154\040\156\141\155\145\075\042\141\143\164\151\166\141" + "\164\145\042\040\150\141\156\144\154\145\162\075\042\156\145\167" + "\137\147\141\155\145\137\155\145\156\165\137\143\142\042\040\163" + "\167\141\160\160\145\144\075\042\156\157\042\057\076\074\141\143" + "\143\145\154\145\162\141\164\157\162\040\153\145\171\075\042\156" + "\042\040\163\151\147\156\141\154\075\042\141\143\164\151\166\141" + "\164\145\042\040\155\157\144\151\146\151\145\162\163\075\042\107" + "\104\113\137\103\117\116\124\122\117\114\137\115\101\123\113\042" + "\057\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151" + "\154\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143" + "\164\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165" + "\111\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141" + "\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160" + "\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040" + "\117\160\145\156\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\117\160\145\156\040\141\156\040\145\170\151\163\164\151\156" + "\147\040\147\141\155\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042" + "\076\137\117\160\145\156\056\056\056\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\165\163\145\137\165\156\144\145\162\154\151\156" + "\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\163\151\147\156\141\154\040\156\141\155\145\075\042" + "\141\143\164\151\166\141\164\145\042\040\150\141\156\144\154\145" + "\162\075\042\154\157\141\144\137\147\141\155\145\137\155\145\156" + "\165\137\143\142\042\040\163\167\141\160\160\145\144\075\042\156" + "\157\042\057\076\074\141\143\143\145\154\145\162\141\164\157\162" + "\040\153\145\171\075\042\157\042\040\163\151\147\156\141\154\075" + "\042\141\143\164\151\166\141\164\145\042\040\155\157\144\151\146" + "\151\145\162\163\075\042\107\104\113\137\103\117\116\124\122\117" + "\114\137\115\101\123\113\042\057\076\074\057\157\142\152\145\143" + "\164\076\074\057\143\150\151\154\144\076\074\143\150\151\154\144" + "\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075\042" + "\107\164\153\115\145\156\165\111\164\145\155\042\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163" + "\151\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076" + "\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\164\157\157\154\164\151\160\137\164\145\170\164\042\040\164\162" + "\141\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042" + "\040\143\157\155\155\145\156\164\163\075\042\124\157\157\154\164" + "\151\160\040\146\157\162\040\123\141\166\145\040\155\145\156\165" + "\040\145\156\164\162\171\042\076\123\141\166\145\040\147\141\155" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\154\141\142\145" + "\154\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042" + "\115\145\156\165\040\145\156\164\162\171\042\076\137\123\141\166" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\165\163\145\137" + "\165\156\144\145\162\154\151\156\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\163\151\147\156\141" + "\154\040\156\141\155\145\075\042\141\143\164\151\166\141\164\145" + "\042\040\150\141\156\144\154\145\162\075\042\163\141\166\145\137" + "\147\141\155\145\137\155\145\156\165\137\143\142\042\040\163\167" + "\141\160\160\145\144\075\042\156\157\042\057\076\074\141\143\143" + "\145\154\145\162\141\164\157\162\040\153\145\171\075\042\163\042" + "\040\163\151\147\156\141\154\075\042\141\143\164\151\166\141\164" + "\145\042\040\155\157\144\151\146\151\145\162\163\075\042\107\104" + "\113\137\103\117\116\124\122\117\114\137\115\101\123\113\042\057" + "\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154" + "\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111" + "\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137" + "\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040\123" + "\141\166\145\040\101\163\040\155\145\156\165\040\145\156\164\162" + "\171\042\076\123\141\166\145\040\141\163\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141\156" + "\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040\143" + "\157\155\155\145\156\164\163\075\042\115\145\156\165\040\145\156" + "\164\162\171\042\076\123\141\166\145\040\137\101\163\056\056\056" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\165\163\145\137\165" + "\156\144\145\162\154\151\156\145\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\163\151\147\156\141\154" + "\040\156\141\155\145\075\042\141\143\164\151\166\141\164\145\042" + "\040\150\141\156\144\154\145\162\075\042\163\141\166\145\137\141" + "\163\137\155\145\156\165\137\143\142\042\040\163\167\141\160\160" + "\145\144\075\042\156\157\042\057\076\074\141\143\143\145\154\145" + "\162\141\164\157\162\040\153\145\171\075\042\163\042\040\163\151" + "\147\156\141\154\075\042\141\143\164\151\166\141\164\145\042\040" + "\155\157\144\151\146\151\145\162\163\075\042\107\104\113\137\123" + "\110\111\106\124\137\115\101\123\113\040\174\040\107\104\113\137" + "\103\117\116\124\122\117\114\137\115\101\123\113\042\057\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\123\145\160\141\162\141\164" + "\157\162\115\145\156\165\111\164\145\155\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151" + "\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145" + "\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146" + "\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145" + "\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145" + "\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075" + "\042\124\157\157\154\164\151\160\040\146\157\162\040\103\150\141" + "\156\147\145\040\124\151\164\154\145\040\155\145\156\165\040\145" + "\156\164\162\171\042\076\103\150\141\156\147\145\040\147\141\155" + "\145\040\164\151\164\154\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171" + "\042\076\103\150\141\156\147\145\040\137\124\151\164\154\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\165\163\145\137\165\156" + "\144\145\162\154\151\156\145\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\163\151\147\156\141\154\040" + "\156\141\155\145\075\042\141\143\164\151\166\141\164\145\042\040" + "\150\141\156\144\154\145\162\075\042\143\150\141\156\147\145\137" + "\164\151\164\154\145\137\155\145\156\165\137\143\142\042\040\163" + "\167\141\160\160\145\144\075\042\156\157\042\057\076\074\057\157" + "\142\152\145\143\164\076\074\057\143\150\151\154\144\076\074\143" + "\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141" + "\163\163\075\042\107\164\153\115\145\156\165\111\164\145\155\042" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143" + "\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\164\157\157\154\164\151\160\137\164\145\170\164" + "\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042" + "\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042\124" + "\157\157\154\164\151\160\040\146\157\162\040\103\150\145\143\153" + "\040\126\151\143\164\157\162\171\040\120\157\151\156\164\040\124" + "\141\162\147\145\164\040\155\145\156\165\040\145\156\164\162\171" + "\042\076\103\150\145\143\153\040\167\150\145\164\150\145\162\040" + "\164\150\145\040\147\141\155\145\040\143\141\156\040\142\145\040" + "\167\157\156\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154\141" + "\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142\154" + "\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163" + "\075\042\115\145\156\165\040\145\156\164\162\171\042\076\137\103" + "\150\145\143\153\040\126\151\143\164\157\162\171\040\120\157\151" + "\156\164\040\124\141\162\147\145\164\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\165\163\145\137\165\156\144\145\162\154\151\156" + "\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\163\151\147\156\141\154\040\156\141\155\145\075\042" + "\141\143\164\151\166\141\164\145\042\040\150\141\156\144\154\145" + "\162\075\042\143\150\145\143\153\137\166\160\137\143\142\042\040" + "\163\167\141\160\160\145\144\075\042\156\157\042\057\076\074\057" + "\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076\074" + "\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154" + "\141\163\163\075\042\107\164\153\123\145\160\141\162\141\164\157" + "\162\115\145\156\165\111\164\145\155\042\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151\142" + "\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106\141" + "\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074\057" + "\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076\074" + "\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154" + "\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145\155" + "\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157" + "\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\164\157\157\154\164\151\160\137\164\145\170" + "\164\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042" + "\124\157\157\154\164\151\160\040\146\157\162\040\121\165\151\164" + "\040\155\145\156\165\040\145\156\164\162\171\042\076\121\165\151" + "\164\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\154\141\142\145" + "\154\042\040\164\162\141\156\163\154\141\164\141\142\154\145\075" + "\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075\042" + "\115\145\156\165\040\145\156\164\162\171\042\076\137\121\165\151" + "\164\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\165\163\145\137" + "\165\156\144\145\162\154\151\156\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\163\151\147\156\141" + "\154\040\156\141\155\145\075\042\141\143\164\151\166\141\164\145" + "\042\040\150\141\156\144\154\145\162\075\042\145\170\151\164\137" + "\143\142\042\040\163\167\141\160\160\145\144\075\042\156\157\042" + "\057\076\074\141\143\143\145\154\145\162\141\164\157\162\040\153" + "\145\171\075\042\161\042\040\163\151\147\156\141\154\075\042\141" + "\143\164\151\166\141\164\145\042\040\155\157\144\151\146\151\145" + "\162\163\075\042\107\104\113\137\103\117\116\124\122\117\114\137" + "\115\101\123\113\042\057\076\074\057\157\142\152\145\143\164\076" + "\074\057\143\150\151\154\144\076\074\057\157\142\152\145\143\164" + "\076\074\057\143\150\151\154\144\076\074\057\157\142\152\145\143" + "\164\076\074\057\143\150\151\154\144\076\074\143\150\151\154\144" + "\076\074\157\142\152\145\143\164\040\143\154\141\163\163\075\042" + "\107\164\153\115\145\156\165\111\164\145\155\042\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163" + "\151\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076" + "\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141" + "\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156" + "\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076" + "\137\126\151\145\167\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\165\163\145\137\165\156\144\145\162\154\151\156\145\042\076\124" + "\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074\143" + "\150\151\154\144\040\164\171\160\145\075\042\163\165\142\155\145" + "\156\165\042\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\115\145\156\165\042\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\166\151\163\151" + "\142\154\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076\106" + "\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143\154" + "\141\163\163\075\042\107\164\153\103\150\145\143\153\115\145\156" + "\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042\076" + "\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\143" + "\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164\151" + "\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\124\157\157\154\164\151\160\040\146\157\162" + "\040\106\165\154\154\163\143\162\145\145\156\040\155\145\156\165" + "\040\145\156\164\162\171\042\076\123\145\164\040\167\151\156\144" + "\157\167\040\164\157\040\146\165\154\154\040\163\143\162\145\145" + "\156\040\155\157\144\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042" + "\076\137\106\165\154\154\163\143\162\145\145\156\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\165\163\145\137\165\156\144\145\162" + "\154\151\156\145\042\076\124\162\165\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\163\151\147\156\141\154\040\156\141\155" + "\145\075\042\164\157\147\147\154\145\144\042\040\150\141\156\144" + "\154\145\162\075\042\164\157\147\147\154\145\137\146\165\154\154" + "\137\163\143\162\145\145\156\137\143\142\042\040\163\167\141\160" + "\160\145\144\075\042\156\157\042\057\076\074\141\143\143\145\154" + "\145\162\141\164\157\162\040\153\145\171\075\042\122\145\164\165" + "\162\156\042\040\163\151\147\156\141\154\075\042\141\143\164\151" + "\166\141\164\145\042\040\155\157\144\151\146\151\145\162\163\075" + "\042\107\104\113\137\115\117\104\061\137\115\101\123\113\042\057" + "\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154" + "\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111" + "\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137" + "\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040\122" + "\145\163\145\164\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\126\151\145\167\040\164\150\145\040\146\165\154\154\040\155" + "\141\160\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\154\141\142" + "\145\154\042\040\164\162\141\156\163\154\141\164\141\142\154\145" + "\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075" + "\042\115\145\156\165\040\145\156\164\162\171\042\076\137\122\145" + "\163\145\164\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\165\163" + "\145\137\165\156\144\145\162\154\151\156\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\163\151\147" + "\156\141\154\040\156\141\155\145\075\042\141\143\164\151\166\141" + "\164\145\042\040\150\141\156\144\154\145\162\075\042\172\157\157" + "\155\137\156\157\162\155\141\154\137\143\142\042\040\163\167\141" + "\160\160\145\144\075\042\156\157\042\057\076\074\141\143\143\145" + "\154\145\162\141\164\157\162\040\153\145\171\075\042\060\042\040" + "\163\151\147\156\141\154\075\042\141\143\164\151\166\141\164\145" + "\042\040\155\157\144\151\146\151\145\162\163\075\042\107\104\113" + "\137\103\117\116\124\122\117\114\137\115\101\123\113\042\057\076" + "\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144" + "\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040" + "\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164" + "\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137" + "\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164" + "\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154" + "\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163" + "\075\042\124\157\157\154\164\151\160\040\146\157\162\040\103\145" + "\156\164\145\162\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\103\145\156\164\145\162\040\164\150\145\040\155\141\160\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\154\141\142\145\154\042" + "\040\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171" + "\145\163\042\040\143\157\155\155\145\156\164\163\075\042\115\145" + "\156\165\040\145\156\164\162\171\042\076\137\103\145\156\164\145" + "\162\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\165\163\145\137" + "\165\156\144\145\162\154\151\156\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\163\151\147\156\141" + "\154\040\156\141\155\145\075\042\141\143\164\151\166\141\164\145" + "\042\040\150\141\156\144\154\145\162\075\042\172\157\157\155\137" + "\143\145\156\164\145\162\137\155\141\160\137\143\142\042\040\163" + "\167\141\160\160\145\144\075\042\156\157\042\057\076\074\057\157" + "\142\152\145\143\164\076\074\057\143\150\151\154\144\076\074\057" + "\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076\074" + "\057\157\142\152\145\143\164\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164\145" + "\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146" + "\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\154\141\142\145\154\042\040\164\162\141" + "\156\163\154\141\164\141\142\154\145\075\042\171\145\163\042\040" + "\143\157\155\155\145\156\164\163\075\042\115\145\156\165\040\145" + "\156\164\162\171\042\076\137\110\145\154\160\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\165\163\145\137\165\156\144\145\162\154" + "\151\156\145\042\076\124\162\165\145\074\057\160\162\157\160\145" + "\162\164\171\076\074\143\150\151\154\144\040\164\171\160\145\075" + "\042\163\165\142\155\145\156\165\042\076\074\157\142\152\145\143" + "\164\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165" + "\042\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157" + "\143\165\163\042\076\106\141\154\163\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\143\150\151\154\144\076\074\157\142\152" + "\145\143\164\040\143\154\141\163\163\075\042\107\164\153\115\145" + "\156\165\111\164\145\155\042\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163\145" + "\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\164\157\157\154\164" + "\151\160\137\164\145\170\164\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\124\157\157\154\164\151\160\040\146\157" + "\162\040\101\142\157\165\164\040\120\151\157\156\145\145\162\163" + "\040\105\144\151\164\157\162\040\155\145\156\165\040\145\156\164" + "\162\171\042\076\111\156\146\157\162\155\141\164\151\157\156\040" + "\141\142\157\165\164\040\120\151\157\156\145\145\162\163\040\105" + "\144\151\164\157\162\074\057\160\162\157\160\145\162\164\171\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\141\143\143\145\154\137\160\141\164\150\042\076\046\154\164\073" + "\110\145\154\160\046\147\164\073\057\101\142\157\165\164\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\154\141\142\145\154\042\040" + "\164\162\141\156\163\154\141\164\141\142\154\145\075\042\171\145" + "\163\042\040\143\157\155\155\145\156\164\163\075\042\115\145\156" + "\165\040\145\156\164\162\171\042\076\137\101\142\157\165\164\040" + "\120\151\157\156\145\145\162\163\040\105\144\151\164\157\162\074" + "\057\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145" + "\162\164\171\040\156\141\155\145\075\042\165\163\145\137\165\156" + "\144\145\162\154\151\156\145\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\163\151\147\156\141\154\040" + "\156\141\155\145\075\042\141\143\164\151\166\141\164\145\042\040" + "\150\141\156\144\154\145\162\075\042\141\142\157\165\164\137\155" + "\145\156\165\137\143\142\042\040\163\167\141\160\160\145\144\075" + "\042\156\157\042\057\076\074\057\157\142\152\145\143\164\076\074" + "\057\143\150\151\154\144\076\074\057\157\142\152\145\143\164\076" + "\074\057\143\150\151\154\144\076\074\057\157\142\152\145\143\164" + "\076\074\057\143\150\151\154\144\076\074\057\157\142\152\145\143" + "\164\076\074\160\141\143\153\151\156\147\076\074\160\162\157\160" + "\145\162\164\171\040\156\141\155\145\075\042\145\170\160\141\156" + "\144\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\146\151\154\154\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\160\157\163\151\164\151\157\156" + "\042\076\060\074\057\160\162\157\160\145\162\164\171\076\074\057" + "\160\141\143\153\151\156\147\076\074\057\143\150\151\154\144\076" + "\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\116\157\164\145\142\157\157" + "\153\042\040\151\144\075\042\156\157\164\145\142\157\157\153\042" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057" + "\160\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143" + "\165\163\042\076\124\162\165\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\057\157\142\152\145\143\164\076\074\160\141\143" + "\153\151\156\147\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\145\170\160\141\156\144\042\076\106\141\154" + "\163\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\146\151\154" + "\154\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\160\157\163\151\164\151\157\156\042\076\061\074\057\160" + "\162\157\160\145\162\164\171\076\074\057\160\141\143\153\151\156" + "\147\076\074\057\143\150\151\154\144\076\074\057\157\142\152\145" + "\143\164\076\074\057\143\150\151\154\144\076\074\057\157\142\152" + "\145\143\164\076\074\057\151\156\164\145\162\146\141\143\145\076" + "\012\000\000\050\165\165\141\171\051\163\157\165\162\143\145\146" + "\157\162\147\145\057\000\000\000\001\000\000\000\145\144\151\164" + "\157\162\057\000\000\000\000\000" }; +#endif /* !_MSC_VER */ + +static GStaticResource static_resource = { editor_resource_data.data, sizeof (editor_resource_data.data) - 1 /* nul terminator */, NULL, NULL, NULL }; + +G_MODULE_EXPORT +GResource *editor_get_resource (void); +GResource *editor_get_resource (void) +{ + return g_static_resource_get_resource (&static_resource); +} +/* + If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and + destructors, in a usable way, including e.g. on library unload. If not you're on + your own. + + Some compilers need #pragma to handle this, which does not work with macros, + so the way you need to use this is (for constructors): + + #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA + #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor) + #endif + G_DEFINE_CONSTRUCTOR(my_constructor) + static void my_constructor(void) { + ... + } + +*/ + +#ifndef __GTK_DOC_IGNORE__ + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void); +#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void); + +#elif defined (_MSC_VER) && (_MSC_VER >= 1500) +/* Visual studio 2008 and later has _Pragma */ + +#include + +#define G_HAS_CONSTRUCTORS 1 + +/* We do some weird things to avoid the constructors being optimized + * away on VS2015 if WholeProgramOptimization is enabled. First we + * make a reference to the array from the wrapper to make sure its + * references. Then we use a pragma to make sure the wrapper function + * symbol is always included at the link stage. Also, the symbols + * need to be extern (but not dllexport), even though they are not + * really used from another object file. + */ + +/* We need to account for differences between the mangling of symbols + * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed + * with an underscore but symbols on x64 are not. + */ +#ifdef _WIN64 +#define G_MSVC_SYMBOL_PREFIX "" +#else +#define G_MSVC_SYMBOL_PREFIX "_" +#endif + +#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) +#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX) + +#define G_MSVC_CTOR(_func,_sym_prefix) \ + static void _func(void); \ + extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper; + +#define G_MSVC_DTOR(_func,_sym_prefix) \ + static void _func(void); \ + extern int (* _array ## _func)(void); \ + int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined (_MSC_VER) + +#define G_HAS_CONSTRUCTORS 1 + +/* Pre Visual studio 2008 must use #pragma section */ +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _wrapper(void) { _func(); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper; + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _constructor(void) { atexit (_func); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined(__SUNPRO_C) + +/* This is not tested, but i believe it should work, based on: + * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c + */ + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + init(_func) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + fini(_func) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); + +#else + +/* constructors not supported for this compiler */ + +#endif + +#endif /* __GTK_DOC_IGNORE__ */ + +#ifdef G_HAS_CONSTRUCTORS + +#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor) +#endif +G_DEFINE_CONSTRUCTOR(resource_constructor) +#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor) +#endif +G_DEFINE_DESTRUCTOR(resource_destructor) + +#else +#warning "Constructor not supported on this compiler, linking in resources will not work" +#endif + +static void resource_constructor (void) +{ + g_static_resource_init (&static_resource); +} + +static void resource_destructor (void) +{ + g_static_resource_fini (&static_resource); +} diff -Nru pioneers-15.5/editor/gtk/editor-resources.h pioneers-15.6/editor/gtk/editor-resources.h --- pioneers-15.5/editor/gtk/editor-resources.h 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/editor/gtk/editor-resources.h 2020-08-02 12:59:36.000000000 +0000 @@ -0,0 +1,7 @@ +#ifndef __RESOURCE_editor_H__ +#define __RESOURCE_editor_H__ + +#include + +extern GResource *editor_get_resource (void); +#endif diff -Nru pioneers-15.5/editor/gtk/editor.ui pioneers-15.6/editor/gtk/editor.ui --- pioneers-15.5/editor/gtk/editor.ui 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/editor/gtk/editor.ui 2020-04-13 19:15:48.000000000 +0000 @@ -0,0 +1,239 @@ + + + + + + + + + + + False + + + + + + True + False + vertical + + + True + False + + + True + False + _File + True + + + True + False + + + True + False + Create a new game + <File>/New + _New + True + + + + + + + True + False + Open an existing game + _Open... + True + + + + + + + True + False + Save game + _Save + True + + + + + + + True + False + Save as + Save _As... + True + + + + + + + True + False + + + + + True + False + Change game title + Change _Title + True + + + + + + True + False + Check whether the game can be won + _Check Victory Point Target + True + + + + + + True + False + + + + + True + False + Quit + _Quit + True + + + + + + + + + + + True + False + _View + True + + + True + False + + + True + False + Set window to full screen mode + _Fullscreen + True + + + + + + + True + False + View the full map + _Reset + True + + + + + + + True + False + Center the map + _Center + True + + + + + + + + + + True + False + _Help + True + + + True + False + + + True + False + Information about Pioneers Editor + <Help>/About + _About Pioneers Editor + True + + + + + + + + + + False + True + 0 + + + + + True + True + + + False + True + 1 + + + + + + diff -Nru pioneers-15.5/editor/gtk/game-buildings.c pioneers-15.6/editor/gtk/game-buildings.c --- pioneers-15.5/editor/gtk/game-buildings.c 2011-11-07 22:00:35.000000000 +0000 +++ pioneers-15.6/editor/gtk/game-buildings.c 2020-03-26 10:13:59.000000000 +0000 @@ -11,7 +11,8 @@ N_("City"), N_("City wall") }; -static void game_buildings_init(GameBuildings * gb); +static void game_buildings_init(GTypeInstance * instance, + gpointer g_class); /* Register the class */ GType game_buildings_get_type(void) @@ -28,42 +29,41 @@ NULL, /* class_data */ sizeof(GameBuildings), 0, - (GInstanceInitFunc) game_buildings_init, + game_buildings_init, NULL }; gb_type = - g_type_register_static(GTK_TYPE_TABLE, "GameBuildings", + g_type_register_static(GTK_TYPE_GRID, "GameBuildings", &gb_info, 0); } return gb_type; } /* Build the composite widget */ -static void game_buildings_init(GameBuildings * gb) +static void game_buildings_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkWidget *label; GtkWidget *spin; GtkAdjustment *adjustment; - guint row; + gint row; + GameBuildings *gb = GAMEBUILDINGS(instance); - gtk_table_resize(GTK_TABLE(gb), NUM_BUILD_TYPES - 1, 2); - gtk_table_set_row_spacings(GTK_TABLE(gb), 3); - gtk_table_set_col_spacings(GTK_TABLE(gb), 5); - gtk_table_set_homogeneous(GTK_TABLE(gb), TRUE); + gtk_grid_set_row_spacing(GTK_GRID(gb), 3); + gtk_grid_set_column_spacing(GTK_GRID(gb), 5); + gtk_grid_set_column_homogeneous(GTK_GRID(gb), TRUE); for (row = 1; row < NUM_BUILD_TYPES; row++) { label = gtk_label_new(gettext(building_names[row])); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(gb), label, - 0, 1, row - 1, row); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_grid_attach(GTK_GRID(gb), label, 0, row - 1, 1, 1); adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 100, 1, 5, 0)); spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0); gtk_entry_set_alignment(GTK_ENTRY(spin), 1.0); - gtk_table_attach_defaults(GTK_TABLE(gb), spin, - 1, 2, row - 1, row); + gtk_grid_attach(GTK_GRID(gb), spin, 1, row - 1, 1, 1); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin), TRUE); gb->num_buildings[row] = GTK_SPIN_BUTTON(spin); } diff -Nru pioneers-15.5/editor/gtk/game-buildings.h pioneers-15.6/editor/gtk/game-buildings.h --- pioneers-15.5/editor/gtk/game-buildings.h 2009-08-29 11:00:09.000000000 +0000 +++ pioneers-15.6/editor/gtk/game-buildings.h 2018-05-23 10:51:57.000000000 +0000 @@ -16,13 +16,13 @@ typedef struct _GameBuildingsClass GameBuildingsClass; struct _GameBuildings { - GtkTable table; + GtkGrid grid; GtkSpinButton *num_buildings[NUM_BUILD_TYPES]; }; struct _GameBuildingsClass { - GtkTableClass parent_class; + GtkGridClass parent_class; }; GType game_buildings_get_type(void); diff -Nru pioneers-15.5/editor/gtk/game-devcards.c pioneers-15.6/editor/gtk/game-devcards.c --- pioneers-15.5/editor/gtk/game-devcards.c 2011-11-07 22:00:35.000000000 +0000 +++ pioneers-15.6/editor/gtk/game-devcards.c 2020-03-26 10:13:59.000000000 +0000 @@ -6,7 +6,7 @@ #include "game-devcards.h" -static void game_devcards_init(GameDevCards * gd); +static void game_devcards_init(GTypeInstance * instance, gpointer g_class); /* Register the class */ GType game_devcards_get_type(void) @@ -23,34 +23,34 @@ NULL, /* class_data */ sizeof(GameDevCards), 0, - (GInstanceInitFunc) game_devcards_init, + game_devcards_init, NULL }; gd_type = - g_type_register_static(GTK_TYPE_TABLE, "GameDevCards", + g_type_register_static(GTK_TYPE_GRID, "GameDevCards", &gd_info, 0); } return gd_type; } /* Build the composite widget */ -static void game_devcards_init(GameDevCards * gd) +static void game_devcards_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkWidget *label; GtkWidget *spin; GtkAdjustment *adjustment; - guint row; + gint row; + GameDevCards *gd = GAMEDEVCARDS(instance); - gtk_table_resize(GTK_TABLE(gd), NUM_DEVEL_TYPES, 2); - gtk_table_set_row_spacings(GTK_TABLE(gd), 3); - gtk_table_set_col_spacings(GTK_TABLE(gd), 5); - gtk_table_set_homogeneous(GTK_TABLE(gd), TRUE); + gtk_grid_set_row_spacing(GTK_GRID(gd), 3); + gtk_grid_set_column_spacing(GTK_GRID(gd), 5); + gtk_grid_set_column_homogeneous(GTK_GRID(gd), TRUE); for (row = 0; row < NUM_DEVEL_TYPES; row++) { label = gtk_label_new(get_devel_name(row)); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(gd), label, - 0, 1, row, row + 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_grid_attach(GTK_GRID(gd), label, 0, row, 1, 1); adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 100, 1, 5, 0)); @@ -59,8 +59,7 @@ gtk_widget_set_tooltip_text(spin, get_devel_description(row)); gtk_entry_set_alignment(GTK_ENTRY(spin), 1.0); - gtk_table_attach_defaults(GTK_TABLE(gd), spin, - 1, 2, row, row + 1); + gtk_grid_attach(GTK_GRID(gd), spin, 1, row, 1, 1); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin), TRUE); gd->num_cards[row] = GTK_SPIN_BUTTON(spin); } diff -Nru pioneers-15.5/editor/gtk/game-devcards.h pioneers-15.6/editor/gtk/game-devcards.h --- pioneers-15.5/editor/gtk/game-devcards.h 2010-03-09 05:13:47.000000000 +0000 +++ pioneers-15.6/editor/gtk/game-devcards.h 2018-05-23 10:51:57.000000000 +0000 @@ -17,13 +17,13 @@ typedef struct _GameDevCardsClass GameDevCardsClass; struct _GameDevCards { - GtkTable table; + GtkGrid grid; GtkSpinButton *num_cards[NUM_DEVEL_TYPES]; }; struct _GameDevCardsClass { - GtkTableClass parent_class; + GtkGridClass parent_class; }; GType game_devcards_get_type(void); diff -Nru pioneers-15.5/editor/gtk/game-resources.c pioneers-15.6/editor/gtk/game-resources.c --- pioneers-15.5/editor/gtk/game-resources.c 2011-11-07 22:00:35.000000000 +0000 +++ pioneers-15.6/editor/gtk/game-resources.c 2020-03-25 17:52:23.000000000 +0000 @@ -6,7 +6,8 @@ #include "game-resources.h" -static void game_resources_init(GameResources * gr); +static void game_resources_init(GTypeInstance * instance, + gpointer g_class); /* Register the class */ GType game_resources_get_type(void) @@ -23,37 +24,38 @@ NULL, /* class_data */ sizeof(GameResources), 0, - (GInstanceInitFunc) game_resources_init, + game_resources_init, NULL }; gr_type = - g_type_register_static(GTK_TYPE_TABLE, "GameResources", + g_type_register_static(GTK_TYPE_GRID, "GameResources", &gr_info, 0); } return gr_type; } /* Build the composite widget */ -static void game_resources_init(GameResources * gr) +static void game_resources_init(GTypeInstance * instance, + G_GNUC_UNUSED gpointer g_class) { GtkWidget *label; GtkWidget *spin; GtkAdjustment *adjustment; + GameResources *gr = GAMERESOURCES(instance); - gtk_table_resize(GTK_TABLE(gr), 1, 2); - gtk_table_set_row_spacings(GTK_TABLE(gr), 3); - gtk_table_set_col_spacings(GTK_TABLE(gr), 5); - gtk_table_set_homogeneous(GTK_TABLE(gr), TRUE); + gtk_grid_set_row_spacing(GTK_GRID(gr), 3); + gtk_grid_set_column_spacing(GTK_GRID(gr), 5); + gtk_grid_set_column_homogeneous(GTK_GRID(gr), TRUE); label = gtk_label_new(_("Resource count")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(gr), label, 0, 1, 0, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_grid_attach(GTK_GRID(gr), label, 0, 0, 1, 1); adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 100, 1, 5, 0)); spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0); gtk_entry_set_alignment(GTK_ENTRY(spin), 1.0); - gtk_table_attach_defaults(GTK_TABLE(gr), spin, 1, 2, 0, 1); + gtk_grid_attach(GTK_GRID(gr), spin, 1, 0, 1, 1); gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin), TRUE); gr->num_resources = GTK_SPIN_BUTTON(spin); } diff -Nru pioneers-15.5/editor/gtk/game-resources.h pioneers-15.6/editor/gtk/game-resources.h --- pioneers-15.5/editor/gtk/game-resources.h 2009-08-29 11:00:09.000000000 +0000 +++ pioneers-15.6/editor/gtk/game-resources.h 2018-05-23 10:51:57.000000000 +0000 @@ -16,13 +16,13 @@ typedef struct _GameResourcesClass GameResourcesClass; struct _GameResources { - GtkTable table; + GtkGrid grid; GtkSpinButton *num_resources; }; struct _GameResourcesClass { - GtkTableClass parent_class; + GtkGridClass parent_class; }; GType game_resources_get_type(void); diff -Nru pioneers-15.5/editor/gtk/Makefile.am pioneers-15.6/editor/gtk/Makefile.am --- pioneers-15.5/editor/gtk/Makefile.am 2013-05-30 19:16:26.000000000 +0000 +++ pioneers-15.6/editor/gtk/Makefile.am 2020-04-13 19:15:48.000000000 +0000 @@ -27,6 +27,16 @@ pioneers_editor_CPPFLAGS = $(gtk_cflags) +resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/editor/gtk/editor.gresource.xml) +editor/gtk/editor-resources.c: editor/gtk/editor.gresource.xml $(resource_files) + $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name editor $(srcdir)/editor/gtk/editor.gresource.xml +editor/gtk/editor-resources.h: editor/gtk/editor.gresource.xml $(resource_files) + $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name editor $(srcdir)/editor/gtk/editor.gresource.xml + +BUILT_RESOURCES = \ + editor/gtk/editor-resources.c \ + editor/gtk/editor-resources.h + pioneers_editor_SOURCES = \ editor/gtk/editor.c \ editor/gtk/game-devcards.c \ @@ -36,10 +46,18 @@ editor/gtk/game-resources.c \ editor/gtk/game-resources.h \ editor/gtk/pioneers-editor.ico \ - editor/gtk/pioneers-editor.rc + editor/gtk/pioneers-editor.rc \ + $(BUILT_RESOURCES) pioneers_editor_LDADD = $(gtk_libs) +EXTRA_DIST += \ + $(resource_files) \ + editor/gtk/editor.gresource.xml + +CLEANFILES += \ + $(BUILT_RESOURCES) + if USE_WINDOWS_ICON pioneers_editor_LDADD += editor/gtk/pioneers-editor.res CLEANFILES += editor/gtk/pioneers-editor.res Binary files /tmp/tmprNzjQx/ytk7fihRg_/pioneers-15.5/editor/gtk/pioneers-editor.48x48_apps.png and /tmp/tmprNzjQx/qpK4jKD3ob/pioneers-15.6/editor/gtk/pioneers-editor.48x48_apps.png differ Binary files /tmp/tmprNzjQx/ytk7fihRg_/pioneers-15.5/editor/gtk/pioneers-editor.png and /tmp/tmprNzjQx/qpK4jKD3ob/pioneers-15.6/editor/gtk/pioneers-editor.png differ diff -Nru pioneers-15.5/install-sh pioneers-15.6/install-sh --- pioneers-15.5/install-sh 2018-03-14 16:02:12.000000000 +0000 +++ pioneers-15.6/install-sh 2020-08-02 12:59:32.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2014-09-12.12; # UTC +scriptversion=2018-03-11.20; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,15 +271,18 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,6 +291,11 @@ fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -324,14 +332,16 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - # $RANDOM is not portable (e.g. dash); use it when possible to - # lower collision chance + # Note that $RANDOM variable is not portable (e.g. dash); Use it + # here however when possible just to lower collision chance. tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - # As "mkdir -p" follows symlinks and we work in /tmp possibly; so - # create the $tmpdir first (and fail if unsuccessful) to make sure - # that nobody tries to guess the $tmpdir name. + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p' feature. if (umask $mkdir_umask && $mkdirprog $mkdir_mode "$tmpdir" && exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 @@ -434,14 +444,25 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -500,9 +521,9 @@ done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru pioneers-15.5/ltmain.sh pioneers-15.6/ltmain.sh --- pioneers-15.5/ltmain.sh 2018-03-14 16:02:08.000000000 +0000 +++ pioneers-15.6/ltmain.sh 2020-08-02 12:59:28.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-2" +VERSION="2.4.6 Debian-2.4.6-14" package_revision=2.4.6 @@ -387,7 +387,7 @@ # putting '$debug_cmd' at the start of all your functions, you can get # bash to show function call trace with: # -# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +# debug_cmd='echo "${FUNCNAME[0]} $*" >&2' bash your-script-name debug_cmd=${debug_cmd-":"} exit_cmd=: @@ -1370,7 +1370,7 @@ #! /bin/sh # Set a version string for this script. -scriptversion=2014-01-07.03; # UTC +scriptversion=2015-10-07.11; # UTC # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 @@ -1530,6 +1530,8 @@ { $debug_cmd + _G_rc_run_hooks=false + case " $hookable_fns " in *" $1 "*) ;; *) func_fatal_error "'$1' does not support hook funcions.n" ;; @@ -1538,16 +1540,16 @@ eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - eval $_G_hook '"$@"' - - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift + if eval $_G_hook '"$@"'; then + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + _G_rc_run_hooks=: + fi done - func_quote_for_eval ${1+"$@"} - func_run_hooks_result=$func_quote_for_eval_result + $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result } @@ -1557,10 +1559,16 @@ ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, remove any -# options that you action, and then pass back the remaining unprocessed +# full positional parameter list in your hook function, you may remove/edit +# any options that you action, and then pass back the remaining unprocessed # options in '_result', escaped suitably for -# 'eval'. Like this: +# 'eval'. In this case you also must return $EXIT_SUCCESS to let the +# hook's caller know that it should pay attention to +# '_result'. Returning $EXIT_FAILURE signalizes that +# arguments are left untouched by the hook and therefore caller will ignore the +# result variable. +# +# Like this: # # my_options_prep () # { @@ -1570,9 +1578,11 @@ # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# -# func_quote_for_eval ${1+"$@"} -# my_options_prep_result=$func_quote_for_eval_result +# # No change in '$@' (ignored completely by this hook). There is +# # no need to do the equivalent (but slower) action: +# # func_quote_for_eval ${1+"$@"} +# # my_options_prep_result=$func_quote_for_eval_result +# false # } # func_add_hook func_options_prep my_options_prep # @@ -1581,25 +1591,37 @@ # { # $debug_cmd # +# args_changed=false +# # # Note that for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do # opt=$1; shift # case $opt in -# --silent|-s) opt_silent=: ;; +# --silent|-s) opt_silent=: +# args_changed=: +# ;; # # Separate non-argument short options: # -s*) func_split_short_opt "$_G_opt" # set dummy "$func_split_short_opt_name" \ # "-$func_split_short_opt_arg" ${1+"$@"} # shift +# args_changed=: # ;; -# *) set dummy "$_G_opt" "$*"; shift; break ;; +# *) # Make sure the first unrecognised option "$_G_opt" +# # is added back to "$@", we could need that later +# # if $args_changed is true. +# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# if $args_changed; then +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# fi +# +# $args_changed # } # func_add_hook func_parse_options my_silent_option # @@ -1611,16 +1633,32 @@ # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." # -# func_quote_for_eval ${1+"$@"} -# my_option_validation_result=$func_quote_for_eval_result +# false # } # func_add_hook func_validate_options my_option_validation # -# You'll alse need to manually amend $usage_message to reflect the extra +# You'll also need to manually amend $usage_message to reflect the extra # options you parse. It's preferable to append if you can, so that # multiple option parsing hooks can be added safely. +# func_options_finish [ARG]... +# ---------------------------- +# Finishing the option parse loop (call 'func_options' hooks ATM). +func_options_finish () +{ + $debug_cmd + + _G_func_options_finish_exit=false + if func_run_hooks func_options ${1+"$@"}; then + func_options_finish_result=$func_run_hooks_result + _G_func_options_finish_exit=: + fi + + $_G_func_options_finish_exit +} + + # func_options [ARG]... # --------------------- # All the functions called inside func_options are hookable. See the @@ -1630,17 +1668,28 @@ { $debug_cmd - func_options_prep ${1+"$@"} - eval func_parse_options \ - ${func_options_prep_result+"$func_options_prep_result"} - eval func_validate_options \ - ${func_parse_options_result+"$func_parse_options_result"} + _G_rc_options=false - eval func_run_hooks func_options \ - ${func_validate_options_result+"$func_validate_options_result"} + for my_func in options_prep parse_options validate_options options_finish + do + if eval func_$my_func '${1+"$@"}'; then + eval _G_res_var='$'"func_${my_func}_result" + eval set dummy "$_G_res_var" ; shift + _G_rc_options=: + fi + done - # save modified positional parameters for caller - func_options_result=$func_run_hooks_result + # Save modified positional parameters for caller. As a top-level + # options-parser function we always need to set the 'func_options_result' + # variable (regardless the $_G_rc_options value). + if $_G_rc_options; then + func_options_result=$_G_res_var + else + func_quote_for_eval ${1+"$@"} + func_options_result=$func_quote_for_eval_result + fi + + $_G_rc_options } @@ -1649,9 +1698,9 @@ # All initialisations required before starting the option parse loop. # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and -# needs to propogate that back to rest of this script, then the complete +# needs to propagate that back to rest of this script, then the complete # modified list must be put in 'func_run_hooks_result' before -# returning. +# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). func_hookable func_options_prep func_options_prep () { @@ -1661,10 +1710,14 @@ opt_verbose=false opt_warning_types= - func_run_hooks func_options_prep ${1+"$@"} + _G_rc_options_prep=false + if func_run_hooks func_options_prep ${1+"$@"}; then + _G_rc_options_prep=: + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result + fi - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result + $_G_rc_options_prep } @@ -1678,18 +1731,20 @@ func_parse_options_result= + _G_rc_parse_options=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - func_run_hooks func_parse_options ${1+"$@"} - - # Adjust func_parse_options positional parameters to match - eval set dummy "$func_run_hooks_result"; shift + if func_run_hooks func_parse_options ${1+"$@"}; then + eval set dummy "$func_run_hooks_result"; shift + _G_rc_parse_options=: + fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -1704,7 +1759,10 @@ ;; --warnings|--warning|-W) - test $# = 0 && func_missing_arg $_G_opt && break + if test $# = 0 && func_missing_arg $_G_opt; then + _G_rc_parse_options=: + break + fi case " $warning_categories $1" in *" $1 "*) # trailing space prevents matching last $1 above @@ -1757,15 +1815,25 @@ shift ;; - --) break ;; + --) _G_rc_parse_options=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift + _G_match_parse_options=false + break + ;; esac + + $_G_match_parse_options && _G_rc_parse_options=: done - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + + if $_G_rc_parse_options; then + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result + fi + + $_G_rc_parse_options } @@ -1778,16 +1846,21 @@ { $debug_cmd + _G_rc_validate_options=false + # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - func_run_hooks func_validate_options ${1+"$@"} + if func_run_hooks func_validate_options ${1+"$@"}; then + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result + _G_rc_validate_options=: + fi # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result + $_G_rc_validate_options } @@ -2068,7 +2141,7 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-2 + version: $progname $scriptversion Debian-2.4.6-14 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2270,6 +2343,8 @@ nonopt= preserve_args= + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2293,11 +2368,18 @@ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) shift; set dummy --mode uninstall ${1+"$@"}; shift ;; + *) + _G_rc_lt_options_prep=false + ;; esac - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + if $_G_rc_lt_options_prep; then + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result + fi + + $_G_rc_lt_options_prep } func_add_hook func_options_prep libtool_options_prep @@ -2309,9 +2391,12 @@ { $debug_cmd + _G_rc_lt_parse_options=false + # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do + _G_match_lt_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -2386,15 +2471,22 @@ func_append preserve_args " $_G_opt" ;; - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"} ; shift + _G_match_lt_parse_options=false + break + ;; esac + $_G_match_lt_parse_options && _G_rc_lt_parse_options=: done + if $_G_rc_lt_parse_options; then + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result + fi - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + $_G_rc_lt_parse_options } func_add_hook func_parse_options libtool_parse_options @@ -7275,10 +7367,13 @@ # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -static-* direct GCC to link specific libraries statically + # -fcilkplus Cilk Plus language extension features for C/C++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*) + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff -Nru pioneers-15.5/m4/libtool.m4 pioneers-15.6/m4/libtool.m4 --- pioneers-15.5/m4/libtool.m4 2018-03-14 16:02:08.000000000 +0000 +++ pioneers-15.6/m4/libtool.m4 2020-08-02 12:59:28.000000000 +0000 @@ -1041,8 +1041,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1492,7 +1492,7 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4063,7 +4063,8 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4703,6 +4704,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -6438,7 +6445,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -6813,7 +6820,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6878,7 +6885,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7217,7 +7224,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -7301,7 +7308,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7312,7 +7319,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' diff -Nru pioneers-15.5/m4/pkg.m4 pioneers-15.6/m4/pkg.m4 --- pioneers-15.5/m4/pkg.m4 2018-03-14 16:02:03.000000000 +0000 +++ pioneers-15.6/m4/pkg.m4 2020-08-02 12:59:23.000000000 +0000 @@ -1,6 +1,6 @@ -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -41,7 +41,7 @@ dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -142,7 +142,7 @@ AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -152,11 +152,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -173,7 +173,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full diff -Nru pioneers-15.5/Makefile.am pioneers-15.6/Makefile.am --- pioneers-15.5/Makefile.am 2018-03-07 15:59:54.000000000 +0000 +++ pioneers-15.6/Makefile.am 2020-08-02 06:49:38.000000000 +0000 @@ -155,8 +155,8 @@ rm -rf html distclean-local: - rm -f *~ - rm -rf autom4te.cache + -rm -f *~ + -rm -rf autom4te.cache # Reformat the code. reindent: @@ -172,8 +172,8 @@ # Remove ALL generated files pristine: maintainer-clean - rm -fr m4 - svn status --no-ignore | awk '$$1=="I" { print substr($$0, 9, 255) }' | tr '\n' '\0' | xargs -0 rm + rm -rf m4 + svn status --no-ignore | awk '$$1=="I" { print substr($$0, 9, 255) }' | tr '\n' '\0' | xargs -0 rm -rf # Application icons, in various sizes BUILT_SOURCES += $(subst .svg,.48x48_apps.png,$(icons)) diff -Nru pioneers-15.5/Makefile.in pioneers-15.6/Makefile.in --- pioneers-15.5/Makefile.in 2018-03-14 16:02:12.000000000 +0000 +++ pioneers-15.6/Makefile.in 2020-08-02 12:59:32.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -547,6 +547,8 @@ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_4 = pioneers @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_5 = client/gtk/pioneers.desktop.in @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_6 = \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(client_resource_files) \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/client.gresource.xml \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(ccflickrtheme_DATA) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(classictheme_DATA) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(freecivtheme_DATA) \ @@ -555,15 +557,18 @@ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(tinytheme_DATA) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(wesnoththeme_DATA) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/splash.svg -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_7 = client/gtk/data/pioneers.png -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_8 = client/gtk/data/pioneers.svg -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_9 = \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_7 = \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(pioneers_BUILT_RESOURCES) + +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_8 = client/gtk/data/pioneers.png +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_9 = client/gtk/data/pioneers.svg +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_10 = \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/bridge.svg \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/city.svg \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/city_wall.svg \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/develop.svg \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/dice.svg \ -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/finish.svg \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/pioneers-finish.svg \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/road.svg \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/settlement.svg \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/ship.svg \ @@ -587,53 +592,67 @@ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/pioneers.ico \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/pioneers.rc -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_10 = \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_11 = \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/splash.png \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view.gob.stamp \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view.c \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view.h \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view-private.h -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_11 = client/gtk/data/pioneers.res @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_12 = client/gtk/data/pioneers.res +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_13 = client/gtk/data/pioneers.res # Include the data here, not at the top, # it can add extra resources to the executable -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_13 = \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__append_14 = \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view.gob.stamp \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view.c \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view.h \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-view-private.h -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_14 = server/gtk/pioneers-server.png -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_15 = server/gtk/pioneers-server-gtk.desktop.in -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_16 = pioneers-server-gtk -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_17 = server/gtk/pioneers-server.svg -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_18 = server/gtk/pioneers-server.res -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_19 = server/gtk/pioneers-server.res -@BUILD_SERVER_TRUE@am__append_20 = pioneers-server-console -@BUILD_SERVER_TRUE@am__append_21 = libpioneers_server.a -@BUILD_METASERVER_TRUE@am__append_22 = pioneers-metaserver -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_23 = editor/gtk/pioneers-editor.png -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_24 = editor/gtk/pioneers-editor.desktop.in -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_25 = pioneers-editor -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_26 = editor/gtk/pioneers-editor.svg -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_27 = editor/gtk/pioneers-editor.res -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_28 = editor/gtk/pioneers-editor.res +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_15 = server/gtk/pioneers-server.png +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_16 = server/gtk/pioneers-server-gtk.desktop.in +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_17 = pioneers-server-gtk +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_18 = server/gtk/pioneers-server.svg +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_19 = \ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(server_resource_files) \ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ server/gtk/server.gresource.xml + +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__append_20 = \ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(pioneers_server_gtk_BUILT_RESOURCES) + +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_21 = server/gtk/pioneers-server.res +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_22 = server/gtk/pioneers-server.res +@BUILD_SERVER_TRUE@am__append_23 = pioneers-server-console +@BUILD_SERVER_TRUE@am__append_24 = libpioneers_server.a +@BUILD_METASERVER_TRUE@am__append_25 = pioneers-metaserver +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_26 = editor/gtk/pioneers-editor.png +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_27 = editor/gtk/pioneers-editor.desktop.in +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_28 = pioneers-editor +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_29 = editor/gtk/pioneers-editor.svg +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_30 = \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(resource_files) \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/editor.gresource.xml + +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__append_31 = \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(BUILT_RESOURCES) + +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_32 = editor/gtk/pioneers-editor.res +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@@USE_WINDOWS_ICON_TRUE@am__append_33 = editor/gtk/pioneers-editor.res # yelp-tools doesn't use automake, but creates its own Makefile -@BUILD_HELP_TRUE@am__append_29 = client/help -@HAVE_GTK_TRUE@am__append_30 = libpioneers_gtk.a -@HAVE_GTK_TRUE@am__append_31 = \ +@BUILD_HELP_TRUE@am__append_34 = client/help +@HAVE_GTK_TRUE@am__append_35 = libpioneers_gtk.a +@HAVE_GTK_TRUE@am__append_36 = \ @HAVE_GTK_TRUE@ common/gtk/scrollable-text-view.gob.stamp \ @HAVE_GTK_TRUE@ common/gtk/scrollable-text-view.c \ @HAVE_GTK_TRUE@ common/gtk/scrollable-text-view.h -@HAVE_GTK_TRUE@am__append_32 = \ +@HAVE_GTK_TRUE@am__append_37 = \ @HAVE_GTK_TRUE@ common/gtk/scrollable-text-view.gob.stamp \ @HAVE_GTK_TRUE@ common/gtk/scrollable-text-view.c \ @HAVE_GTK_TRUE@ common/gtk/scrollable-text-view.h -@HAVE_GTK_TRUE@am__append_33 = \ +@HAVE_GTK_TRUE@am__append_38 = \ @HAVE_GTK_TRUE@ common/gtk/pioneers-checkmark.svg \ @HAVE_GTK_TRUE@ common/gtk/pioneers-cross.svg @@ -653,10 +672,24 @@ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = pioneers.spec Doxyfile MinGW/pioneers.nsi +CONFIG_CLEAN_FILES = pioneers.spec Doxyfile CONFIG_CLEAN_VPATH_FILES = +@BUILD_CLIENT_TRUE@am__EXEEXT_1 = pioneersai$(EXEEXT) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__EXEEXT_2 = pioneers$(EXEEXT) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__EXEEXT_3 = pioneers-server-gtk$(EXEEXT) +@BUILD_SERVER_TRUE@am__EXEEXT_4 = pioneers-server-console$(EXEEXT) +@BUILD_METASERVER_TRUE@am__EXEEXT_5 = pioneers-metaserver$(EXEEXT) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__EXEEXT_6 = \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ pioneers-editor$(EXEEXT) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" \ + "$(DESTDIR)$(actionsdir)" "$(DESTDIR)$(ccflickrthemedir)" \ + "$(DESTDIR)$(classicthemedir)" "$(DESTDIR)$(configdir)" \ + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(freecivthemedir)" \ + "$(DESTDIR)$(icelandthemedir)" "$(DESTDIR)$(icondir)" \ + "$(DESTDIR)$(nouvelliathemedir)" "$(DESTDIR)$(pixmapdir)" \ + "$(DESTDIR)$(tinythemedir)" "$(DESTDIR)$(wesnoththemedir)" +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) am__v_AR_0 = @echo " AR " $@; @@ -672,6 +705,7 @@ common/libpioneers_a-driver.$(OBJEXT) \ common/libpioneers_a-game.$(OBJEXT) \ common/libpioneers_a-game-list.$(OBJEXT) \ + common/libpioneers_a-gettext.$(OBJEXT) \ common/libpioneers_a-log.$(OBJEXT) \ common/libpioneers_a-map.$(OBJEXT) \ common/libpioneers_a-map_query.$(OBJEXT) \ @@ -758,21 +792,6 @@ @BUILD_CLIENT_TRUE@ client/common/libpioneersclient_a-stock.$(OBJEXT) \ @BUILD_CLIENT_TRUE@ client/common/libpioneersclient_a-turn.$(OBJEXT) libpioneersclient_a_OBJECTS = $(am_libpioneersclient_a_OBJECTS) -@BUILD_CLIENT_TRUE@am__EXEEXT_1 = pioneersai$(EXEEXT) -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__EXEEXT_2 = pioneers$(EXEEXT) -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__EXEEXT_3 = pioneers-server-gtk$(EXEEXT) -@BUILD_SERVER_TRUE@am__EXEEXT_4 = pioneers-server-console$(EXEEXT) -@BUILD_METASERVER_TRUE@am__EXEEXT_5 = pioneers-metaserver$(EXEEXT) -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__EXEEXT_6 = \ -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ pioneers-editor$(EXEEXT) -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" \ - "$(DESTDIR)$(actionsdir)" "$(DESTDIR)$(ccflickrthemedir)" \ - "$(DESTDIR)$(classicthemedir)" "$(DESTDIR)$(configdir)" \ - "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(freecivthemedir)" \ - "$(DESTDIR)$(icelandthemedir)" "$(DESTDIR)$(icondir)" \ - "$(DESTDIR)$(nouvelliathemedir)" "$(DESTDIR)$(pixmapdir)" \ - "$(DESTDIR)$(tinythemedir)" "$(DESTDIR)$(wesnoththemedir)" -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__pioneers_SOURCES_DIST = client/gtk/admin-gtk.c client/callback.h \ client/gtk/audio.h client/gtk/avahi.h \ client/gtk/avahi-browser.h client/gtk/frontend.h \ @@ -793,8 +812,10 @@ client/gtk/resource-view.h client/gtk/resource-view-private.h \ client/gtk/resource-table.c client/gtk/resource-table.h \ client/gtk/settingscreen.c client/gtk/state.c \ - client/gtk/trade.c + client/gtk/trade.c client/gtk/client-resources.c \ + client/gtk/client-resources.h @ADMIN_GTK_SUPPORT_TRUE@@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__objects_1 = client/gtk/pioneers-admin-gtk.$(OBJEXT) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am__objects_2 = client/gtk/pioneers-client-resources.$(OBJEXT) @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@am_pioneers_OBJECTS = \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__objects_1) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/pioneers-audio.$(OBJEXT) \ @@ -826,7 +847,8 @@ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/pioneers-resource-table.$(OBJEXT) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/pioneers-settingscreen.$(OBJEXT) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/pioneers-state.$(OBJEXT) \ -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/pioneers-trade.$(OBJEXT) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/pioneers-trade.$(OBJEXT) \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__objects_2) am__EXTRA_pioneers_SOURCES_DIST = client/gtk/admin-gtk.c pioneers_OBJECTS = $(am_pioneers_OBJECTS) am__DEPENDENCIES_1 = @@ -841,7 +863,8 @@ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_3) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_4) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \ -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__append_11) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_1) \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__append_12) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -850,15 +873,18 @@ editor/gtk/game-devcards.c editor/gtk/game-devcards.h \ editor/gtk/game-buildings.c editor/gtk/game-buildings.h \ editor/gtk/game-resources.c editor/gtk/game-resources.h \ - editor/gtk/pioneers-editor.ico editor/gtk/pioneers-editor.rc + editor/gtk/pioneers-editor.ico editor/gtk/pioneers-editor.rc \ + editor/gtk/editor-resources.c editor/gtk/editor-resources.h +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am__objects_3 = editor/gtk/pioneers_editor-editor-resources.$(OBJEXT) @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@am_pioneers_editor_OBJECTS = editor/gtk/pioneers_editor-editor.$(OBJEXT) \ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/pioneers_editor-game-devcards.$(OBJEXT) \ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/pioneers_editor-game-buildings.$(OBJEXT) \ -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/pioneers_editor-game-resources.$(OBJEXT) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/pioneers_editor-game-resources.$(OBJEXT) \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(am__objects_3) pioneers_editor_OBJECTS = $(am_pioneers_editor_OBJECTS) @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@pioneers_editor_DEPENDENCIES = \ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_3) \ -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(am__append_27) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(am__append_32) am__pioneers_metaserver_SOURCES_DIST = metaserver/main.c @BUILD_METASERVER_TRUE@am_pioneers_metaserver_OBJECTS = metaserver/pioneers_metaserver-main.$(OBJEXT) pioneers_metaserver_OBJECTS = $(am_pioneers_metaserver_OBJECTS) @@ -874,14 +900,17 @@ @BUILD_SERVER_TRUE@ libpioneers_server.a $(am__DEPENDENCIES_2) \ @BUILD_SERVER_TRUE@ $(am__DEPENDENCIES_4) am__pioneers_server_gtk_SOURCES_DIST = server/gtk/main.c \ - server/gtk/pioneers-server.ico server/gtk/pioneers-server.rc -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am_pioneers_server_gtk_OBJECTS = server/gtk/pioneers_server_gtk-main.$(OBJEXT) + server/gtk/pioneers-server.ico server/gtk/pioneers-server.rc \ + server/gtk/server-resources.c server/gtk/server-resources.h +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am__objects_4 = server/gtk/pioneers_server_gtk-server-resources.$(OBJEXT) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@am_pioneers_server_gtk_OBJECTS = server/gtk/pioneers_server_gtk-main.$(OBJEXT) \ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(am__objects_4) pioneers_server_gtk_OBJECTS = $(am_pioneers_server_gtk_OBJECTS) @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@pioneers_server_gtk_DEPENDENCIES = \ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ libpioneers_server.a \ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_3) \ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(am__DEPENDENCIES_4) \ -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(am__append_18) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(am__append_21) am__pioneersai_SOURCES_DIST = client/callback.h client/ai/ai.h \ client/ai/ai.c client/ai/genetic.c client/ai/genetic_core.h \ client/ai/genetic_core.c client/ai/greedy.c \ @@ -909,7 +938,111 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = client/ai/$(DEPDIR)/pioneersai-ai.Po \ + client/ai/$(DEPDIR)/pioneersai-genetic.Po \ + client/ai/$(DEPDIR)/pioneersai-genetic_core.Po \ + client/ai/$(DEPDIR)/pioneersai-greedy.Po \ + client/ai/$(DEPDIR)/pioneersai-lobbybot.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-build.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-callback.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-client.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-develop.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-main.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-player.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-resource.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-robber.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-setup.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-stock.Po \ + client/common/$(DEPDIR)/libpioneersclient_a-turn.Po \ + client/gtk/$(DEPDIR)/pioneers-admin-gtk.Po \ + client/gtk/$(DEPDIR)/pioneers-audio.Po \ + client/gtk/$(DEPDIR)/pioneers-avahi-browser.Po \ + client/gtk/$(DEPDIR)/pioneers-avahi.Po \ + client/gtk/$(DEPDIR)/pioneers-callbacks.Po \ + client/gtk/$(DEPDIR)/pioneers-chat.Po \ + client/gtk/$(DEPDIR)/pioneers-client-resources.Po \ + client/gtk/$(DEPDIR)/pioneers-connect.Po \ + client/gtk/$(DEPDIR)/pioneers-develop.Po \ + client/gtk/$(DEPDIR)/pioneers-discard.Po \ + client/gtk/$(DEPDIR)/pioneers-frontend.Po \ + client/gtk/$(DEPDIR)/pioneers-gameover.Po \ + client/gtk/$(DEPDIR)/pioneers-gold.Po \ + client/gtk/$(DEPDIR)/pioneers-gui.Po \ + client/gtk/$(DEPDIR)/pioneers-histogram.Po \ + client/gtk/$(DEPDIR)/pioneers-identity.Po \ + client/gtk/$(DEPDIR)/pioneers-interface.Po \ + client/gtk/$(DEPDIR)/pioneers-legend.Po \ + client/gtk/$(DEPDIR)/pioneers-monopoly.Po \ + client/gtk/$(DEPDIR)/pioneers-name.Po \ + client/gtk/$(DEPDIR)/pioneers-notification.Po \ + client/gtk/$(DEPDIR)/pioneers-offline.Po \ + client/gtk/$(DEPDIR)/pioneers-player.Po \ + client/gtk/$(DEPDIR)/pioneers-plenty.Po \ + client/gtk/$(DEPDIR)/pioneers-quote-view.Po \ + client/gtk/$(DEPDIR)/pioneers-quote.Po \ + client/gtk/$(DEPDIR)/pioneers-resource-table.Po \ + client/gtk/$(DEPDIR)/pioneers-resource-view.Po \ + client/gtk/$(DEPDIR)/pioneers-resource.Po \ + client/gtk/$(DEPDIR)/pioneers-settingscreen.Po \ + client/gtk/$(DEPDIR)/pioneers-state.Po \ + client/gtk/$(DEPDIR)/pioneers-trade.Po \ + common/$(DEPDIR)/libpioneers_a-buildrec.Po \ + common/$(DEPDIR)/libpioneers_a-cards.Po \ + common/$(DEPDIR)/libpioneers_a-common_glib.Po \ + common/$(DEPDIR)/libpioneers_a-cost.Po \ + common/$(DEPDIR)/libpioneers_a-deck.Po \ + common/$(DEPDIR)/libpioneers_a-driver.Po \ + common/$(DEPDIR)/libpioneers_a-game-list.Po \ + common/$(DEPDIR)/libpioneers_a-game.Po \ + common/$(DEPDIR)/libpioneers_a-gettext.Po \ + common/$(DEPDIR)/libpioneers_a-log.Po \ + common/$(DEPDIR)/libpioneers_a-map.Po \ + common/$(DEPDIR)/libpioneers_a-map_query.Po \ + common/$(DEPDIR)/libpioneers_a-network.Po \ + common/$(DEPDIR)/libpioneers_a-notifying-string.Po \ + common/$(DEPDIR)/libpioneers_a-quoteinfo.Po \ + common/$(DEPDIR)/libpioneers_a-random.Po \ + common/$(DEPDIR)/libpioneers_a-set.Po \ + common/$(DEPDIR)/libpioneers_a-state.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-aboutbox.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-colors.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-common_gtk.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-config-gnome.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-rules.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-settings.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-guimap.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-map-icons.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-metaserver.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-player-icon.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-polygon.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-scrollable-text-view.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-select-game.Po \ + common/gtk/$(DEPDIR)/libpioneers_gtk_a-theme.Po \ + editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Po \ + editor/gtk/$(DEPDIR)/pioneers_editor-editor.Po \ + editor/gtk/$(DEPDIR)/pioneers_editor-game-buildings.Po \ + editor/gtk/$(DEPDIR)/pioneers_editor-game-devcards.Po \ + editor/gtk/$(DEPDIR)/pioneers_editor-game-resources.Po \ + metaserver/$(DEPDIR)/pioneers_metaserver-main.Po \ + server/$(DEPDIR)/libpioneers_server_a-admin.Po \ + server/$(DEPDIR)/libpioneers_server_a-avahi.Po \ + server/$(DEPDIR)/libpioneers_server_a-buildutil.Po \ + server/$(DEPDIR)/libpioneers_server_a-develop.Po \ + server/$(DEPDIR)/libpioneers_server_a-discard.Po \ + server/$(DEPDIR)/libpioneers_server_a-gold.Po \ + server/$(DEPDIR)/libpioneers_server_a-meta.Po \ + server/$(DEPDIR)/libpioneers_server_a-player.Po \ + server/$(DEPDIR)/libpioneers_server_a-pregame.Po \ + server/$(DEPDIR)/libpioneers_server_a-resource.Po \ + server/$(DEPDIR)/libpioneers_server_a-robber.Po \ + server/$(DEPDIR)/libpioneers_server_a-server.Po \ + server/$(DEPDIR)/libpioneers_server_a-trade.Po \ + server/$(DEPDIR)/libpioneers_server_a-turn.Po \ + server/$(DEPDIR)/pioneers_server_console-glib-driver.Po \ + server/$(DEPDIR)/pioneers_server_console-main.Po \ + server/gtk/$(DEPDIR)/pioneers_server_gtk-main.Po \ + server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -1000,9 +1133,9 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in + cscope distdir distdir-am dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -1042,9 +1175,8 @@ $(srcdir)/editor/Makefile.am $(srcdir)/editor/gtk/Makefile.am \ $(srcdir)/metaserver/Makefile.am $(srcdir)/pioneers.spec.in \ $(srcdir)/server/Makefile.am $(srcdir)/server/gtk/Makefile.am \ - $(top_srcdir)/MinGW/pioneers.nsi.in AUTHORS COPYING ChangeLog \ - NEWS README TODO compile config.guess config.sub depcomp \ - install-sh ltmain.sh missing + AUTHORS COPYING ChangeLog NEWS README TODO compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -1094,6 +1226,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_LDFLAGS = @AM_LDFLAGS@ AR = @AR@ +ARFLAGS = @ARFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1156,6 +1289,8 @@ ITSTOOL = @ITSTOOL@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBCANBERRA_CFLAGS = @LIBCANBERRA_CFLAGS@ +LIBCANBERRA_LIBS = @LIBCANBERRA_LIBS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ @@ -1324,9 +1459,9 @@ # set up these variables so the included Makefile.ams can use += # po doesn't use automake, but creates its own Makefile -SUBDIRS = $(am__append_29) po -noinst_LIBRARIES = $(am__append_1) $(am__append_21) libpioneers.a \ - $(am__append_30) +SUBDIRS = $(am__append_34) po +noinst_LIBRARIES = $(am__append_1) $(am__append_24) libpioneers.a \ + $(am__append_35) man_MANS = docs/pioneers.6 docs/pioneers-server-gtk.6 \ docs/pioneers-server-console.6 docs/pioneersai.6 \ docs/pioneers-metaserver.6 docs/pioneers-editor.6 @@ -1344,34 +1479,35 @@ server/henjes.game server/lorindol.game server/lobby.game \ server/south_africa.game server/ubuntuland.game \ server/north_america.game -icon_DATA = $(am__append_7) $(am__append_14) $(am__append_23) -pixmap_DATA = $(am__append_9) -actions_DATA = $(am__append_33) -desktop_in_files = $(am__append_5) $(am__append_15) $(am__append_24) -CLEANFILES = $(am__append_12) $(am__append_19) $(am__append_28) \ +icon_DATA = $(am__append_8) $(am__append_15) $(am__append_26) +pixmap_DATA = $(am__append_10) +actions_DATA = $(am__append_38) +desktop_in_files = $(am__append_5) $(am__append_16) $(am__append_27) +CLEANFILES = $(am__append_7) $(am__append_13) $(am__append_20) \ + $(am__append_22) $(am__append_31) $(am__append_33) \ common/authors.h common/version.h DISTCLEANFILES = $(desktop_in_files:.desktop.in=.desktop) \ intltool-extract intltool-merge intltool-update # Make use of some of the variables that were filled in by the included # Makefile.ams -MAINTAINERCLEANFILES = $(am__append_10) $(am__append_32) \ +MAINTAINERCLEANFILES = $(am__append_11) $(am__append_37) \ common/notifying-string.gob.stamp common/notifying-string.c \ common/notifying-string.h common/notifying-string-private.h \ $(icon_DATA) EXTRA_DIST = autogen.sh pioneers.spec README.Cygwin README.MinGW \ - Doxyfile $(am__append_6) $(srcdir)/MinGW/loaders.cache \ - $(srcdir)/MinGW/README.txt $(man_MANS) $(desktop_in_files) \ - $(config_DATA) $(pixmap_DATA) $(icon_DATA) $(subst \ - png,svg,$(icon_DATA)) $(actions_DATA) $(icons) $(subst \ - .svg,.48x48_apps.png,$(icons)) + Doxyfile $(am__append_6) $(am__append_19) $(am__append_30) \ + $(srcdir)/MinGW/loaders.cache $(srcdir)/MinGW/README.txt \ + $(man_MANS) $(desktop_in_files) $(config_DATA) $(pixmap_DATA) \ + $(icon_DATA) $(subst png,svg,$(icon_DATA)) $(actions_DATA) \ + $(icons) $(subst .svg,.48x48_apps.png,$(icons)) # Application icons, in various sizes -BUILT_SOURCES = $(am__append_13) $(am__append_31) common/authors.h \ +BUILT_SOURCES = $(am__append_14) $(am__append_36) common/authors.h \ common/notifying-string.gob.stamp common/notifying-string.c \ common/notifying-string.h common/notifying-string-private.h \ common/version.h $(subst .svg,.48x48_apps.png,$(icons)) -icons = $(am__append_8) $(am__append_17) $(am__append_26) +icons = $(am__append_9) $(am__append_18) $(am__append_29) @BUILD_CLIENT_TRUE@libpioneersclient_a_CPPFLAGS = -I$(top_srcdir)/client $(console_cflags) @BUILD_CLIENT_TRUE@libpioneersclient_a_SOURCES = \ @BUILD_CLIENT_TRUE@ client/callback.h \ @@ -1409,8 +1545,13 @@ @ADMIN_GTK_SUPPORT_TRUE@@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ADMIN_GTK_FILES_ACTIVE = client/gtk/admin-gtk.c @ADMIN_GTK_SUPPORT_FALSE@@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ADMIN_GTK_FILES_INACTIVE = client/gtk/admin-gtk.c @ADMIN_GTK_SUPPORT_TRUE@@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ADMIN_GTK_FILES_INACTIVE = -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@pioneers_CPPFLAGS = -I$(top_srcdir)/client -I$(top_srcdir)/client/common $(LIBNOTIFY_CFLAGS) $(gtk_cflags) $(ADMIN_GTK) $(avahi_cflags) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@pioneers_CPPFLAGS = -I$(top_srcdir)/client -I$(top_srcdir)/client/common $(LIBNOTIFY_CFLAGS) $(gtk_cflags) $(ADMIN_GTK) $(avahi_cflags) $(LIBCANBERRA_CFLAGS) @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@EXTRA_pioneers_SOURCES = $(ADMIN_GTK_FILES_INACTIVE) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@client_resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/client/gtk/client.gresource.xml) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@pioneers_BUILT_RESOURCES = \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/client-resources.c \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/client-resources.h + @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@pioneers_SOURCES = \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(ADMIN_GTK_FILES_ACTIVE) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/callback.h \ @@ -1456,13 +1597,15 @@ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/resource-table.h \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/settingscreen.c \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/state.c \ -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/trade.c +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/trade.c \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(pioneers_BUILT_RESOURCES) @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@pioneers_LDADD = \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ libpioneersclient.a \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(gtk_libs) $(avahi_libs) \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(LIBNOTIFY_LIBS) \ -@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__append_11) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(LIBCANBERRA_LIBS) \ +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(am__append_12) @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ccflickrthemedir = $(pioneers_themedir)/ccFlickr @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ccflickrtheme_DATA = \ @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ client/gtk/data/themes/ccFlickr/ATTRIB \ @@ -1576,11 +1719,17 @@ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@pioneers_server_gtk_LDADD = \ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ libpioneers_server.a \ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(gtk_libs) $(avahi_libs) \ -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(am__append_18) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(am__append_21) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@server_resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/server/gtk/server.gresource.xml) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@pioneers_server_gtk_BUILT_RESOURCES = \ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ server/gtk/server-resources.c \ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ server/gtk/server-resources.h + @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@pioneers_server_gtk_SOURCES = \ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ server/gtk/main.c \ @BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ server/gtk/pioneers-server.ico \ -@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ server/gtk/pioneers-server.rc +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ server/gtk/pioneers-server.rc \ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(pioneers_server_gtk_BUILT_RESOURCES) @BUILD_SERVER_TRUE@pioneers_server_console_CPPFLAGS = $(console_cflags) @BUILD_SERVER_TRUE@libpioneers_server_a_CPPFLAGS = $(console_cflags) $(avahi_cflags) @@ -1615,6 +1764,11 @@ @BUILD_METASERVER_TRUE@ metaserver/main.c @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@pioneers_editor_CPPFLAGS = $(gtk_cflags) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/editor/gtk/editor.gresource.xml) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@BUILT_RESOURCES = \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/editor-resources.c \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/editor-resources.h + @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@pioneers_editor_SOURCES = \ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/editor.c \ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/game-devcards.c \ @@ -1624,10 +1778,11 @@ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/game-resources.c \ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/game-resources.h \ @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/pioneers-editor.ico \ -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/pioneers-editor.rc +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ editor/gtk/pioneers-editor.rc \ +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(BUILT_RESOURCES) @BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@pioneers_editor_LDADD = $(gtk_libs) \ -@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(am__append_27) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(am__append_32) @HAVE_GTK_TRUE@libpioneers_gtk_a_CPPFLAGS = $(gtk_cflags) @HAVE_GTK_TRUE@libpioneers_gtk_a_SOURCES = \ @HAVE_GTK_TRUE@ common/gtk/aboutbox.c \ @@ -1680,6 +1835,8 @@ common/game.h \ common/game-list.c \ common/game-list.h \ + common/gettext.c \ + common/gettext.h \ common/log.c \ common/log.h \ common/map.c \ @@ -1729,8 +1886,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(srcdir)/client/Makefile.am $(srcdir)/client/common/Makefile.am $(srcdir)/client/ai/Makefile.am $(srcdir)/client/gtk/Makefile.am $(srcdir)/client/gtk/data/Makefile.am $(srcdir)/client/gtk/data/themes/Makefile.am $(srcdir)/client/gtk/data/themes/ccFlickr/Makefile.am $(srcdir)/client/gtk/data/themes/Classic/Makefile.am $(srcdir)/client/gtk/data/themes/FreeCIV-like/Makefile.am $(srcdir)/client/gtk/data/themes/Iceland/Makefile.am $(srcdir)/client/gtk/data/themes/Nouvellia/Makefile.am $(srcdir)/client/gtk/data/themes/Tiny/Makefile.am $(srcdir)/client/gtk/data/themes/Wesnoth-like/Makefile.am $(srcdir)/server/Makefile.am $(srcdir)/server/gtk/Makefile.am $(srcdir)/metaserver/Makefile.am $(srcdir)/editor/Makefile.am $(srcdir)/editor/gtk/Makefile.am $(srcdir)/MinGW/Makefile.am $(srcdir)/common/Makefile.am $(srcdir)/common/gtk/Makefile.am $(srcdir)/docs/Makefile.am $(am__empty): @@ -1761,8 +1918,64 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -MinGW/pioneers.nsi: $(top_builddir)/config.status $(top_srcdir)/MinGW/pioneers.nsi.in - cd $(top_builddir) && $(SHELL) ./config.status $@ +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -1788,6 +2001,8 @@ common/$(DEPDIR)/$(am__dirstamp) common/libpioneers_a-game-list.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) +common/libpioneers_a-gettext.$(OBJEXT): common/$(am__dirstamp) \ + common/$(DEPDIR)/$(am__dirstamp) common/libpioneers_a-log.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) common/libpioneers_a-map.$(OBJEXT): common/$(am__dirstamp) \ @@ -1947,64 +2162,6 @@ $(AM_V_at)-rm -f libpioneersclient.a $(AM_V_AR)$(libpioneersclient_a_AR) libpioneersclient.a $(libpioneersclient_a_OBJECTS) $(libpioneersclient_a_LIBADD) $(AM_V_at)$(RANLIB) libpioneersclient.a -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list client/gtk/$(am__dirstamp): @$(MKDIR_P) client/gtk @: > client/gtk/$(am__dirstamp) @@ -2078,6 +2235,9 @@ client/gtk/$(DEPDIR)/$(am__dirstamp) client/gtk/pioneers-trade.$(OBJEXT): client/gtk/$(am__dirstamp) \ client/gtk/$(DEPDIR)/$(am__dirstamp) +client/gtk/pioneers-client-resources.$(OBJEXT): \ + client/gtk/$(am__dirstamp) \ + client/gtk/$(DEPDIR)/$(am__dirstamp) pioneers$(EXEEXT): $(pioneers_OBJECTS) $(pioneers_DEPENDENCIES) $(EXTRA_pioneers_DEPENDENCIES) @rm -f pioneers$(EXEEXT) @@ -2100,6 +2260,9 @@ editor/gtk/pioneers_editor-game-resources.$(OBJEXT): \ editor/gtk/$(am__dirstamp) \ editor/gtk/$(DEPDIR)/$(am__dirstamp) +editor/gtk/pioneers_editor-editor-resources.$(OBJEXT): \ + editor/gtk/$(am__dirstamp) \ + editor/gtk/$(DEPDIR)/$(am__dirstamp) pioneers-editor$(EXEEXT): $(pioneers_editor_OBJECTS) $(pioneers_editor_DEPENDENCIES) $(EXTRA_pioneers_editor_DEPENDENCIES) @rm -f pioneers-editor$(EXEEXT) @@ -2134,6 +2297,9 @@ server/gtk/pioneers_server_gtk-main.$(OBJEXT): \ server/gtk/$(am__dirstamp) \ server/gtk/$(DEPDIR)/$(am__dirstamp) +server/gtk/pioneers_server_gtk-server-resources.$(OBJEXT): \ + server/gtk/$(am__dirstamp) \ + server/gtk/$(DEPDIR)/$(am__dirstamp) pioneers-server-gtk$(EXEEXT): $(pioneers_server_gtk_OBJECTS) $(pioneers_server_gtk_DEPENDENCIES) $(EXTRA_pioneers_server_gtk_DEPENDENCIES) @rm -f pioneers-server-gtk$(EXEEXT) @@ -2174,106 +2340,116 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-ai.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-genetic.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-genetic_core.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-greedy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-lobbybot.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-build.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-callback.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-client.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-develop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-player.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-resource.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-robber.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-setup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-stock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-turn.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-admin-gtk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-audio.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-avahi-browser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-avahi.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-callbacks.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-chat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-connect.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-develop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-discard.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-frontend.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-gameover.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-gold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-gui.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-histogram.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-identity.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-interface.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-legend.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-monopoly.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-name.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-notification.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-offline.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-player.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-plenty.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-quote-view.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-quote.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-resource-table.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-resource-view.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-resource.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-settingscreen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-state.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-trade.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-buildrec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-cards.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-common_glib.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-cost.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-deck.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-driver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-game-list.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-game.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-map.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-map_query.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-network.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-notifying-string.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-quoteinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-random.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-set.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-state.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-aboutbox.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-colors.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-common_gtk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-config-gnome.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-rules.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-settings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-guimap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-map-icons.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-metaserver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-player-icon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-polygon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-scrollable-text-view.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-select-game.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-theme.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-editor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-game-buildings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-game-devcards.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-game-resources.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@metaserver/$(DEPDIR)/pioneers_metaserver-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-admin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-avahi.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-buildutil.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-develop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-discard.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-gold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-meta.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-player.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-pregame.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-resource.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-robber.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-server.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-trade.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-turn.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/pioneers_server_console-glib-driver.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/pioneers_server_console-main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@server/gtk/$(DEPDIR)/pioneers_server_gtk-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-ai.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-genetic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-genetic_core.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-greedy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/ai/$(DEPDIR)/pioneersai-lobbybot.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-build.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-callback.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-client.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-develop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-player.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-resource.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-robber.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-setup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-stock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/common/$(DEPDIR)/libpioneersclient_a-turn.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-admin-gtk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-audio.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-avahi-browser.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-avahi.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-callbacks.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-chat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-client-resources.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-connect.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-develop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-discard.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-frontend.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-gameover.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-gold.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-gui.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-histogram.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-identity.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-interface.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-legend.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-monopoly.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-name.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-notification.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-offline.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-player.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-plenty.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-quote-view.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-quote.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-resource-table.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-resource-view.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-resource.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-settingscreen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-state.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@client/gtk/$(DEPDIR)/pioneers-trade.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-buildrec.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-cards.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-common_glib.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-cost.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-deck.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-driver.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-game-list.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-game.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-gettext.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-log.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-map.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-map_query.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-network.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-notifying-string.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-quoteinfo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-random.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-set.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/$(DEPDIR)/libpioneers_a-state.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-aboutbox.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-colors.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-common_gtk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-config-gnome.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-rules.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-settings.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-guimap.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-map-icons.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-metaserver.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-player-icon.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-polygon.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-scrollable-text-view.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-select-game.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@common/gtk/$(DEPDIR)/libpioneers_gtk_a-theme.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-editor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-game-buildings.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-game-devcards.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@editor/gtk/$(DEPDIR)/pioneers_editor-game-resources.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@metaserver/$(DEPDIR)/pioneers_metaserver-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-admin.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-avahi.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-buildutil.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-develop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-discard.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-gold.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-meta.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-player.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-pregame.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-resource.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-robber.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-server.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-trade.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/libpioneers_server_a-turn.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/pioneers_server_console-glib-driver.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/$(DEPDIR)/pioneers_server_console-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/gtk/$(DEPDIR)/pioneers_server_gtk-main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -2411,6 +2587,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpioneers_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common/libpioneers_a-game-list.obj `if test -f 'common/game-list.c'; then $(CYGPATH_W) 'common/game-list.c'; else $(CYGPATH_W) '$(srcdir)/common/game-list.c'; fi` +common/libpioneers_a-gettext.o: common/gettext.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpioneers_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common/libpioneers_a-gettext.o -MD -MP -MF common/$(DEPDIR)/libpioneers_a-gettext.Tpo -c -o common/libpioneers_a-gettext.o `test -f 'common/gettext.c' || echo '$(srcdir)/'`common/gettext.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) common/$(DEPDIR)/libpioneers_a-gettext.Tpo common/$(DEPDIR)/libpioneers_a-gettext.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/gettext.c' object='common/libpioneers_a-gettext.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpioneers_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common/libpioneers_a-gettext.o `test -f 'common/gettext.c' || echo '$(srcdir)/'`common/gettext.c + +common/libpioneers_a-gettext.obj: common/gettext.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpioneers_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common/libpioneers_a-gettext.obj -MD -MP -MF common/$(DEPDIR)/libpioneers_a-gettext.Tpo -c -o common/libpioneers_a-gettext.obj `if test -f 'common/gettext.c'; then $(CYGPATH_W) 'common/gettext.c'; else $(CYGPATH_W) '$(srcdir)/common/gettext.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) common/$(DEPDIR)/libpioneers_a-gettext.Tpo common/$(DEPDIR)/libpioneers_a-gettext.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/gettext.c' object='common/libpioneers_a-gettext.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpioneers_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common/libpioneers_a-gettext.obj `if test -f 'common/gettext.c'; then $(CYGPATH_W) 'common/gettext.c'; else $(CYGPATH_W) '$(srcdir)/common/gettext.c'; fi` + common/libpioneers_a-log.o: common/log.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpioneers_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common/libpioneers_a-log.o -MD -MP -MF common/$(DEPDIR)/libpioneers_a-log.Tpo -c -o common/libpioneers_a-log.o `test -f 'common/log.c' || echo '$(srcdir)/'`common/log.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) common/$(DEPDIR)/libpioneers_a-log.Tpo common/$(DEPDIR)/libpioneers_a-log.Po @@ -3517,6 +3707,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/gtk/pioneers-trade.obj `if test -f 'client/gtk/trade.c'; then $(CYGPATH_W) 'client/gtk/trade.c'; else $(CYGPATH_W) '$(srcdir)/client/gtk/trade.c'; fi` +client/gtk/pioneers-client-resources.o: client/gtk/client-resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/gtk/pioneers-client-resources.o -MD -MP -MF client/gtk/$(DEPDIR)/pioneers-client-resources.Tpo -c -o client/gtk/pioneers-client-resources.o `test -f 'client/gtk/client-resources.c' || echo '$(srcdir)/'`client/gtk/client-resources.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) client/gtk/$(DEPDIR)/pioneers-client-resources.Tpo client/gtk/$(DEPDIR)/pioneers-client-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client/gtk/client-resources.c' object='client/gtk/pioneers-client-resources.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/gtk/pioneers-client-resources.o `test -f 'client/gtk/client-resources.c' || echo '$(srcdir)/'`client/gtk/client-resources.c + +client/gtk/pioneers-client-resources.obj: client/gtk/client-resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/gtk/pioneers-client-resources.obj -MD -MP -MF client/gtk/$(DEPDIR)/pioneers-client-resources.Tpo -c -o client/gtk/pioneers-client-resources.obj `if test -f 'client/gtk/client-resources.c'; then $(CYGPATH_W) 'client/gtk/client-resources.c'; else $(CYGPATH_W) '$(srcdir)/client/gtk/client-resources.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) client/gtk/$(DEPDIR)/pioneers-client-resources.Tpo client/gtk/$(DEPDIR)/pioneers-client-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client/gtk/client-resources.c' object='client/gtk/pioneers-client-resources.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client/gtk/pioneers-client-resources.obj `if test -f 'client/gtk/client-resources.c'; then $(CYGPATH_W) 'client/gtk/client-resources.c'; else $(CYGPATH_W) '$(srcdir)/client/gtk/client-resources.c'; fi` + editor/gtk/pioneers_editor-editor.o: editor/gtk/editor.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_editor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT editor/gtk/pioneers_editor-editor.o -MD -MP -MF editor/gtk/$(DEPDIR)/pioneers_editor-editor.Tpo -c -o editor/gtk/pioneers_editor-editor.o `test -f 'editor/gtk/editor.c' || echo '$(srcdir)/'`editor/gtk/editor.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) editor/gtk/$(DEPDIR)/pioneers_editor-editor.Tpo editor/gtk/$(DEPDIR)/pioneers_editor-editor.Po @@ -3573,6 +3777,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_editor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o editor/gtk/pioneers_editor-game-resources.obj `if test -f 'editor/gtk/game-resources.c'; then $(CYGPATH_W) 'editor/gtk/game-resources.c'; else $(CYGPATH_W) '$(srcdir)/editor/gtk/game-resources.c'; fi` +editor/gtk/pioneers_editor-editor-resources.o: editor/gtk/editor-resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_editor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT editor/gtk/pioneers_editor-editor-resources.o -MD -MP -MF editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Tpo -c -o editor/gtk/pioneers_editor-editor-resources.o `test -f 'editor/gtk/editor-resources.c' || echo '$(srcdir)/'`editor/gtk/editor-resources.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Tpo editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='editor/gtk/editor-resources.c' object='editor/gtk/pioneers_editor-editor-resources.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_editor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o editor/gtk/pioneers_editor-editor-resources.o `test -f 'editor/gtk/editor-resources.c' || echo '$(srcdir)/'`editor/gtk/editor-resources.c + +editor/gtk/pioneers_editor-editor-resources.obj: editor/gtk/editor-resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_editor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT editor/gtk/pioneers_editor-editor-resources.obj -MD -MP -MF editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Tpo -c -o editor/gtk/pioneers_editor-editor-resources.obj `if test -f 'editor/gtk/editor-resources.c'; then $(CYGPATH_W) 'editor/gtk/editor-resources.c'; else $(CYGPATH_W) '$(srcdir)/editor/gtk/editor-resources.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Tpo editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='editor/gtk/editor-resources.c' object='editor/gtk/pioneers_editor-editor-resources.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_editor_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o editor/gtk/pioneers_editor-editor-resources.obj `if test -f 'editor/gtk/editor-resources.c'; then $(CYGPATH_W) 'editor/gtk/editor-resources.c'; else $(CYGPATH_W) '$(srcdir)/editor/gtk/editor-resources.c'; fi` + metaserver/pioneers_metaserver-main.o: metaserver/main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_metaserver_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT metaserver/pioneers_metaserver-main.o -MD -MP -MF metaserver/$(DEPDIR)/pioneers_metaserver-main.Tpo -c -o metaserver/pioneers_metaserver-main.o `test -f 'metaserver/main.c' || echo '$(srcdir)/'`metaserver/main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) metaserver/$(DEPDIR)/pioneers_metaserver-main.Tpo metaserver/$(DEPDIR)/pioneers_metaserver-main.Po @@ -3629,6 +3847,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_server_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o server/gtk/pioneers_server_gtk-main.obj `if test -f 'server/gtk/main.c'; then $(CYGPATH_W) 'server/gtk/main.c'; else $(CYGPATH_W) '$(srcdir)/server/gtk/main.c'; fi` +server/gtk/pioneers_server_gtk-server-resources.o: server/gtk/server-resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_server_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT server/gtk/pioneers_server_gtk-server-resources.o -MD -MP -MF server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Tpo -c -o server/gtk/pioneers_server_gtk-server-resources.o `test -f 'server/gtk/server-resources.c' || echo '$(srcdir)/'`server/gtk/server-resources.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Tpo server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='server/gtk/server-resources.c' object='server/gtk/pioneers_server_gtk-server-resources.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_server_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o server/gtk/pioneers_server_gtk-server-resources.o `test -f 'server/gtk/server-resources.c' || echo '$(srcdir)/'`server/gtk/server-resources.c + +server/gtk/pioneers_server_gtk-server-resources.obj: server/gtk/server-resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_server_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT server/gtk/pioneers_server_gtk-server-resources.obj -MD -MP -MF server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Tpo -c -o server/gtk/pioneers_server_gtk-server-resources.obj `if test -f 'server/gtk/server-resources.c'; then $(CYGPATH_W) 'server/gtk/server-resources.c'; else $(CYGPATH_W) '$(srcdir)/server/gtk/server-resources.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Tpo server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='server/gtk/server-resources.c' object='server/gtk/pioneers_server_gtk-server-resources.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneers_server_gtk_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o server/gtk/pioneers_server_gtk-server-resources.obj `if test -f 'server/gtk/server-resources.c'; then $(CYGPATH_W) 'server/gtk/server-resources.c'; else $(CYGPATH_W) '$(srcdir)/server/gtk/server-resources.c'; fi` + client/ai/pioneersai-ai.o: client/ai/ai.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pioneersai_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client/ai/pioneersai-ai.o -MD -MP -MF client/ai/$(DEPDIR)/pioneersai-ai.Tpo -c -o client/ai/pioneersai-ai.o `test -f 'client/ai/ai.c' || echo '$(srcdir)/'`client/ai/ai.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) client/ai/$(DEPDIR)/pioneersai-ai.Tpo client/ai/$(DEPDIR)/pioneersai-ai.Po @@ -4109,7 +4341,10 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -4192,6 +4427,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -4234,6 +4473,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -4303,7 +4544,7 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(DATA) config.h +all-am: Makefile $(PROGRAMS) $(LIBRARIES) $(MANS) $(DATA) config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man6dir)" "$(DESTDIR)$(actionsdir)" "$(DESTDIR)$(ccflickrthemedir)" "$(DESTDIR)$(classicthemedir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(freecivthemedir)" "$(DESTDIR)$(icelandthemedir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(nouvelliathemedir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(tinythemedir)" "$(DESTDIR)$(wesnoththemedir)"; do \ @@ -4370,7 +4611,110 @@ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf client/ai/$(DEPDIR) client/common/$(DEPDIR) client/gtk/$(DEPDIR) common/$(DEPDIR) common/gtk/$(DEPDIR) editor/gtk/$(DEPDIR) metaserver/$(DEPDIR) server/$(DEPDIR) server/gtk/$(DEPDIR) + -rm -f client/ai/$(DEPDIR)/pioneersai-ai.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-genetic.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-genetic_core.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-greedy.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-lobbybot.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-build.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-callback.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-client.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-develop.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-main.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-player.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-resource.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-robber.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-setup.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-stock.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-turn.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-admin-gtk.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-audio.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-avahi-browser.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-avahi.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-callbacks.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-chat.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-client-resources.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-connect.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-develop.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-discard.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-frontend.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-gameover.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-gold.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-gui.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-histogram.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-identity.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-interface.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-legend.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-monopoly.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-name.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-notification.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-offline.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-player.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-plenty.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-quote-view.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-quote.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-resource-table.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-resource-view.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-resource.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-settingscreen.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-state.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-trade.Po + -rm -f common/$(DEPDIR)/libpioneers_a-buildrec.Po + -rm -f common/$(DEPDIR)/libpioneers_a-cards.Po + -rm -f common/$(DEPDIR)/libpioneers_a-common_glib.Po + -rm -f common/$(DEPDIR)/libpioneers_a-cost.Po + -rm -f common/$(DEPDIR)/libpioneers_a-deck.Po + -rm -f common/$(DEPDIR)/libpioneers_a-driver.Po + -rm -f common/$(DEPDIR)/libpioneers_a-game-list.Po + -rm -f common/$(DEPDIR)/libpioneers_a-game.Po + -rm -f common/$(DEPDIR)/libpioneers_a-gettext.Po + -rm -f common/$(DEPDIR)/libpioneers_a-log.Po + -rm -f common/$(DEPDIR)/libpioneers_a-map.Po + -rm -f common/$(DEPDIR)/libpioneers_a-map_query.Po + -rm -f common/$(DEPDIR)/libpioneers_a-network.Po + -rm -f common/$(DEPDIR)/libpioneers_a-notifying-string.Po + -rm -f common/$(DEPDIR)/libpioneers_a-quoteinfo.Po + -rm -f common/$(DEPDIR)/libpioneers_a-random.Po + -rm -f common/$(DEPDIR)/libpioneers_a-set.Po + -rm -f common/$(DEPDIR)/libpioneers_a-state.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-aboutbox.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-colors.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-common_gtk.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-config-gnome.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-rules.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-settings.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-guimap.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-map-icons.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-metaserver.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-player-icon.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-polygon.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-scrollable-text-view.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-select-game.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-theme.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-editor.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-game-buildings.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-game-devcards.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-game-resources.Po + -rm -f metaserver/$(DEPDIR)/pioneers_metaserver-main.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-admin.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-avahi.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-buildutil.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-develop.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-discard.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-gold.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-meta.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-player.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-pregame.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-resource.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-robber.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-server.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-trade.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-turn.Po + -rm -f server/$(DEPDIR)/pioneers_server_console-glib-driver.Po + -rm -f server/$(DEPDIR)/pioneers_server_console-main.Po + -rm -f server/gtk/$(DEPDIR)/pioneers_server_gtk-main.Po + -rm -f server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-local distclean-tags @@ -4425,7 +4769,110 @@ maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf client/ai/$(DEPDIR) client/common/$(DEPDIR) client/gtk/$(DEPDIR) common/$(DEPDIR) common/gtk/$(DEPDIR) editor/gtk/$(DEPDIR) metaserver/$(DEPDIR) server/$(DEPDIR) server/gtk/$(DEPDIR) + -rm -f client/ai/$(DEPDIR)/pioneersai-ai.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-genetic.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-genetic_core.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-greedy.Po + -rm -f client/ai/$(DEPDIR)/pioneersai-lobbybot.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-build.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-callback.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-client.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-develop.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-main.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-player.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-resource.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-robber.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-setup.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-stock.Po + -rm -f client/common/$(DEPDIR)/libpioneersclient_a-turn.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-admin-gtk.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-audio.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-avahi-browser.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-avahi.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-callbacks.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-chat.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-client-resources.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-connect.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-develop.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-discard.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-frontend.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-gameover.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-gold.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-gui.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-histogram.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-identity.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-interface.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-legend.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-monopoly.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-name.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-notification.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-offline.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-player.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-plenty.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-quote-view.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-quote.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-resource-table.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-resource-view.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-resource.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-settingscreen.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-state.Po + -rm -f client/gtk/$(DEPDIR)/pioneers-trade.Po + -rm -f common/$(DEPDIR)/libpioneers_a-buildrec.Po + -rm -f common/$(DEPDIR)/libpioneers_a-cards.Po + -rm -f common/$(DEPDIR)/libpioneers_a-common_glib.Po + -rm -f common/$(DEPDIR)/libpioneers_a-cost.Po + -rm -f common/$(DEPDIR)/libpioneers_a-deck.Po + -rm -f common/$(DEPDIR)/libpioneers_a-driver.Po + -rm -f common/$(DEPDIR)/libpioneers_a-game-list.Po + -rm -f common/$(DEPDIR)/libpioneers_a-game.Po + -rm -f common/$(DEPDIR)/libpioneers_a-gettext.Po + -rm -f common/$(DEPDIR)/libpioneers_a-log.Po + -rm -f common/$(DEPDIR)/libpioneers_a-map.Po + -rm -f common/$(DEPDIR)/libpioneers_a-map_query.Po + -rm -f common/$(DEPDIR)/libpioneers_a-network.Po + -rm -f common/$(DEPDIR)/libpioneers_a-notifying-string.Po + -rm -f common/$(DEPDIR)/libpioneers_a-quoteinfo.Po + -rm -f common/$(DEPDIR)/libpioneers_a-random.Po + -rm -f common/$(DEPDIR)/libpioneers_a-set.Po + -rm -f common/$(DEPDIR)/libpioneers_a-state.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-aboutbox.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-colors.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-common_gtk.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-config-gnome.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-rules.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-game-settings.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-guimap.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-map-icons.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-metaserver.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-player-icon.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-polygon.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-scrollable-text-view.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-select-game.Po + -rm -f common/gtk/$(DEPDIR)/libpioneers_gtk_a-theme.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-editor-resources.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-editor.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-game-buildings.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-game-devcards.Po + -rm -f editor/gtk/$(DEPDIR)/pioneers_editor-game-resources.Po + -rm -f metaserver/$(DEPDIR)/pioneers_metaserver-main.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-admin.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-avahi.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-buildutil.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-develop.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-discard.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-gold.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-meta.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-player.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-pregame.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-resource.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-robber.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-server.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-trade.Po + -rm -f server/$(DEPDIR)/libpioneers_server_a-turn.Po + -rm -f server/$(DEPDIR)/pioneers_server_console-glib-driver.Po + -rm -f server/$(DEPDIR)/pioneers_server_console-main.Po + -rm -f server/gtk/$(DEPDIR)/pioneers_server_gtk-main.Po + -rm -f server/gtk/$(DEPDIR)/pioneers_server_gtk-server-resources.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -4457,12 +4904,12 @@ install-data-am install-exec-am install-strip uninstall-am .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-binPROGRAMS \ - clean-cscope clean-generic clean-libtool clean-local \ - clean-noinstLIBRARIES clean-noinstPROGRAMS cscope \ + am--depfiles am--refresh check check-am clean \ + clean-binPROGRAMS clean-cscope clean-generic clean-libtool \ + clean-local clean-noinstLIBRARIES clean-noinstPROGRAMS cscope \ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-compile \ + dist-zip dist-zstd distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ distclean-local distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ @@ -4507,54 +4954,125 @@ @USE_WINDOWS_ICON_TRUE@%.res: %.rc %.ico @USE_WINDOWS_ICON_TRUE@ $(MKDIR_P) $(dir $@) @USE_WINDOWS_ICON_TRUE@ windres -I$(top_srcdir) -O coff -o $@ $< +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@client/gtk/client-resources.c: client/gtk/client.gresource.xml $(client_resource_files) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name client $(srcdir)/client/gtk/client.gresource.xml +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@client/gtk/client-resources.h: client/gtk/client.gresource.xml $(client_resource_files) +@BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name client $(srcdir)/client/gtk/client.gresource.xml @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@client/gtk/data/splash.png: client/gtk/data/splash.svg @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(MKDIR_P) $(dir $@) @BUILD_CLIENT_TRUE@@HAVE_GTK_TRUE@ $(svg_renderer_path) $(svg_renderer_width)400$(svg_renderer_height)400 $< $(svg_renderer_output) $@ +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@server/gtk/server-resources.c: server/gtk/server.gresource.xml $(server_resource_files) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name server $(srcdir)/server/gtk/server.gresource.xml +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@server/gtk/server-resources.h: server/gtk/server.gresource.xml $(server_resource_files) +@BUILD_SERVER_TRUE@@HAVE_GTK_TRUE@ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name server $(srcdir)/server/gtk/server.gresource.xml +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@editor/gtk/editor-resources.c: editor/gtk/editor.gresource.xml $(resource_files) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name editor $(srcdir)/editor/gtk/editor.gresource.xml +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@editor/gtk/editor-resources.h: editor/gtk/editor.gresource.xml $(resource_files) +@BUILD_EDITOR_TRUE@@HAVE_GTK_TRUE@ $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name editor $(srcdir)/editor/gtk/editor.gresource.xml @IS_MINGW_PORT_TRUE@install-exec-hook: install-MinGW -@IS_MINGW_PORT_TRUE@install-MinGW: -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libatk-1.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libcairo-2.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libcairo-gobject-2.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libcroco-0.6-3.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libffi-6.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libfontconfig-1.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libfreetype-6.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libgcc_s_dw2-1.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libgdk-3-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libgdk_pixbuf-2.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libgio-2.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libglib-2.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libgmodule-2.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libgobject-2.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libgtk-3-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libiconv-2.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libintl-8.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/liblzma-5.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libpango-1.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libpangocairo-1.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libpangoft2-1.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libpangowin32-1.0-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libpixman-1-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libpng15-15.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/librsvg-2-2.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libssp-0.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/libxml2-2.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/pthreadGC2.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/zlib1.dll /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/gspawn-win32-helper.exe /usr/local -@IS_MINGW_PORT_TRUE@ cp /mingw/bin/gspawn-win32-helper-console.exe /usr/local -@IS_MINGW_PORT_TRUE@ mkdir -p /usr/local/lib/gdk-pixbuf-2.0/2.10.0 -@IS_MINGW_PORT_TRUE@ cp $(srcdir)/MinGW/loaders.cache /usr/local/lib/gdk-pixbuf-2.0/2.10.0 -@IS_MINGW_PORT_TRUE@ mkdir -p /usr/local/share/icons/hicolor -@IS_MINGW_PORT_TRUE@ cp /mingw/share/icons/hicolor/index.theme /usr/local/share/icons/hicolor -@IS_MINGW_PORT_TRUE@ mkdir -p /usr/local/share/icons/hicolor/24x24/actions -@IS_MINGW_PORT_TRUE@ cp /mingw/share/gtk-doc/html/gtk3/edit-undo-ltr.png /usr/local/share/icons/hicolor/24x24/actions/edit-undo.png -@IS_MINGW_PORT_TRUE@ mkdir -p /usr/local/share/glib-2.0/schemas -@IS_MINGW_PORT_TRUE@ cp /mingw/share/glib-2.0/schemas/gschemas.compiled /usr/local/share/glib-2.0/schemas +@IS_MINGW_PORT_TRUE@install-MinGW: install-MinGW-DLLs install-MinGW-icons install-MinGW-fileopen + +@IS_MINGW_PORT_TRUE@install-MinGW-DLLs: +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgdk-3-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgio-2.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgdk_pixbuf-2.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libcairo-2.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libglib-2.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgtk-3-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgobject-2.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libintl-8.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libpango-1.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libpangocairo-1.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ -$(INSTALL_PROGRAM) /mingw64/bin/libnotify-4.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libfontconfig-1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libfreetype-6.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libpangoft2-1.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libpangowin32-1.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libfribidi-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libthai-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libiconv-2.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgcc_s_seh-1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libexpat-1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libbz2-1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libharfbuzz-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libpng16-16.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/zlib1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libpixman-1-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libcairo-gobject-2.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libepoxy-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgmodule-2.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libwinpthread-1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libpcre-1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libbrotlidec.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libbrotlicommon.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgraphite2.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libffi-7.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libatk-1.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libdatrie-1.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libstdc++-6.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/lib/gdk-pixbuf-2.0/2.10.0 +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) $(srcdir)/MinGW/loaders.cache $(bindir)/lib/gdk-pixbuf-2.0/2.10.0 +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/lib/gdk-pixbuf-2.0/2.10.0/loaders +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll $(bindir)/lib/gdk-pixbuf-2.0/2.10.0/loaders +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll $(bindir)/lib/gdk-pixbuf-2.0/2.10.0/loaders +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/librsvg-2-2.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libgdk_pixbuf-2.0-0.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/libxml2-2.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/liblzma-5.dll $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/gspawn-win64-helper.exe $(bindir) +@IS_MINGW_PORT_TRUE@ $(INSTALL_PROGRAM) /mingw64/bin/gspawn-win64-helper-console.exe $(bindir) + +@IS_MINGW_PORT_TRUE@install-MinGW-icons: +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/share/icons/hicolor +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/hicolor/index.theme $(bindir)/share/icons/hicolor +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/index.theme $(bindir)/share/icons/Adwaita +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/list-add-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/list-remove-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/edit-undo-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/edit-delete-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions/edit-delete.svg +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/share/icons/Adwaita/scalable/ui +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/ui/pan-down-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/ui +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/ui/pan-up-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/ui +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/ui/window-close-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/ui + +@IS_MINGW_PORT_TRUE@install-MinGW-fileopen: +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/share/glib-2.0/schemas +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/glib-2.0/schemas/gschemas.compiled $(bindir)/share/glib-2.0/schemas +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/document-open-recent-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/media-eject-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/folder-new-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/actions/bookmark-new-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/actions +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/ui/pan-start-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/ui +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/ui/pan-end-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/ui +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/ui/pan-down-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/ui +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/ui/pan-up-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/ui +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/user-home-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/user-desktop-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/folder-documents-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/folder-download-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/folder-music-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/folder-pictures-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/folder-videos-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/user-trash-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/places/folder-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/places +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/share/icons/Adwaita/scalable/devices +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/devices/drive-harddisk-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/devices +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/devices/drive-harddisk-usb-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/devices +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/devices/drive-optical-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/devices +@IS_MINGW_PORT_TRUE@ $(MKDIR_P) $(bindir)/share/icons/Adwaita/scalable/mimetypes +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) /mingw64/share/icons/Adwaita/scalable/mimetypes/text-x-generic-symbolic.svg $(bindir)/share/icons/Adwaita/scalable/mimetypes + +@IS_MINGW_PORT_TRUE@package: install-strip +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) NEWS $(bindir)/NEWS.txt +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) AUTHORS $(bindir)/AUTHORS.txt +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) COPYING $(bindir)/COPYING.txt +@IS_MINGW_PORT_TRUE@ $(INSTALL_DATA) README $(bindir)/README.txt +@IS_MINGW_PORT_TRUE@ cd $(bindir); zip -r $(abs_top_srcdir)/pioneers-$(VERSION)-portable.zip * common/authors.h: AUTHORS $(MKDIR_P) common @@ -4593,8 +5111,8 @@ rm -rf html distclean-local: - rm -f *~ - rm -rf autom4te.cache + -rm -f *~ + -rm -rf autom4te.cache # Reformat the code. reindent: @@ -4610,8 +5128,8 @@ # Remove ALL generated files pristine: maintainer-clean - rm -fr m4 - svn status --no-ignore | awk '$$1=="I" { print substr($$0, 9, 255) }' | tr '\n' '\0' | xargs -0 rm + rm -rf m4 + svn status --no-ignore | awk '$$1=="I" { print substr($$0, 9, 255) }' | tr '\n' '\0' | xargs -0 rm -rf %.48x48_apps.png: %.svg $(MKDIR_P) $(dir $@) diff -Nru pioneers-15.5/metaserver/main.c pioneers-15.6/metaserver/main.c --- pioneers-15.5/metaserver/main.c 2016-08-28 15:27:00.000000000 +0000 +++ pioneers-15.6/metaserver/main.c 2020-06-20 10:52:00.000000000 +0000 @@ -21,9 +21,6 @@ */ #include "config.h" -#ifdef HAVE_LOCALE_H -#include -#endif #include #include #include @@ -39,6 +36,7 @@ #include "log.h" #include "common_glib.h" #include "game-list.h" +#include "gettext.h" typedef enum { META_UNKNOWN, @@ -605,37 +603,37 @@ } static GOptionEntry commandline_entries[] = { - {"daemon", 'd', 0, G_OPTION_ARG_NONE, &make_daemon, + { "daemon", 'd', 0, G_OPTION_ARG_NONE, &make_daemon, /* Commandline metaserver: daemon */ - N_("Daemonize the metaserver on start"), NULL}, - {"pidfile", 'P', 0, G_OPTION_ARG_STRING, &pidfile, + N_("Daemonize the metaserver on start"), NULL }, + { "pidfile", 'P', 0, G_OPTION_ARG_STRING, &pidfile, /* Commandline metaserver: pidfile */ N_("Pidfile to create when daemonizing (implies -d)"), /* Commandline metaserver: pidfile argument */ - N_("filename")}, - {"redirect", 'r', 0, G_OPTION_ARG_STRING, &redirect_location, + N_("filename") }, + { "redirect", 'r', 0, G_OPTION_ARG_STRING, &redirect_location, /* Commandline metaserver: redirect */ - N_("Redirect clients to another metaserver"), NULL}, - {"servername", 's', 0, G_OPTION_ARG_STRING, &myhostname, + N_("Redirect clients to another metaserver"), NULL }, + { "servername", 's', 0, G_OPTION_ARG_STRING, &myhostname, /* Commandline metaserver: server */ N_("Use this hostname when creating new games"), /* Commandline metaserver: server argument */ - N_("hostname")}, - {"port-range", 'p', 0, G_OPTION_ARG_STRING, &port_range, + N_("hostname") }, + { "port-range", 'p', 0, G_OPTION_ARG_STRING, &port_range, /* Commandline metaserver: port-range */ N_("Use this port range when creating new games"), /* Commandline metaserver: port-range argument */ - N_("from-to")}, - {"debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, + N_("from-to") }, + { "debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, /* Commandline option of metaserver: enable debug logging */ - N_("Enable debug messages"), NULL}, - {"syslog-debug", '\0', 0, G_OPTION_ARG_NONE, &enable_syslog_debug, + N_("Enable debug messages"), NULL }, + { "syslog-debug", '\0', 0, G_OPTION_ARG_NONE, &enable_syslog_debug, /* Commandline option of metaserver: syslog-debug */ - N_("Debug syslog messages"), NULL}, - {"version", '\0', 0, G_OPTION_ARG_NONE, &show_version, + N_("Debug syslog messages"), NULL }, + { "version", '\0', 0, G_OPTION_ARG_NONE, &show_version, /* Commandline option of metaserver: version */ - N_("Show version information"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Show version information"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; static gboolean handle_break_quit_request(G_GNUC_UNUSED gpointer user_data) @@ -662,14 +660,8 @@ set_ui_driver(&Glib_Driver); g_type_init(); -#ifdef ENABLE_NLS - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - - /* have gettext return strings in UTF-8 */ - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif + /* Initialize translations */ + gettext_init(); /* Long description in the commandline for metaserver: help */ context = g_option_context_new(_("- Metaserver for Pioneers")); diff -Nru pioneers-15.5/MinGW/loaders.cache pioneers-15.6/MinGW/loaders.cache --- pioneers-15.5/MinGW/loaders.cache 2016-06-10 21:01:23.000000000 +0000 +++ pioneers-15.6/MinGW/loaders.cache 2020-06-01 11:41:44.000000000 +0000 @@ -1,11 +1,17 @@ # GdkPixbuf Image Loader Modules file # Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.26.5 +# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.40.0 # -# LoaderDir = C:\MinGW/lib/gdk-pixbuf-2.0/2.10.0/loaders +# LoaderDir = C:\msys64\mingw64\lib\gdk-pixbuf-2.0\2.10.0\loaders # -"libpixbufloader-svg.dll" -"svg" 2 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL" +"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-png.dll" +"png" 5 "gdk-pixbuf" "PNG" "LGPL" +"image/png" "" +"png" "" +"\211PNG\r\n\032\n" "" 100 + +"lib\\gdk-pixbuf-2.0\\2.10.0\\loaders\\libpixbufloader-svg.dll" +"svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL" "image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" "" "svg" "svgz" "svg.gz" "" " - -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "Pioneers" -!define PRODUCT_VERSION "@VERSION@" -!define PRODUCT_WEB_SITE "http://pio.sourceforge.net" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\pioneers.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" - -SetCompressor bzip2 - -!include "MUI2.nsh" -!include "FileFunc.nsh" - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" - -; Language Selection Dialog Settings -!define MUI_LANGDLL_ALLLANGUAGES -!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" -!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -!insertmacro MUI_PAGE_LICENSE "../COPYING" -; Components page -!insertmacro MUI_PAGE_COMPONENTS -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Start menu page -var ICONS_GROUP -!define MUI_STARTMENUPAGE_NODISABLE -!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Pioneers" -!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" -!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}" -!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -!define MUI_FINISHPAGE_RUN "$INSTDIR\pioneers.exe" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "English" ;first language is the default -!insertmacro MUI_LANGUAGE "Afrikaans" -!insertmacro MUI_LANGUAGE "Czech" -!insertmacro MUI_LANGUAGE "Danish" -!insertmacro MUI_LANGUAGE "Dutch" -!insertmacro MUI_LANGUAGE "French" -!insertmacro MUI_LANGUAGE "Galician" -!insertmacro MUI_LANGUAGE "German" -!insertmacro MUI_LANGUAGE "Hungarian" -!insertmacro MUI_LANGUAGE "Italian" -!insertmacro MUI_LANGUAGE "Japanese" -!insertmacro MUI_LANGUAGE "Portuguese" -!insertmacro MUI_LANGUAGE "Spanish" -!insertmacro MUI_LANGUAGE "Swedish" - -;Reserve Files - -;If you are using solid compression, files that are required before -;the actual installation should be stored first in the data block, -;because this will make your installer start faster. -!insertmacro MUI_RESERVEFILE_LANGDLL - - -; MUI end ------ - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "Pioneers-${PRODUCT_VERSION}-setup.exe" -InstallDir "$PROGRAMFILES\Pioneers" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -;Request application privileges for Windows Vista -RequestExecutionLevel admin - -Function .onInit - !insertmacro MUI_LANGDLL_DISPLAY -FunctionEnd - -Section "!Minimal install" SEC01 - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - - File "..\..\..\..\local\pioneers.exe" - File "..\..\..\..\local\libatk-1.0-0.dll" - File "..\..\..\..\local\libcairo-2.dll" - File "..\..\..\..\local\libcairo-gobject-2.dll" - File "..\..\..\..\local\libcroco-0.6-3.dll" - File "..\..\..\..\local\libffi-6.dll" - File "..\..\..\..\local\libfontconfig-1.dll" - File "..\..\..\..\local\libfreetype-6.dll" - File "..\..\..\..\local\libgcc_s_dw2-1.dll" - File "..\..\..\..\local\libgdk-3-0.dll" - File "..\..\..\..\local\libgdk_pixbuf-2.0-0.dll" - File "..\..\..\..\local\libgio-2.0-0.dll" - File "..\..\..\..\local\libglib-2.0-0.dll" - File "..\..\..\..\local\libgmodule-2.0-0.dll" - File "..\..\..\..\local\libgobject-2.0-0.dll" - File "..\..\..\..\local\libgtk-3-0.dll" - File "..\..\..\..\local\libiconv-2.dll" - File "..\..\..\..\local\libintl-8.dll" - File "..\..\..\..\local\liblzma-5.dll" - File "..\..\..\..\local\libpango-1.0-0.dll" - File "..\..\..\..\local\libpangocairo-1.0-0.dll" - File "..\..\..\..\local\libpangoft2-1.0-0.dll" - File "..\..\..\..\local\libpangowin32-1.0-0.dll" - File "..\..\..\..\local\libpixbufloader-svg.dll" - File "..\..\..\..\local\libpixman-1-0.dll" - File "..\..\..\..\local\libpng15-15.dll" - File "..\..\..\..\local\librsvg-2-2.dll" - File "..\..\..\..\local\libssp-0.dll" - File "..\..\..\..\local\libxml2-2.dll" - File "..\..\..\..\local\pthreadGC2.dll" - File "..\..\..\..\local\zlib1.dll" - File "..\..\..\..\local\gspawn-win32-helper.exe" - File "..\..\..\..\local\gspawn-win32-helper-console.exe" - - SetOutPath "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0" - File "..\..\..\..\local\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache" - - SetOverwrite TRY -; Translations - SetOutPath "$INSTDIR\locale\af\LC_MESSAGES" - File "..\..\..\..\local\locale\af\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\cs\LC_MESSAGES" - File "..\..\..\..\local\locale\cs\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\da\LC_MESSAGES" - File "..\..\..\..\local\locale\da\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\de\LC_MESSAGES" - File "..\..\..\..\local\locale\de\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\en_GB\LC_MESSAGES" - File "..\..\..\..\local\locale\en_GB\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" - File "..\..\..\..\local\locale\es\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" - File "..\..\..\..\local\locale\fr\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\gl\LC_MESSAGES" - File "..\..\..\..\local\locale\gl\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\hu\LC_MESSAGES" - File "..\..\..\..\local\locale\hu\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" - File "..\..\..\..\local\locale\it\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\ja\LC_MESSAGES" - File "..\..\..\..\local\locale\ja\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\nl\LC_MESSAGES" - File "..\..\..\..\local\locale\nl\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\pt\LC_MESSAGES" - File "..\..\..\..\local\locale\pt\LC_MESSAGES\pioneers.mo" - SetOutPath "$INSTDIR\locale\sv\LC_MESSAGES" - File "..\..\..\..\local\locale\sv\LC_MESSAGES\pioneers.mo" -; No man pages for Windows native distribution -; SetOutPath "$INSTDIR\man\man6" -; File "..\..\..\..\local\man\man6\pioneers-meta-server.6" -; File "..\..\..\..\local\man\man6\pioneers-server-console.6" -; File "..\..\..\..\local\man\man6\pioneers-server-gtk.6" -; File "..\..\..\..\local\man\man6\pioneers.6" -; File "..\..\..\..\local\man\man6\pioneersai.6" -; Main icon - SetOutPath "$INSTDIR\pixmaps" - File "..\..\..\..\local\pixmaps\pioneers.png" -; Main toolbar icons - SetOutPath "$INSTDIR\pixmaps\pioneers" - File "..\..\..\..\local\pixmaps\pioneers\bridge.svg" - File "..\..\..\..\local\pixmaps\pioneers\city.svg" - File "..\..\..\..\local\pixmaps\pioneers\city_wall.svg" - File "..\..\..\..\local\pixmaps\pioneers\develop.svg" - File "..\..\..\..\local\pixmaps\pioneers\dice.svg" - File "..\..\..\..\local\pixmaps\pioneers\finish.svg" - File "..\..\..\..\local\pixmaps\pioneers\road.svg" - File "..\..\..\..\local\pixmaps\pioneers\settlement.svg" - File "..\..\..\..\local\pixmaps\pioneers\ship.svg" - File "..\..\..\..\local\pixmaps\pioneers\ship_move.svg" - File "..\..\..\..\local\pixmaps\pioneers\splash.png" - File "..\..\..\..\local\pixmaps\pioneers\trade.svg" - File "..\..\..\..\local\pixmaps\pioneers\brick.png" - File "..\..\..\..\local\pixmaps\pioneers\grain.png" - File "..\..\..\..\local\pixmaps\pioneers\ore.png" - File "..\..\..\..\local\pixmaps\pioneers\wool.png" - File "..\..\..\..\local\pixmaps\pioneers\lumber.png" - File "..\..\..\..\local\pixmaps\pioneers\style-ai.svg" - File "..\..\..\..\local\pixmaps\pioneers\style-human.png" - File "..\..\..\..\local\pixmaps\pioneers\style-human-1.png" - File "..\..\..\..\local\pixmaps\pioneers\style-human-2.png" - File "..\..\..\..\local\pixmaps\pioneers\style-human-3.png" - File "..\..\..\..\local\pixmaps\pioneers\style-human-4.png" - File "..\..\..\..\local\pixmaps\pioneers\style-human-5.png" - File "..\..\..\..\local\pixmaps\pioneers\style-human-6.png" - File "..\..\..\..\local\pixmaps\pioneers\style-human-7.png" -; Other icons - SetOutPath "$INSTDIR\share\icons\hicolor" - File "..\..\..\..\local\share\icons\hicolor\index.theme" - SetOutPath "$INSTDIR\share\icons\hicolor\scalable\actions" - File "..\..\..\..\local\share\icons\hicolor\scalable\actions\pioneers-checkmark.svg" - File "..\..\..\..\local\share\icons\hicolor\scalable\actions\pioneers-cross.svg" - SetOutPath "$INSTDIR\share\icons\hicolor\24x24\actions" - File "..\..\..\..\local\share\icons\hicolor\24x24\actions\edit-undo.png" -; GSettings file (for File|Open) - SetOutPath "$INSTDIR\share\glib-2.0\schemas" - File "..\..\..\..\local\share\glib-2.0\schemas\gschemas.compiled" - -; Themes - SetOutPath "$INSTDIR\themes" - SetOutPath "$INSTDIR\themes\ccFlickr" - File "..\..\..\..\local\themes\ccFlickr\ATTRIB" - File "..\..\..\..\local\themes\ccFlickr\board.png" - File "..\..\..\..\local\themes\ccFlickr\brick.png" - File "..\..\..\..\local\themes\ccFlickr\desert.png" - File "..\..\..\..\local\themes\ccFlickr\gold.png" - File "..\..\..\..\local\themes\ccFlickr\grain.png" - File "..\..\..\..\local\themes\ccFlickr\lumber.png" - File "..\..\..\..\local\themes\ccFlickr\ore.png" - File "..\..\..\..\local\themes\ccFlickr\port-brick.png" - File "..\..\..\..\local\themes\ccFlickr\port-gold.png" - File "..\..\..\..\local\themes\ccFlickr\port-grain.png" - File "..\..\..\..\local\themes\ccFlickr\port-lumber.png" - File "..\..\..\..\local\themes\ccFlickr\port-ore.png" - File "..\..\..\..\local\themes\ccFlickr\port-wool.png" - File "..\..\..\..\local\themes\ccFlickr\sea.png" - File "..\..\..\..\local\themes\ccFlickr\theme.cfg" - File "..\..\..\..\local\themes\ccFlickr\wool.png" - SetOutPath "$INSTDIR\themes\Classic" - File "..\..\..\..\local\themes\Classic\board.png" - File "..\..\..\..\local\themes\Classic\desert.png" - File "..\..\..\..\local\themes\Classic\field.png" - File "..\..\..\..\local\themes\Classic\forest.png" - File "..\..\..\..\local\themes\Classic\gold.png" - File "..\..\..\..\local\themes\Classic\hill.png" - File "..\..\..\..\local\themes\Classic\mountain.png" - File "..\..\..\..\local\themes\Classic\pasture.png" - File "..\..\..\..\local\themes\Classic\sea.png" - File "..\..\..\..\local\themes\Classic\theme.cfg" - SetOutPath "$INSTDIR\themes\FreeCIV-like" - File "..\..\..\..\local\themes\FreeCIV-like\board.png" - File "..\..\..\..\local\themes\FreeCIV-like\desert.png" - File "..\..\..\..\local\themes\FreeCIV-like\field.png" - File "..\..\..\..\local\themes\FreeCIV-like\forest.png" - File "..\..\..\..\local\themes\FreeCIV-like\gold.png" - File "..\..\..\..\local\themes\FreeCIV-like\hill.png" - File "..\..\..\..\local\themes\FreeCIV-like\mountain.png" - File "..\..\..\..\local\themes\FreeCIV-like\pasture.png" - File "..\..\..\..\local\themes\FreeCIV-like\sea.png" - File "..\..\..\..\local\themes\FreeCIV-like\theme.cfg" - SetOutPath "$INSTDIR\themes\Iceland" - File "..\..\..\..\local\themes\Iceland\board.png" - File "..\..\..\..\local\themes\Iceland\desert.png" - File "..\..\..\..\local\themes\Iceland\field_grain.png" - File "..\..\..\..\local\themes\Iceland\forest_lumber.png" - File "..\..\..\..\local\themes\Iceland\gold.png" - File "..\..\..\..\local\themes\Iceland\hill_brick.png" - File "..\..\..\..\local\themes\Iceland\mountain_ore.png" - File "..\..\..\..\local\themes\Iceland\pasture_wool.png" - File "..\..\..\..\local\themes\Iceland\sea.png" - File "..\..\..\..\local\themes\Iceland\theme.cfg" - SetOutPath "$INSTDIR\themes\Nouvellia" - File "..\..\..\..\local\themes\Nouvellia\ATTRIB" - File "..\..\..\..\local\themes\Nouvellia\board.svg" - File "..\..\..\..\local\themes\Nouvellia\brick.svg" - File "..\..\..\..\local\themes\Nouvellia\desert.svg" - File "..\..\..\..\local\themes\Nouvellia\gold.svg" - File "..\..\..\..\local\themes\Nouvellia\grain.svg" - File "..\..\..\..\local\themes\Nouvellia\lumber.svg" - File "..\..\..\..\local\themes\Nouvellia\port-brick.svg" - File "..\..\..\..\local\themes\Nouvellia\port-grain.svg" - File "..\..\..\..\local\themes\Nouvellia\port-lumber.svg" - File "..\..\..\..\local\themes\Nouvellia\port-ore.svg" - File "..\..\..\..\local\themes\Nouvellia\port-wool.svg" - File "..\..\..\..\local\themes\Nouvellia\ore.svg" - File "..\..\..\..\local\themes\Nouvellia\sea.svg" - File "..\..\..\..\local\themes\Nouvellia\theme.cfg" - File "..\..\..\..\local\themes\Nouvellia\wool.svg" - SetOutPath "$INSTDIR\themes\Tiny" - File "..\..\..\..\local\themes\Tiny\board.png" - File "..\..\..\..\local\themes\Tiny\brick-lorindol.png" - File "..\..\..\..\local\themes\Tiny\brick-port.png" - File "..\..\..\..\local\themes\Tiny\desert-lorindol.png" - File "..\..\..\..\local\themes\Tiny\gold-lorindol.png" - File "..\..\..\..\local\themes\Tiny\grain-lorindol.png" - File "..\..\..\..\local\themes\Tiny\grain-port.png" - File "..\..\..\..\local\themes\Tiny\lumber-lorindol.png" - File "..\..\..\..\local\themes\Tiny\lumber-port.png" - File "..\..\..\..\local\themes\Tiny\ore-lorindol.png" - File "..\..\..\..\local\themes\Tiny\ore-port.png" - File "..\..\..\..\local\themes\Tiny\sea-lorindol.png" - File "..\..\..\..\local\themes\Tiny\theme.cfg" - File "..\..\..\..\local\themes\Tiny\wool-lorindol.png" - File "..\..\..\..\local\themes\Tiny\wool-port.png" - SetOutPath "$INSTDIR\themes\Wesnoth-like" - File "..\..\..\..\local\themes\Wesnoth-like\board.png" - File "..\..\..\..\local\themes\Wesnoth-like\desert.png" - File "..\..\..\..\local\themes\Wesnoth-like\field.png" - File "..\..\..\..\local\themes\Wesnoth-like\forest.png" - File "..\..\..\..\local\themes\Wesnoth-like\gold.png" - File "..\..\..\..\local\themes\Wesnoth-like\hill.png" - File "..\..\..\..\local\themes\Wesnoth-like\mountain.png" - File "..\..\..\..\local\themes\Wesnoth-like\pasture.png" - File "..\..\..\..\local\themes\Wesnoth-like\sea.png" - File "..\..\..\..\local\themes\Wesnoth-like\theme.cfg" - -; Shortcuts - SetOutPath "$INSTDIR" - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Pioneers.lnk" "$INSTDIR\pioneers.exe" - CreateShortCut "$DESKTOP\Pioneers.lnk" "$INSTDIR\pioneers.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section /o "Additional programs" SEC02 - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - File "..\..\..\..\local\pioneersai.exe" - File "..\..\..\..\local\pioneers-editor.exe" - File "..\..\..\..\local\pioneers-server-console.exe" - File "..\..\..\..\local\pioneers-server-gtk.exe" - SetOutPath "$INSTDIR\pixmaps" - File "..\..\..\..\local\pixmaps\pioneers-editor.png" - File "..\..\..\..\local\pixmaps\pioneers-server.png" - - SetOverwrite TRY - SetOutPath "$INSTDIR\games\pioneers" -; Names for the AI - File "..\..\..\..\local\games\pioneers\computer_names" -; Games for the editor (and server) - File "..\..\..\..\local\games\pioneers\5-6-player.game" - File "..\..\..\..\local\games\pioneers\Another_swimming_pool_in_the_wall.game" - File "..\..\..\..\local\games\pioneers\archipel_gold.game" - File "..\..\..\..\local\games\pioneers\canyon.game" - File "..\..\..\..\local\games\pioneers\coeur.game" - File "..\..\..\..\local\games\pioneers\conquest+ports.game" - File "..\..\..\..\local\games\pioneers\conquest.game" - File "..\..\..\..\local\games\pioneers\crane_island.game" - File "..\..\..\..\local\games\pioneers\Cube.game" - File "..\..\..\..\local\games\pioneers\default.game" - File "..\..\..\..\local\games\pioneers\Evil_square.game" - File "..\..\..\..\local\games\pioneers\four-islands.game" - File "..\..\..\..\local\games\pioneers\GuerreDe100ans.game" - File "..\..\..\..\local\games\pioneers\henjes.game" - File "..\..\..\..\local\games\pioneers\iles.game" - File "..\..\..\..\local\games\pioneers\lorindol.game" - File "..\..\..\..\local\games\pioneers\Mini_another_swimming_pool_in_the_wall.game" - File "..\..\..\..\local\games\pioneers\north_america.game" - File "..\..\..\..\local\games\pioneers\pond.game" - File "..\..\..\..\local\games\pioneers\seafarers-gold.game" - File "..\..\..\..\local\games\pioneers\seafarers.game" - File "..\..\..\..\local\games\pioneers\small.game" - File "..\..\..\..\local\games\pioneers\south_africa.game" - File "..\..\..\..\local\games\pioneers\square.game" - File "..\..\..\..\local\games\pioneers\star.game" - File "..\..\..\..\local\games\pioneers\ubuntuland.game" - File "..\..\..\..\local\games\pioneers\x.game" -; Shortcuts - SetOutPath "$INSTDIR" - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Pioneers Editor.lnk" "$INSTDIR\pioneers-editor.exe" - CreateShortCut "$DESKTOP\Pioneers Editor.lnk" "$INSTDIR\pioneers-editor.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Pioneers Server.lnk" "$INSTDIR\pioneers-server-gtk.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section -AdditionalIcons - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninst.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\pioneers.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\pioneers.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "NoModify" "1" - WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "NoRepair" "1" - ; Installed size - ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 - IntFmt $0 "0x%08X" $0 - WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0" -SectionEnd - -; Section descriptions -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Play games of Pioneers" - !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Install a server, a game editor and a computer player" -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." -FunctionEnd - -Function un.onInit -!insertmacro MUI_UNGETLANGUAGE - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 - Abort -FunctionEnd - -Section Uninstall - !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP - Delete "$INSTDIR\${PRODUCT_NAME}.url" - Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\pioneers-server-gtk.exe" - Delete "$INSTDIR\pioneers-server-console.exe" - Delete "$INSTDIR\pioneers-editor.exe" - Delete "$INSTDIR\pioneersai.exe" - Delete "$INSTDIR\pioneers.exe" - Delete "$INSTDIR\libatk-1.0-0.dll" - Delete "$INSTDIR\libcairo-2.dll" - Delete "$INSTDIR\libcairo-gobject-2.dll" - Delete "$INSTDIR\libcroco-0.6-3.dll" - Delete "$INSTDIR\libffi-6.dll" - Delete "$INSTDIR\libfontconfig-1.dll" - Delete "$INSTDIR\libfreetype-6.dll" - Delete "$INSTDIR\libgcc_s_dw2-1.dll" - Delete "$INSTDIR\libgdk-3-0.dll" - Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll" - Delete "$INSTDIR\libgio-2.0-0.dll" - Delete "$INSTDIR\libglib-2.0-0.dll" - Delete "$INSTDIR\libgmodule-2.0-0.dll" - Delete "$INSTDIR\libgobject-2.0-0.dll" - Delete "$INSTDIR\libgtk-3-0.dll" - Delete "$INSTDIR\libiconv-2.dll" - Delete "$INSTDIR\libintl-8.dll" - Delete "$INSTDIR\liblzma-5.dll" - Delete "$INSTDIR\libpango-1.0-0.dll" - Delete "$INSTDIR\libpangocairo-1.0-0.dll" - Delete "$INSTDIR\libpangoft2-1.0-0.dll" - Delete "$INSTDIR\libpangowin32-1.0-0.dll" - Delete "$INSTDIR\libpixbufloader-svg.dll" - Delete "$INSTDIR\libpixman-1-0.dll" - Delete "$INSTDIR\libpng15-15.dll" - Delete "$INSTDIR\librsvg-2-2.dll" - Delete "$INSTDIR\libssp-0.dll" - Delete "$INSTDIR\libxml2-2.dll" - Delete "$INSTDIR\pthreadGC2.dll" - Delete "$INSTDIR\zlib1.dll" - Delete "$INSTDIR\gspawn-win32-helper.exe" - Delete "$INSTDIR\gspawn-win32-helper-console.exe" - Delete "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache" - Delete "$INSTDIR\themes\Wesnoth-like\theme.cfg" - Delete "$INSTDIR\themes\Wesnoth-like\sea.png" - Delete "$INSTDIR\themes\Wesnoth-like\pasture.png" - Delete "$INSTDIR\themes\Wesnoth-like\mountain.png" - Delete "$INSTDIR\themes\Wesnoth-like\hill.png" - Delete "$INSTDIR\themes\Wesnoth-like\gold.png" - Delete "$INSTDIR\themes\Wesnoth-like\forest.png" - Delete "$INSTDIR\themes\Wesnoth-like\field.png" - Delete "$INSTDIR\themes\Wesnoth-like\desert.png" - Delete "$INSTDIR\themes\Wesnoth-like\board.png" - Delete "$INSTDIR\themes\Tiny\wool-port.png" - Delete "$INSTDIR\themes\Tiny\wool-lorindol.png" - Delete "$INSTDIR\themes\Tiny\theme.cfg" - Delete "$INSTDIR\themes\Tiny\sea-lorindol.png" - Delete "$INSTDIR\themes\Tiny\ore-port.png" - Delete "$INSTDIR\themes\Tiny\ore-lorindol.png" - Delete "$INSTDIR\themes\Tiny\lumber-port.png" - Delete "$INSTDIR\themes\Tiny\lumber-lorindol.png" - Delete "$INSTDIR\themes\Tiny\grain-port.png" - Delete "$INSTDIR\themes\Tiny\grain-lorindol.png" - Delete "$INSTDIR\themes\Tiny\gold-lorindol.png" - Delete "$INSTDIR\themes\Tiny\desert-lorindol.png" - Delete "$INSTDIR\themes\Tiny\brick-port.png" - Delete "$INSTDIR\themes\Tiny\brick-lorindol.png" - Delete "$INSTDIR\themes\Tiny\board.png" - Delete "$INSTDIR\themes\Nouvellia\wool.svg" - Delete "$INSTDIR\themes\Nouvellia\theme.cfg" - Delete "$INSTDIR\themes\Nouvellia\sea.svg" - Delete "$INSTDIR\themes\Nouvellia\port-wool.svg" - Delete "$INSTDIR\themes\Nouvellia\port-ore.svg" - Delete "$INSTDIR\themes\Nouvellia\port-lumber.svg" - Delete "$INSTDIR\themes\Nouvellia\port-grain.svg" - Delete "$INSTDIR\themes\Nouvellia\port-brick.svg" - Delete "$INSTDIR\themes\Nouvellia\ore.svg" - Delete "$INSTDIR\themes\Nouvellia\lumber.svg" - Delete "$INSTDIR\themes\Nouvellia\grain.svg" - Delete "$INSTDIR\themes\Nouvellia\gold.svg" - Delete "$INSTDIR\themes\Nouvellia\desert.svg" - Delete "$INSTDIR\themes\Nouvellia\brick.svg" - Delete "$INSTDIR\themes\Nouvellia\board.svg" - Delete "$INSTDIR\themes\Nouvellia\ATTRIB" - Delete "$INSTDIR\themes\Iceland\theme.cfg" - Delete "$INSTDIR\themes\Iceland\sea.png" - Delete "$INSTDIR\themes\Iceland\pasture_wool.png" - Delete "$INSTDIR\themes\Iceland\mountain_ore.png" - Delete "$INSTDIR\themes\Iceland\hill_brick.png" - Delete "$INSTDIR\themes\Iceland\gold.png" - Delete "$INSTDIR\themes\Iceland\forest_lumber.png" - Delete "$INSTDIR\themes\Iceland\field_grain.png" - Delete "$INSTDIR\themes\Iceland\desert.png" - Delete "$INSTDIR\themes\Iceland\board.png" - Delete "$INSTDIR\themes\FreeCIV-like\theme.cfg" - Delete "$INSTDIR\themes\FreeCIV-like\sea.png" - Delete "$INSTDIR\themes\FreeCIV-like\pasture.png" - Delete "$INSTDIR\themes\FreeCIV-like\mountain.png" - Delete "$INSTDIR\themes\FreeCIV-like\hill.png" - Delete "$INSTDIR\themes\FreeCIV-like\gold.png" - Delete "$INSTDIR\themes\FreeCIV-like\forest.png" - Delete "$INSTDIR\themes\FreeCIV-like\field.png" - Delete "$INSTDIR\themes\FreeCIV-like\desert.png" - Delete "$INSTDIR\themes\FreeCIV-like\board.png" - Delete "$INSTDIR\themes\Classic\theme.cfg" - Delete "$INSTDIR\themes\Classic\sea.png" - Delete "$INSTDIR\themes\Classic\pasture.png" - Delete "$INSTDIR\themes\Classic\mountain.png" - Delete "$INSTDIR\themes\Classic\hill.png" - Delete "$INSTDIR\themes\Classic\gold.png" - Delete "$INSTDIR\themes\Classic\forest.png" - Delete "$INSTDIR\themes\Classic\field.png" - Delete "$INSTDIR\themes\Classic\desert.png" - Delete "$INSTDIR\themes\Classic\board.png" - Delete "$INSTDIR\themes\ccFlickr\wool.png" - Delete "$INSTDIR\themes\ccFlickr\theme.cfg" - Delete "$INSTDIR\themes\ccFlickr\sea.png" - Delete "$INSTDIR\themes\ccFlickr\port-wool.png" - Delete "$INSTDIR\themes\ccFlickr\port-ore.png" - Delete "$INSTDIR\themes\ccFlickr\port-lumber.png" - Delete "$INSTDIR\themes\ccFlickr\port-grain.png" - Delete "$INSTDIR\themes\ccFlickr\port-gold.png" - Delete "$INSTDIR\themes\ccFlickr\port-brick.png" - Delete "$INSTDIR\themes\ccFlickr\ore.png" - Delete "$INSTDIR\themes\ccFlickr\lumber.png" - Delete "$INSTDIR\themes\ccFlickr\grain.png" - Delete "$INSTDIR\themes\ccFlickr\gold.png" - Delete "$INSTDIR\themes\ccFlickr\desert.png" - Delete "$INSTDIR\themes\ccFlickr\brick.png" - Delete "$INSTDIR\themes\ccFlickr\board.png" - Delete "$INSTDIR\themes\ccFlickr\ATTRIB" - Delete "$INSTDIR\pixmaps\pioneers\style-human-7.png" - Delete "$INSTDIR\pixmaps\pioneers\style-human-6.png" - Delete "$INSTDIR\pixmaps\pioneers\style-human-5.png" - Delete "$INSTDIR\pixmaps\pioneers\style-human-4.png" - Delete "$INSTDIR\pixmaps\pioneers\style-human-3.png" - Delete "$INSTDIR\pixmaps\pioneers\style-human-2.png" - Delete "$INSTDIR\pixmaps\pioneers\style-human-1.png" - Delete "$INSTDIR\pixmaps\pioneers\style-human.png" - Delete "$INSTDIR\pixmaps\pioneers\style-ai.svg" - Delete "$INSTDIR\pixmaps\pioneers\brick.png" - Delete "$INSTDIR\pixmaps\pioneers\grain.png" - Delete "$INSTDIR\pixmaps\pioneers\ore.png" - Delete "$INSTDIR\pixmaps\pioneers\wool.png" - Delete "$INSTDIR\pixmaps\pioneers\lumber.png" - Delete "$INSTDIR\pixmaps\pioneers\trade.svg" - Delete "$INSTDIR\pixmaps\pioneers\splash.png" - Delete "$INSTDIR\pixmaps\pioneers\ship_move.svg" - Delete "$INSTDIR\pixmaps\pioneers\ship.svg" - Delete "$INSTDIR\pixmaps\pioneers\settlement.svg" - Delete "$INSTDIR\pixmaps\pioneers\road.svg" - Delete "$INSTDIR\pixmaps\pioneers\finish.svg" - Delete "$INSTDIR\pixmaps\pioneers\dice.svg" - Delete "$INSTDIR\pixmaps\pioneers\develop.svg" - Delete "$INSTDIR\pixmaps\pioneers\city_wall.svg" - Delete "$INSTDIR\pixmaps\pioneers\city.svg" - Delete "$INSTDIR\pixmaps\pioneers\bridge.svg" - Delete "$INSTDIR\pixmaps\pioneers.png" - Delete "$INSTDIR\pixmaps\pioneers-server.png" - Delete "$INSTDIR\pixmaps\pioneers-editor.png" - Delete "$INSTDIR\share\glib-2.0\schemas\gschemas.compiled" - Delete "$INSTDIR\share\icons\hicolor\index.theme" - Delete "$INSTDIR\share\icons\hicolor\24x24\actions\edit-undo.png" - Delete "$INSTDIR\share\icons\hicolor\scalable\actions\pioneers-cross.svg" - Delete "$INSTDIR\share\icons\hicolor\scalable\actions\pioneers-checkmark.svg" -; Delete "$INSTDIR\man\man6\pioneersai.6" -; Delete "$INSTDIR\man\man6\pioneers.6" -; Delete "$INSTDIR\man\man6\pioneers-server-gtk.6" -; Delete "$INSTDIR\man\man6\pioneers-server-console.6" -; Delete "$INSTDIR\man\man6\pioneers-meta-server.6" - Delete "$INSTDIR\locale\sv\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\pt\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\nl\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\ja\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\it\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\hu\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\gl\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\fr\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\es\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\en_GB\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\de\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\da\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\cs\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\locale\af\LC_MESSAGES\pioneers.mo" - Delete "$INSTDIR\games\pioneers\x.game" - Delete "$INSTDIR\games\pioneers\ubuntuland.game" - Delete "$INSTDIR\games\pioneers\star.game" - Delete "$INSTDIR\games\pioneers\square.game" - Delete "$INSTDIR\games\pioneers\south_africa.game" - Delete "$INSTDIR\games\pioneers\small.game" - Delete "$INSTDIR\games\pioneers\seafarers.game" - Delete "$INSTDIR\games\pioneers\seafarers-gold.game" - Delete "$INSTDIR\games\pioneers\pond.game" - Delete "$INSTDIR\games\pioneers\north_america.game" - Delete "$INSTDIR\games\pioneers\Mini_another_swimming_pool_in_the_wall.game" - Delete "$INSTDIR\games\pioneers\lorindol.game" - Delete "$INSTDIR\games\pioneers\iles.game" - Delete "$INSTDIR\games\pioneers\henjes.game" - Delete "$INSTDIR\games\pioneers\GuerreDe100ans.game" - Delete "$INSTDIR\games\pioneers\four-islands.game" - Delete "$INSTDIR\games\pioneers\Evil_square.game" - Delete "$INSTDIR\games\pioneers\default.game" - Delete "$INSTDIR\games\pioneers\Cube.game" - Delete "$INSTDIR\games\pioneers\crane_island.game" - Delete "$INSTDIR\games\pioneers\conquest.game" - Delete "$INSTDIR\games\pioneers\conquest+ports.game" - Delete "$INSTDIR\games\pioneers\computer_names" - Delete "$INSTDIR\games\pioneers\coeur.game" - Delete "$INSTDIR\games\pioneers\canyon.game" - Delete "$INSTDIR\games\pioneers\archipel_gold.game" - Delete "$INSTDIR\games\pioneers\Another_swimming_pool_in_the_wall.game" - Delete "$INSTDIR\games\pioneers\5-6-player.game" - - Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" - Delete "$DESKTOP\Pioneers.lnk" - Delete "$DESKTOP\Pioneers Editor.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Pioneers.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Pioneers Editor.lnk" - Delete "$SMPROGRAMS\$ICONS_GROUP\Pioneers Server.lnk" - - RMDir "$SMPROGRAMS\$ICONS_GROUP" - RMDir "$INSTDIR\themes\Wesnoth-like" - RMDir "$INSTDIR\themes\Tiny" - RMDir "$INSTDIR\themes\Nouvellia" - RMDir "$INSTDIR\themes\Iceland" - RMDir "$INSTDIR\themes\FreeCIV-like" - RMDir "$INSTDIR\themes\Classic" - RMDir "$INSTDIR\themes\ccFlickr" - RMDir "$INSTDIR\themes" - RMDir "$INSTDIR\pixmaps\pioneers" - RMDir "$INSTDIR\pixmaps" - RMDir "$INSTDIR\locale\sv\LC_MESSAGES" - RMDir "$INSTDIR\locale\sv" - RMDir "$INSTDIR\locale\pt\LC_MESSAGES" - RMDir "$INSTDIR\locale\pt" - RMDir "$INSTDIR\locale\nl\LC_MESSAGES" - RMDir "$INSTDIR\locale\nl" - RMDir "$INSTDIR\locale\ja\LC_MESSAGES" - RMDir "$INSTDIR\locale\ja" - RMDir "$INSTDIR\locale\it\LC_MESSAGES" - RMDir "$INSTDIR\locale\it" - RMDir "$INSTDIR\locale\hu\LC_MESSAGES" - RMDir "$INSTDIR\locale\hu" - RMDir "$INSTDIR\locale\gl\LC_MESSAGES" - RMDir "$INSTDIR\locale\gl" - RMDir "$INSTDIR\locale\fr\LC_MESSAGES" - RMDir "$INSTDIR\locale\fr" - RMDir "$INSTDIR\locale\es\LC_MESSAGES" - RMDir "$INSTDIR\locale\es" - RMDir "$INSTDIR\locale\en_GB\LC_MESSAGES" - RMDir "$INSTDIR\locale\en_GB" - RMDir "$INSTDIR\locale\de\LC_MESSAGES" - RMDir "$INSTDIR\locale\de" - RMDir "$INSTDIR\locale\da\LC_MESSAGES" - RMDir "$INSTDIR\locale\da" - RMDir "$INSTDIR\locale\cs\LC_MESSAGES" - RMDir "$INSTDIR\locale\cs" - RMDir "$INSTDIR\locale\af\LC_MESSAGES" - RMDir "$INSTDIR\locale\af" - RMDir "$INSTDIR\locale" - RMDir "$INSTDIR\lib\gdk-pixbuf-2.0\2.10.0" - RMDir "$INSTDIR\lib\gdk-pixbuf-2.0" - RMDir "$INSTDIR\lib" - RMDir "$INSTDIR\share\glib-2.0\schemas" - RMDir "$INSTDIR\share\glib-2.0" - RMDir "$INSTDIR\share\icons\hicolor\scalable\actions" - RMDir "$INSTDIR\share\icons\hicolor\scalable" - RMDir "$INSTDIR\share\icons\hicolor\24x24\actions" - RMDir "$INSTDIR\share\icons\hicolor\24x24" - RMDir "$INSTDIR\share\icons\hicolor" - RMDir "$INSTDIR\share\icons" - RMDir "$INSTDIR\share" - RMDir "$INSTDIR\games\pioneers" - RMDir "$INSTDIR\games" - RMDir "$INSTDIR\games" - RMDir "$INSTDIR" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose true -SectionEnd diff -Nru pioneers-15.5/MinGW/README.txt pioneers-15.6/MinGW/README.txt --- pioneers-15.5/MinGW/README.txt 2014-04-20 18:12:27.000000000 +0000 +++ pioneers-15.6/MinGW/README.txt 2020-06-27 15:05:43.000000000 +0000 @@ -1,60 +1,90 @@ -Short guide to build Pioneers from source in MinGW +Short guide to build Pioneers from source in MSYS2 + +Prepare the build environment for building from a released tarball +================================================================== +* Install GTK as instructed on https://www.gtk.org/docs/installations/windows/ + A tailored copy is copied here +* Download the 64-bit version of MSYS2 from http://www.msys2.org/ +* After the installation, a MSYS shell is started +* Install the basic installation of MSYS2 +* Update and install the packages. Here 2 possibilities are listed: + A) Typical installation + B) Installation using virtual machines without a network connection +** A) Use the MSYS2 shell and perform all updates that are mentioned on the webpage above, i.e. + - pacman -Syu + Close the shell with the X + Restart the MSYS shell + - pacman -Su +** B) + * Use the MSYS2 shell and prepare a copy of the following folders from a regular installation + - /var/cache/pacman/pkg + - /var/lib/pacman/sync + * Use the regular steps from A, but instead of '-Syu' use '-Su' + * Placing files in a qemu-qcow2 image: + - modprobe nbd + - qemu-nbd -c /dev/nbd0 image.qcow2 + - mount /dev/nbd0p1 mountpoint + - ... + - umount mountpoint + - qemu-nbd -d /dev/nbd0 +* Install GTK+3: + - pacman -S mingw-w64-x86_64-gtk3 +* Install the development environment (use the default: all): + - pacman -S mingw-w64-x86_64-toolchain base-devel +* Install the zip package: + - pacman -S zip + +Prepare the build environment for building from unreleased code +=============================================================== +Note: releases for Windows should always be based on tarballs +Note: you need to be in the 'MSYS2 MinGW 64-bit' shell + +In addition to the default build environment, the following needs to be installed: + - pacman -S openssh + - pacman -S mingw-w64-x86_64-libnotify + - pacman -S subversion + - svn checkout https://svn.code.sf.net/p/pio/code/trunk/pioneers trunk -Prepare the build environment -============================= -* Download mingw-get-setup.exe from http://www.mingw.org/wiki/Getting_Started - - Install with the default settings - - In the MinGW Installation Manager, select: - - mingw-developer-toolkit, mingw32-base - - Installation | Apply -* Download the all-in-one bundle from http://www.gtk.org/download/win32.php - - Extract to C:\MinGW -* Download from http://ftp.gnome.org/pub/GNOME/binaries/win32: - - From the folder intltool: intltool_0.40.4-1_win32.zip - - From the folder librsvg: librsvg_2.32.1-1_win32.zip and - librsvg-dev_2.32.1-1_win32.zip - - Extract all to C:\MinGW and overwrite existing files -* Download GNU Indent from ftp://ftp.gnu.org/gnu/indent/ - - In src/Makefile.in add 'wildexp.${OBJEXT)' to the variable - am_indent_OBJECTS (line 62) - - ./configure --prefix=/MinGW - - make - - make install * Download the GOB2 tarball from http://www.jirka.org/gob.html - - ./configure --prefix=/mingw + - ./configure - make - make install -* In MSYS shell: - - vim /MinGW/bin/intltool-* - - Adjust all first lines to point to /bin/perl instead of - /opt/perl/bin/perl - - gdk-pixbuf-query-loaders --update-cache - - cp /MinGW/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache MinGW/loaders.cache +* Updating the pixbuf loaders, in a MSYS64 shell: + - gdk-pixbuf-query-loaders > MinGW/loaders.cache - vim MinGW/loaders.cache - - Remove all directories before the filename part of the DLL + - Change the line-ending to Linux: :set ff=unix + - Keep only png and svg (and the trailing empty line) + +* The following fonts are used +** FreeSans +** Gentium + +Note: The dependency walker helps during porting + https://dependencywalker.com/ +Note: Sysinternals Process Monitor helps during porting + https://docs.microsoft.com/en-us/sysinternals/downloads/procmon If any of the downloads cannot be found, a newer version will probably work. Build and install Pioneers ========================== 1) Download the source tarball to your home directory - (c:\MinGW\msys\1.0\home\%username%) -2) Start the MinGW shell + (c:\msys64\home\%username%) +2) Start the 'MSYS2 MinGW 64-bit' shell 3) Expand the source tarball (tar xvzf pioneers-%versionnumber%.tar.gz) 4) Enter the source directory (cd pioneers-%versionnumber%) 5) Configure, build and install - ./configure + ./configure --prefix=/usr/local123 make - make install - make install-MinGW + make package Start Pioneers ============== a) Start Pioneers by double clicking on the executable - (found in C:\MinGW\msys\1.0\local) -b) or start pioneers.exe from /usr/local in the shell + (found in C:\msys64\usr\local123) +b) or start pioneers.exe from /usr/local123 in the shell Rebuild the icons ================= @@ -66,6 +96,8 @@ ================= * The online help is not built * The metaserver is not built. It is recommended to use the existing metaservers +* The notification system does not work +* The beep does not work (libcanberra not ported to Windows) Roland Clobus -2014-03-07 Pioneers-15.2 +2020-06-27 Pioneers-15.6 diff -Nru pioneers-15.5/missing pioneers-15.6/missing --- pioneers-15.5/missing 2018-03-14 16:02:12.000000000 +0000 +++ pioneers-15.6/missing 2020-08-02 12:59:32.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru pioneers-15.5/NEWS pioneers-15.6/NEWS --- pioneers-15.5/NEWS 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/NEWS 2020-08-02 12:54:45.000000000 +0000 @@ -1,10 +1,23 @@ +Subversion release 15.6 +* Fix for #307: Prevent writing invalid games in the editor +* Re-enabled the Windows port (15.5 was not released for Windows) +* New feature: Allow automatic rolling of the dice +* New feature: When trading, charity can be prevented +* Explicit language selection with an environment variable: LANG for Windows, LANGUAGE for Linux +* Better IPv6 support for games found with Avahi +* Support for building with gcc 10 +* Cosmetic improvements for many themes +* Use a more modern 'beep' on Linux +* New default: wide-screen layout +* Various improvements in the editor +* Code quality improvements + Subversion release 15.5 * Fix for #298: Allow trade after a road building development card * Use more modern helper libraries for the inline help * Minor code quality improvements Subversion release 15.4 - * New theme Nouvellia, by Brian Mansberger * Fixed rendering issues in ccFlickr theme * Improvements for the MinGW port @@ -16,11 +29,9 @@ * Minor code quality improvements Subversion release 15.3 - * Relicense of the desktop icons to CC-BY-SA-4.0 Subversion release 15.2 - * Ported from GTK+2 to GTK+3 * A new computer player, by Rodrigo Espiga Gómez diff -Nru pioneers-15.5/pioneers.spec pioneers-15.6/pioneers.spec --- pioneers-15.5/pioneers.spec 2018-03-14 16:02:15.000000000 +0000 +++ pioneers-15.6/pioneers.spec 2020-08-02 12:59:35.000000000 +0000 @@ -1,12 +1,12 @@ Name: pioneers Summary: Playable implementation of the Settlers of Catan -Version: 15.5 +Version: 15.6 Release: 1 Group: Amusements/Games License: GPL Url: http://pio.sourceforge.net/ Packager: The Pioneers developers -Source: http://downloads.sourceforge.net/pio/pioneers-15.5.tar.gz +Source: http://downloads.sourceforge.net/pio/pioneers-15.6.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libgnome-devel, scrollkeeper BuildRequires: gtk2-devel >= 3.22 diff -Nru pioneers-15.5/po/af.po pioneers-15.6/po/af.po --- pioneers-15.5/po/af.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/af.po 2020-08-02 12:37:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Pioneers 15.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2013-11-19 16:16+0200\n" "Last-Translator: Petri Jooste \n" "Language-Team: Afrikaans\n" @@ -58,8 +58,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Skakel ontfoutboodskappe aan" @@ -69,8 +69,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Wys weergawe-inligting" @@ -79,9 +79,9 @@ msgid "- Computer player for Pioneers" msgstr "- Robotspeler vir Pioniers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioniers weergawe:" @@ -334,8 +334,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -369,7 +369,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Nie gekoppel nie" @@ -399,7 +399,7 @@ msgstr "%s ontvang %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s vat %s.\n" @@ -443,70 +443,70 @@ msgstr "" "Weergawes pas nie. Maak asb. seker die kliënt en bediener is op datum.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Bou twee dorpe, elkeen met 'n verbindende" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Bou 'n dorp met 'n verbindende" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "pad" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "brug" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "skip" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " of" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Wag vir jou beurt." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Kies die gebou om van te steel." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Kies die skip om van te steel." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Plaas die rower." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Maak die padbou klaar." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Bou een padsegment." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Bou twee padsegmente." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Dit is jou beurt." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Jammer, %s is beskikbaar.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Die spel is verby." @@ -560,7 +560,7 @@ msgid "%s took %s from %s.\n" msgstr "%s het %s by %s gevat.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Toeskouer %d" @@ -570,7 +570,7 @@ msgid "spectator %d" msgstr "toeskouer %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Speler %d" @@ -896,6 +896,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "enige hulpbron (fout)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -941,12 +947,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Beurt %d vir %s het nou begin.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Fout tydens begin van %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioniers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Kies 'n spel wat outomaties ontdek is" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) op %s:%s" @@ -979,110 +999,397 @@ msgid " said: " msgstr " het gesê: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Spel" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Begin 'n nuwe spel" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nuwe Spel" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Verlaat hierdie spel" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "Ver_laat spel" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administreer Pioniers-bediener" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Admin" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Verander jou spelernaam" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "S_pelernaam" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Terreinuiteensetting en boukostes" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "Uit_eensetting" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Instellings vir die huidige spel" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Spel-instellings" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogram van kansgetalle" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Histogram van kansgetalle" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Verlaat" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Verlaat" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Aksies" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Gooi die kanssteentjies" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Gooi" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Ruilhandel" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Herroep" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Klaar" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Bou 'n pad" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Pad" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Bou 'n skip" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Skip" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Bou 'n skip" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Skuif 'n skip" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Bou 'n brug" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Brug" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Bou 'n dorp" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Dorp" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Bou 'n stad" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Stad" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Koop 'n ontwikkelingskaart" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Ontwikkel" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Bou 'n stadsmuur" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Stadsmuur" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Stellings" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Wys of verberg die nutsbalk" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Nutsbalk" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Konfigureer die toepassing" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Voor_keure" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Bekyk" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Stel die venster na volskerm modus" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Volskerm" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Bekyk die hele kaart" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "He_rstel" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Sentreer die kaart" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Sentreer" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Hulp" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Inligting oor Pioniers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Aangaande Pioniers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Wys die handleiding" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metabediener by %s, poort %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Klaar.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "Die metabediener is nie meer beskikbaar nie.\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "Die metabediener het die verbinding onverwags toegemaak.\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Besig om name te kry vanaf metabediener.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "Nuwe spelbediener aangevra op %s poort %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "Onvolledige inligting oor die spelbediener is ontvang.\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Onbekende boodskap vanaf die metabediener: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "Besig om data van onaktiewe sessie te ontvang: %s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "Te veel metabediener herleidings.\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Foutiewe verwysing: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Metabediener te oud om nuwe bedieners te skep (weergawe %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Onverwagte data vanaf die metabediener: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normaal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Rol weer op 1ste en 2e beurte" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Rol weer alle 7s" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Verstek" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Ewekansig" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Herlei na die metabediener by %s.\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Herlei na die metabediener by %s, poort %s.\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Ontvang tans 'n lys van Pioniersbedieners vanaf die meta-bediener.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Aantal robotspelers" @@ -1102,11 +1409,6 @@ msgid "Requesting new game server.\n" msgstr "Nuwe spelbediener word aangevra.\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Fout tydens begin van %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1114,9 +1416,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 #, fuzzy msgid "_Cancel" msgstr "Gekanselleer.\n" @@ -1143,7 +1445,7 @@ msgstr "_Nuwe afgeleë spel" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 #, fuzzy msgid "_Join" msgstr "Sluit aan" @@ -1210,7 +1512,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Sewes-reël" @@ -1251,104 +1553,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Spelernaam" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Tik jou naam" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Toeskouer" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Merk as jy 'n toeskouer wil wees" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Sluit aan" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Sluit aan by 'n spel wat outomaties ontdek is" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Meta-bediener" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Betree openbare spel" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Betree 'n openbare spel" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Skep spel" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Skep 'n spel" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Betree privaatspel" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Betree 'n private spel" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Bedienernaam" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Naam van die gasheermasjien van die spel" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Bedienerpoort" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Poort van die gasheermasjien van die spel" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Onlangse spelle" @@ -1368,526 +1670,255 @@ msgstr "Gooi hulpbronne weg" #. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Jy moet %d hulpbron weggooi" -msgstr[1] "Jy moet %d hulpbronne weggooi" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Totaal weggegooi" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Wag tans dat spelers hulpbronne opgee" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Spel verby" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s het die spel gewen met %d oorwinningspunte!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Geluk aan %s, heerser van hierdie wêreld!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Kies hulpbronne" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Jy mag %d hulpbron kies" -msgstr[1] "Jy mag %d hulpbronne kies" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Hulpbrontotaal" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Wag tans vir spelers om te kies" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Spel" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nuwe Spel" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Begin 'n nuwe spel" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "Ver_laat spel" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Verlaat hierdie spel" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Admin" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administreer Pioniers-bediener" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "S_pelernaam" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Verander jou spelernaam" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "Uit_eensetting" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Terreinuiteensetting en boukostes" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Spel-instellings" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Instellings vir die huidige spel" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Histogram van kansgetalle" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogram van kansgetalle" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Verlaat" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Verlaat die program" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Aksies" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Gooi" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Gooi die kanssteentjies" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Ruilhandel" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Herroep" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Klaar" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Pad" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Bou 'n pad" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Skip" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Bou 'n skip" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Skuif 'n skip" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Bou 'n skip" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Brug" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Bou 'n brug" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Dorp" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Bou 'n dorp" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Stad" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Bou 'n stad" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Ontwikkel" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Koop 'n ontwikkelingskaart" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Stadsmuur" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Bou 'n stadsmuur" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Stellings" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Voor_keure" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Konfigureer die toepassing" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Bekyk" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "He_rstel" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "Bekyk die hele kaart" +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Sentreer" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Jy moet %d hulpbron weggooi" +msgstr[1] "Jy moet %d hulpbronne weggooi" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Sentreer die kaart" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Totaal weggegooi" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Hulp" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Wag tans dat spelers hulpbronne opgee" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Aangaande Pioniers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Spel verby" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Inligting oor Pioniers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s het die spel gewen met %d oorwinningspunte!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Wys die handleiding" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Geluk aan %s, heerser van hierdie wêreld!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Volskerm" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Kies hulpbronne" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Stel die venster na volskerm modus" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Jy mag %d hulpbron kies" +msgstr[1] "Jy mag %d hulpbronne kies" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Nutsbalk" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Hulpbrontotaal" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Wys of verberg die nutsbalk" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Wag tans vir spelers om te kies" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Punte nodig om te wen: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Boodskappe" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Landkaart" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Stop met ruilhandel" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Kwotasie" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Verwerp plaaslike handel" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Uiteensetting" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Welkom by Pioniers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioniers voorkeure" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Kies een van die temas" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Wys uiteensetting" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Wys die uiteensetting as 'n bladsy langs die landkaart" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Boodskappe in kleur" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Wys nuwe boodskappe in kleur" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Gesels in die kleur van die speler" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Wys nuwe boodskappe in die kleur van die speler" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Opsomming met kleure" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Gebruikl kleure in die speleropsomming" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Nutsbalk met kortpaaie" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Wys sleutelbordkortpaaie in die nutsbalk" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Stilmodus" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "In stilmodus word geen klank gemaak nie" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Kondig nuwe spelers aan" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "Maak 'n geluid wanner 'n nuwe speler of toeskouer die spel betree" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Wys aankondigings" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" "Wys aankondigings wanneer dit jou beurt is of wanneer handel beskikbaar is" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Gebruik 16:9 uitleg" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Gebruik 'n 16:9-vriendelike uitleg vir die venster" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "Gooi die kanssteentjies" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Aangaande Pioniers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Welkom by Pioniers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioniers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Kansgetalhistogram" @@ -1900,7 +1931,7 @@ msgstr "Kies 'n nuwe plek vir die skip." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "Dit is jou beurt om op te stel." @@ -1933,21 +1964,21 @@ msgstr "See" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Terrein-opbrengs" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Boukoste" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Stadsmuur" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Ontwikkelingskaart" @@ -1978,28 +2009,30 @@ msgstr "Gesig:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variant:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Skakel in as 'n toeskouer" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Metabediener masjien" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Kies 'n spel om te betree." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Besig om te koppel" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Speel 'n Pioniers-spel" @@ -2094,7 +2127,7 @@ msgstr "Hulpbronkaarte" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Ontwikkelingskaarte" @@ -2120,66 +2153,77 @@ msgid "The bank is empty" msgstr "Die bank is leeg" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s het %s, en wil graag %s hê" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Nuwe aanbod van %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Aanbod van %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Ek vra" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Ek gee" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Vee uit" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Skakel gesels aan" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Verwerp plaaslike handel" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Speler" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Kwotasies" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s vir %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Handel verwerp" @@ -2194,240 +2238,220 @@ msgstr "Totaal" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Aantal beskikbaar" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "meer>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Vermeerder die hoeveelheid" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Gekose hoeveelheid" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Die huidig geselekteerde lêernaam" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "Die bank kan nie leeggemaak word nie" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Ja" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Nee" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Onbekend" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Geen spel is tans besig nie..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Algemene instellings" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Aantal spelers:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Wenpunteteiken:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Geskommelde verstekterrein:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Laat ruilhandel toe tussen spelers:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Laat ruilhandel slegs toe voor bou of koop:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Toets slegs aan die einde van 'n beurt vir oorwinning:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Aantal van elke hulpbron:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Sewes-reël:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "Gebruik 'n stel van kansgetalkaarte in plaas van nuwe kansgetalle:" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "Aantal stelle kansgetalkaarte:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "Aantal ewekansige kaarte wat verwyder word na skommeling:" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Gebruik die seerower om skepe te blokkeer:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Eiland-ontdekbonusse:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Boukwotas" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Paaie:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Dorpe:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Stede:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Stadsmure:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Skepe:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Brûe:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Stapel van ontwikkelingskaarte" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Padboukaarte:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Monopoliekaarte:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Oorvloedjaarkaarte:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Kapelkaarte:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Pionier universiteitkaarte:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Ampswoningkaarte:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Biblioteekkaarte:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Markkaarte:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Soldaatkaarte:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Huidige spelinstellings" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "vra vir gratis %s" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "gee %s gratis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "gee %s vir %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Ek vra %s en sal %s gee" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Aanhaling ontvang vanaf %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Vra vir kwotasies" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Aanvaar kwotasie" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "_Stop met ruilhandel" @@ -2492,23 +2516,23 @@ "Die spel gebruik die nuwe reël '%s', wat nog nie ondersteun word nie. " "Oorweeg dit om op te gradeer.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Hierdie spel kan nie gewen word nie." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Daar is geen land." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Dit is moontlik dat hierdie spel nie gewen kan word nie." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "Hierdie spel kans gewen word deur slegs alle dorpe en stede te bou." -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2565,175 +2589,175 @@ " Petri Jooste https://launchpad.net/~petri-jooste" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Analise van wenpunte" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Alle sewes skuif die rower of seerower" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "In die eerste twee beurte word alle sewes vervang" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Alle sewes word vervang" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Geskommelde verstekterrein" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Verewekansig die terrein" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Gebruik seerower" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Gebruik die seerower om skepe te blokkeer" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Streng handel" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Laat ruilhandel slegs voor bou of koop toe" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Plaaslike handel" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Laat ruilhandel toe tussen spelers" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Oorwinning aan die einde van 'n beurt" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Toets slegs aan die einde van 'n beurt vir oorwinning" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "Gebruik 'n stel kansgetalle" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "Gebruik 'n stel van 36 kansgetalkaarte in plaas van regte kansgetalle" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "Aantal pakke kansgetalkaarte" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "Die aantal kansgetalkaartpakke (36 kaarte elk)" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "Aantal kansgetalkaarte verwyder" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" "Die aantal kansgetalkaarte wat uitgehaal word nadat die pak geskommel is" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Bonus vir eilandontdekking" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "'n Lys, met kommas geskei, van bonuspunte vir ontdek van eilande" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "Kontrolleer eiland-ontdekking bonusse" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Aantal spelers" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Die hoeveelheid spelers" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Wenpuntteiken" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Die punte wat nodig is om die spel te wen" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Is dit moontlik om hierdie spel te wen?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "Baksteenhawe" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "Graanhawe" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "Ertshawe" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "Wolhawe" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Houthawe" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Kies 'n meta-bediener" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Kies 'n spel" @@ -2842,30 +2866,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** ONBEKENDE BOODSKAPTIPE ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Fout met skryf na sok: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "Kon nie al die data stuur nie\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Leesbuffer het oorgeloop - ontkoppel tans\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Fout tydens lees van sok: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "Kon nie aan %s koppel nie: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "onbekend" @@ -2875,222 +2899,222 @@ msgstr "Konnekteer aan %s, poort %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "Statusstapel loop oor. Stapel word gestort op standaardfoutafvoer.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Heuwel" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Veld" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Berg" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Weiveld" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "W_oud" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Woestyn" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_See" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Goud" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Niks" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Baksteen (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Graan (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Erts (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Wol (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Hout (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Alles (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "O" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NO" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NW" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "W" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SW" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SO" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "Plaas 'n heuwelblok" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "Plaas 'n veldblok" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "Plaas 'n bergblok" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "Plaas 'n weiveldblok" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "Plaas 'n woudblok" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "Plaas 'n woestynblok" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "Plaas 'n seeblok" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "Plaas 'n goudblok" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "Verwyder die blok" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "Plaas 'n merker 2" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "Plaas 'n merker 3" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "Plaas 'n merker 4" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "Plaas 'n merker 5" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "Plaas 'n merker 6" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "Plaas 'n merker 8" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "Plaas 'n merker 9" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "Plaas 'n merker 10" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "Plaas 'n merker 11" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "Plaas 'n merker 12" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "Plaas 'n 2:1 baksteenhawe" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "Plaas 'n 2:1 graanhawe" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "Plaas 'n 2:1 ertshawe" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "Plaas 'n 2:1 wolhawe" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "Plaas 'n 2:1 houthawe" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "Verwyder 'n hawe" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "Plaas 'n 3:1 hawe" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3098,244 +3122,233 @@ "Kies die terreintipe met die kontekskieslys van die links-kliek of wissel 'n " "node om dit uit te laat tydens die opstelfase" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Voeg 'n ry in" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Vee 'n ry uit" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Voeg 'n kolom in" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Vee 'n kolom uit" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "_Titel" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "_Beskrywing" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "_Kommentaar" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Skommel" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Spelparameters" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Reëls" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Hulpbronne" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Geboue" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "Ongetiteld" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioniers-redigeerder" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Kon nie '%s' laai nie" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Kon nie '%s' stoor nie" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Spelle" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Ongefilter" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Maak spel oop" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Open..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Stoor As..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Stoor _As..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Verander titel" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Nuwe titel:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Aangaande die Pioniersredigeerder" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Maak hierdie lêer oop" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "lêernaam" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Redigeerder vir Pioniersspelle" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Instellings" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Kommentaar" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Lêer" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Nuwe" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Skep nuwe spel" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Open..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nuwe" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Maak 'n bestaande spel oop" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Stoor" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Open..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Stoor spel" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Stoor _As..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Stoor" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Stoor as" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "Verander _Titel" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Stoor _As..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Verander die spel se titel" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "_Kontrolleer Wenpunt teiken" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "Verander _Titel" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Merk as die spel gewen kan word" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Verlaat" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Aangaande die Pioniersredigeerder" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Kontrolleer Wenpunt teiken" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Inligting oor die Pioniersredigeerder" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Maak hierdie lêer oop" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "lêernaam" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Redigeerder vir Pioniersspelle" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Bou van kieslyste het misluk: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Instellings" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Kommentaar" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Aangaande die Pioniersredigeerder" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Aantal hulpbronne" @@ -3348,51 +3361,51 @@ msgstr "spel;bord;skep;redigeer;Pioniers;Setlaars;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Loop die metabediener in die agtergrond wanneer dit begin" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Pid-lêer om te skep wanneer bediener loop as daemon (impliseer -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Herlei kliënte na 'n ander metabediener" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Gebruik hierdie masjiennaam wanneer nuwe spelle geskep word" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "masjiennaam" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Gebruik hierdie poortreeks wanneer 'n nuwe spel geskep word" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "vanaf-na" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Ontfout syslog-boodskappe" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metabediener vir Pioniers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "metabediener protokol:" @@ -3426,66 +3439,56 @@ msgid "Unregistering Avahi.\n" msgstr "Deregistreer tans Avahi.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Aangaande Pioniersbediener" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Inligting oor Pioniersbediener" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Stop bediener" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Begin bediener" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Stop die bediener" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Begin die bediener" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Speler %s van %s tree in\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Speler %s van %s tree uit\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Speler %d is nou %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "Die poort vir die spelbediener" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Registreer bediener" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registreer hierdie spel by die metabediener" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Masjiennaam soos verskaf" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3493,134 +3496,134 @@ "gespeel word)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Ewekansige beurtvolgorde" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Maak beurtvolgorde deurmekaar" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Wys alle spelers en toeskouers wat aan die bediener gekoppel is" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Gekonnekteer" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Is die speler tans gekonnekteer?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Naam" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Spelernaam" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Plek" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Masjiennaam van die speler" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Nommer" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Spelernommer" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Rol" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Speler of toeskouer" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Lanseer Pioniers-kliënt" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Lanseer die Pioniers-kliënt" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Skakel gesels aan" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Skakel geselsboodskappe aan" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Voeg robotspeler by" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Voeg 'n robotspeler by die spel" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Boodskappe vanaf die bediener" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Spelinstellings" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Bedienerparameters" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Spel word tans geloop" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Spelers het toegetree" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Robotspelers" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Boodskappe" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "Die Pioniers-spelbediener" @@ -3629,18 +3632,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "Die spel is verby.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Skep 'n Pioniersspel" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioniersbediener" @@ -3652,140 +3655,150 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "spel;bord;bediener;masjiennaam;Pioniers;Setlaars;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Inligting oor Pioniersbediener" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Aangaande Pioniersbediener" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Speltitel om te gebruik" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Spellêer om te gebruik" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Poort om na te luister" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Beheer aantal spelers" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Verander die aantal punte wat nodig is om die spel te wen" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Verander die sewes-reëlhantering" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "Verander die hantering van die kansgetalkaarte" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "Verander num-dice-decks hantering" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "Verander die hantering van num-removed-dice-cards" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Verander die terreintipe, 0=verstek, 1=ewekansig" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Voeg N robotspelers by" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Registreer bediener by metabediener" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registreer by die metabediener (impliseer -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Gebruik hierdie masjiennaam vir registrasie" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Verlaat die spel wanneer 'n speler gewen het" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Verlaat die spel na N sekondes sonder spelers" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Toernooi-modus, rekenaars bygevoeg na N minute" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Adminpoort om op te luister" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "Moenie die spel dadelik begin nie, wag vir 'n opdrag op die adminpoort" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Gee nommers aan spelers soos wat hulle die spel betree" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Opsies vir die metabediener" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opsies vir die metabediener" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Verskeie opsies" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Verskeie opsies" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "Kan nie die speltitel en lêernaam terselfdertyd verander nie\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Kan die spel-parameters nie laai nie\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3795,7 +3808,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Die verbinding aan die metabediener is verbreek.\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3806,45 +3820,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Probeer tans om weer aan die metabediener te verbind.\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registreer by die metabediener by %s.\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "Deregistreer by die metabediener.\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "geselslyn te lank" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "naam te lank" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "onbekende uitbreiding word geïgnoreer" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "Die laaste speler is weg, die toernooitydhouer is herstel." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "Geen menslike spelers teenwoordig nie. Totsiens." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Die spel begin, robotspelers word bygevoeg." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "Die spel begin oor %s minute." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "Die spel begin oor %s minuut." @@ -3853,11 +3867,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Robotspeler" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "Kan nie die masjiennaam van die speler bepaal nie: %s" @@ -3865,49 +3879,49 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Jammer, die spel is verby." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Speler vanaf %s word weggewys: spel is verby\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Naam is nie verander nie: nuwe naam word reeds gebruik" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Het te lank gewag sonder spelers... totsiens.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" "Die laaste menslike speler is weg. Wag tans vir 'n speler om terug te kom." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Die spel word hervat." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s het weer gekonnekteer." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Weergawes pas nie: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Hierdie spel gaan binnekort begin." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Spel word voorberei" @@ -3928,6 +3942,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "Die kies van kansgetalle is bepaal deur die administrateur." +#~ msgid "Quit the program" +#~ msgstr "Verlaat die program" + +#~ msgid "" +#~ msgstr "meer>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Vermeerder die hoeveelheid" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Bou van kieslyste het misluk: %s" + #~ msgid "Join the selected game" #~ msgstr "Betree die gekose spel" diff -Nru pioneers-15.5/po/ca.po pioneers-15.6/po/ca.po --- pioneers-15.5/po/ca.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/ca.po 2020-08-02 12:37:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Pioneers 15.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2016-06-23 20:08+0100\n" "Last-Translator: Jaume Badiella \n" "Language-Team: Catalan <>\n" @@ -58,8 +58,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Activa els missatges de depuració" @@ -69,8 +69,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Mostra la informació de la versió" @@ -79,9 +79,9 @@ msgid "- Computer player for Pioneers" msgstr "- Jugador artificial de Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Versió de Pioneers:" @@ -334,8 +334,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -368,7 +368,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Desconnectat" @@ -398,7 +398,7 @@ msgstr "%s rep %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s pren %s.\n" @@ -443,70 +443,70 @@ "La versió no coincideix. Assegura't que tant el client com el servidor estan " "actualitzats, si et plau.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Construeix dos pobles, connectats cadascun amb un" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Construeix un poble connectat amb un" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "camí" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "pont" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "vaixell" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " o" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "S'està esperant el teu torn." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Selecciona l'edifici d'on vols robar." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Selecciona el vaixell d'on vols robar" -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Col·loca el lladre." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Acaba l'acció de construcció del camí" -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Construeix un segment de camí." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Construeix dos segments de camí." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Et toca a tu." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Ho sento, %s disponible.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "S'ha acabat la partida." @@ -560,7 +560,7 @@ msgid "%s took %s from %s.\n" msgstr "%s pren %s de %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Espectador %d" @@ -570,7 +570,7 @@ msgid "spectator %d" msgstr "espectador %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Jugador %d" @@ -896,6 +896,11 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "qualsevol recurs" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -941,12 +946,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Comença el torn %d per a %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Error en iniciar %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Selecciona una partida detectada automàticament" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) a %s:%s" @@ -979,110 +998,397 @@ msgid " said: " msgstr " diu: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Partida" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Comença una nova partida" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nova Partida" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Deixa aquesta partida" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "A_bandona la Partida" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administra el servidor de Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Administració" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Canvia el teu nom de jugador" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "Nom del _Jugador" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Llegenda de terrenys i costos de construcció" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "Ll_egenda" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Paràmetres de la partida actual" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "Paràmetres de la _Partida" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histograma de les tirades de daus" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "Histograma dels _Daus" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Surt" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Surt" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Accions" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Tira els daus" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Tira els Daus" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Comerç" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Desfés" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Acaba" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Construeix un camí" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Camí" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Construeix un vaixell" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Vaixell" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Mou un vaixell" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Mou un Vaixell" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Construeix un pont" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Pont" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Construeix un poble" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Poble" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Construeix una ciutat" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Ciutat" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Compra una carta de desenvolupament" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Desenvolupa" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Construeix una muralla" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Muralla" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Paràmetres" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Mostra o amaga la barra d'eines" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "Barra d'_Eines" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Configura l'aplicació" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Preferè_ncies" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Visualitza" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Posa la finestra a pantalla completa" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "Pantalla Co_mpleta" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Visualitza el mapa complet" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Reinicia" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Centra el mapa" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Centra" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "A_juda" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informació sobre Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "Quant _a Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Mostra el manual" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metaservidor a %s, port %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Acabat.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "El metaservidor ja no està disponible.\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "El metaservidor ha tancat la connexió inesperadament.\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "S'estan rebent noms de partides del metaservidor.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "S'ha requerit un nou servidor de joc a %s, port %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "S'ha rebut informació incompleta quant al nou servidor de joc.\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Missatge desconegut del metaservidor: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "S'estan rebent dades de la sessió inactiva: %s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "Massa redireccions del metaservidor\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Línia de redirecció incorrecta: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "El metaservidor és massa vell per crear servidors (versió %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Dades inesperades del metaservidor: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Tornar a tirar en els primers 2 torns" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Tornar a tirar a cada set" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Per defecte" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "A l'atzar" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "S'ha redireccionat al metaservidor a %s.\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "S'ha redireccionat al metaservidor a %s, port %s.\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "S'està rebent una llista de servidors Pioneers del metaservidor.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Nombre de jugadors artificials" @@ -1102,11 +1408,6 @@ msgid "Requesting new game server.\n" msgstr "S'està demanant un nou servidor de joc.\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Error en iniciar %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1114,9 +1415,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "_Cancel·la" @@ -1141,7 +1442,7 @@ msgstr "_Nova Partida Remota" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "Apunta-t'_hi" @@ -1207,7 +1508,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Regla dels sets" @@ -1248,104 +1549,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Nom del jugador" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Introdueix el teu nom de jugador" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Espectador" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Marca-ho si vols ser un espectador" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Apunta-t'hi" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Apunta't a una partida descoberta automàticament" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaservidor" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Apunta't a una Partida Pública" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Apunta't a una partida pública" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Crea una Partida" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Crea una partida" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Apunta't a una Partida Privada" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Apunta't a una partida privada" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Servidor" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Nom del servidor de la partida" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Port" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Port del servidor de la partida" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Partides recents" @@ -1364,527 +1665,255 @@ msgid "Discard Resources" msgstr "Descarta Recursos" -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "_Bé" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Has de descartar %d carta de recurs" -msgstr[1] "Has de descartar %d cartes de recursos" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Total descartats" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Esperant que els jugadors es descartin" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Fi de la Partida" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s ha guanyat la partida amb %d punts!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Lloem a %s, Senyor del món conegut!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Tria recursos" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Pots triar %d recurs" -msgstr[1] "Pots triar %d recursos" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Recursos totals" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Esperant que els jugadors triïn" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Partida" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nova Partida" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Comença una nova partida" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "A_bandona la Partida" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Deixa aquesta partida" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Administració" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administra el servidor de Pioneers" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "Nom del _Jugador" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Canvia el teu nom de jugador" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "Ll_egenda" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Llegenda de terrenys i costos de construcció" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "Paràmetres de la _Partida" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Paràmetres de la partida actual" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "Histograma dels _Daus" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histograma de les tirades de daus" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Surt" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Surt del programa" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Accions" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Tira els Daus" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Tira els daus" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Comerç" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Desfés" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Acaba" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Camí" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Construeix un camí" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Vaixell" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Construeix un vaixell" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Mou un Vaixell" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Mou un vaixell" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Pont" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Construeix un pont" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Poble" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Construeix un poble" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Ciutat" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Construeix una ciutat" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Desenvolupa" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Compra una carta de desenvolupament" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Muralla" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Construeix una muralla" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Paràmetres" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Preferè_ncies" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Configura l'aplicació" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Visualitza" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Reinicia" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "Visualitza el mapa complet" - -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Centra" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "_Bé" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Centra el mapa" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Has de descartar %d carta de recurs" +msgstr[1] "Has de descartar %d cartes de recursos" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "A_juda" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Total descartats" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "Quant _a Pioneers" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Esperant que els jugadors es descartin" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informació sobre Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Fi de la Partida" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Mostra el manual" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s ha guanyat la partida amb %d punts!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "Pantalla Co_mpleta" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Lloem a %s, Senyor del món conegut!" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Posa la finestra a pantalla completa" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Tria recursos" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "Barra d'_Eines" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Pots triar %d recurs" +msgstr[1] "Pots triar %d recursos" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Mostra o amaga la barra d'eines" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Recursos totals" + +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Esperant que els jugadors triïn" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Punts necessaris per guanyar: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Missatges" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Mapa" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Acaba els tractes" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Oferta" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Rebutja tracte local" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Llegenda" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Benvingut/da a Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Preferències de Pioneers" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "Tan_ca" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Tria un dels temes" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Mostra la llegenda" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Mostra la llegenda com una pàgina al costat del mapa" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Missatges amb colors" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Mostra els missatges amb colors" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Conversa amb el color del jugador" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Mostrar els nous missatges de conversa amb el color del jugador" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Resum en color" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Utilitza colors al resum del jugador" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Barra d'eines amb dreceres" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Mostra les dreceres de teclat a la barra d'eines" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Mode silenciós" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "En mode silenciós, no es reprodueix cap so." #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Anuncia els nous jugadors" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "Fes un so quan un nou jugador o espectador entri a la partida" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Mostra notificacions" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" "Mostra les notificacions quan és el teu torn o quan es poden fer tractes" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Utilitza una disposició de 16:9" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Utilitza una disposició amigable de 16:9 per a la finestra" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Quant a Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Benvingut/da a Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Histograma dels Daus" @@ -1897,7 +1926,7 @@ msgstr "Selecciona una nova ubicació per al vaixell." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "Et toca col·locar a tu." @@ -1930,21 +1959,21 @@ msgstr "Mar" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Rendiments del terreny" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Costos de construcció" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Muralla" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Carta de desenvolupament" @@ -1975,28 +2004,30 @@ msgstr "Cara:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variació:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Connecta't com a espectador" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Servidor metaservidor" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Selecciona una partida per jugar." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Connectant" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Juga una partida de Pioneers" @@ -2091,7 +2122,7 @@ msgstr "Cartes de recursos" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Cartes de desenvolupament" @@ -2117,66 +2148,76 @@ msgid "The bank is empty" msgstr "El banc està buit" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s té %s, i busca %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Nova oferta de %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Oferta de %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Vull" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Dono" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Esborra" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Rebutja el Tracte Local" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Jugador" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Ofertes" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s per %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Tracte rebutjat" @@ -2191,240 +2232,220 @@ msgstr "Total" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Total a la mà" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "més>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Augmenta la quantitat seleccionada" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Quantitat seleccionada" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Quantitat seleccionada total" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "No es pot buidar el banc" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Sí" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "No" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Desconegut" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "No hi ha cap partida en curs..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Paràmetres generals" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Nombre de jugadors:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Punts de victòria objectiu:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Terreny aleatori:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Permet els tractes entre jugadors:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Permet els tractes només abans de construir o comprar:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Comprova els punts de victòria només al final del torn" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Quantitat de cada recurs:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Regla dels sets:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "Utilitza baralles de daus en lloc de daus:" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "Nombre de baralles de daus:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "Nombre de cartes de daus eliminades després de remenar:" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Utilitza el pirata per bloquejar vaixells:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonificacions per descobriment d'illes:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Costos de construcció" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Camins:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Pobles:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Ciutats:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Muralles:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Vaixells:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Ponts:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Cartes de desenvolupament" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Cartes de construir camins:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Cartes de monopoli:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Cartes d'any d'abundància:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Cartes de capella:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Cartes d'universitat pionera:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Cartes e palau del governador:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Cartes de biblioteca:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Cartes de mercat:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Cartes de soldat:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Paràmetres de la Partida Actual" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "demana %s de franc" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "dóna %s de franc" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "dóna %s per %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Vull %s, i dono %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Oferta rebuda de %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Demana Ofertes" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Accepta Oferta" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "Acaba el _Tracte" @@ -2489,23 +2510,23 @@ "El joc utilitza la nova regla '%s', que encara no està suportada. Pensa en " "actualitzar-te.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Aquesta partida no es pot guanyar." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "No hi ha terra." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "És possible que aquesta partida no es pugui guanyar." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "Aquesta partida es pot guanyar només construint pobles i ciutats." -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2559,177 +2580,177 @@ msgstr "Jaume Badiella" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Anàlisi de Punt de Victòria" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Tots els sets mouen el lladre o pirata" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "En els dos primers torns, amb un set es torna a tirar" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Amb un set sempre es torna a tirar" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Fes aleatori el terreny" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Fes aleatori el terreny" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Utilitza el pirata" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Utilitza el pirata per bloquejar vaixells" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Tracte estricte" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Permet fer tractes només abans de construir o comprar" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Tracte local" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Permet els tractes entre jugadors" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Victòria al final del torn" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Comprova la victòria només al final del torn" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "Utilitza una baralla de daus" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "Utilitza una baralla de 36 daus en lloc de daus de debò" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "Nombre de baralles de daus" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "El nombre de baralles de daus (de 36 cartes cadascuna)" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "Nombre de cartes de daus eliminades" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" "El nombre de cartes de daus que s'eliminen després de remenar la baralla" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Bonificacions per descobriment d'illes" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" "Una llista separada per comes de punts de bonificació per descobriment " "d'illes" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "Comprova i corregeix les bonificacions per descobriment d'illes" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Nombre de jugadors" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "El nombre de jugadors" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Punts de victòria objectiu" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Els punts necessaris per guanyar la partida" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "És possible guanyar aquesta partida?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "M" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "G" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "P" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "L" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "F" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Selecciona un metaservidor" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Selecciona una partida" @@ -2838,30 +2859,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** TIPUS DE MISSATGE DESCONEGUT ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Error en escriure al sòcol: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "No s'han pogut enviar totes les dades\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Sobreeiximent de buffer de lectura - desconnectant\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Error en llegit el sòcol: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "Error en connectar amb %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "desconegut" @@ -2871,224 +2892,224 @@ msgstr "Connectant amb %s, port %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" "Sobreeiximent de la pila d'estat. S'ha envia l'abocament de la pila a " "l'error estàndard.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "Pu_jol" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Camp" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Muntanya" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Pastura" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "B_osc" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Desert" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "Ma_r" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Or" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "C_ap" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Maó (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Gra (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "Mi_nerals (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Llana (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Fusta (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Qualsevol (_3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "E" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NO" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "O" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SO" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "Posa un hexàgon de pujol" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "Posa un hexàgon de camp" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "Posa un hexàgon de muntanya" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "Posa un hexàgon de pastura" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "Posa un hexàgon de bosc" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "Posa un hexàgon de desert" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "Posa un hexàgon de mar" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "Posa un hexàgon d'or" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "Esborra l'hexàgon" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "Posa una etiqueta de 2" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "Posa una etiqueta de 3" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "Posa una etiqueta de 4" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "Posa una etiqueta de 5" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "Posa una etiqueta de 6" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "Posa una etiqueta de 8" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "Posa una etiqueta de 9" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "Posa una etiqueta de 10" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "Posa una etiqueta de 11" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "Posa una etiqueta de 12" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "Posa un port de maó 2:1" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "Posa un port de gra 2:1" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "Posa un port de minerals 2:1" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "Posa un port de llana 2:1" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "Posa un port de fusta 2:1" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "Elimina un port" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "Posa un port 3:1" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3097,242 +3118,231 @@ "canvia l'estat d'un node per excloure'l de ser usat durant la fase de " "configuració" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Insereix una fila" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Suprimeix una fila" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Insereix una columna" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Suprimeix una columna" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "_Títol" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "_Descripció" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "_Comentaris" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Barreja" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Paràmetres de la partida" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Regles" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Recursos" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Construccions" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "Sense títol" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Editor de Pioneers" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "La càrrega de '%s' ha fallat" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "El desament a '%s' ha fallat" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Partides" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Sense filtrar" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Partida Oberta" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 msgid "_Open" msgstr "_Obre" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Anomena i Desa..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 msgid "Save _As" msgstr "_Anomena i Desa" #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Canvi de Títol" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Nou títol:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Quant a l'Editor de Joc de Pioneers" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Obre aquest fitxer" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "nom de fitxer" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor de partides de Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Paràmetres" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Comentaris" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Fitxer" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Nou" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Crea una nova partida" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Obre" +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nou" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Obre una partida existent" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "De_sa" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Obre" #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Desa la partida" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "_Anomena i Desa..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "De_sa" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Anomena i desa" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "Canvia el _Títol" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "_Anomena i Desa..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Canvia el títol de la partida" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "_Comprova l'Objectiu de Punts de Victòria" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "Canvia el _Títol" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Comprova si es pot guanyar la partida" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Surt" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "Quant _A l'Editor de Pioneers" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Comprova l'Objectiu de Punts de Victòria" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informació sobre l'Editor de Pioneers" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Obre aquest fitxer" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "nom de fitxer" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor de partides de Pioneers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "La construcció dels menús ha fallat: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Paràmetres" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Comentaris" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "Quant _A l'Editor de Pioneers" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Recompte de recursos" @@ -3345,51 +3355,51 @@ msgstr "partida;taulell;crea;edita;disposició;Pioneers;Colons;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Demonitza el metaservidor en iniciar" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Fitxer de PID a crear en demonitzar (implica -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Redirecciona els clients a un altre metaservidor" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Utilitza aquest nom de servidor en crear noves partides" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "nom de servidor" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Utilitza aquest rang de ports en crear nous jocs" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "de-a" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Depura els missatges de registre del sistema" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metaservidor de Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "protocol del metaservidor:" @@ -3423,66 +3433,56 @@ msgid "Unregistering Avahi.\n" msgstr "Anul·lant el registre d'Avahi.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "Quant _Al Servidor Pioneers" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Informació sobre el Servidor Pioneers" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Atura el Servidor" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Inicia el Servidor" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Atura el servidor" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Inicia el servidor" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Ha entrat el jugador %s de %s\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "El jugador %s de %s se n'ha anat\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "El jugador %d ara és %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "El port del servidor de joc" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Registra el servidor" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registra aquesta partida al metaservidor" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Nom de servidor informat" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3490,134 +3490,134 @@ "tallafoc)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Ordre de torns aleatori" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Desordena l'ordre dels torns" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Mostra tots els jugadors i espectadors connectats al servidor" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Connectat" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "El jugador, està actualment connectat?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Nom" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Nom del jugador" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Ubicació" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Nom d'ordinador del jugador" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Número" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Número de jugador" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Funció" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Jugador o espectador" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Llança el client de Pioneers" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Llança el client de Pioneers" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Habilita la conversa" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Habilita els missatges de conversa" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Afegeix un Jugador Artificial" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Afegeix un jugador artificial a la partida" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Missatge del servidor" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Paràmetres de la partida" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Paràmetres del servidor" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Partida en curs" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Jugadors connectats" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Jugadors artificials" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Missatges" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 msgid "About the Pioneers Game Server" msgstr "Quant al Servidor de Joc de Pioneers" @@ -3625,18 +3625,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "S'ha acabat la partida.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Hostatja una partida de Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Servidor de Pioneers" @@ -3648,142 +3648,152 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "partida;taulell;servidor;host;Pioneers;Colons;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Informació sobre el Servidor Pioneers" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "Quant _Al Servidor Pioneers" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Títol de partida a utilitzar" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Fitxer de partida a utilitzar" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Port d'escolta" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Obviar el nombre de jugadors" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Obviar el nombre de punts necessaris per guanyar" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Obviar la regla dels sets" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "Obvia la gestió de baralles de daus" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "Obvia la gestió del nombre de les baralles de daus" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "" "Obvia la gestió del nombre de cartes eliminades de les baralles de daus" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Obviar el tipus de terreny, 0=per defecte 1=aleatori" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Afegeix N jugadors artificials" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Registra el servidor amb el metaservidor" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registra't al nom del metaservidor (implica -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Utilitza aquest nom de servidor en registrar-te" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Surt després que un jugador hagi guanyat" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Surt després de N segons sense jugadors" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Modo de torneig, s'afegeixen jugadors artificials passats N minuts" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Port d'escolta d'administració" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "No comencis el joc immediatament, espera una ordre del port d'administració" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Dóna números als jugadors d'acord amb l'ordre d'entrada a la partida" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Opcions del Metaservidor" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opcions del el metaservidor" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Opcions Diverses" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Opcions diverses" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "No es pot establir el títol i el nom de fitxer alhora\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "No es poden carregar els paràmetres de la partida\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3793,7 +3803,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "S'ha perdut la connexió amb el metaservidor.\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3804,45 +3815,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "S'està intentant la reconnexió amb el metaservidor.\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registra't amb el metaservidor a %s.\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "Desregistra't del metaservidor\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "conversa massa llarga" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "nom massa llarg" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "s'ignora l'extensió desconeguda" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "L'últim jugador ha marxat, es restableix el comptador del torneig." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "No hi ha cap jugador humà. Siau." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Comença la partida, s'afegeixen els jugadors artificials." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "La partida començarà d'aquí a %s minuts." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "La partida començarà d'aquí a %s minut." @@ -3851,11 +3862,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Jugador Artificial" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "No es pot determinar el nom de host del jugador: %s" @@ -3863,48 +3874,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Ho sento, s'ha acabat la partida." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "S'ha rebutjat el jugador de %s: s'ha acabat la partida\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "No s'ha canviat el nom: el nou nom ja està en ús" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Ha estat esperant massa temps sense jugadors... Siau.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "L'últim jugador humà ha marxat. Esperant que torni algun jugador." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Es reprèn la partida." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s s'ha reconnectat." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "La versió no coincideix: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Aquesta partida començarà aviat." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "S'està preparant la partida" @@ -3924,3 +3935,21 @@ #: ../server/turn.c:516 msgid "The dice roll has been determined by the administrator." msgstr "La tirada de daus ha estat determinada per l'administrador." + +#~ msgid "Quit the program" +#~ msgstr "Surt del programa" + +#~ msgid "" +#~ msgstr "més>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Augmenta la quantitat seleccionada" + +#~ msgid "Building menus failed: %s" +#~ msgstr "La construcció dels menús ha fallat: %s" diff -Nru pioneers-15.5/po/ChangeLog pioneers-15.6/po/ChangeLog --- pioneers-15.5/po/ChangeLog 2018-03-14 13:28:44.000000000 +0000 +++ pioneers-15.6/po/ChangeLog 2020-08-02 12:37:55.000000000 +0000 @@ -1,3 +1,21 @@ +2020-08-02 Roland Clobus + * all: Line number update for 15.6 + * en_GB.po: Updated to 15.6 + * de.po: Added a few translations + +2020-06-26 Roland Clobus + * nl.po: Updated to 15.6 + * nl.po: Use infinitives instead of imperatives + +2020-06-21 Roland Clobus + * pioneers.pot: Updated for 15.6 + +2019-07-17 Jose Riha + * sk.po: Updated translation + +2019-06-30 Jose Riha + * sk.po: New translation + 2017-03-14 Cyril C. * fr.po: Plural forms for dice. Fixes SF bug #296 diff -Nru pioneers-15.5/po/cs.po pioneers-15.6/po/cs.po --- pioneers-15.5/po/cs.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/cs.po 2020-08-02 12:37:55.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Pioneers 0.12.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2010-03-28 01:29+0000\n" "Last-Translator: Ladislav Dobias \n" "Language-Team: \n" @@ -56,8 +56,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Povolit ladící hlášení" @@ -67,8 +67,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Ukázat informaci o verzi" @@ -77,9 +77,9 @@ msgid "- Computer player for Pioneers" msgstr "- Strojový hráč pro Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Verze Pioneers:" @@ -332,8 +332,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -365,7 +365,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Nepřipojen" @@ -395,7 +395,7 @@ msgstr "%s obdržel: %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s bere: %s.\n" @@ -439,70 +439,70 @@ msgstr "" "Verze nesouhlasí. Ujistěte se, prosím, zda klient i server jsou aktuální.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Postavte dvě vesnice, ke každé připojte" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Postavte vesnici, ke které připojte" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "silnici" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "most" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "loď" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " nebo" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Čekání na váš tah." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Zvolte stavbu, ze které se bude krást." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Zvolte loď, ze které se bude krást." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Přemístěte zloděje." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Ukončit akci: stavba silnice." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Postavte jednu silnici." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Postavte dvě silnice." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Jste na tahu." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Promiňte, dostupno je pouze %s.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Tato hra skončila." @@ -556,7 +556,7 @@ msgid "%s took %s from %s.\n" msgstr "%s sebral kartu %s hráči %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "" @@ -566,7 +566,7 @@ msgid "spectator %d" msgstr "" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Hráč %d" @@ -892,6 +892,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "libovolná surovina (chyba)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -937,12 +943,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Začátek kola %d pro hráče %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, fuzzy, c-format +msgid "Error starting %s: %s\n" +msgstr "Chyba při startu %s: %s" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "" @@ -975,111 +995,399 @@ msgid " said: " msgstr " řekl: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Hra" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Spustit novou hru" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nová hra" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Opustit tuto hru" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Opustit hru" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administrovat server Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Admin" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Změnit jméno vašeho hráče" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "_Jméno hráče" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Legenda krajiny a náklady na stavění" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "_Legenda" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Nastavení pro současnou hry" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Herní nastavení" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogram hodů kostkami" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "Histogram ho_dů" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Konec" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Konec" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Akce" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Hodit kostkami" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Hodit kostky" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Obchod" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Zpět" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Dokončit" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Postavit silnici" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Silnice" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Postavit loď" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Loď" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Posunout lodí" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Posunout loď" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Postavit most" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Most" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Postavit vesnici" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Vesnice" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Postavit město" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Město" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Koupit akční kartu" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Akční karta" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Postavit městskou zeď" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Městská zeď" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "Na_stavení" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Ukáže či skryje nástrojovou lištu" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "Nástrojová liš_ta" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Konfigurovat aplikaci" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Vlast_nosti" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +#, fuzzy +msgid "_View" +msgstr "Pozorovatel" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Nápověda" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informace o hře Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_O Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Ukázat manuál" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Meta server na adrese %s, port %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Ukončen.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Získávám jména her z meta serveru.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, fuzzy, c-format msgid "New game server requested on %s port %s.\n" msgstr "Nový herní server požadován na adrese %s, port %s\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Neznámá zpráva z meta serveru: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 #, fuzzy msgid "Too many metaserver redirects.\n" msgstr "Velmi mnoho přesměrování na meta serveru\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Špatná řádka přesměrování: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Meta server je moc starý na vytváření serverů (verze %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, fuzzy, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Neznámá zpráva z meta serveru: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normální" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Házet znovu první 2 kola" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Házet znovu při každé 7" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Standardní" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Náhodná" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, fuzzy, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Přesměrováno na meta server %s, port %s\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, fuzzy, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Přesměrováno na meta server %s, port %s\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Získávám seznam serverů Pioneers z meta serveru.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Počet počítačových hráčů" @@ -1100,11 +1408,6 @@ msgid "Requesting new game server.\n" msgstr "Požadován nový hrací server\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, fuzzy, c-format -msgid "Error starting %s: %s\n" -msgstr "Chyba při startu %s: %s" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1112,9 +1415,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1140,7 +1443,7 @@ msgstr "_Nová vzdálená hra" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 #, fuzzy msgid "_Join" msgstr "Připojit se" @@ -1207,7 +1510,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Pravidlo sedmiček" @@ -1249,105 +1552,105 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Jméno hráče" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Vložte své jméno" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 #, fuzzy msgid "Check if you want to be a spectator" msgstr "Chcete být jen pozorovatel?" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Připojit se" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Meta server" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Připojit k veřejné hře" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Připojit se k veřejné hře" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Vytvořit hru" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Vytvořit hru - nastavit a spustit vlastní server" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Připojit k soukromé hře" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Připojit k soukromé hře (která není oznámena na meta serveru)" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Adresa serveru" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Jméno počítače s hrou" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Port serveru" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Port na počítači s hrou" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Současné hry" @@ -1368,527 +1671,255 @@ #. Button text #: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, fuzzy, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Musíte odhodit suroviny: %d" -msgstr[1] "Musíte odhodit suroviny: %d" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Celkem odhodit" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Čekání na odhazujícího hráče" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Konec hry" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s vyhrál tuto hru s %d vítěznými body!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Buď blahořečený, %s, Pane poznaného světa!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Zvolit suroviny" - -#: ../client/gtk/gold.c:96 -#, fuzzy, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Můžete zvolit surovin: %d" -msgstr[1] "Můžete zvolit surovin: %d" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Celkem surovin" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Čekání na hráče, až si vyberou" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Hra" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nová hra" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Spustit novou hru" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Opustit hru" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Opustit tuto hru" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Admin" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administrovat server Pioneers" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "_Jméno hráče" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Změnit jméno vašeho hráče" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "_Legenda" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Legenda krajiny a náklady na stavění" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Herní nastavení" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Nastavení pro současnou hry" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "Histogram ho_dů" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogram hodů kostkami" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Konec" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Ukončit program" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Akce" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Hodit kostky" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Hodit kostkami" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Obchod" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Zpět" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Dokončit" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Silnice" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Postavit silnici" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Loď" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Postavit loď" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Posunout loď" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Posunout lodí" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Most" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Postavit most" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Vesnice" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Postavit vesnici" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Město" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Postavit město" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Akční karta" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Koupit akční kartu" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Městská zeď" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Postavit městskou zeď" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "Na_stavení" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Vlast_nosti" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Konfigurovat aplikaci" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -#, fuzzy -msgid "_View" -msgstr "Pozorovatel" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "" +#: ../client/gtk/discard.c:101 +#, fuzzy, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Musíte odhodit suroviny: %d" +msgstr[1] "Musíte odhodit suroviny: %d" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Celkem odhodit" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Nápověda" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Čekání na odhazujícího hráče" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_O Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Konec hry" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informace o hře Pioneers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s vyhrál tuto hru s %d vítěznými body!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Ukázat manuál" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Buď blahořečený, %s, Pane poznaného světa!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Zvolit suroviny" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "" +#: ../client/gtk/gold.c:96 +#, fuzzy, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Můžete zvolit surovin: %d" +msgstr[1] "Můžete zvolit surovin: %d" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "Nástrojová liš_ta" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Celkem surovin" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Ukáže či skryje nástrojovou lištu" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Čekání na hráče, až si vyberou" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Body pro vítězství:%i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Hlášení" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Mapa" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Ukončit obchodování" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Kotovat" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Odmítnout vnitřní obchod" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Legenda" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Vítejte ve hře Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Vlastnosti Pioneers" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Téma:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Vyberte jedno téma" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Ukázat legendu" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Ukázat legendu jako stránku vedle mapy" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Barevná hlášení" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Ukázat nová hlášení barevně" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Chat v barvě hráče" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Obarví hlášky hráče podle jeho barvy" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Barevné shrnutí" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Použít barvy v shrnutí hráče" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Nástrojová lišta se zkratkami" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Ukázat klávesové zkratky v nástrojové liště" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Tichý mód" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "V tichém módu jsou všechny zvuky vypnuty" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Oznámit nové hráče" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 #, fuzzy msgid "Make a sound when a new player or spectator enters the game" msgstr "Udělat zvuk, když nový hráč nebo pozorovatel vstoupí do hry" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 #, fuzzy msgid "Show notifications" msgstr "Ukázat informaci o verzi" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Použít rozložení 16:9" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Použít rozložení vhodné pro okna v poměru 16:9" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "Hodit kostkami" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "O Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Vítejte ve hře Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Histogram hodů" @@ -1901,7 +1932,7 @@ msgstr "Zvolit novou pozici pro loď." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 #, fuzzy msgid "It is your turn to setup." msgstr "Jste na tahu." @@ -1935,21 +1966,21 @@ msgstr "Moře" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Výnosy krajiny" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Stavební náklady" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Městská zeď" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Akční karta" @@ -1980,29 +2011,31 @@ msgstr "Obličej:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Varianta:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 #, fuzzy msgid "Connect as a spectator" msgstr "Připojit jako pozorovatel" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Adresa meta serveru" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Zvolte hru k připojení." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Připojuji" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Hrát hru Pioneers" @@ -2097,7 +2130,7 @@ msgstr "Karty surovin" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Akční karty" @@ -2123,66 +2156,77 @@ msgid "The bank is empty" msgstr "Bank je prázdný" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "Hráč %s má %s, a shání: %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, fuzzy, c-format msgid "New offer from %s." msgstr "Ukradl jsi %s hráči %s.\n" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Já chci" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Dát jim" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Smazat" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Povolit chat" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Odmítnout vnitřní obchod" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Hráč" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Nabídky" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s za %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Obchod odmítnut" @@ -2197,242 +2241,222 @@ msgstr "Celkem" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Množství v ruce" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "více>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Zvýšit zvolené množství" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Zvolené množství" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Celkem zvolené množství" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "Bank nemůže být vyprázdněn" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Ano" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Ne" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Neznámý" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Žádná hra zde neběží..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Obecná nastavení" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Počet hráčů:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Počet bodů pro vítězství:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Náhodná krajina:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Dovolit obchodování mezi hráči:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Dovolit obchodovat pouze před stavěním nebo nákupem:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 #, fuzzy msgid "Check victory only at end of turn:" msgstr "Kontrolovat vítězství až na konci tahu" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Množství každé suroviny:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Pravidlo sedmiček:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 #, fuzzy msgid "Number of dice decks:" msgstr "Počet hráčů:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Používat piráta pro blokování lodí:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonusy za objevení ostrova:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Stavební příděl" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Silnice:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Vesnice:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Města:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Městské zdi:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Lodě:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Mosty:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Balíček akčních karet" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Karty Pokrok - Stavba silnic:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Karty Pokrok - Monopol:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Karty Pokrok - Vynález:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Karty kostel:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Karty univerzita:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Karty radnice:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Karty knihovna:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Karty tržiště:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Karty rytíř:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Nastavení současné hry" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "požaduje %s zdarma" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "dám %s zdarma" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "dám %s za %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Já chci %s, a dám jim %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, fuzzy, c-format msgid "Quote received from %s." msgstr "%s obdržel %s.\n" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Získat nabídky" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "Přijmout n_abídku" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "Ukončit _obchodování" @@ -2489,23 +2513,23 @@ "upgrading.\n" msgstr "" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Tato hra nemůže být vyhrána." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Není zde žádná pevnina." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Je možné, že tuto hru nebude možné vyhrát." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "Tato hra může být vyhrána, jen pokud se postaví i vesnice i města." -#: ../common/game.c:971 +#: ../common/game.c:970 #, fuzzy, c-format msgid "" "Required victory points: %d\n" @@ -2564,177 +2588,177 @@ " Ladislav Dobias https://launchpad.net/~lada-preklad" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Všechny sedmičky posunou zloděje nebo piráta" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "V prvních dvou kolech se po sedmičkách hází znovu" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Po sedmičkách se vždy hází znovu" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Náhodná krajina" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Náhodně rozmístit díly krajiny" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Používat piráta" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Používat piráta pro blokování lodí" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Striktní obchod" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Dovolit obchodovat pouze před stavěním nebo nákupem" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Vnitřní obchod" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Dovolit obchodování mezi hráči" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Vítězství na konci tahu" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Kontrolovat vítězství až na konci tahu" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 #, fuzzy msgid "Number of dice decks" msgstr "Počet počítačových hráčů" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 #, fuzzy msgid "Island discovery bonuses" msgstr "Bonusy za objevení ostrova:" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 #, fuzzy msgid "Check and correct island discovery bonuses" msgstr "Bonusy za objevení ostrova:" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Počet hráčů" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Počet hráčů" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Počet bodů pro vítězství" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Kolik bodů je potřeba k vítězství" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Je možné vyhrát tuto hru?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "C" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "T" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "R" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "V" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "D" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Zvolit hru" @@ -2843,30 +2867,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** NEZNÁMÝ TYP HLÁŠENÍ ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Chyba při zápisu do socketu: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Přetečení vstupního zásobníku - odpojuji\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Chyba při čtení socketu: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, fuzzy, c-format msgid "Error connecting to %s: %s\n" msgstr "Chyba při spojování k %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "neznámý" @@ -2876,473 +2900,462 @@ msgstr "Připojování k %s, port %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" "Přetečení zásobníku stavů. Obsah zásobníku poslán na standardní chybový " "výstup.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "Pa_horkatina" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "P_ole" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "Ho_ry" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Pastviny" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Les" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "Po_ušť" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_Moře" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Zlato" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Nic" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Cihly (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Obilí (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Ruda (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Vlna (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Dřevo (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "Co_koliv (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "V" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "SV" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "SZ" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "Z" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "JZ" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "JV" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 #, fuzzy msgid "Remove a port" msgstr "Port serveru" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 #, fuzzy msgid "Delete a row" msgstr "Smazat" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 #, fuzzy msgid "_Title" msgstr "_Změnit název" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 #, fuzzy msgid "_Description" msgstr "Po_ušť" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Přeházet" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Parametry hry" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Pravidla" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Suroviny" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Budovy" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioneers Editor" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Nepodařilo se nahrát '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Nepodařilo se uložit do '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 #, fuzzy msgid "Games" msgstr "_Hra" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Otevřít hru" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Otevřít..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Uložit jako..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Uložit _jako..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Změnit název" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Nový název:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "O Pioneers Editoru" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Otevřít tento soubor" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "soubor" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor pro hry Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Nastavení" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Soubor" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Nová" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Vytvořit novou hru" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Otevřít..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nová" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Otevřít existující hru" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Uložit" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Otevřít..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Uložit hru" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Uložit _jako..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Uložit" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Uložit pod jiným jménem" #. Menu entry -#: ../editor/gtk/editor.c:1748 -#, fuzzy -msgid "Change _Title" -msgstr "Změnit název" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Uložit _jako..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Změnit název hry" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "Zkontrolovat počet bodů pro vítěztví" +#: ../editor/gtk/editor.ui.h:22 +#, fuzzy +msgid "Change _Title" +msgstr "Změnit název" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Zkontrolovat, zda hra může být vyhrána" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Konec" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_O Pioneers Editoru" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "Zkontrolovat počet bodů pro vítěztví" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informace o Pioneers Editoru" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Otevřít tento soubor" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "soubor" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor pro hry Pioneers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Selhalo vytváření menu: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Nastavení" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_O Pioneers Editoru" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Počet surovin" @@ -3355,51 +3368,51 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Použít tuto adresu při vytváření nových her" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "jméno počítače" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Použít tento rozsah portů při vytváření nových her" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "od-do" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Ladící informace v syslogu" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Pioneers Meta server" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "" @@ -3434,203 +3447,193 @@ msgid "Unregistering Avahi.\n" msgstr "" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_O Pioneers Serveru" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Informace o Pioneers Serveru" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Zastavit server" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Spustit server" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Zastavit ten server" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Spustit ten server" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Vstoupil hráč %s z %s.\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Odešel hráč %s z %s\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Hráč %d je nyní %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "Port pro hrací serveru" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Registrovat server" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registruje server na meta serveru" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Nahlásit jméno počítače" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" "Veřejné jméno (adresa) tohoto počítače - je potřeba, když jste za firewallem" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 #, fuzzy msgid "Random turn order" msgstr "Náhodně přeházet pořadí hráčů" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Náhodně přeházet pořadí hráčů" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 #, fuzzy msgid "Shows all players and spectators connected to the server" msgstr "Ukázat všechny hráče a pozorovatele připojené k serveru" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Spojeno" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Je hráč nyní připojen?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Jméno" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Jméno hráče" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Adresa" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Adresa počítače, kde je hráč" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Číslo" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Číslo hráče" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Role" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 #, fuzzy msgid "Player or spectator" msgstr "Hráč nebo pozorovatel" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Spustit Pioneers klienta" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Spustí klienta hry Pioneers" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Povolit chat" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Povolí chatování mezi strojovými hráči" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Přidat strojového hráče" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Přidá do hry strojového hráče" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Hlášení ze servery" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Herní nastavení" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Parametry serveru" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Spuštěná hra" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Připojení hráči" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Strojoví hráči" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Hlášení" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "Server hry Pioneers" @@ -3639,18 +3642,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "Tato hra skončila.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Hostovat hru Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Server Pioneers" @@ -3662,143 +3665,153 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Informace o Pioneers Serveru" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_O Pioneers Serveru" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Název hry" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Jméno souboru" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Port pro naslouchání" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Přepsat počet hráčů" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Přepsat počet bodů potřebných pro vítězství" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Přepsat pravidlo sedmiček" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 #, fuzzy msgid "Override dice-deck handling" msgstr "Přepsat pravidlo sedmiček" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 #, fuzzy msgid "Override num-dice-decks handling" msgstr "Přepsat pravidlo sedmiček" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 #, fuzzy msgid "Override num-removed-dice-cards handling" msgstr "Přepsat pravidlo sedmiček" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Přepsat typ krajiny, 0=standardní, 1=náhodná" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Přidat N strojových hráčů" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Registrovat server na meta serveru" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registruje server na meta serveru (zahrnuje -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Při oznamování použít tento název počítače" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Odejít když hráč vyhraje" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Skončit po N sekundách bez hráčů" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Typ hry: turnaj, strojoví hráči jsou přidáni po N minutách" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Síťový port, na kterém poslouchat" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "Nestartovat hru okamžitě, čekat na příkaz na administračním portu" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Dát hráčům čísla vzhledem k pořadí, jak se připojili do hry" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Možnosti meta serveru" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Možnosti pro meta server" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Různé možnosti" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Různé možnosti" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Nelze načíst parametry hry\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3808,7 +3821,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Možnosti pro meta server" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3821,46 +3835,46 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Možnosti pro meta server" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, fuzzy, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registrovat na meta serveru na adrese %s, port %s\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 #, fuzzy msgid "Unregister from the metaserver.\n" msgstr "Odregistrovat od meta serveru\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "příliš dlouhý chat" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "příliš dlouhé jméno" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignoruji neznámou příponu" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "" -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Hra začíná, přidávání počíačových hráčů." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "Hra začne za %s minut." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "Hra začne za %s minutu." @@ -3869,11 +3883,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Strojový hráč" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3881,48 +3895,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Promiňte, hra skončila." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Hráč z adresy %s je odmítnut: hra skončila\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Jméno nebylo změněno: nové jméno se již používá jinde" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Nečinně jsem čekal moc dlouho bez hráčů...sbohem.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s se znovu připojil." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Verze nesouhlasí: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Tato hra začne již brzy." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Příprava hry" @@ -3943,6 +3957,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "" +#~ msgid "Quit the program" +#~ msgstr "Ukončit program" + +#~ msgid "" +#~ msgstr "více>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Zvýšit zvolené množství" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Selhalo vytváření menu: %s" + #~ msgid "Join the selected game" #~ msgstr "Připojit se k vybrané hře" diff -Nru pioneers-15.5/po/da.po pioneers-15.6/po/da.po --- pioneers-15.5/po/da.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/da.po 2020-08-02 12:37:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Pioneers 0.11.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2008-04-29 09:36+0000\n" "Last-Translator: carson\n" "Language-Team: Danish \n" @@ -59,8 +59,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Aktivér fejlmeddelelser" @@ -70,8 +70,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Vis versionsinformation" @@ -80,9 +80,9 @@ msgid "- Computer player for Pioneers" msgstr "- computerspilller for Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers version:" @@ -335,8 +335,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -369,7 +369,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Offline" @@ -399,7 +399,7 @@ msgstr "%s modtager %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s tager %s.\n" @@ -444,70 +444,70 @@ "Versioner passer ikke sammen. Vær sikker på at klient og server er " "opdaterede.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Byg to bebyggelser, hver med en forbindelse" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Byg en bebyggelse med en forbindelse" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "vej" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "bro" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "skib" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " eller" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Vent på din tur." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Vælg en bygning at stjæle fra." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Vælg et skib at stjæle fra." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Placér en røver." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Afslut vejbygningen." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Byg et vejstykke." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Byg to vejstykker." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Det er din tur." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Beklager, %s tilgængelig.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Spillet er slut." @@ -561,7 +561,7 @@ msgid "%s took %s from %s.\n" msgstr "%s tog %s fra %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "" @@ -571,7 +571,7 @@ msgid "spectator %d" msgstr "" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Spiller %d" @@ -897,6 +897,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "nogle ressourcer (fejl)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -942,12 +948,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Begynd tur %d for %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, fuzzy, c-format +msgid "Error starting %s: %s\n" +msgstr "Fejl startende %s: %s" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "" @@ -980,111 +1000,399 @@ msgid " said: " msgstr " sagde: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Spil" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Start et nyt spil" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nyt spil" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Forlad dette spil" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Forlad spil" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administrer Pioneers server" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Admin" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Ændre dit spillernavn" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "S_pillernavn" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Terrænforklaring og bygningsomkostninger" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "_Forklaring" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Opsætning for dette spil" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Spil opsætninger" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogram for terningskast" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Ternings histogram" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Afslut" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Afslut" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Handlinger" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Kast terningen" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Kast terning" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Handel" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Fortryd" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Afslut" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Byg en vej" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Vej" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Byg et skib" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Skib" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Flyt et skib" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Flyt skib" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Byg en bro" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Bro" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Byg en bebyggelse" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Bebyggelse" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Byg en by" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "By" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Køb et udviklingskort" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Udvikle" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Byg en bymur" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Bymur" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Indstillinger" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Vis eller skjul værktøjslinje" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Værktøjslinje" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Konfigurér applikationen" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Indstilli_nger" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +#, fuzzy +msgid "_View" +msgstr "Tilskuer" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Hjælp" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Information om Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Om Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Vis manual" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Mataserver på %s, port %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Afsluttet.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Modtager spilnavne fra metaserveren.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, fuzzy, c-format msgid "New game server requested on %s port %s.\n" msgstr "Ny spilserver anmodning på %s port %s\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Ukendt meddelelse fra metaserveren: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 #, fuzzy msgid "Too many metaserver redirects.\n" msgstr "For mange metaserver omdirigeringer\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Dårlig omdirigeringslinje: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Metaserver for gammel til at lave servere (version %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, fuzzy, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Ukendt meddelelse fra metaserveren: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Omslag på de to første ture" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Slå alle 7'ere om" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Forhåndsvalg" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Tilfældig" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, fuzzy, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Omdirigeret til metaserver %s, port %s\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, fuzzy, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Omdirigeret til metaserver %s, port %s\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Modtager en liste over Pioneer servere fra metaserveren.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 #, fuzzy msgid "Number of computer players" msgstr "Type af computerspiller" @@ -1107,11 +1415,6 @@ msgid "Requesting new game server.\n" msgstr "Anmoder om ny spilserver\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, fuzzy, c-format -msgid "Error starting %s: %s\n" -msgstr "Fejl startende %s: %s" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1119,9 +1422,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1148,7 +1451,7 @@ msgstr "_Nyt fjern spil" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "" @@ -1214,7 +1517,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "7'er regel" @@ -1256,105 +1559,105 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Spillernavn" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Indtast dit navn" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 #, fuzzy msgid "Check if you want to be a spectator" msgstr "Vil du være tilskuer?" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaserver" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Deltag i offentligt spil" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Deltag i et offenligt spil" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Skab spil" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Skab et spil" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Deltag i privat spil" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Deltag i et privat spil" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Server vært" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Navn på værten for spillet" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Server port" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Port for værten af spillet" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Seneste spil" @@ -1375,527 +1678,255 @@ #. Button text #: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, fuzzy, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Du skal bortkaste %d ressourcer" -msgstr[1] "Du skal bortkaste %d ressourcer" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Totalt antal kast" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Venter på at spillere skal kaste" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Spil slut" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s har vundet spillet med %d sejers point!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Tilbed %s, Hersker af den kendte verden!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Vælg ressourser" - -#: ../client/gtk/gold.c:96 -#, fuzzy, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Du kan vælge %d ressource" -msgstr[1] "Du kan vælge %d ressource" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Totale ressourcer" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Venter på at spillerne vælger" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Spil" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nyt spil" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Start et nyt spil" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Forlad spil" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Forlad dette spil" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Admin" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administrer Pioneers server" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "S_pillernavn" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Ændre dit spillernavn" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "_Forklaring" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Terrænforklaring og bygningsomkostninger" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Spil opsætninger" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Opsætning for dette spil" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Ternings histogram" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogram for terningskast" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Afslut" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Forlad dette program" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Handlinger" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Kast terning" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Kast terningen" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Handel" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Fortryd" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Afslut" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Vej" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Byg en vej" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Skib" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Byg et skib" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Flyt skib" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Flyt et skib" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Bro" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Byg en bro" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Bebyggelse" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Byg en bebyggelse" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "By" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Byg en by" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Udvikle" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Køb et udviklingskort" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Bymur" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Byg en bymur" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Indstillinger" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Indstilli_nger" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Konfigurér applikationen" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -#, fuzzy -msgid "_View" -msgstr "Tilskuer" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "" +#: ../client/gtk/discard.c:101 +#, fuzzy, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Du skal bortkaste %d ressourcer" +msgstr[1] "Du skal bortkaste %d ressourcer" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Totalt antal kast" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Hjælp" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Venter på at spillere skal kaste" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Om Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Spil slut" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Information om Pioneers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s har vundet spillet med %d sejers point!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Vis manual" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Tilbed %s, Hersker af den kendte verden!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Vælg ressourser" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "" +#: ../client/gtk/gold.c:96 +#, fuzzy, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Du kan vælge %d ressource" +msgstr[1] "Du kan vælge %d ressource" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Værktøjslinje" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Totale ressourcer" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Vis eller skjul værktøjslinje" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Venter på at spillerne vælger" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Point nødvendige for at vinde: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Meddelelser" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Kort" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Afslut handel" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Citat" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Afvis indenlandsk handel" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Forklaring" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Velkommen til Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioneers opsætning" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Vælg et af temaerne" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Vis forklaring" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Vis forklaring som en side ved siden af kortet" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Meddelelser med farver" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Vis en ny meddelelse med farve" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Caht i spillerens farve" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Vis nye chat meddelelser i spillerens farve" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Sammenfatning i farver" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Anvend farver i spiller sammenfatning" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Værktøjslinje med genveje" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Vis genveje i værktøjslinje" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Tyst tilstand" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "I tyst tilstand der laves ikke lyd" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Annoncér nye spillere" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 #, fuzzy msgid "Make a sound when a new player or spectator enters the game" msgstr "Lav en lyd når en ny spiller eller seer ankommer til spillet" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 #, fuzzy msgid "Show notifications" msgstr "Vis versionsinformation" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Anvend 16:9 layout" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Anvend et 16:9 venligt layout for skærmen" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "Kast terningen" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Om Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Velkommen til Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Ternings histogram" @@ -1908,7 +1939,7 @@ msgstr "Vælg en ny lokation for skibet." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 #, fuzzy msgid "It is your turn to setup." msgstr "Det er din tur." @@ -1942,21 +1973,21 @@ msgstr "Hav" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Terænudbytte" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Bygningsomkostninger" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Bymur" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Udviklingskort" @@ -1987,29 +2018,31 @@ msgstr "Forside:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variant:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 #, fuzzy msgid "Connect as a spectator" msgstr "Deltag som seer" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Metaserver vært" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Vælg et spil at deltage i." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Forbinder" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Spil et spil Pioneers" @@ -2104,7 +2137,7 @@ msgstr "Ressourcekort" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Udviklingskort" @@ -2130,66 +2163,77 @@ msgid "The bank is empty" msgstr "Banken er tom" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s har %s, og er på udkig efter %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, fuzzy, c-format msgid "New offer from %s." msgstr "Du stjal %s fra %s.\n" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Jeg ønsker" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Giv dem" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Slet" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Tilslut chat" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Afvis indenlandsk handel" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Spiller" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Citater" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s for %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Afvis handel" @@ -2204,242 +2248,222 @@ msgstr "I alt" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Mængde på hånden" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "mere>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Øg det valgte beløb" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Vælg beløb" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Samlet valgt beløb" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "Banken kan ikke tømmes" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Ja" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Nej" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Ukendt" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Der pågår ingen spil..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "General opsætning" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Antal spillere:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Pointmål for at vinde:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Tilfældigt terræn:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Tillad handel mellem spillere:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Tillad kun handel før bygning eller indkøb:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 #, fuzzy msgid "Check victory only at end of turn:" msgstr "Tjek for sejer ved turens slutning" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Mængde af hver ressource:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "7'er regel:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 #, fuzzy msgid "Number of dice decks:" msgstr "Antal spillere:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Brug piraten til at blokkere skibe:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonus for opdagelse af ø:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Bygningsomkostninger" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Veje:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Bebyggelser:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Byer:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Bymurer:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Skibe:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Broer:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Udviklingskort" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Vejbygningskort:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Monopol kort:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Gyldent år kort:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Kapel kort:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Pioneer Universitets kort:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Borgmester hus kort:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Biblioteks kort:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Markeds kort:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Soldater kort:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Aktuel spil opsætning" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "spørg om gratis %s" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "giv %s gratis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "giv %s for %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Jeg ønsker %s, og giver dem %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, fuzzy, c-format msgid "Quote received from %s." msgstr "%s modtog %s.\n" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Spørg efter pris" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Accepter pris" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "_Afslut handel" @@ -2496,23 +2520,23 @@ "upgrading.\n" msgstr "" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Dette spill kan ikke vindes" -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Der er ikke noget land." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Det er muligt at dette spil ikke kan vindes." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "Dette spil kan kun vindes ved at bygge alle bebyggelser og byer." -#: ../common/game.c:971 +#: ../common/game.c:970 #, fuzzy, c-format msgid "" "Required victory points: %d\n" @@ -2569,177 +2593,177 @@ " carson https://launchpad.net/~nanker" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Alle 7'ere flytter røvere eller pirater" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "I de to første ture slås alle 7'ere om" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Alle 7'ere slås om" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Tilfældigt terræn" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Lav tilfældigt terræn" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Brug pirat" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Brug piraten til at blokkere skibe" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Begrænset handel" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Tillad kun handel før bygning eller indkøb" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Indenlandsk handel" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Tillad handel mellem spillere" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Sejer ved turens slutning" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Tjek for sejer ved turens slutning" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 #, fuzzy msgid "Number of dice decks" msgstr "Type af computerspiller" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 #, fuzzy msgid "Island discovery bonuses" msgstr "Bonus for opdagelse af ø:" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 #, fuzzy msgid "Check and correct island discovery bonuses" msgstr "Bonus for opdagelse af ø:" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Antal spillere" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Antallet af spillere" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Point for sejer" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Nødvendigt antal point for at vinde spillet" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Er det muligt at vinde dette spil?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2 for 1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3 for 1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "Murstens port|M" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "Korn port|K" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "Malm port|M" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "Uld port|U" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Tømmer port|T" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Start meta server" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Vælg et spil" @@ -2848,30 +2872,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** UKENDT MEDDELELSESTYPE ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "" -#: ../common/network.c:378 +#: ../common/network.c:383 #, fuzzy, c-format msgid "Error connecting to %s: %s\n" msgstr "Fejl ved tilslutning til %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "ukendt" @@ -2881,471 +2905,460 @@ msgstr "Opretter forbindelse til %s, port %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Bakke" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Mark" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Bjerg" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "G_ræsmark" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Skov" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Ørken" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_Hav" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Guld" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Ingen" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Mursten (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Korn (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Malm (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Uld (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Tømmer (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Noget (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "Øst|Ø" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "Nord Øst|NØ" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "Nord Vest|NV" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "Vest|V" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "Syd Vest|SV" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "Syd Øst|SØ" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 #, fuzzy msgid "Remove a port" msgstr "Server port" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 #, fuzzy msgid "Delete a row" msgstr "Slet" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 #, fuzzy msgid "_Title" msgstr "Ændre _titel" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 #, fuzzy msgid "_Description" msgstr "_Ørken" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Bland" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Spil parametre" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Regler" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Ressourcer" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Bygninger" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Editor for Pioneers" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Kunne ikke indlæse '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Kunne ikke gemme '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 #, fuzzy msgid "Games" msgstr "_Spil" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Åbn spil" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Åben..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Gem som..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Gem _som..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Ændre titel" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Ny titel:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Om Pioneers editor" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Åben denne fil" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "filnavn" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor for Pioneers spil" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Opsætninger" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Arkivér" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Ny" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Skab et nyt spil" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Åben..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Ny" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Åben et bestående spil" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Gem" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Åben..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Gem spil" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Gem _som..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Gem" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Gem som" #. Menu entry -#: ../editor/gtk/editor.c:1748 -#, fuzzy -msgid "Change _Title" -msgstr "Ændre titel" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Gem _som..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Ændre spil titel" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "Tjek _pointmål for at vinde" +#: ../editor/gtk/editor.ui.h:22 +#, fuzzy +msgid "Change _Title" +msgstr "Ændre titel" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Tjek om spillet kan vindes" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Afslut" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Om Pioneers editor" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "Tjek _pointmål for at vinde" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Information om Pioneers editor" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Åben denne fil" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "filnavn" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor for Pioneers spil" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Opsætninger" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Om Pioneers editor" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Ressource optælling" @@ -3358,53 +3371,53 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 #, fuzzy msgid "Daemonize the metaserver on start" msgstr "Kør metaserver i baggrund ved start" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 #, fuzzy msgid "Redirect clients to another metaserver" msgstr "Omdiriger klienter til en anden metaserver" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Brug dette værtsnavn når der skabes et nyt spil" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "værtsnavn" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Anvend det her portinterval når nye spil skabes" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "fra-til" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Fejlmeddelelse til systemlog" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metaserver for Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, fuzzy, c-format msgid "metaserver protocol:" msgstr "metaserver protekol:" @@ -3438,66 +3451,56 @@ msgid "Unregistering Avahi.\n" msgstr "" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Om Pioneers server" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Information om Pioneers server" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Stop server" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Start server" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Stop serveren" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Start serveren" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Spiller %s fra %s ankommet\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Spiller %s fra %s forlod spil\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Spiller %d er nu %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "Porten for spil serveren" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Registrer server" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registrer dette spil på metaserveren" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Rapporteret værtsnavn" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3505,137 +3508,137 @@ "firewall)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 #, fuzzy msgid "Random turn order" msgstr "Skab en tilfældig tur rækkefølge" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Skab en tilfældig tur rækkefølge" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 #, fuzzy msgid "Shows all players and spectators connected to the server" msgstr "Vis alle spillere og tilskuere, der er tilsluttet serveren" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Tilsluttet" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "er spilleren tilsluttet?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Navn" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Navn på spiller" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Placering" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Værts navn for spilleren" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Nummer" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Spiller nummer" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Rolle" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 #, fuzzy msgid "Player or spectator" msgstr "Tilskuere" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Start Pioneers klient" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Start Pioneers klienten" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Tilslut chat" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Tillad chat meddelelser" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Tilføj computer spiller" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Tilføj en computerspiller til spillet" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Meddelelse fra serveren" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Spilopsætning" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Server parametre" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Kører spillet" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Spillere tilsluttet" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Computer spillere" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Beskeder" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "Pioneers spil server" @@ -3644,18 +3647,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "Spiller er slut.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Vær vært for et spil Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioneer Server" @@ -3667,144 +3670,154 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Information om Pioneers server" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Om Pioneers server" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Spil titel der kan bruges" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Spil fil der kan bruges" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Port at lytte til" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Tilsidesæt antal spillere" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "tilsidesæt antal point, der er nødvendige for at vinde" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Tilsidesæt 7'er regel" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 #, fuzzy msgid "Override dice-deck handling" msgstr "Tilsidesæt 7'er regel" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 #, fuzzy msgid "Override num-dice-decks handling" msgstr "Tilsidesæt 7'er regel" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 #, fuzzy msgid "Override num-removed-dice-cards handling" msgstr "Tilsidesæt 7'er regel" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Tilsidesæt terræntype, 0=standard 1=tilfældig" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Tilføj N computerspillere" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Registrer server hos metaserver" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Brug dette værtsnavn ved registrering" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Afbryd når en spiller har vundet" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Afbryd efter N sekunder uden spillere" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Administrationsport at lytte på" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "Start ikke spilllet lige nu, vent for besked på admin port" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "" "Giv spillerne et nummer svarende til den rækkefølge de meldte sig til spillet" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Metaserver muligheder" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opsætning af metaserver" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Diverse indstillinger" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Diverse indstillinger" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Kan ikke indlæse parametre for spillet\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3814,7 +3827,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Opsætning af metaserver" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3826,46 +3840,46 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Opsætning af metaserver" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, fuzzy, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registrer med metaserver %s, port %s\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 #, fuzzy msgid "Unregister from the metaserver.\n" msgstr "Afregistrerer fra metaserver\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "char for lang" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "navn for langt" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ser bort fra ukendt extension" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "" -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Spil starter, tilføjer computer spillere" -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "Spillet starter om %s minutter." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "Spillet starter om %s minutter." @@ -3874,11 +3888,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Computerspiller" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3886,48 +3900,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Beklager, spillet er afsluttet." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Spiller fra %s er afvist: Spil er overstået\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Navn ikke ændret: Nyt navn allerede i brug" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Ventede for længe uden spillere... farvel\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s har tilsluttet sig igen." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Versions uoverensstemmelse: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Dette spil vil starte om lidt." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Forbereder spil" @@ -3948,6 +3962,21 @@ msgid "The dice roll has been determined by the administrator." msgstr "" +#~ msgid "Quit the program" +#~ msgstr "Forlad dette program" + +#~ msgid "" +#~ msgstr "mere>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Øg det valgte beløb" + #~ msgid "Join the selected game" #~ msgstr "Deltag i det valgte spil" diff -Nru pioneers-15.5/po/de.po pioneers-15.6/po/de.po --- pioneers-15.5/po/de.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/de.po 2020-08-02 12:37:31.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pioneers 0.12.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" -"PO-Revision-Date: 2013-09-29 09:39+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" +"PO-Revision-Date: 2020-08-02 14:35+0200\n" "Last-Translator: Roland Clobus \n" "Language-Team: Pit Garbe , Roman Hodek , de " "\n" @@ -20,7 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Launchpad-Export-Date: 2012-09-06 06:01+0000\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 2.3.1\n" #. Commandline pioneersai: chromosome-file #: ../client/ai/ai.c:90 @@ -62,8 +62,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Debug-Nachrichten einschalten" @@ -73,8 +73,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Versionsnummer anzeigen" @@ -83,9 +83,9 @@ msgid "- Computer player for Pioneers" msgstr "- Computerspieler für Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers Version:" @@ -338,8 +338,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -372,7 +372,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Offline" @@ -389,7 +389,7 @@ #: ../client/common/client.c:693 #, c-format msgid "%s does not receive any %s, because the bank is empty.\n" -msgstr "%s bekommt kein %s, weil die Bank leer is.\n" +msgstr "%s bekommt kein %s, weil die Bank leer ist.\n" #: ../client/common/client.c:706 #, c-format @@ -402,7 +402,7 @@ msgstr "%s bekommt %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s nimmt %s.\n" @@ -447,70 +447,70 @@ "Versionsunterschied. Bitte stelle sicher, dass der Client und der Server auf " "dem neuesten Stand sind.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Baue zwei Siedlungen mit je einer verbundenen" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Baue eine Siedlung mit einer verbundenen" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "Straße" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "Brücke" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "Schiff" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " oder" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Warte auf deinen Zug." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Wähle das Gebäude, von dem gestohlen werden soll." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Wähle das Schiff, von dem du stehlen willst." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Setze den Räuber." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Beende die Straßenbauaktion." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Baue eine Straße." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Baue zwei Straßen." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Du bist am Zug." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Entschuldigung, %s verfügbar.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Das Spiel ist beendet." @@ -564,7 +564,7 @@ msgid "%s took %s from %s.\n" msgstr "%s hat %s von %s genommen.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Zuschauer %d" @@ -574,7 +574,7 @@ msgid "spectator %d" msgstr "Zuschauer %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Spieler %d" @@ -900,6 +900,11 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "beliebiger Rohstoff" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -945,12 +950,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Beginn Runde %d für %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Fehler beim Starten von %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Wähle ein automatisch entdecktes Spiel" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) auf %s:%s" @@ -983,110 +1002,397 @@ msgid " said: " msgstr " sagte: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Spiel" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Ein neues Spiel starten" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Neues Spiel" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Dieses Spiel verlassen" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "Spiel ver_lassen" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Pioneers-Server verwalten" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Administration" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Ändern des Spielernamens" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "S_pielername" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Geländeerklärung und Gebäudekosten" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "_Erklärung" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Einstellungen des aktuellen Spiels" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Spieleinstellungen" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogramm der Würfelergebnisse" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Würfelhistogramm" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Beenden" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Beenden" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Aktionen" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Würfeln" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Würfeln" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Handel" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Rückgängig" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Fertig" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Baue eine Straße" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Straße" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Baue ein Schiff" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Schiff" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Bewege ein Schiff" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Schiff verlegen" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Baue eine Brücke" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Brücke" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Baue eine Siedlung" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Siedlung" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Baue eine Stadt" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Stadt" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Kaufe eine Entwicklungskarte" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Entwicklungskarte" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Baue eine Stadtmauer" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Stadtmauer" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Einstellungen" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Werkzeugleiste zeigen oder verstecken" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Werkzeugleiste" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Konfiguriere die Anwendung" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Einstellu_ngen" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Ansicht" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Umschalten in den Vollbildmodus" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Vollbild" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Zeige ganze Karte" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Zurücksetzen" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Zentriert die Karte" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "Z_entrieren" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Hilfe" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informationen über Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "Ü_ber Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Das Handbuch zeigen" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metaserver auf %s, Port %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Fertig.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "Der Metaserver ist nicht mehr verfügbar.\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Empfange Spielenamen vom Metaserver.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "Neuer Spielserver angefordert auf %s Port %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Unbekannte Nachricht vom Metaserver: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "Zu viele Metaserver-Weiterleitungen.\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Fehlerhafte Weiterleitungszeile: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Metaserver zu alt, um Spielserver zu starten (Version %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Unbekannte Nachricht vom Metaserver: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Standard" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Wiederholen in ersten 2 Runden" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Immer wiederholen" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Standard" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Zufällig" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Weitergeleitet zu Metaserver auf %s.\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Weitergeleitet zu Metaserver auf %s, Port %s.\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Empfange eine Liste von Pioneers-Servern vom Metaserver.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Anzahl der Computerspieler" @@ -1106,11 +1412,6 @@ msgid "Requesting new game server.\n" msgstr "Anfrage für einen neuen Spielserver gesendet.\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Fehler beim Starten von %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1118,17 +1419,16 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "_Abbrechen" #. Button text #: ../client/gtk/connect.c:1042 -#, fuzzy msgid "C_reate" -msgstr "Spiel erstellen" +msgstr "_Erstellen" #. Dialog caption #: ../client/gtk/connect.c:1182 @@ -1146,7 +1446,7 @@ msgstr "_Neues Netzwerkspiel" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "_Teilnehmen" @@ -1212,7 +1512,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "7-Regel" @@ -1253,104 +1553,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Spielername" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Gib deinen Namen ein" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Zuschauer" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Anwählen falls Sie als Beobachter teilnehmen wollen" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Teilnehmen" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Spiele ein automatisch entdecktes Spiel" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaserver" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "An öffentlichem Spiel teilnehmen" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "An einem öffentlichen Spiel teilnehmen" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Spiel erstellen" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Ein Spiel erstellen" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "An privatem Spiel teilnehmen" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "An einem privaten Spiel teilnehmen" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Serverrechner" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Name des Spiel-Hosts" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Serverport" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Port des Spiel-Hosts" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Zuletzt besuchte Spielserver" @@ -1367,531 +1667,259 @@ #. Dialog caption #: ../client/gtk/discard.c:77 msgid "Discard Resources" -msgstr "Karten ablegen" - -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "_OK" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Du mußt %d Karte ablegen" -msgstr[1] "Du mußt %d Karten ablegen" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Insgesamt abgelegte Karten" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Warte auf Spieler, die ablegen müssen" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Spiel beendet" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s hat das Spiel mit %d Punkten gewonnen!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Lobet %s, den Herrscher der bekannten Welt!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Karten wählen" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Du mußt %d Karte wählen" -msgstr[1] "Du mußt %d Karten wählen" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Insgesamt" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Warte auf Spieler, die wählen müssen" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Spiel" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Neues Spiel" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Ein neues Spiel starten" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "Spiel ver_lassen" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Dieses Spiel verlassen" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Administration" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Pioneers-Server verwalten" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "S_pielername" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Ändern des Spielernamens" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "_Erklärung" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Geländeerklärung und Gebäudekosten" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Spieleinstellungen" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Einstellungen des aktuellen Spiels" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Würfelhistogramm" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogramm der Würfelergebnisse" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Beenden" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Das Programm verlassen" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Aktionen" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Würfeln" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Würfeln" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Handel" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Rückgängig" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Fertig" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Straße" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Baue eine Straße" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Schiff" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Baue ein Schiff" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Schiff verlegen" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Bewege ein Schiff" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Brücke" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Baue eine Brücke" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Siedlung" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Baue eine Siedlung" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Stadt" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Baue eine Stadt" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Entwicklungskarte" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Kaufe eine Entwicklungskarte" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Stadtmauer" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Baue eine Stadtmauer" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Einstellungen" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Einstellu_ngen" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Konfiguriere die Anwendung" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Ansicht" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Zurücksetzen" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "Zeige ganze Karte" +msgstr "Karten ablegen" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "Z_entrieren" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "_OK" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Zentriert die Karte" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Du mußt %d Karte ablegen" +msgstr[1] "Du mußt %d Karten ablegen" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Hilfe" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Insgesamt abgelegte Karten" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "Ü_ber Pioneers" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Warte auf Spieler, die ablegen müssen" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informationen über Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Spiel beendet" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Das Handbuch zeigen" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s hat das Spiel mit %d Punkten gewonnen!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Vollbild" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Lobet %s, den Herrscher der bekannten Welt!" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Umschalten in den Vollbildmodus" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Karten wählen" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Werkzeugleiste" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Du mußt %d Karte wählen" +msgstr[1] "Du mußt %d Karten wählen" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Werkzeugleiste zeigen oder verstecken" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Insgesamt" + +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Warte auf Spieler, die wählen müssen" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Punkte für Sieg: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Nachrichten" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Karte" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Handel beenden" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Angebot" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Handel ablehnen" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Erklärung" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Willkommen zu Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioneers Einstellungen" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "S_chließen" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Thema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Wähle eins der Themen" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Legende Anzeigen" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Erklärung als eigene Seite neben der Karte anzeigen" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Nachrichten mit Farben anzeigen" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Neue Nachrichten mit Farben anzeigen" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Chat in den Spielerfarben" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Neue Chatnachrichten in den Farben der Spieler zeigen" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Zusammenfassung mit Farben anzeigen" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Farben in der Spielerzusammenfassung benutzen" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Werkzeugleiste mit Shortcuts" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Tastatur-Shortcuts in der Werkzeugleiste zeigen" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Stummschaltung" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "Bei Stummschaltung werden keine Klänge abgespielt" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Neue Spieler ankündigen" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "" "Spiele ein Geräusch, wenn ein neuer Spieler oder Zuschauer das Spiel betritt" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Zeige Benachrichtigungen" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" "Zeigt Meldungen, wenn Sie an der Reihe sind oder wenn ein neuer Handel " "möglich ist" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Benutze 16:9 Layout" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Benutze ein 16:9-freundliches Layout für das Fenster" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "Automatisch würfeln" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Über Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Willkommen zu Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Würfelhistogramm" @@ -1904,9 +1932,9 @@ msgstr "Wähle die neue Position des Schiffes." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." -msgstr "Sie sind an der Reihe mit der Startaufstellung" +msgstr "Sie sind an der Reihe mit der Startaufstellung." #: ../client/gtk/legend.c:34 msgid "Hill" @@ -1937,21 +1965,21 @@ msgstr "Meer" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Geländeerträge" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Gebäudekosten" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Stadtmauer" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Entwicklungskarte" @@ -1982,28 +2010,30 @@ msgstr "Gesicht:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variante:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Als Zuschauer verbinden" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Metaserver-Rechner" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Wähle ein Spiel zur Teilnahme." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Verbinde" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Spiel ein Spiel Pioneers" @@ -2098,7 +2128,7 @@ msgstr "Rohstoffkarten" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Entwicklungskarten" @@ -2124,66 +2154,76 @@ msgid "The bank is empty" msgstr "Die Bank ist leer" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s hat %s und möchte %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Neues Angebot von %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Angebot von %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Ich will" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Ich gebe dafür" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Löschen" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "Spenden aktivieren" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "Rohstoffe können gratis verschenkt werden" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Handel ablehnen" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Spieler" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Angebote" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s für %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Handel abgelehnt" @@ -2198,240 +2238,220 @@ msgstr "Insgesamt" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Karten in der Hand" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "mehr>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Die gewählte Menge erhöhen" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Gewählte Menge" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Gesamte ausgewählte Menge" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "Die Bank kann nicht geleert werden" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Ja" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Nein" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Unbekannt" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Es läuft gerade kein Spiel..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Allgemein" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Anzahl Spieler:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Siegpunkte:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Zufällige Geländeverteilung:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Handel unter den Spielern erlauben:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Handel nur vor dem Bauen oder Kaufen erlauben:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Sieg nur am Ende einer Runde überprüfen:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Anzahl aller Rohstoffkarten:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "7-Regel:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Den Pirat benutzen, um Schiffe zu blockieren:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Insel-Entdeckungs-Bonus:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Gebäudeanzahl" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Straßen:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Siedlungen:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Städte:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Stadtmauern:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Schiffe:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Brücken:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Entwicklungskartenstapel" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Straßenbau-Karten:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Monopol-Karten:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Erfindungs-Karten:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Kathedralen-Karten:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Pioneer-Universitäts-Karten:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Regierungsgebäude-Karten:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Bibliotheks-Karten:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Marktplatz-Karten:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Ritter-Karten:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Aktuelle Spieleinstellungen" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "möchte %s gratis" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "gibt %s gratis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "gibt %s für %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Ich möchte %s, und gebe dafür %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Angebot erhalten von %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "Angebote einholen" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "Angebot annehmen" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "Handel beenden" @@ -2448,7 +2468,7 @@ #. Description of the 'Road Building' development card #: ../common/cards.c:118 msgid "Build two new roads" -msgstr "Baue zwei Straßen." +msgstr "Baue zwei Straßen" #. Description of the 'Monopoly' development card #: ../common/cards.c:121 @@ -2496,25 +2516,25 @@ "Das Spiel verwendet die neue Regel '%s', die noch nicht unterstützt ist. " "Aktualisierung ist empfohlen.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Dieses Spiel kann nicht gewonnen werden." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Hier gibt es kein Land." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Es ist möglich, dass dieses Spiel unentschieden endet." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" "Dieses Spiel kann allein durch das Bauen aller Siedlungen und Städte " "gewonnen werden." -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2580,174 +2600,174 @@ " Vinzenz Vietzke https://launchpad.net/~vinzv" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Siegpunkt-Analyse" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Jede 7 bewegt den Räuber oder Pirat" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" -msgstr "In den ersten beiden Runden wird jede 7 wiederholt gewürfelt." +msgstr "In den ersten beiden Runden wird jede 7 wiederholt gewürfelt" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Jede 7 wird wiederholt gewürfelt" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Zufällige Geländeverteilung" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Zufällige Geländeverteilung" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Pirat benutzen" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Den Pirat benutzen, um Schiffe zu blockieren" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Strenger Handel" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Handel nur vor dem Bauen oder Kaufen erlauben" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Binnenhandel" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Handel unter den Spielern erlauben" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Sieg am Ende des Zuges" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Sieg nur am Ende einer Runde überprüfen" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Insel-Entdeckungs-Bonus" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Anzahl Spieler" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Die Anzahl der Spieler" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Siegpunkte" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Punkte für Sieg" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Ist es möglich, dieses Spiel zu gewinnen?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "S" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "G" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "E" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "W" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "H" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Einen Metaserver auswählen" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Wähle ein Spiel" @@ -2856,30 +2876,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** UNBEKANNTER NACHRICHTENTYP ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Fehler beim Schreiben auf Socket: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Überlauf des Lesepuffers - Ende der Verbindung\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Fehler beim Lesen des Sockets: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "Fehler beim Verbinden zu %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "unbekannt" @@ -2889,465 +2909,452 @@ msgstr "Verbinde zu %s Port %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "Zustandsstack-Überlauf. Stack dump an 'standard error' gesendet.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Hügelland" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Ackerland" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Gebirge" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "We_ideland" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "Wa_ld" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "Wü_ste" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_Meer" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "G_old" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Keine" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Lehm (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Getreide (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Erz (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Wolle (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Holz (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Alles (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "O" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NO" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NW" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "W" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SW" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SO" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Reihe einfügen" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Reihe löschen" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Spalte einfügen" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Spalte löschen" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "_Titel" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "_Umschreibung" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "_Kommentare" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Mischen" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Spiel-Parameter" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Regeln" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Rohstoffe" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Gebäude" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "Ohne Titel" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioneers Editor" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Laden von '%s' fehlgeschlagen" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Speichern nach '%s' fehlgeschlagen" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Spiele" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Ungefiltert" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Spiel öffnen" #. Button text -#: ../editor/gtk/editor.c:1524 -#, fuzzy +#: ../editor/gtk/editor.c:1587 msgid "_Open" -msgstr "Ö_ffnen..." +msgstr "Ö_ffnen" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Speichern unter..." #. Button text -#: ../editor/gtk/editor.c:1565 -#, fuzzy +#: ../editor/gtk/editor.c:1627 msgid "Save _As" -msgstr "Speichern _unter..." +msgstr "Speichern _unter" #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Titel ändern" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Neuer Titel:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Über Pioneers Editor" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Diese Datei öffnen" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "Dateiname" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor für Pioneers-Spiele" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Einstellungen" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Kommentare" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Datei" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Neu" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Neues Spiel erstellen" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "Ö_ffnen..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Neu" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Existierendes Spiel öffnen" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Speichern" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "Ö_ffnen..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Spiel speichern" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Speichern _unter..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Speichern" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Speichern unter" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "_Titel ändern" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Speichern _unter..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Spieltitel ändern" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "Zeige die Anzahl der benötigten Siegpunkte" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "_Titel ändern" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Überprüfe, ob das Spiel gewonnen werden kann" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Quit" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "Ü_ber Pioneers Editor" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "Zeige die Anzahl der benötigten Siegpunkte" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informationen über den Pioneers Editor" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Diese Datei öffnen" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "Dateiname" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor für Pioneers-Spiele" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Menüaufbau fehlgeschlagen: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Einstellungen" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Kommentare" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "Ü_ber Pioneers Editor" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Rohstoffe" @@ -3360,53 +3367,53 @@ msgstr "Spiel;Brett;Entwurf;bearbeiten;Layout;Pioneers;Siedler;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Starte Metaserver beim Programmstart als eigenständigen Prozess" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "" "Zu erstellende Pid-Datei, wenn Metaserver als eigenständiger Prozess " "gestartet wird (bewirkt -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Verbinde Clients mit anderem Metaserver" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Diesen Host beim Erstellen neuer Spiele benutzen" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "Hostname" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Diesen Port-Bereich für neu erstellte Spiele verwenden" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "von-bis" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Debugge Syslog Nachrichten" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metaserver für Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "Protokoll des Metaservers:" @@ -3440,66 +3447,56 @@ msgid "Unregistering Avahi.\n" msgstr "Lösche Avahi aus dem Register.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "Ü_ber Pioneers-Server" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Informationen über den Pioneers-Server" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Server stoppen" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Server starten" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Den Server anhalten" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Den Server starten" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Spieler %s von %s eingetreten\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Spieler %s von %s gegangen\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Spieler %d heißt jetzt %s.\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "Der Port für den Spielserver" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Server registrieren" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Dieses Spiel beim Metaserver registrieren" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Angezeigter Hostname" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3507,154 +3504,153 @@ "Firewall steht)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Rundenreihenfolge mischen" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Rundenreihenfolge mischen" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Zeigt alle Spieler und Zuschauer die zum Server verbunden sind" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Verbunden" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Ist der Spieler zur Zeit verbunden?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Name" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Name des Spielers" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Standort" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Hostname des Spielers" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Nummer" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Spielernummer" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Rolle" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Spieler oder Zuschauer" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Pioneers-Client starten" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Den Pioneers-Client starten" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Chat aktivieren" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Chatnachrichten aktivieren" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Computerspieler hinzufügen" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Einen Computerspieler hinzufügen" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Nachrichten vom Server" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Spieleinstellungen" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Server-Einstellungen" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Laufendes Spiel" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Verbundene Spieler" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Computerspieler" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Nachrichten" #. Caption of about box -#: ../server/gtk/main.c:1150 -#, fuzzy +#: ../server/gtk/main.c:1095 msgid "About the Pioneers Game Server" -msgstr "Der Pioneers-Spielserver" +msgstr "Über Pioneers-Server" # #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "Ende des Spiels.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Einen Pioneerserver betreiben" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioneers-Server" @@ -3666,143 +3662,153 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "Spiel;Brett;Server;Host;Pioneers;Siedler;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Informationen über den Pioneers-Server" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "Ü_ber Pioneers-Server" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Zu benutzender Spieltitel" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Zu verwendende Spieldatei" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Port auf dem gewartet werden soll" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Überschreibe die Anzahl der Spieler" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Überschreibe die Anzahl der Siegpunkte" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Überschreibe die 7-Regel" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Überschreibe den Gelände-Typ, 0=Standard 1=Zufällig" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "N Computerspieler hinzufügen" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Server beim Metaserver registrieren" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Bei ausgewähltem Metaserver registrieren (impliziert -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Diesen Hostnamen beim Registrieren benutzen" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Beenden nachdem ein Spieler gewonnen hat" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Nach N Sekunden ohne Spieler beenden" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Turniermodus, nach N Minuten werden Computerspieler hinzugefügt" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Administrator-Port" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "Das Spiel nicht sofort starten, sondern auf den Befehl auf dem Adminport " "hören" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Den Spielern in der Reihenfolge der Teilnahme Nummern zuteilen" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Metaserver-Optionen" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Optionen für den Metaserver" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Diverse Optionen" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Diverse Optionen" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" "Spiel-Titel und Dateiname können nicht zur gleichen Zeit gesetzt werden.\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Port des Spiel-Hosts\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3811,7 +3817,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Die Verbindung mit dem Metaserver ist verbrochen.\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3822,45 +3829,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Versuch die Verbindung zum Metaserver wieder zu stellen.\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registriere bei Metaserver auf %s.\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "Beim Metaserver austragen.\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "Chat ist zu lang" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "Name ist zu lang" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignoriere unbekannte Erweiterung" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "Der letzte Spieler ist gegangen, der Turnier-Timer wird zurückgesetzt." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "Keine menschlichen Spieler anwesend. Tschüss." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Spiel beginnt, füge Computerspieler hinzu." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "Das Spiel beginnt in %s Minuten." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "Das Spiel beginnt in %s Minute." @@ -3869,11 +3876,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Computerspieler" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3881,50 +3888,50 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Das Spiel ist beendet." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Spieler von %s abgelehnt: Das Spiel ist vorbei\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Name nicht geändert: neuer Name wird schon benutzt" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Habe zu lange auf andere Spieler gewartet... tschüss.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" "Der letzte menschliche Spieler ist gegangen. Warte auf das wiederkehren " "eines Spielers." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Spiel fortsetzen." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s hat sich neu verbunden." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Versionsunterschied: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Das Spiel beginnt bald." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Bereite Spiel vor" @@ -3945,6 +3952,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "Das Würfeln wurde vom Administrator bestimmt." +#~ msgid "Quit the program" +#~ msgstr "Das Programm verlassen" + +#~ msgid "" +#~ msgstr "mehr>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Die gewählte Menge erhöhen" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Menüaufbau fehlgeschlagen: %s" + #~ msgid "Join the selected game" #~ msgstr "An ausgewähltem Spiel teilnehmen" diff -Nru pioneers-15.5/po/en_GB.po pioneers-15.6/po/en_GB.po --- pioneers-15.5/po/en_GB.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/en_GB.po 2020-08-02 12:37:44.000000000 +0000 @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Pioneers 15.4\n" +"Project-Id-Version: Pioneers 15.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" -"PO-Revision-Date: 2016-06-10 18:23+0200\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" +"PO-Revision-Date: 2020-08-02 13:56+0200\n" "Last-Translator: Roland Clobus \n" "Language-Team: English (United Kingdom) \n" "Language: en_GB\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Launchpad-Export-Date: 2010-03-11 19:44+0000\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 2.3.1\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" #. Commandline pioneersai: chromosome-file @@ -60,8 +60,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Enable debug messages" @@ -71,8 +71,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Show version information" @@ -81,9 +81,9 @@ msgid "- Computer player for Pioneers" msgstr "- Computer player for Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers version:" @@ -336,14 +336,14 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." @@ -370,7 +370,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Offline" @@ -400,7 +400,7 @@ msgstr "%s receives %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s takes %s.\n" @@ -443,70 +443,70 @@ msgid "Version mismatch. Please make sure client and server are up to date.\n" msgstr "Version mismatch. Please make sure client and server are up to date.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Build two settlements, each with a connecting" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Build a settlement with a connecting" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "road" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "bridge" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "ship" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " or" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Waiting for your turn." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Select the building to steal from." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Select the ship to steal from." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Place the robber." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Finish the road building action." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Build one road segment." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Build two road segments." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "It is your turn." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Sorry, %s available.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "The game is over." @@ -560,7 +560,7 @@ msgid "%s took %s from %s.\n" msgstr "%s took %s from %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Spectator %d" @@ -570,7 +570,7 @@ msgid "spectator %d" msgstr "spectator %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Player %d" @@ -896,6 +896,11 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "any resource" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -941,12 +946,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Begin turn %d for %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Error starting %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Select an automatically discovered game" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) on %s:%s" @@ -979,110 +998,397 @@ msgid " said: " msgstr " said: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Game" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Start a new game" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_New Game" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Leave this game" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Leave Game" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administer Pioneers server" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Admin" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Change your player name" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "_Player Name" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Terrain legend and building costs" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "L_egend" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Settings for the current game" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Game Settings" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogram of dice rolls" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Dice Histogram" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Quit" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Quit" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Actions" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Roll the dice" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Roll Dice" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Trade" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Undo" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Finish" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Build a road" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Road" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Build a ship" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Ship" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Move a ship" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Move Ship" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Build a bridge" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Bridge" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Build a settlement" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Settlement" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Build a city" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "City" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Buy a development card" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Develop" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Build a city wall" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "City Wall" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Settings" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Show or hide the toolbar" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Toolbar" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Configure the application" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Prefere_nces" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_View" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Set window to full screen mode" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Fullscreen" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "View the full map" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Reset" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Centre the map" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Centre" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Help" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Information about Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_About Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Show the manual" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metaserver at %s, port %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Finished.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "The metaserver is not available anymore.\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "The metaserver closed the connection unexpectedly.\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Receiving game names from the metaserver.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "New game server requested on %s port %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "Incomplete information about the new game server received.\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Unknown message from the metaserver: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "Receiving data from inactive session: %s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "Too many metaserver redirects.\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Bad redirect line: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "The metaserver is too old to create servers (version %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Unexpected data from the metaserver: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Reroll on 1st 2 turns" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Reroll all 7s" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Default" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Random" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Redirected to the metaserver at %s.\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Redirected to the metaserver at %s, port %s.\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Receiving a list of Pioneers servers from the metaserver.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Number of computer players" @@ -1102,11 +1408,6 @@ msgid "Requesting new game server.\n" msgstr "Requesting new game server.\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Error starting %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1114,9 +1415,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "_Cancel" @@ -1141,7 +1442,7 @@ msgstr "_New Remote Game" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "_Join" @@ -1207,7 +1508,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Sevens rule" @@ -1248,104 +1549,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Player name" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Enter your name" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Spectator" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Check if you want to be a spectator" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Join" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Join an automatically discovered game" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaserver" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Join Public Game" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Join a public game" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Create Game" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Create a game" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Join Private Game" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Join a private game" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Server host" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Name of the host of the game" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Server port" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Port of the host of the game" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Recent games" @@ -1357,533 +1658,261 @@ #. Button text: play development card #: ../client/gtk/develop.c:163 msgid "Play Card" -msgstr "Play Card" - -#. Dialog caption -#: ../client/gtk/discard.c:77 -msgid "Discard Resources" -msgstr "Discard Resources" - -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "_OK" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "You must discard %d resource" -msgstr[1] "You must discard %d resources" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Total discards" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Waiting for players to discard" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Game Over" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s has won the game with %d victory points!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "All praise %s, Lord of the known world!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Choose Resources" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "You may choose %d resource" -msgstr[1] "You may choose %d resources" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Total resources" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Waiting for players to choose" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Game" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_New Game" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Start a new game" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Leave Game" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Leave this game" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Admin" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administer Pioneers server" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "_Player Name" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Change your player name" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "L_egend" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Terrain legend and building costs" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Game Settings" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Settings for the current game" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Dice Histogram" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogram of dice rolls" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Quit" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Quit the program" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Actions" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Roll Dice" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Roll the dice" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Trade" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Undo" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Finish" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Road" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Build a road" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Ship" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Build a ship" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Move Ship" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Move a ship" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Bridge" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Build a bridge" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Settlement" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Build a settlement" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "City" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Build a city" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Develop" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Buy a development card" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "City Wall" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Build a city wall" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Settings" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Prefere_nces" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Configure the application" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_View" +msgstr "Play Card" -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Reset" +#. Dialog caption +#: ../client/gtk/discard.c:77 +msgid "Discard Resources" +msgstr "Discard Resources" -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "View the full map" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "_OK" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Centre" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "You must discard %d resource" +msgstr[1] "You must discard %d resources" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Centre the map" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Total discards" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Help" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Waiting for players to discard" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_About Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Game Over" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Information about Pioneers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s has won the game with %d victory points!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Show the manual" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "All praise %s, Lord of the known world!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Fullscreen" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Choose Resources" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Set window to full screen mode" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "You may choose %d resource" +msgstr[1] "You may choose %d resources" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Toolbar" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Total resources" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Show or hide the toolbar" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Waiting for players to choose" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Points needed to win: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Messages" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Map" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Finish trading" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Quote" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Reject domestic trade" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Legend" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Welcome to Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioneers Preferences" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "_Close" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Theme:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Choose one of the themes" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Show legend" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Show the legend as a page beside the map" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Messages with colour" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Show new messages with colour" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Chat in colour of player" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Show new chat messages in the colour of the player" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Summary with colour" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Use colours in the player summary" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Toolbar with shortcuts" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Show keyboard shortcuts in the toolbar" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Silent mode" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "In silent mode no sounds are made" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Announce new players" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "Make a sound when a new player or spectator enters the game" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Show notifications" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "Show notifications when it's your turn or when new trade is available" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Use 16:9 layout" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Use a 16:9 friendly layout for the window" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "Roll the dice manually each turn" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "Roll the dice automatically, except when you have a soldier card" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "Roll the dice automatically, except when you have a development card" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "Roll the dice automatically" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "Automate the rolling of the dice" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "About Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Welcome to Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Dice Histogram" @@ -1896,7 +1925,7 @@ msgstr "Select a new location for the ship." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "It is your turn to setup." @@ -1929,21 +1958,21 @@ msgstr "Sea" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Terrain yield" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Building costs" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "City wall" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Development card" @@ -1974,28 +2003,30 @@ msgstr "Face:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variant:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Connect as a spectator" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Metaserver Host" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Select a game to join." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Connecting" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Play a game of Pioneers" @@ -2090,7 +2121,7 @@ msgstr "Resource cards" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Development cards" @@ -2116,66 +2147,77 @@ msgid "The bank is empty" msgstr "The bank is empty" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s has %s, and is looking for %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "New offer from %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Offer from %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "I want" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Give them" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Delete" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "Enable Charity" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" +"When checked, a resource can be given away without receiving anything back" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Reject Domestic Trade" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Player" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Quotes" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s for %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Rejected trade" @@ -2190,240 +2232,220 @@ msgstr "Total" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Amount in hand" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "more>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Increase the selected amount" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Selected amount" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Total selected amount" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "The bank cannot be emptied" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Yes" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "No" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Unknown" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "No game in progress..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "General settings" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Number of players:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Victory point target:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Random terrain:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Allow trade between players:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Allow trade only before building or buying:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Check victory only at end of turn:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Amount of each resource:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Sevens rule:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "Use dice deck instead of dice:" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "Number of dice decks:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "Number of dice cards removed after shuffling:" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Use the pirate to block ships:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Island discovery bonuses:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Building quotas" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Roads:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Settlements:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Cities:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "City walls:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Ships:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Bridges:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Development card deck" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Road building cards:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Monopoly cards:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Year of plenty cards:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Chapel cards:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Pioneer university cards:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Governor's house cards:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Library cards:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Market cards:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Soldier cards:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Current Game Settings" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "ask for %s for free" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "give %s for free" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "give %s for %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "I want %s, and give them %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Quote received from %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Call for Quotes" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Accept Quote" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "_Finish Trading" @@ -2488,23 +2510,23 @@ "The game uses the new rule '%s', which is not yet supported. Consider " "upgrading.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "This game cannot be won." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "There is no land." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "It is possible that this game cannot be won." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "This game can be won by only building all settlements and cities." -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2559,174 +2581,174 @@ "Philipp Kleinhenz https://launchpad.net/~zweistecken" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Victory Point Analysis" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "All sevens move the robber or pirate" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "In the first two turns all sevens are rerolled" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "All sevens are rerolled" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Randomise terrain" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Randomise the terrain" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Use pirate" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Use the pirate to block ships" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Strict trade" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Allow trade only before building or buying" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Domestic trade" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Allow trade between players" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Victory at end of turn" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Check for victory only at end of turn" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "Use dice deck" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "Use a deck of 36 dice cards instead of real dice" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "Number of dice decks" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "The number of dice decks (of 36 cards each)" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "Number of removed dice cards" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "The number of dice cards that are removed after shuffling the deck" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Island discovery bonuses" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "A comma separated list of bonus points for discovering islands" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "Check and correct island discovery bonuses" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Number of players" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "The number of players" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Victory point target" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "The points needed to win the game" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Is it possible to win this game?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "B" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "G" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "O" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "W" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "L" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Select a metaserver" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Select a game" @@ -2835,30 +2857,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** UNKNOWN MESSAGE TYPE ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Error writing to socket: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "Could not send all data\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Read buffer overflow - disconnecting\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Error reading socket: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "Error connecting to %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "unknown" @@ -2868,222 +2890,222 @@ msgstr "Connecting to %s, port %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "State stack overflow. Stack dump sent to standard error.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Hill" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Field" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Mountain" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Pasture" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "F_orest" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Desert" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_Sea" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Gold" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_None" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Brick (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Grain (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Ore (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Wool (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Lumber (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Any (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "E" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NW" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "W" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SW" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "Place a hill hex" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "Place a field hex" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "Place a mountain hex" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "Place a pasture hex" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "Place a forest hex" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "Place a desert hex" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "Place a sea hex" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "Place a gold hex" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "Clear the hex" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "Place a 2 chit" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "Place a 3 chit" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "Place a 4 chit" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "Place a 5 chit" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "Place a 6 chit" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "Place an 8 chit" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "Place a 9 chit" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "Place a 10 chit" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "Place an 11 chit" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "Place a 12 chit" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "Place a brick 2:1 port" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "Place a grain 2:1 port" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "Place an ore 2:1 port" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "Place a wool 2:1 port" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "Place a lumber 2:1 port" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "Remove a port" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "Place a 3:1 port" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3091,242 +3113,231 @@ "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Insert a row" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Delete a row" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Insert a column" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Delete a column" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "_Title" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "_Description" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "_Comments" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Shuffle" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Game parameters" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Rules" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Resources" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Buildings" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "Untitled" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioneers Editor" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Failed to load '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Failed to save to '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Games" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Unfiltered" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Open Game" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 msgid "_Open" msgstr "_Open" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Save As..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 msgid "Save _As" msgstr "Save _As" #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Change Title" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "New title:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "About Pioneers Game Editor" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Open this file" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "filename" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor for games of Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Settings" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Comments" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_File" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_New" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Create a new game" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Open..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_New" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Open an existing game" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Save" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Open..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Save game" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Save _As..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Save" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Save as" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "Change _Title" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Save _As..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Change game title" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "_Check Victory Point Target" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "Change _Title" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Check whether the game can be won" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Quit" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_About Pioneers Editor" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Check Victory Point Target" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Information about Pioneers Editor" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Open this file" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "filename" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor for games of Pioneers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Building menus failed: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Settings" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Comments" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_About Pioneers Editor" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Resource count" @@ -3339,51 +3350,51 @@ msgstr "game;board;create;edit;layout;Pioneers;Settlers;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Daemonise the metaserver on start" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Pidfile to create when daemonising (implies -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Redirect clients to another metaserver" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Use this hostname when creating new games" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "hostname" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Use this port range when creating new games" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "from-to" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Debug syslog messages" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metaserver for Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "metaserver protocol:" @@ -3417,218 +3428,208 @@ msgid "Unregistering Avahi.\n" msgstr "Unregistering Avahi.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_About Pioneers Server" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Information about Pioneers Server" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Stop Server" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Start Server" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Stop the server" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Start the server" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Player %s from %s entered\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Player %s from %s left\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Player %d is now %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "The port for the game server" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Register server" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Register this game at the metaserver" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Reported hostname" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" "The public name of this computer (needed when playing behind a firewall)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Random turn order" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Randomise turn order" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Shows all players and spectators connected to the server" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Connected" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Is the player currently connected?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Name" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Name of the player" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Location" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Host name of the player" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Number" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Player number" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Role" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Player or spectator" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Launch Pioneers Client" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Launch the Pioneers client" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Enable chat" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Enable chat messages" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Add Computer Player" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Add a computer player to the game" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Messages from the server" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Game settings" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Server parameters" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Running game" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Players connected" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Computer players" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Messages" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 msgid "About the Pioneers Game Server" msgstr "About the Pioneers Game Server" #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "The game is over.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Host a game of Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioneers Server" @@ -3640,140 +3641,150 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "game;board;server;host;Pioneers;Settlers;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Information about Pioneers Server" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_About Pioneers Server" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Game title to use" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Game file to use" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Port to listen on" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Override number of players" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Override number of points needed to win" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Override seven-rule handling" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "Override dice-deck handling" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "Override num-dice-decks handling" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "Override num-removed-dice-cards handling" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Override terrain type, 0=default 1=random" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Add N computer players" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Register server with metaserver" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Register at metaserver name (implies -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Use this hostname when registering" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Quit after a player has won" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Quit after N seconds with no players" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Tournament mode, computer players added after N minutes" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Admin port to listen on" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "Don't start game immediately, wait for a command on admin port" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Give players numbers according to the order they enter the game" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Metaserver Options" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Options for the metaserver" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Miscellaneous Options" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Miscellaneous options" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "Cannot set game title and filename at the same time\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Cannot load the parameters for the game\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "The network port (%s) for the admin interface is not available.\n" @@ -3782,7 +3793,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "The connection to the metaserver is lost.\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3793,45 +3805,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Attempting to reconnect to the metaserver.\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "Register with the metaserver at %s.\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "Unregister from the metaserver.\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "chat too long" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "name too long" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignoring unknown extension" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "The last player left, the tournament timer is reset." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "No human players present. Bye." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Game starts, adding computer players." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "The game starts in %s minutes." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "The game starts in %s minute." @@ -3839,11 +3851,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Computer Player" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "Unable to determine the hostname of the player: %s" @@ -3851,48 +3863,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Sorry, game is over." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Player from %s is refused: game is over\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Name not changed: new name is already in use" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Was hanging around for too long without players... bye.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "The last human player left. Waiting for the return of a player." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Resuming the game." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s has reconnected." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Version mismatch: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "This game will start soon." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Preparing game" @@ -3912,3 +3924,21 @@ #: ../server/turn.c:516 msgid "The dice roll has been determined by the administrator." msgstr "The dice roll has been determined by the administrator." + +#~ msgid "Quit the program" +#~ msgstr "Quit the program" + +#~ msgid "" +#~ msgstr "more>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Increase the selected amount" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Building menus failed: %s" diff -Nru pioneers-15.5/po/es.po pioneers-15.6/po/es.po --- pioneers-15.5/po/es.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/es.po 2020-08-02 12:37:55.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Pioneers 0.12.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2012-07-08 03:34+0000\n" "Last-Translator: Eduardo Alberto Calvo \n" "Language-Team: Spanish \n" @@ -61,8 +61,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Activar mensajes depurados" @@ -72,8 +72,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Mostrar información de la versión" @@ -82,9 +82,9 @@ msgid "- Computer player for Pioneers" msgstr "- Adversario electrónico de Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Versión de Pioneers:" @@ -337,8 +337,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -371,7 +371,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "desconectado" @@ -401,7 +401,7 @@ msgstr "%s recibe %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s toma a %s.\n" @@ -446,70 +446,70 @@ "Versión no coincide, Por favor asegúrese de que el cliente y el servidor " "están actualizados.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Contruya dos asentamientos, cada uno con una conexión" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Construya un asentamiento con una conexión" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "camino" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "puente" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "barco" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " o" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Esperando tu turno." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Escoge el edificio que quieres robar." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Seleccione el barco a robar" -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Coloca el ladrón." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Termina la acción de construcción del camino" -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Construir un segmento de camino." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Construye dos segmentos de camino." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Te toca a tí." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Lo siento, %s disponible.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Fin del juego" @@ -563,7 +563,7 @@ msgid "%s took %s from %s.\n" msgstr "%s toma %s de %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Espectador %d" @@ -573,7 +573,7 @@ msgid "spectator %d" msgstr "espectador %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Jugador %d" @@ -899,6 +899,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "cualquier recurso (gusano)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -944,12 +950,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Comienza turno %d para %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Error al empezar %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Selecciona un juego que ha sido detectado automáticamente" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) en %s:%s" @@ -982,111 +1002,398 @@ msgid " said: " msgstr " dice: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Juego" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Comenzar un nuevo juego" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nuevo juego" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Dejar este juego" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Dejar juego" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administrar servidor de Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Admin" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Cambiar tu nombre de jugador" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "Nombre de _jugador" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Leyenda de terreno y costos de construccion" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "L_eyenda" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Ajustes del juego actual" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Ajustes de juego" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histograma de las tiradas" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Histograma de los dados" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Salir" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Salir" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Acciones" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Tirar los dados" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Tirar los dados" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Comercio" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Deshacer" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Terminar" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Construir camino" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Camino" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Construir un barco" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Barco" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Quitar un barco" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Quitar barco" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Construir un puente" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Puente" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Construir un asentamiento" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Asentamiento" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Construir una ciudad" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Ciudad" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Comprar una carta de desarrollo" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Desarrollar" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Construir un muro de ciudad" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Muralla" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Ajustes" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Muestre o esconder barra de herramientas" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Barra de herramientas" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Configurar aplicacion" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Prefere_ncias" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Ver" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Cambiar a modo de pantalla completa" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Pantalla completa" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Ver todo el mapa" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Reiniciar" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Centrar el mapa" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Centrar" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "A_yuda" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informacion acerca de Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Acerca de Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Mostrar el manual" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Meta-servidor en %s, puerto %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Terminado.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Recibiendo nombres del juego de Meta-servidor.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, fuzzy, c-format msgid "New game server requested on %s port %s.\n" msgstr "Nuevo servidor de juego solicitado en %s puerto %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Mensaje desconocido del Meta-servidor: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 #, fuzzy msgid "Too many metaserver redirects.\n" msgstr "Demasiados desvíos del meta-servidor\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Mala linea de desvío: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Meta-servidor muy viejo para crear servidores(versión %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, fuzzy, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Mensaje desconocido del Meta-servidor: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Tirar de nuevo durante las dos primeras vueltas" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Tirar de nuevo cada siete" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Por defecto" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Al azar" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, fuzzy, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Desviado al Meta-servidor en %s, puerto %s\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, fuzzy, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Desviado al Meta-servidor en %s, puerto %s\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Recibiendo una lista de servidores Pioneers del Meta-servidor.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Número de jugadores de la computador" @@ -1107,11 +1414,6 @@ msgid "Requesting new game server.\n" msgstr "Pidiendo nuevo servidor de juego\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Error al empezar %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1119,9 +1421,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1147,7 +1449,7 @@ msgstr "_Nuevo juego remoto" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 #, fuzzy msgid "_Join" msgstr "Adherir" @@ -1214,7 +1516,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Regla de los sietes" @@ -1255,104 +1557,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Nombre de jugador" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Entra tu nombre de jugador" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Espectador" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Marcar para ser un espectador" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Adherir" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Adherir un juego descubierto automáticamente" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Meta-servidor" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Adherir a juego publico" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Adherir a un juego publico" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Crear juego" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Crear un juego" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Adherir a juego privado" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Adherir a juego privado" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Servidor" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Nombre del anfitrion del juego" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Puerto" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Puerto del anfitrion del juego" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Juegos recientes" @@ -1374,526 +1676,255 @@ #. Button text #: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 #: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Tienes que desechar %d carta de recurso" -msgstr[1] "Tienes que desechar %d cartas de recurso" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Rechazos totales" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Esperando a que los jugadores descarten" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Fin del juego" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s ha ganado con %d puntos!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Alabanzas a %s, Señor del mundo conocido!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Elige recursos" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Puedes escoger %d recurso" -msgstr[1] "Puedes escoger %d recursos" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Recursos totales" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Esperando a que los jugadores escojan" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Juego" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nuevo juego" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Comenzar un nuevo juego" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Dejar juego" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Dejar este juego" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Admin" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administrar servidor de Pioneers" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "Nombre de _jugador" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Cambiar tu nombre de jugador" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "L_eyenda" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Leyenda de terreno y costos de construccion" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Ajustes de juego" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Ajustes del juego actual" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Histograma de los dados" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histograma de las tiradas" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Salir" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Salir del programa" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Acciones" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Tirar los dados" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Tirar los dados" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Comercio" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Deshacer" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Terminar" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Camino" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Construir camino" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Barco" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Construir un barco" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Quitar barco" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Quitar un barco" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Puente" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Construir un puente" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Asentamiento" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Construir un asentamiento" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Ciudad" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Construir una ciudad" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Desarrollar" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Comprar una carta de desarrollo" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Muralla" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Construir un muro de ciudad" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Ajustes" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Prefere_ncias" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Configurar aplicacion" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Ver" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Reiniciar" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "Ver todo el mapa" +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Centrar" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Tienes que desechar %d carta de recurso" +msgstr[1] "Tienes que desechar %d cartas de recurso" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Centrar el mapa" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Rechazos totales" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "A_yuda" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Esperando a que los jugadores descarten" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Acerca de Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Fin del juego" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informacion acerca de Pioneers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s ha ganado con %d puntos!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Mostrar el manual" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Alabanzas a %s, Señor del mundo conocido!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Pantalla completa" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Elige recursos" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Cambiar a modo de pantalla completa" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Puedes escoger %d recurso" +msgstr[1] "Puedes escoger %d recursos" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Barra de herramientas" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Recursos totales" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Muestre o esconder barra de herramientas" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Esperando a que los jugadores escojan" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Puntos necesarios para ganar: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Mensajes" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Mapa" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Terminar negocio" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Presupuestos" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Rechazar Negocio Domestico" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Leyenda" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Bienvenido al Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Preferencias de Pioneers" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Escoger uno de los temas" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Mostrar leyenda" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "¿Mostrar la leyenda como una página junto al mapa?" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "¿Usar colores en los mensajes?" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "¿Usar colores en los mensajes nuevos?" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "¿Charlar con el color del jugador?" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Mostrar nuevos mensajes de charla en el color del jugador" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Resumen en color" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Usar color en el resumen del jugador" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Barra de herramientas con acceso directo" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Mostrar accesos directos de teclado en barra de herramientas" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Modo silencioso" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "En modo de silencio, no se reproducen sonidos." #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Anunciar nuevos jugadores" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "" "Reproducir un sonido cuando un nuevo jugador o espectador entra en el juego" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Mostrar notificaciones" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" "Mostrar notificaciones cuando sea tu turno o cuando haya una oferta de " "comercio" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Usa un tema de 16:9" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Usar una disposición para la ventana de 16:9" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "Tirar los dados" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Acerca de Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "¡Bienvenido a Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Histograma de los dados" @@ -1906,7 +1937,7 @@ msgstr "Seleccione una nueva locacion para el barco" #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "" @@ -1939,21 +1970,21 @@ msgstr "Mar" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Produccion de terreno" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Costes de construcción" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Muralla" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Carta de desarrollo" @@ -1984,28 +2015,30 @@ msgstr "Cara:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variante:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Conectarse como un espectador" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Meta-servidor del anfitrion" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Selecciona un juego para unirte." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Conectando" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Jugar un juego de Pioneers" @@ -2100,7 +2133,7 @@ msgstr "Cartas de recurso" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Cartas de desarrollo" @@ -2126,66 +2159,77 @@ msgid "The bank is empty" msgstr "El banco esta vacio" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s tiene %s y quiere %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Nueva oferta de %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Oferta de %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Quiero..." #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Dales..." #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Borrar" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Habilitar charla" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Rechazar Negocio Domestico" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Jugador" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Presupuestos" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s por %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Negocio rechazado" @@ -2200,241 +2244,221 @@ msgstr "Total" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Cartas de recurso en mano" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "más>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Incrementar la cantidad seleccionada" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Cantidad seleccionada" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Cantidad seleccionada total" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "El banco no se puede vaciar" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Sí" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "No" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Desconocido" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "No hay juego en proceso" #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Ajuste general" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Número de jugadores:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Punto de victoria:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Terreno Aleatorio:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Permitir comerciar entre jugadores:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Permitir comerciar sólo antes de construir o comprar:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Revisar por victoria únicamente al fin del turno" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Cantidad de cada recurso:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Regla de los sietes:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 #, fuzzy msgid "Number of dice decks:" msgstr "Número de jugadores:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Usa al pirata para bloquear barcos:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonificaciones por descubrimiento de islas:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Costes de construcción" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Caminos:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Asentamientos:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Ciudades:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Muros de la Ciudad:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Barcos:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Puentes:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Cartas de desarrollo" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Cartas de construir caminos:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Cartas de monopolio:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Cartas de año de abundancia:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Cartas de capilla:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Cartas Universidad de Pioneers:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Cartas Palacio del Gobernador:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Cartas de biblioteca:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Cartas de mercado:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Cartas de soldado:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Ajusted de juego actual" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "pide %s gratis" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "ofrece %s gratis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "ofrece %s por %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Quiero %s, y darles %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Cita recibida de %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "Pedir presupuestos" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Aceptar presupuesto" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "Terminar negocio" @@ -2495,25 +2519,25 @@ "upgrading.\n" msgstr "" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Este juego no se puede ganar." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "No hay tierra" -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Es posible que este juego no pueda ser ganado." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" "Este juego puede ser ganado con solo construir todos los asentamientos y " "ciudades." -#: ../common/game.c:971 +#: ../common/game.c:970 #, fuzzy, c-format msgid "" "Required victory points: %d\n" @@ -2581,175 +2605,175 @@ " skarevoluti https://launchpad.net/~skarevoluti" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Análisis de Punto de Victoria" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Todos los 7 quitan el ladron o pirata" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "En los primeros dos turnos todos los 7 se tiran de nuevo" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Todos los 7 se tiran de nuevo" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Hacer aleatorio el terreno" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Hacer aleatorio el terreno" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Use Pirata" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Usa al pirata para bloquear barcos" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Negocio riguroso" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Permitir comerciar sólo antes de construir o comprar" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Negocio local" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Permitir comerciar entre jugadores" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Victoria al terminar el turno" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Revisa la victoria únicamente al fin del turno" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 #, fuzzy msgid "Number of dice decks" msgstr "Número de jugadores de la computador" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Bonificaciones por descubrimiento de islas" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Número de jugadores" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Número de jugadores" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Punto de victoria" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Puntos necesarios para ganar el juego" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "¿Se puede ganar este juego?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "Ld" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "C" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "Mi" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "Ln" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Ma" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Seleccionar un meta-servidor" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Seleccione un juego" @@ -2858,30 +2882,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** TIPO DE MENSAJE DESCONOCIDO ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "error escribiendo conector: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Leer buffer sobreflujo - desconectando\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Error leyendo conector: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, fuzzy, c-format msgid "Error connecting to %s: %s\n" msgstr "Error conectando a %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "Desconocido" @@ -2891,470 +2915,459 @@ msgstr "Conectando a %s, puerto %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "State stack overflow. Stack dump sent to standard error.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Colina" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Siembra" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Montaña" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Pasto" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Bosque" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Desierto" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "M_ar" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Oro" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Ninguno" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "La_drillo (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Cereales (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "Mine_rales (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Lana (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Madera (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "Cualquiera (_3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "E" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NO" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "O" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SO" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 #, fuzzy msgid "Remove a port" msgstr "Puerto" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Insertar una línea" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Borrar una línea" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Insertar una columna" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Borrar una columna" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 #, fuzzy msgid "_Title" msgstr "_Cambiar título" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 #, fuzzy msgid "_Description" msgstr "_Desierto" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 #, fuzzy msgid "_Comments" msgstr "Comentarios" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Desordenar" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Parametros de juego" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Reglas" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Recursos" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Construcciones" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Editos de Pioneers" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Falla al bajar '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Falla al salvar a '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Juegos" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Sin filtrar" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Juego abierto" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Abrir" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Grabar como..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Grabar _como..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Cambiar titulo" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Nuevo titulo:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Acerca de Editor de Pioneers" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Abrir este archivo" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "Nombre de archivo" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor para juegos de Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Ajustes" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Comentarios" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Archivo" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Nuevo" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Crear un nuevo juego" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Abrir" +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nuevo" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Abrir un juego existente" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Grabar" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Abrir" #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Grabar juego" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Grabar _como..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Grabar" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Guardar como" #. Menu entry -#: ../editor/gtk/editor.c:1748 -#, fuzzy -msgid "Change _Title" -msgstr "Cambiar titulo" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Grabar _como..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Cambiar título del juego" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "_Comprueba el objetivo de puntos de victoria" +#: ../editor/gtk/editor.ui.h:22 +#, fuzzy +msgid "Change _Title" +msgstr "Cambiar titulo" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Comprueba cuando puede ganarse el juego" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Salir" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Acerca de Editor de Pioneers" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Comprueba el objetivo de puntos de victoria" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informacion acerca de Editor de Pioneers" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Abrir este archivo" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "Nombre de archivo" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor para juegos de Pioneers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Construcción menus fallida: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Ajustes" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Comentarios" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Acerca de Editor de Pioneers" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Cuenta de Recursos" @@ -3367,51 +3380,51 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Daemonizar el metaservidor al iniciar" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Archivo PID a crear al daemonizar (implica -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Redirigir clientes a otro metaservidor" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Usar este nombre de servidor al crear nuevas partidas" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "nombre de servidor" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Usa este rango de puertos cuando estés creando nuevos juegos" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "de-para" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Depurar mensajes del log de sistema" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Meta Servidor para Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "protocolo del metaservidor:" @@ -3447,66 +3460,56 @@ msgid "Unregistering Avahi.\n" msgstr "Anulando el registro Avahi.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Acerca del Servidor Pioneers" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Información del Servidor Pioneers" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Parar servidor" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Iniciar servidor" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Parar el servidor" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Comience el servidor" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Jugador %s de %s ha entrado\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Jugador %s de %s se ha ido\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Jugador %d es ahora %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "El puerto para el servidor el juego" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Hacer incribirse el servidor" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registrar este juego en el Meta-servidor" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Nombre de Anfitrión Reportado" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3514,134 +3517,134 @@ "un firewall)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Desordenar el orden de la vuelta" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Desordenar orden de turnos" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Muestra todos los jugadores y espectadores conectados al servidor" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Conectado" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "¿Está el jugador actualmente conectado?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Nombre" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Nombre del jugador" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Sitio" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Nombre del jugador anfitrión" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Número" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Número del jugador" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Función" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Jugador o espectador" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Lanzar cliente de Pioneers" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Lanzar el cliente de Pioneers" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Habilitar charla" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Habilitar mensajes de charla" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Añadir un adversario electrónico" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Añadir un adversario electrónico" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Mensaje del servidor" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Ajuste del juego" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Parámetros del servidor" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Juego actual" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Jugadores conectados" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Adversario electrónico" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Mensajes" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "El servidor del Juego Pionners" @@ -3650,18 +3653,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "El juego ha terminado.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Organice un juego de Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Servidor de Pioneers" @@ -3673,133 +3676,143 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Información del Servidor Pioneers" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Acerca del Servidor Pioneers" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Titulo de juego para usar" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Archivo de juego para usar" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Puerto para escuchar" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Invalidar número de adversarios" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Invalidar número de puntos necesarios para ganar" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Invalidar regla del 7" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 #, fuzzy msgid "Override dice-deck handling" msgstr "Invalidar regla del 7" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 #, fuzzy msgid "Override num-dice-decks handling" msgstr "Invalidar regla del 7" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 #, fuzzy msgid "Override num-removed-dice-cards handling" msgstr "Invalidar regla del 7" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Invalidar tipo de terreno, 0=Omisión 1=aleatorio" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Añadir N adversarios electrónicos" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Hacer incribirse el servidor con el Meta-servidor" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registro en nombre de Meta-servidor (supone -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Usar este nombre de huesped cuando se registre" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Salir luego de que un jugador ha ganado" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Salir luego de N segundos sin jugadores" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Modo de torneo, adversarios electrónicos agregados luego de N minutos" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Puerto Admin para escucha" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "No comience el juego inmediatamente, espere un comando del puerto " "administrador" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Dar números de jugadores de acuerdo al orden en que entren al juego" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Opciones de Meta-servidor" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opciones para el Meta-servidor" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Opciones variadas" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Opciones variadas" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" @@ -3807,13 +3820,13 @@ "tiempo\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "No se pueden cargar los parámetros de la partida\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3823,7 +3836,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Opciones para el Meta-servidor" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3835,46 +3849,46 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Opciones para el Meta-servidor" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, fuzzy, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registro con Meta-servidor en %s, puerto %s\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 #, fuzzy msgid "Unregister from the metaserver.\n" msgstr "Registro del Meta-servidor\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "Charla demasiado larga" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "Nombre demasiado largo" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignorar extension desconocida" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "El ultimo jugador salió, el contador del torne es restablecido." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "No hay jugadores humanos. Chao." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "La partida empieza, añadiendo jugadores no-humanos." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "El juego comienza en %s minutos." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "El juego comienza en %s minutos." @@ -3883,11 +3897,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Adversario electrónico" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3895,48 +3909,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "El juego ha terminado." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Jugador de %s rechazado: fin del juego\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Nombre no ha cambiado: nuevo nombre está ya en uso" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Ha estado esperando demasiado tiempo sin jugadores... Adiós.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "El último jugador humano salió. Esperando el regreso de un jugador." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Reanudando el juego" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s se ha reconectado." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Versión no coincide: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Este juego comenzará pronto" #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Preparando juego" @@ -3957,6 +3971,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "El rol del dado ha sido determinado por el administrador." +#~ msgid "Quit the program" +#~ msgstr "Salir del programa" + +#~ msgid "" +#~ msgstr "más>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Incrementar la cantidad seleccionada" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Construcción menus fallida: %s" + #~ msgid "Join the selected game" #~ msgstr "Adherir al juego seleccionado" diff -Nru pioneers-15.5/po/fr.po pioneers-15.6/po/fr.po --- pioneers-15.5/po/fr.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/fr.po 2020-08-02 12:37:55.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Pioneers 15.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2016-06-11 16:40+0200\n" "Last-Translator: Jean-Charles GRANGER \n" "Language-Team: Français , LT-P , Yusei " @@ -63,8 +63,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Activer les messages de débogage" @@ -74,8 +74,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Voir les informations de version" @@ -84,9 +84,9 @@ msgid "- Computer player for Pioneers" msgstr "- IA pour Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Version de Pioneers :" @@ -342,8 +342,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -376,7 +376,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Déconnecté" @@ -406,7 +406,7 @@ msgstr "%s reçoit %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s prend %s.\n" @@ -450,70 +450,70 @@ msgstr "" "Versions incompatibles. Vérifiez que le client et le serveur sont à jour.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Fondez deux colonies avec une voie de liaison pour chacune" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Fondez une colonie et sa voie de liaison" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "route" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "pont" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "navire" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " ou" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Nous attendons notre tour." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Choisissez la construction à voler." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Choisissez le navire à voler." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Déplacez le voleur." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Finissez la construction des routes." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Construit un segment de route." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Construit deux segments de route" #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "C'est votre tour." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Désolé, %s indisponible.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "La partie est finie." @@ -567,7 +567,7 @@ msgid "%s took %s from %s.\n" msgstr "%s prend %s à %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Spectateur %d" @@ -577,7 +577,7 @@ msgid "spectator %d" msgstr "spectateur %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Joueur %d" @@ -903,6 +903,11 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "n'importe quelle ressource" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -948,12 +953,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Début du tour %d pour %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Erreur lors du démarrage de %s : %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Sélectionner une partie découverte automatiquement" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) sur %s:%s" @@ -986,111 +1005,398 @@ msgid " said: " msgstr " a dit : " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Partie" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Commencer une nouvelle partie" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nouvelle partie" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Quitter cette partie" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "Abandonner _la partie" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administrer le serveur Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Administrateur" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Changer de pseudonyme" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "Nom du joueur" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Légende des terrains et des coûts de construction" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "Lég_ende" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Paramètres de la partie actuelle" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "P_aramètres de la partie" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogramme des lancers de dés" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Histogramme des lancers de dés" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Quitter" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Quitter" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Actions" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Lancer les dés" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Lancer les dés" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Échange" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Annuler" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Terminer" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Construire une route" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Route" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Construire un navire" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Navire" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Déplacer un navire" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Déplacer un navire" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Construire un pont" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Pont" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Fonder une colonie" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Colonie" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Eriger une cité" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Ville" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Acheter une carte de développement" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Carte de Dév." + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Construire un rempart" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Rempart" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "Préférence_s" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Afficher ou masquer la barre d'outils" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "Barre d'ou_tils" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Configurer l'application" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Préfére_nces" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Voir" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Mettre la fenêtre en mode plein écran" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Plein écran" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Voir la carte complète" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Réinitialiser" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Centrer la carte" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Centrer" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "A_ide" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informations à propos de Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "À _propos de Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Montrer le manuel" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Méta-serveur à l'adresse %s, port %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Terminé.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "Le méta-serveur n'est plus disponible.\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "Le méta-serveur a terminé la connexion de manière inattendue.\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Réception du nom des parties du méta-serveur.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "Requête vers le nouveau serveur %s, port %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "Le nouveau serveur a envoyé des informations incomplètes.\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Message inconnu du méta-serveur : %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "Réception de données depuis une session inactive : %s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "Trop de redirections du méta-serveur.\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Mauvaise redirection ligne %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "" "Le méta-serveur est trop vieux pour créer des parties (version %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Données inconnues reçues du méta-serveur : %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Relancer les dés les 2 premiers tours" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Relancer tous les 7" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Par défaut" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Aléatoire" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Redirection vers le méta-serveur %s.\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Redirection vers le méta-serveur %s, port %s.\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Réception d'une liste de serveurs Pioneers depuis le méta-serveur.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Type d'IA" @@ -1110,11 +1416,6 @@ msgid "Requesting new game server.\n" msgstr "Requête en cours pour un nouveau serveur.\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Erreur lors du démarrage de %s : %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1122,9 +1423,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "Annuler" @@ -1149,7 +1450,7 @@ msgstr "_Nouvelle partie distante" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "Re_joindre" @@ -1215,7 +1516,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Règle des sept" @@ -1256,104 +1557,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Nom du joueur" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Entrez votre nom" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Spectateur" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Cochez si vous souhaitez être spectateur" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Rejoindre" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Rejoindre une partie découverte automatiquement" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Méta-serveur" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Rejoindre une partie publique" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Rejoindre une partie publique" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Créer une partie" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Créer une partie" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Rejoindre une partie privée" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Rejoindre une partie privée" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Hôte serveur" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Nom du serveur hébergeant la partie" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Port du serveur" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Port du serveur hébergeant la partie" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Parties récentes" @@ -1372,529 +1673,257 @@ msgid "Discard Resources" msgstr "Jeter les ressources" -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "_Ok" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Vous devez jeter %d ressource" -msgstr[1] "Vous devez jeter %d ressources" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Total des cartes jetées" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "En attente des joueurs jetant des cartes" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Partie terminée" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s a gagné la partie avec %d points de victoire !" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Gloire à %s, seigneur du monde connu !" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Choisissez des ressources" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Vous devez choisir %d ressource" -msgstr[1] "Vous devez choisir %d ressources" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Total des ressources" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "En attente des joueurs qui choisissent" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Partie" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nouvelle partie" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Commencer une nouvelle partie" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "Abandonner _la partie" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Quitter cette partie" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Administrateur" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administrer le serveur Pioneers" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "Nom du joueur" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Changer de pseudonyme" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "Lég_ende" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Légende des terrains et des coûts de construction" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "P_aramètres de la partie" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Paramètres de la partie actuelle" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Histogramme des lancers de dés" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogramme des lancers de dés" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Quitter" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Quitter le programme" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Actions" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Lancer les dés" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Lancer les dés" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Échange" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Annuler" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Terminer" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Route" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Construire une route" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Navire" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Construire un navire" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Déplacer un navire" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Déplacer un navire" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Pont" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Construire un pont" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Colonie" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Fonder une colonie" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Ville" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Eriger une cité" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Carte de Dév." - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Acheter une carte de développement" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Rempart" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Construire un rempart" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "Préférence_s" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Préfére_nces" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Configurer l'application" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Voir" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Réinitialiser" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "Voir la carte complète" - -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Centrer" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "_Ok" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Centrer la carte" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Vous devez jeter %d ressource" +msgstr[1] "Vous devez jeter %d ressources" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "A_ide" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Total des cartes jetées" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "À _propos de Pioneers" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "En attente des joueurs jetant des cartes" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informations à propos de Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Partie terminée" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Montrer le manuel" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s a gagné la partie avec %d points de victoire !" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Plein écran" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Gloire à %s, seigneur du monde connu !" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Mettre la fenêtre en mode plein écran" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Choisissez des ressources" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "Barre d'ou_tils" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Vous devez choisir %d ressource" +msgstr[1] "Vous devez choisir %d ressources" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Afficher ou masquer la barre d'outils" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Total des ressources" + +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "En attente des joueurs qui choisissent" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Pts requis pour gagner : %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Messages" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Carte" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Fin des échanges" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Offre" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Refuser l'offre" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Légende" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Bienvenue à Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Préférences de Pioneers" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "Fermer" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Thème :" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Choisissez un thème" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Afficher la légende" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Afficher la légende en dessous de la carte" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Afficher les messages en couleur" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Afficher les nouveaux messages en couleur" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Afficher les dialogues en couleur" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Afficher les nouveaux messages des joueurs en couleurs" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Afficher les joueurs en couleur" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Utiliser des couleurs pour afficher les joueurs" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Barre d'outils avec ses raccourcis" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Afficher les raccourcis clavier dans la barre d'outils" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Mode silencieux" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "En mode silencieux, aucun son n'est émis" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Annoncer les nouveaux joueurs" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "" "Jouer un son quand un nouveau joueur ou un spectateur entre dans la partie" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Voir les notifications" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" "Afficher les notifications quand c'est votre tour ou quand un nouvel échange " "est proposé" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Utiliser un plateau de jeu 16:9" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Utiliser pour la fenêtre un plateau de jeu compatible 16:9" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "À propos de Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Bienvenue dans Pioneers !" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Histogramme des lancers de dés" @@ -1907,7 +1936,7 @@ msgstr "Choisissez un nouvel emplacement pour le navire" #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "C'est votre tour." @@ -1940,21 +1969,21 @@ msgstr "Mer" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Production des terrains" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Coûts de construction" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Rempart" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Carte de développement" @@ -1985,28 +2014,30 @@ msgstr "Figure :" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variante :" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Se connecter en tant que spectateur" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Hôte du méta-serveur" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Choisir une partie à rejoindre." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Connexion" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Jouer à une partie de Pionneers" @@ -2101,7 +2132,7 @@ msgstr "Cartes de ressource" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Cartes de développement" @@ -2127,66 +2158,76 @@ msgid "The bank is empty" msgstr "La banque est vide" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s a %s et cherche %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Nouvelle offre de %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Offre de %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Je veux" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Accepter" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Effacer" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Refuser l'offre" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Joueur" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Offres" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d : 1 %s pour %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Offre refusée" @@ -2201,240 +2242,220 @@ msgstr "Total" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Ressources en main" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "plus>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Augmenter le montant sélectionné" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Montant sélectionné" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Montant total sélectionné" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "La banque ne peut pas être vide" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Oui" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Non" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Inconnu" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Pas de parties en cours..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Paramètres généraux" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Nombre de joueurs :" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Pts de victoire requis :" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Carte aléatoire :" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Autoriser les échanges entre joueurs :" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Autoriser les échanges uniquement avant de construire ou d'acheter :" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Vérifie la victoire uniquement à la fin du tour :" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Nombre de chaque ressource :" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Règle des sept :" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "Utiliser des cartes-dés au lieu de dés :" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "Nombre paquets de cartes-dés :" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "Nombre de cartes-dés retirées après le mélange :" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Utiliser le pirate pour bloquer les bateaux :" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonus pour la découverte d'une île :" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Quotas de construction" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Routes :" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Colonies :" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Villes :" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Remparts :" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Navires :" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Ponts :" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Pioche des cartes de développement" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Cartes Construction de routes :" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Cartes Monopole :" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Cartes Année faste :" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Cartes Chapelle :" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Cartes Université :" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Cartes Palais du Gouverneur :" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Cartes Bibliothèque :" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Cartes Marché :" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Cartes Chevalier :" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Paramètres de la partie en cours" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "demande %s gratuitement" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "donne %s gratuitement" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "donne %s contre %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Je voudrais %s, et donner %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Offre reçue de %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Appel d'offre" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Accepter l'offre" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "_Fin des échanges" @@ -2499,25 +2520,25 @@ "Cette partie utilise la nouvelle règle '%s' alors qu'elle n'est pas encore " "supportée. Vous devriez faire une mise à jour.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Cette partie ne peut pas être gagnée." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Il n'y a pas de terrain." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Il est possible que ce jeu ne puissent pas être gagné." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" "Cette partie ne peut pas être gagnée uniquement en construisant des colonies " "et des villes." -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2578,176 +2599,176 @@ " Clément Lorteau https://launchpad.net/~northern-lights" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Analyse des points de victoire" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Sur 7, il faut déplacer le voleur ou le pirate" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "Durant les 2 premier tours, on relance les 7" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Tous les 7 sont relancés" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Carte aléatoire" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Carte aléatoire" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Jouer avec le pirate" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Utiliser le pirate pour bloquer les bateaux" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Échanges stricts" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Autoriser les échanges uniquement avant de construire ou d'acheter" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Échanges commerciaux" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Autoriser les échanges entre joueurs" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Victoire en fin de tour" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Vérifie la victoire uniquement à la fin du tour" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "Utiliser des cartes-dés" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "Utiliser 36 cartes-dés à la place de vrais dés" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "Nombre paquets de cartes-dés" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "Nombre de paquets de cartes-dés (de 36 cartes chacun)" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "Nombre de cartes-dés retirées" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "Nombre de cartes-dés qui seront retirées après le mélange du paquet" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Bonus pour la découverte d'une île" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" "Liste des points de bonus (séparés par des virgules) pour la découverte des " "îles" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "Vérifiez et corrigez les bonus pour la découverte d'une île" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Nombre de joueurs" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Nombre de joueurs" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Pts de victoire requis" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Pts requis pour gagner : %i" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Est-il possible de gagner ce jeu ?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "A" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "Bl" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "P" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "L" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Bo" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Choisir un méta-serveur" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Sélectionnez une partie" @@ -2856,30 +2877,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** TYPE DE MESSAGE INCONNU ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Erreur lors de l'écriture du socket : %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "Impossible d'envoyer toutes les données\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Débordement du tampon de lecture - déconnexion\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Erreur lors de la lecture du socket : %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "Erreur lors de la connexion à %s : %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "inconnu" @@ -2889,223 +2910,223 @@ msgstr "Connexion à %s, port %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" "Débordement de la pile d'état. Copie de la pile sur la sortie d'erreur.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Colline" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "C_hamps" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Montagne" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Pré" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "F_orêt" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Désert" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "Me_r" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Or" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "Aucu_n" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Argile (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Blé (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Pierre (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Laine (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "B_ois (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "N'importe _quoi (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "E" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NO" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "O" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SO" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "Placez un hexagone \"colline\"" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "Placez un hexagone \"champ\"" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "Placez un hexagone \"montagne\"" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "Placez un hexagone \"prairie\"" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "Placez un hexagone \"forêt\"" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "Placez un hexagone \"désert\"" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "Placez un hexagone \"mer\"" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "Placez un hexagone \"or\"" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "Effacer cet hexagone" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "Placez un \"2\"" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "Placez un \"3\"" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "Placez un \"4\"" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "Placez un \"5\"" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "Placez un \"6\"" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "Placez un \"8\"" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "Placez un \"9\"" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "Placez un \"10\"" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "Placez un \"11\"" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "Placez un \"12\"" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "Placez un port 2:1 \"argile\"" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "Placez un port 2:1 \"blé\"" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "Placez un port 2:1 \"minerai\"" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "Placez un port 2:1 \"laine\"" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "Placez un port 2:1 \"bois\"" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "Supprimer un port" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "Placez un port 3:1" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3113,242 +3134,231 @@ "Sélectionnez le type de terrain avec le menu contextuel du clic gauche, ou " "permutez un sommet pour ne pas l'utiliser pendant la phase de paramétrage" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Insérer une ligne" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Supprimer une ligne" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Insérer une colonne" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Supprimer une colonne" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "_Titre" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "_Description" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "_Commentaires" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Mélanger" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Paramètres de la partie" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Règles" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Ressources" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Constructions" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "Sans titre" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Éditeur de partie" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "N'a pas réussi à charger '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "N'a pas réussi à enregistrer '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Parties" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Non filtré" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Ouvrir une partie" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 msgid "_Open" msgstr "_Ouvrir" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Enregistrer sous..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 msgid "Save _As" msgstr "Enregistrer sous" #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Changer le nom" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Nouveau titre :" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "_À propos de l'éditeur de parties" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Ouvrir le fichier" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "nom de fichier" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Éditeur de parties pour Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Préférences" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Commentaires" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Fichier" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Nouveau" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Créer une nouvelle partie" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Ouvrir..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nouveau" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Ouvrir une partie existante" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "Enregi_strer" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Ouvrir..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Enregistrer une partie" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Enregistrer sous..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "Enregi_strer" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Enregistrer sous" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "Changer le _titre" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Enregistrer sous..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Changer le nom de la partie" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "Vérifier les points de vi_ctoire requis" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "Changer le _titre" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Vérifier si le jeu peut être gagné" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Quitter" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_À propos de l'éditeur de partie" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "Vérifier les points de vi_ctoire requis" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informations à propos de l'éditeur de partie" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Ouvrir le fichier" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "nom de fichier" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Éditeur de parties pour Pioneers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Échec de la construction des menus : %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Préférences" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Commentaires" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_À propos de l'éditeur de partie" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Nombre de ressources" @@ -3361,51 +3371,51 @@ msgstr "jeu;plateau;créer;éditer;carte;Pioneers;Colons;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Démoniser le méta-serveur au démarrage" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Fichier PID à créer lors de la démonisation (implique -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Rediriger les clients vers un autre méta-serveur" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Utiliser ce nom d'hôte lors de la création de nouvelles parties" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "nom d'hôte" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Utiliser cette plage de ports lors de la création de nouvelles parties" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "de-à" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Messages de débogage système (syslog)" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Méta-serveur pour Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "protocole du méta-serveur :" @@ -3440,200 +3450,190 @@ msgid "Unregistering Avahi.\n" msgstr "Désenregistrement auprès du serveur Avahi.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_À propos du serveur de Pioneers" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Information sur le serveur de Pioneers" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Arrêter le serveur" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Démarrer le serveur" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Arrêter le serveur" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Démarrer le serveur" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Arrivée du joueur %s depuis %s\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Départ du joueur %s depuis %s\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Le joueur %d s'appelle maintenant %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "Le port du serveur" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Annoncer le serveur" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Annoncer cette partie sur le méta-serveur" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Nom d'hôte" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" "Le nom de cet ordinateur (nécessaire pour jouer depuis derrière un pare-feu)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Tours de jeu aléatoires" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Rendre les tours de jeu aléatoires" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Montrer tous les joueurs et spectateurs connectés au serveur" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Connecté" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Est-ce que le joueur est bien connecté ?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Nom" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Nom du joueur" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Adresse" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Adresse du joueur" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Numéro" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Numéro du joueur" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Rôle" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Joueur ou spectateur" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Démarrer le client Pioneers" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Démarrer le client Pioneers" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Discussion autorisée" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Autoriser les messages" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Ajouter une IA" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Ajouter une IA" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Messages du serveur" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Paramètres de la partie" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Paramètres du serveur" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Partie en cours" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Joueurs connectés" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "IA" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Messages" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 msgid "About the Pioneers Game Server" msgstr "A propos du serveur de parties Pioneers" @@ -3641,18 +3641,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "La partie est terminée.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Héberger une partie de Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Serveur Pioneers" @@ -3664,145 +3664,155 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "jeu;plateau;serveur;hôte;Pioneers;Colons;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Information sur le serveur de Pioneers" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_À propos du serveur de Pioneers" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Nom de la partie" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Fichier de partie à utiliser" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Port à écouter" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Outrepasser le nombre de joueurs" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Outrepasser le nombre de points requis pour gagner" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Outrepasser la gestion de la règle des 7" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "Outrepasser la gestion des cartes-dés" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "Outrepasser le nombre de cartes dans la gestion des cartes-dés" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "" "Outrepasser le nombre de cartes supprimées dans la gestion des cartes-dés" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Outrepasser le type de terrain : 0 = défaut, 1 = aléatoire" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Ajouter N joueurs IA" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Annoncer cette partie sur le méta-serveur" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Nom du méta-serveur d'enregistrement (implique -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Utiliser ce nom d'hôte lors de l'enregistrement" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Quitter après qu'un joueur ait gagné" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Quitter après N secondes sans joueurs" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Mode tournoi, joueurs IA ajoutés après N minutes" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Port à écouter pour l'administration" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "Ne pas démarrer la partie immédiatement, attendre une commande sur le port " "d'administration" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "" "Attribuer aux joueurs un numéro selon leur ordre d'arrivée dans la partie" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Options du méta-serveur" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Options du méta-serveur" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Options diverses" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Options diverses" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" "Impossible de définir le titre du jeu et le nom de fichier en même temps\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Impossible de charger les paramètres de la partie\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3812,7 +3822,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "La connexion au méta-serveur a été perdue.\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3823,45 +3834,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Tentative de reconnexion au méta-serveur.\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "Enregistrement sur le méta-serveur %s.\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "Se désinscrire du méta-serveur.\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "dialogue trop long" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "nom trop grand" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignorer les extensions inconnues" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "Le dernier joueur est parti, le sablier du tournoi a été réinitialisé." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "Aucun joueur humain présent. Au revoir." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "La partie démarre, ajout des IA." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "La partie démarre dans %s minutes." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "La partie démarre dans %s minute." @@ -3870,11 +3881,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "IA" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "Impossible de déterminer le nom d'hôte du joueur : %s" @@ -3882,50 +3893,50 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "La partie est terminée." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Le joueur depuis %s a été rejeté : la partie est terminée\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Le nom n'a pas été changé : le nouveau nom est déjà pris" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "" "Le serveur fonctionne depuis trop longtemps sans qu'il n'y ait de joueurs... " "Au revoir.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "Le dernier joueur humain est parti. Attendons le retour d'un joueur." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Recommencer la partie." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s s'est reconnecté." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Versions incompatibles : %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "La partie va bientôt démarrer." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Préparation de la partie" @@ -3946,6 +3957,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "Le jet de dés a été défini par l'administrateur." +#~ msgid "Quit the program" +#~ msgstr "Quitter le programme" + +#~ msgid "" +#~ msgstr "plus>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Augmenter le montant sélectionné" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Échec de la construction des menus : %s" + #~ msgid "Join the selected game" #~ msgstr "Rejoindre la partie sélectionnée" diff -Nru pioneers-15.5/po/gl.po pioneers-15.6/po/gl.po --- pioneers-15.5/po/gl.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/gl.po 2020-08-02 12:37:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Pioneers 0.12.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2010-04-05 08:14+0000\n" "Last-Translator: Indalecio Freiría Santos \n" "Language-Team: Galician \n" @@ -59,8 +59,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Activar as mensaxes depuradas" @@ -70,8 +70,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Amosar información da versión" @@ -80,9 +80,9 @@ msgid "- Computer player for Pioneers" msgstr "Xogador do computador para Pioneiros" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Versión de Pioneiros:" @@ -335,8 +335,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -369,7 +369,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Sen conexión" @@ -399,7 +399,7 @@ msgstr "%s recibe %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s toma a %s.\n" @@ -444,70 +444,70 @@ "Versión é incompatíbel, Asegúrese de que o cliente e o servidor están " "actualizados.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Constrúa dous asentamentos, cada un cunha conexión" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Constrúa un asentamento cunha conexión" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "camiño" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "ponte" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "barco" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " ou" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Esperando quenda." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Elixe o edificio que queres roubar." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Elixe o barco queres roubar" -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Coloca o ladrón." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Remata a acción de construción do camiño" -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Construír un tramo do camiño." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Construír dous tramos do camiño" #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Tócache." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Sintoo, %s dispoñíbel.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Rematou o xogo." @@ -561,7 +561,7 @@ msgid "%s took %s from %s.\n" msgstr "%s toma %s de %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "" @@ -571,7 +571,7 @@ msgid "spectator %d" msgstr "" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Xogador %d" @@ -897,6 +897,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "calquera recurso (erro)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -942,12 +948,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Comeza a quenda %d para %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, fuzzy, c-format +msgid "Error starting %s: %s\n" +msgstr "Erro ao empezar %s: %s" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneiros" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "" @@ -980,111 +1000,399 @@ msgid " said: " msgstr " di: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Xogo" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Comezar un xogo novo" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "Partida _nova" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Abandonar esta partida" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Abandonar a partida" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administrar o servidor de Pioneiros" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Administrar" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Cambiar o teu nome de xogador" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "Nome do _xogador" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Lenda do terreo e costos de construción" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "L_enda" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Axustes do xogo actual" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Axustes do xogo" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histograma das tiradas" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Histograma dos dados" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Saír" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Saír" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Accións" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Tirar os dados" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Tirar os dados" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Comercio" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Desfacer" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Rematar" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Construir un camiño" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Camiño" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Construir un barco" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Barco" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Mover un barco" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Mover o barco" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Construír unha ponte" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Ponte" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Construír un asentamento" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Asentamento" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Construir unha cidade" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Cidade" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Mercar unha carta de desenvolvemento" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Desenvolver" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Construír unha muralla para a cidade" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Muralla da cidade" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Axustes" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Amosar ou ocultar a barra de ferramentas" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Barra de ferramentas" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Configurar o aplicativo" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Prefere_ncias" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +#, fuzzy +msgid "_View" +msgstr "Visor" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Axuda" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Información acerca de Pioneiros" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Acerca de Pioneiros" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Amosar o manual" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metaservidor en %s, porto %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Rematado.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Recibindo nomes do xogo dende o metaservidor.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, fuzzy, c-format msgid "New game server requested on %s port %s.\n" msgstr "Novo servidor solicitado en %s porto %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Mensaxe descoñecida do metaservidor: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 #, fuzzy msgid "Too many metaserver redirects.\n" msgstr "Demasiada redireccións do metaservidor\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Mala liña de redireccionamento: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Metaservidor moi vello para crear servidores(versión %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, fuzzy, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Mensaxe descoñecida do metaservidor: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Volver a tirar durante as dúas primeiras quendas" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Tirar de novo todos os setes" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Predefinido" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Aleatorio" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, fuzzy, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Desviado ao metaservidor en %s, porto %s\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, fuzzy, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Desviado ao metaservidor en %s, porto %s\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Recibindo unha lista de servidores Pioneiros do meta-servidor.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 #, fuzzy msgid "Number of computer players" msgstr "Tipo de xogador do computador" @@ -1107,11 +1415,6 @@ msgid "Requesting new game server.\n" msgstr "Pidindo un novo servidor de xogo\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, fuzzy, c-format -msgid "Error starting %s: %s\n" -msgstr "Erro ao empezar %s: %s" - #. Dialog caption #: ../client/gtk/connect.c:1037 #, fuzzy @@ -1120,9 +1423,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1148,7 +1451,7 @@ msgstr "_Novo xogo remoto" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "" @@ -1214,7 +1517,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Regra dos setes" @@ -1256,105 +1559,105 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Nome de xogador" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Insire o teu nome de xogador" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 #, fuzzy msgid "Check if you want to be a spectator" msgstr "Queres ser un espectador?" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaservidor" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Unirse a un xogo público" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Unir a un xogo público" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Crear un xogo" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Crear un xogo" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Unirse a un xogo privado" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Unirse a un xogo privado" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Servidor" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Nome do servidor do xogo" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Porto do Servidor" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Porto do servidor do xogo" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Xogos recentes" @@ -1375,527 +1678,255 @@ #. Button text #: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, fuzzy, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Tes que descartar %d recursos" -msgstr[1] "Tes que descartar %d recursos" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Descartes totais" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Esperando a que os xogadores descarten" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Fin da partida" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s gañou con %d puntos!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Louvanzas a %s, Señor do mundo coñecido!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Elixe recursos" - -#: ../client/gtk/gold.c:96 -#, fuzzy, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Podes elixir %d recursos" -msgstr[1] "Podes elixir %d recursos" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Recursos totais" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Esperando a que os xogadores elixan" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Xogo" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "Partida _nova" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Comezar un xogo novo" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Abandonar a partida" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Abandonar esta partida" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Administrar" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administrar o servidor de Pioneiros" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "Nome do _xogador" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Cambiar o teu nome de xogador" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "L_enda" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Lenda do terreo e costos de construción" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Axustes do xogo" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Axustes do xogo actual" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Histograma dos dados" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histograma das tiradas" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Saír" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Saír do aplicativo" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Accións" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Tirar os dados" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Tirar os dados" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Comercio" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Desfacer" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Rematar" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Camiño" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Construir un camiño" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Barco" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Construir un barco" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Mover o barco" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Mover un barco" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Ponte" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Construír unha ponte" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Asentamento" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Construír un asentamento" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Cidade" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Construir unha cidade" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Desenvolver" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Mercar unha carta de desenvolvemento" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Muralla da cidade" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Construír unha muralla para a cidade" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Axustes" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Prefere_ncias" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Configurar o aplicativo" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -#, fuzzy -msgid "_View" -msgstr "Visor" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "" +#: ../client/gtk/discard.c:101 +#, fuzzy, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Tes que descartar %d recursos" +msgstr[1] "Tes que descartar %d recursos" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Descartes totais" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Axuda" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Esperando a que os xogadores descarten" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Acerca de Pioneiros" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Fin da partida" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Información acerca de Pioneiros" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s gañou con %d puntos!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Amosar o manual" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Louvanzas a %s, Señor do mundo coñecido!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Elixe recursos" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "" +#: ../client/gtk/gold.c:96 +#, fuzzy, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Podes elixir %d recursos" +msgstr[1] "Podes elixir %d recursos" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Barra de ferramentas" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Recursos totais" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Amosar ou ocultar a barra de ferramentas" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Esperando a que os xogadores elixan" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Puntos necesarios para gañar: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Mensaxes" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Mapa" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Rematar negocio" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Comiñas" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Rexeitar negocio domestico" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Lenda" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Benvido ao Pioneiros" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Preferencias de Pioneiros" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Elixir un dos temas" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Amosar a lenda" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Amosar a lenda como unha páxina xunto ao mapa?" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Usar cores nas mensaxes?" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Usar cores nas mensaxes novas?" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "conversar coa cor do xogador?" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Amosar as novas mensaxes de conversa na cor do xogador" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Resume con cor" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Usar cores no resume do xogador" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Barra de ferramentas con acceso directo" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Amosar os accesos directos de teclado na barra de ferramentas" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Modo silencioso" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "En modo de silencio, non se reproducen sons." #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Anunciar novos xogadores" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 #, fuzzy msgid "Make a sound when a new player or spectator enters the game" msgstr "Facer un son cando un xogador novo ou visor entre ao xogo" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 #, fuzzy msgid "Show notifications" msgstr "Amosar información da versión" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Usa un tema de 16:9" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Usar unha disposición para a xanela de 16:9" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "Tirar os dados" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Acerca de Pioneiros" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Benvenido ao Pioneiros!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneiros" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Histograma dos dados" @@ -1908,7 +1939,7 @@ msgstr "Seleccione unha localización nova para o barco" #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 #, fuzzy msgid "It is your turn to setup." msgstr "Tócache." @@ -1942,21 +1973,21 @@ msgstr "Mar" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Produción de terreo" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Custes de construción" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Muralla da cidade" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Carta de desenvolvemento" @@ -1987,29 +2018,31 @@ msgstr "Cara:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variante:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 #, fuzzy msgid "Connect as a spectator" msgstr "Conectar como visor" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Meta-servidor do anfitrion" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Seleccionar un xogo para unirse." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Conectando" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Xogar unha partida de Pioneiros" @@ -2104,7 +2137,7 @@ msgstr "Cartas de recurso" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Cartas de desenvolvemento" @@ -2130,66 +2163,77 @@ msgid "The bank is empty" msgstr "O banco está vacio" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s ten %s e quere %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, fuzzy, c-format msgid "New offer from %s." msgstr "Roubas %s a %s.\n" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Quero..." #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Dalles..." #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Eliminar" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Permitir conversa" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Rexeitar negocio domestico" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Xogador" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Comiñas" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s por %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Negocio rexeitado" @@ -2204,242 +2248,222 @@ msgstr "Total" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Cartas de recurso en man" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "máis>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Incrementar a cantidade seleccionada" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Cantidade seleccionada" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Cantidade seleccionada total" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "O banco non se pode baleirar" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Si" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Non" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Descoñecido" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "No hai xogo en proceso" #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Configuracións xerais" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Número de xogadores:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Punto de victoria:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Terreo ao chou:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Permitir comerciar entre xogadores:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Permitir comerciar só antes de construír ou mercar:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 #, fuzzy msgid "Check victory only at end of turn:" msgstr "Revisa a vitoria unicamente ao rematar a quenda" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Cantidade de cada recurso:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Regra dos setes:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 #, fuzzy msgid "Number of dice decks:" msgstr "Número de xogadores:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Use ao pirata para bloquear barcos:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonificacións por descubrimento de illas:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Custos de construción" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Camiños:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Asentamentos:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Cidades:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Muros da cidade:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Barcos:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Pontes:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Cartas de desenvolvemento" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Cartas de construír camiños:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Cartas de monopolio:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Cartas de ano de abundancia:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Cartas de capela:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Cartas de universidade de Pioneiros:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Cartas de palacio do gobernador:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Cartas de biblioteca:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Cartas de mercado:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Cartas de soldado:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Axuste do xogo actual" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "pida %s gratis" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "ofreza %s gratis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "ofreza %s por %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Quero %s, e darlles %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, fuzzy, c-format msgid "Quote received from %s." msgstr "%s recibe %s.\n" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "Pedir orzamentos" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Aceptar orzamento" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "Rematar negocio" @@ -2496,24 +2520,24 @@ "upgrading.\n" msgstr "" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Este xogo non se puede gañar." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Non hai terra" -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "É posíbel que este xogo non se poida gañar." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" "Este xogo pode gañarse con só construír todos os asentamentos e cidades." -#: ../common/game.c:971 +#: ../common/game.c:970 #, fuzzy, c-format msgid "" "Required victory points: %d\n" @@ -2570,177 +2594,177 @@ " Indalecio Freiría Santos https://launchpad.net/~ifreiria" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Todos os 7 quitan o ladrón ou o pirata" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "Nas primeiras dúas quendas todos os 7 tíranse de novo" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Todos os 7 tíranse de novo" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Facer o terreo ao chou" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Facer o terreo ao chou" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Use pirata" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Use ao pirata para bloquear barcos" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Negocio rigoroso" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Permitir comerciar só antes de construír ou mercar" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Negocio local" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Permitir comerciar entre xogadores" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Vitoria ao rematar a quenda" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Revisa a vitoria unicamente ao rematar a quenda" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 #, fuzzy msgid "Number of dice decks" msgstr "Tipo de xogador do computador" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 #, fuzzy msgid "Island discovery bonuses" msgstr "Bonificacións por descubrimento de illas:" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 #, fuzzy msgid "Check and correct island discovery bonuses" msgstr "Bonificacións por descubrimento de illas:" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Número de xogadores" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Número de xogadores" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Punto de vitoria" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Puntos precisos para gañar o xogo" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Pódese gañar este xogo?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "Porto de Ladrillo|L" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "Porto de cereais|C" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "Porto de ouro|O" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "Porto de lá|La" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Porto de madeira|M" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Seleccionar un meta-servidor" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Seleccione un xogo" @@ -2849,30 +2873,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** TIPO DE MENSAXE DESCOÑECIDA ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "erro escribindo conectador: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Ler desbordamento de buffer - desconectando\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Erro lendo conectador: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, fuzzy, c-format msgid "Error connecting to %s: %s\n" msgstr "Erro conectando a %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "descoñecido" @@ -2882,472 +2906,461 @@ msgstr "Conectando a %s, porto %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" "Estado de desbordamento de pila. Volteado de pila enviado a erro estándar.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Outeiro" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Leira" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Montaña" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Prado" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Bosque" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Deserto" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "M_ar" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "O_uro" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Ningún" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "La_drillo (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Cereais (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "Mine_rais (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Lá (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Madeira (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "Calquera (_3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "Leste|L" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "Nordeste|NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "Noroeste|NO" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "Oeste@O" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "Suroeste|SO" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "Sureste|SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 #, fuzzy msgid "Remove a port" msgstr "Porto do Servidor" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 #, fuzzy msgid "Delete a row" msgstr "Eliminar" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 #, fuzzy msgid "_Title" msgstr "Cambiar _titulo" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 #, fuzzy msgid "_Description" msgstr "_Deserto" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Ao chou" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Parametros do xogo" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Regras" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Recursos" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Construccións" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Editor de Pioneiros" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Falla ao cargar '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Falla ao gardar a '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 #, fuzzy msgid "Games" msgstr "_Xogo" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Abrir partida" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Abrir..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Gardar como..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Gardar _como..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Cambiar titulo" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Novo titulo:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Acerca do editor de Pioneiros" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Abrir este ficheiro" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "nome de ficheiro" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor para xogos de Pioneiros" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Axustes" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Ficheiro" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Novo" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Crear un novo xogo" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Abrir..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Novo" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Abrir un xogo existente" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Gardar" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Abrir..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Gardar o xogo" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Gardar _como..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Gardar" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Gardar como" #. Menu entry -#: ../editor/gtk/editor.c:1748 -#, fuzzy -msgid "Change _Title" -msgstr "Cambiar titulo" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Gardar _como..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Cambiar titulo do xogo" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "Comproba o obxetivo de puntos de _victoria" +#: ../editor/gtk/editor.ui.h:22 +#, fuzzy +msgid "Change _Title" +msgstr "Cambiar titulo" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Comproba cando pode gañarse o xogo" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Saír" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Acerca do editor de Pioneiros" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "Comproba o obxetivo de puntos de _victoria" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informacion acerca de editor de Pioneiros" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Abrir este ficheiro" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "nome de ficheiro" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor para xogos de Pioneiros" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Construción menús fallada: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Axustes" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Acerca do editor de Pioneiros" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Conta de recursos" @@ -3360,51 +3373,51 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Converter en daemon o meta servidor ao iniciar" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Ficheiro PID a crear ao converter en daemon (implica -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Redirixir clientes a outro meta-servidor" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Usar este nome de servidor ao crear novas partidas" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "nome de equipo" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Usa este rango de portos cando estea creando novos xogos" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "de-para" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Depurar mensaxes do log do sistema" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Meta Servidor para Pioneiros" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "protocolo do meta-servidor:" @@ -3439,203 +3452,193 @@ msgid "Unregistering Avahi.\n" msgstr "" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Acerca do servidor de Pioneiros" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Información do servidor Pioneiros" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Deter o servidor" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Iniciar o servidor" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Deter o servidor" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Inicie o servidor" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Entrou o xogador %s de %s\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "O xogador %s de %s foise\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "O xogador %d é agora %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "O porto para o servidor do xogo" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Rexistrar o servidor" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Rexistrar este xogo no meta-servidor" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Nome informado do anfitrión" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" "O nome público deste computador (preciso cando se xoga a través dun firewall)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 #, fuzzy msgid "Random turn order" msgstr "Desordenar a orde das quendas" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Desordenar a orde das quendas" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 #, fuzzy msgid "Shows all players and spectators connected to the server" msgstr "Amosar todos os xogadores e visores conectados ao servidor" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Conectado" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Está conectado actualmente o xogador ?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Nome" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Nome do xogador" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Ubicación" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Nome do xogador anfitrión" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Número" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Número do xogador" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Rol" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 #, fuzzy msgid "Player or spectator" msgstr "Xogador de visor" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Lanzar o cliente de Pioneiros" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Lanzar o cliente de Pioneiros" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Permitir conversa" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Permitir as mensaxes de conversa" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Engadir un xogador do computador" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Engadir un xogador do computador no xogo" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Mensaxes do servidor" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Configuración do xogo" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Parámetros do servidor" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Xogo actual" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Xogadores conectados" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Xogadores do computador" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Mensaxes" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "O servidor do xogo Pioneiros" @@ -3644,18 +3647,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "O xogo rematou.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Organice un xogo de Pioneiros" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Servidor de Pioneiros" @@ -3667,132 +3670,142 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Información do servidor Pioneiros" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Acerca do servidor de Pioneiros" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Título do xogo para usar" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Ficheiro de xogo para usar" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Porto para escoitar" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Anular o número de xogadores" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Anular o número de puntos precisos para gañar" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Anular a regra do 7" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 #, fuzzy msgid "Override dice-deck handling" msgstr "Anular a regra do 7" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 #, fuzzy msgid "Override num-dice-decks handling" msgstr "Anular a regra do 7" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 #, fuzzy msgid "Override num-removed-dice-cards handling" msgstr "Anular a regra do 7" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Anular tipo de terreo, 0=predefinido 1=ao chou" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Engadir N xogadores do computador" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Rexistrar o servidor co meta-servidor" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Rexistrar en nome do meta-servidor (supón -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Usar este nome de máquina cando se rexistre" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Saír despois de que un xogador gañe" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Saír despois de N segundos sen xogadores" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Modo de torneo, xogadores do computador engadidos despois de N minutos" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Porto administrador para a escoita" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "Non comece o xogo inmediatamente, espere unha orde do porto administrador" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Dar números de xogadores de acordo á orde na que entren no xogo" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Opción do metaservidor" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opción para o metaservidor" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Opcións varias" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Opcións varias" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" @@ -3800,13 +3813,13 @@ "tempo\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Non se poden cargar os parámetros da partida\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3816,7 +3829,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Opción para o metaservidor" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3828,46 +3842,46 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Opción para o metaservidor" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, fuzzy, c-format msgid "Register with the metaserver at %s.\n" msgstr "Rexistrar co metaservidor no %s, porto %s\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 #, fuzzy msgid "Unregister from the metaserver.\n" msgstr "Darse de baixa do metaservidor\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "Conversa demasiado longa" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "Nome demasiado longo" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignorar extensión descoñecida" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "O ultimo xogador saíu, o contador do torneo restableceuse." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "A partida comeza, engadindo xogadores do computador." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "O xogo comeza en %s minutos." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "O xogo comeza en %s minutos." @@ -3876,11 +3890,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Xogador do computador" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3888,48 +3902,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "O xogo rematou." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Xogador de %s rexeitado: fin do xogo\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "O nome non cambiou: o novo nome xa está en uso" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Esperouse demasiado tempo sen xogadores... Adeus.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s reconectouse." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "A versión non coincide: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Este xogo comezará en breve" #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Preparando a partida" @@ -3950,6 +3964,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "O rol do dado foi determinado polo administrador." +#~ msgid "Quit the program" +#~ msgstr "Saír do aplicativo" + +#~ msgid "" +#~ msgstr "máis>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Incrementar a cantidade seleccionada" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Construción menús fallada: %s" + #~ msgid "Join the selected game" #~ msgstr "Unirse ao xogo seleccionado" diff -Nru pioneers-15.5/po/hu.po pioneers-15.6/po/hu.po --- pioneers-15.5/po/hu.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/hu.po 2020-08-02 12:37:55.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Pioneers 0.12.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2008-04-05 15:37+0200\n" "Last-Translator: Ferenc Bánhidi \n" "Language-Team: Hungarian \n" @@ -59,8 +59,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Debug üzenetek engedélyezése" @@ -70,8 +70,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Verzió információ" @@ -80,9 +80,9 @@ msgid "- Computer player for Pioneers" msgstr "- Robot játékos a Pioneers játékhoz" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers verzió" @@ -335,8 +335,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -369,7 +369,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Nincs kapcsolatban" @@ -399,7 +399,7 @@ msgstr "%s kap %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s felhasznál %s.\n" @@ -444,74 +444,74 @@ "Verzió eltérés. Kérlek ellenőrizd van-e frissítés a klienshez és a " "szerverhez.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Építs két falut, és mindegyikhez csatlakozzon egy" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Építs egy falut és csatlakozzon hozzá egy" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "út" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "híd" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "hajó" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " vagy" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Várj a körödre." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "" "Válaszd ki az épüetet\n" "akitől lopni szeretnél." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "" "Válaszd ki a hajót\n" "akitől lopni szeretnél." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Helyezd el a rablót." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Vége az útépítésnek." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Épít egy utat." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Épít két utat." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Ez a te köröd." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Bocs, %s használható.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "A játéknak vége." @@ -565,7 +565,7 @@ msgid "%s took %s from %s.\n" msgstr "%s elvesz %s játékostól %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "" @@ -575,7 +575,7 @@ msgid "spectator %d" msgstr "" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Játékos %d" @@ -902,6 +902,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "bármelyik nyersanyag (bug)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -947,12 +953,26 @@ msgid "Begin turn %d for %s.\n" msgstr "%d. köre kezdődik, %s játékosnak.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, fuzzy, c-format +msgid "Error starting %s: %s\n" +msgstr "Inditási hiba %s: %s" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "" @@ -985,111 +1005,400 @@ msgid " said: " msgstr " mondja: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Játék" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Új játék indítása" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "Új já_ték" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Játék elhagyása" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "Játék _elhagyása" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Pioneers szerver adminisztrálás" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Adminsztárció" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Játékos neved módostása" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "Játékos _neve" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Táj magyarázat és építmény árak" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +#, fuzzy +msgid "L_egend" +msgstr "Je_lmagyarázat" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Aktuális játék beállitásai" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Játék beállítások" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Kocka dobások statisztikája" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Dobás statisztika" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Kilépés" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Kilépés" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Tevékenység" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "A kocka dobása" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Kocka dobás" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Kereskedelem" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Visszavonás" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Kész" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Út építés" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Út" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Hajó építés" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Hajó" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Hajó mozgatás" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Hajó mozgatás" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Híd építés" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Híd" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Falu építés" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Falu" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Város építés" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Város" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Fejlesztés kártya vásárlás" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Fejlesztés" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Város építés" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Város fal" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Beállítások" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Eszköztár megjelenítése vagy elrejtése" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Eszköztár" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Program konfigurálás" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "_Beállítások" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +#, fuzzy +msgid "_View" +msgstr "Szemlélő" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Súgó" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Információ a Pioneersről" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "Pioneers _névjegy" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Kézikönyv" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Meta szerver: %s, port: %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Kész.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Játékok vétele a meta szerverről.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, fuzzy, c-format msgid "New game server requested on %s port %s.\n" msgstr "Szerver kérés új játékra: %s, port: %s\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Ismeretlen üzenet a metaszervertől: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 #, fuzzy msgid "Too many metaserver redirects.\n" msgstr "Túl sok meta szerver átirányítás\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Hibás átirányított vonal: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Meta szerver túl régi a szerver létrehozáshoz (verzió %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, fuzzy, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Ismeretlen üzenet a metaszervertől: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normál" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Első két körben újradobás" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Mindig újradobás" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Alapértelmezett" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Véletlen" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, fuzzy, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Átirányítva %s meta szerverhez, %s portra\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, fuzzy, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Átirányítva %s meta szerverhez, %s portra\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Pioneers szerver lista fogadása a meta szervertől.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 #, fuzzy msgid "Number of computer players" msgstr "A játékos típusa" @@ -1112,11 +1421,6 @@ msgid "Requesting new game server.\n" msgstr "Új játékszerver kérés\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, fuzzy, c-format -msgid "Error starting %s: %s\n" -msgstr "Inditási hiba %s: %s" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1124,9 +1428,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1152,7 +1456,7 @@ msgstr "Ú_j távoli játék" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "" @@ -1218,7 +1522,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Hetes szabály" @@ -1260,105 +1564,105 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Játékos neve" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Add meg a neved" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 #, fuzzy msgid "Check if you want to be a spectator" msgstr "Szemlélő akarsz lenni?" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Meta szerver" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Csatlakozás nyilvános játékhoz" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Játékba jelentkezés" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Játék létrehozása" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Játék létrehozása" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Csatlakozás privát játékhoz" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Csatlakozás egy privát játékhoz" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Szerver gép" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "A játékot futtató gép neve" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Szerver port" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "A játékot futtató gép portja" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Legutóbbi játékok" @@ -1379,528 +1683,255 @@ #. Button text #: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "" -msgstr[1] "El kell dobnod %d db nyersanyagot" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Összes eldobása" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Várunk míg dobnak a játékosok" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Játék vége" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s megnyerte a játékot, %d ponttal!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "%s minden elismerésünk. Te vagy a világ ura!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Válassz nyersanyagokat" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "" -msgstr[1] "Választhatsz %d db nyersanyagot" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Összes nyersanyag" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Várunk a játékosokra, hogy válasszanak" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Játék" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "Új já_ték" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Új játék indítása" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "Játék _elhagyása" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Játék elhagyása" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Adminsztárció" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Pioneers szerver adminisztrálás" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "Játékos _neve" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Játékos neved módostása" - -#. Menu entry -#: ../client/gtk/gui.c:249 -#, fuzzy -msgid "L_egend" -msgstr "Je_lmagyarázat" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Táj magyarázat és építmény árak" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Játék beállítások" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Aktuális játék beállitásai" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Dobás statisztika" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Kocka dobások statisztikája" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Kilépés" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Kilépés a programból" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Tevékenység" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Kocka dobás" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "A kocka dobása" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Kereskedelem" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Visszavonás" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Kész" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Út" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Út építés" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Hajó" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Hajó építés" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Hajó mozgatás" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Hajó mozgatás" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Híd" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Híd építés" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Falu" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Falu építés" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Város" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Város építés" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Fejlesztés" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Fejlesztés kártya vásárlás" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Város fal" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Város építés" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Beállítások" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "_Beállítások" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Program konfigurálás" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -#, fuzzy -msgid "_View" -msgstr "Szemlélő" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "" +msgstr[1] "El kell dobnod %d db nyersanyagot" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Összes eldobása" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Súgó" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Várunk míg dobnak a játékosok" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "Pioneers _névjegy" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Játék vége" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Információ a Pioneersről" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s megnyerte a játékot, %d ponttal!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Kézikönyv" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "%s minden elismerésünk. Te vagy a világ ura!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Válassz nyersanyagokat" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "" +msgstr[1] "Választhatsz %d db nyersanyagot" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Eszköztár" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Összes nyersanyag" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Eszköztár megjelenítése vagy elrejtése" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Várunk a játékosokra, hogy válasszanak" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Nyeréshez szükséges pontok: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Üzenetek" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Térkép" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Kereskedés befejezése" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Kínál" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Elutasított belső üzlet" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Jelmagyarázat" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Üdvözlünk a Pioneersban" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioneers beállítások" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Téma:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Válassz egyett a témák közül" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Jelmagyarázat megjelenítése" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Jelmagyarázat megjelenítése a térkép mellett" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Színes üzenetek" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Új üzenetek megjelenítése színesen" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Játékosok üzenetei színesen" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Új üzenetek megjelenítése a játékosok színével" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Összesítés színesben" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Színek használata a játékos összesítésben" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Eszköztár gyorsbillentyűkkel" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Gyorsbillentyűk megjelenítése az eszköztáron" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Csendes mód" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "Csendes módban nincsenek hangok" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Új játékosok jelzése" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 #, fuzzy msgid "Make a sound when a new player or spectator enters the game" msgstr "Hangjelzés, amikor egy új játékos vagy szemlélő belép a játékba" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 #, fuzzy msgid "Show notifications" msgstr "Verzió információ" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "16:9-es elrendezés" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Elrendezés 16:9-es ablakhoz" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "A kocka dobása" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Pioneers névjegy" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Üdvözlünk a Pioneersban!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Dobás statisztka" @@ -1913,7 +1944,7 @@ msgstr "Válaszd ki a hajó új helyét." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 #, fuzzy msgid "It is your turn to setup." msgstr "Ez a te köröd." @@ -1947,21 +1978,21 @@ msgstr "Tenger" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Vidék hozama:" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Építmény árak:" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Város fal" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Fejlesztés kártya" @@ -1992,29 +2023,31 @@ msgstr "Arc:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Változat:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 #, fuzzy msgid "Connect as a spectator" msgstr "Csatlakozás szemlélőként" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Meta-szerver host" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Válassz egy játékot." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Kapcsolódás" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Játsz egy játékot a Pioneersszal" @@ -2109,7 +2142,7 @@ msgstr "Nyersanyag kártya" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Fejlesztés kártyák" @@ -2135,66 +2168,77 @@ msgid "The bank is empty" msgstr "A bank üres" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s kínál %s nyersanyagot, és cserébe szeretne %s nyersanyagot" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, fuzzy, c-format msgid "New offer from %s." msgstr "Lopsz %s %s játékostól.\n" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Szeretnék" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Adok érte" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Törlés" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Chat engedélyezése" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Elutasított belső üzlet" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Játékos" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Ajánlatok" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s:%s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Elutasított üzlet" @@ -2209,243 +2253,223 @@ msgstr "Összes" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Összeg a kézben" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr ">több" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Kiválasztott mennyiség növelése" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Kiválasztott összeg" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Összes kválasztott összeg" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "A bank nem lehet üres" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Igen" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Nem" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Ismeretlen" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Nincs játék folyamatban..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Általános beállítások" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Játékosok száma:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Nyerő pont:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Véletlen táj:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Engedélyezett játékosok közötti kereskedés:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Kereskedés csak építkezés / vásárlás előtt:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 #, fuzzy msgid "Check victory only at end of turn:" msgstr "Csak a kör végén ellenőrizd a győzelmet:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 #, fuzzy msgid "Amount of each resource:" msgstr "Összes nyersanyag száma:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Hetes szabály:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 #, fuzzy msgid "Number of dice decks:" msgstr "Játékosok száma:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Használj kalózt a hajók megállítására:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Sziget felfedezés bónuszok:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Épület árak" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Utak:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Falvak:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Városok" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Város falak:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Hajók:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Hidak:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Fejlesztés kátyák" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Útépítő kártyák:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Monopólium kártyák:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Bőség éve kártyák:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Kápolna kártyák:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Pioneer egyetem kártyák:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Kormányzók háza kártyák:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Könyvtár kártyák:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Piac kártyák:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Katona kártyák:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Aktuális játék beállítások" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "%s nyersanyagot kérek ingyen" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "Adok %s ingyen" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "Ad %s kér %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Szeretnék %s nyersanyagot, cserébe adok %s nyersanyagot" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, fuzzy, c-format msgid "Quote received from %s." msgstr "%s kap %s.\n" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Ajánlatot kér" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Ajánlat elfogadása" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "_Kereskedés befejezése" @@ -2502,23 +2526,23 @@ "upgrading.\n" msgstr "" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "A játékot nem lehet megnyerni." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Nincs vidék" -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Lehet, hogy a játékot nem lehet megnyerni." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "A játékot csak az összes falu és város megépítésével lehet megnyerni." -#: ../common/game.c:971 +#: ../common/game.c:970 #, fuzzy, c-format msgid "" "Required victory points: %d\n" @@ -2573,177 +2597,177 @@ msgstr "Ferenc Bánhidi" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Minden hetes dobás mozgatja a rablót vagy a kalózt" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "Az első két körben minden hetes dobás újradobandó" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Minden hetes dobás újradobandó" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Véletlen táj?" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Véletlen táj?" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Kalóz használat" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Használj kalózt a hajók megállítására" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Szigorú kereskedés" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Kereskedés csak építkezés / vásárlás előtt?" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Játékosok közötti kereskedés" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Engedélyezett játékosok közötti kereskedés" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Győzelem a kör végén" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Csak a kör végén ellenőrizd a győzelmet" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 #, fuzzy msgid "Number of dice decks" msgstr "A játékos típusa" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 #, fuzzy msgid "Island discovery bonuses" msgstr "Sziget felfedezés bónuszok:" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 #, fuzzy msgid "Check and correct island discovery bonuses" msgstr "Sziget felfedezés bónuszok:" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Játékosok száma" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "A játékosok száma" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Győzelemhez szükséges pontok" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "A győzelemhez szükséges pontok" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Meg lehet nyerni ezt a játékot?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "T" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "G" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "É" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "Gy" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "R" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Válassz egy meta szervert" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Válassz egy játékot" @@ -2852,30 +2876,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** ISMERETLEN ÜZENET TÍPUS ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Hiba socket írásakor: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Olvasási tároló túlcsordulás - kapcsolat bontás\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Hiba socket olvasáskor: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, fuzzy, c-format msgid "Error connecting to %s: %s\n" msgstr "Hiba a csatlakozáskor %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "ismeretlen" @@ -2885,473 +2909,462 @@ msgstr "Kapcsolódás: %s , port: %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" "Állapot verem túlcsordulás. A verem tartalmát elküldtem a standard hiba " "kimenetre.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Domb" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Szántóföld" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Hegy" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Legelő" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Erdő" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "S_ivatag" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_Tenger" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Arany" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "Se_mmi" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "Té_gla (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Gabona (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "É_rc (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "Gy_apjú (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "Rö_nk (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Bármi (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "Kelet|K" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "Észak Kelet|ÉK" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "Észak Nyugat|ÉNY" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "Nyugat|W" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "Dél Nyugat|DNY" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "Dél Kelet|DK" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 #, fuzzy msgid "Remove a port" msgstr "Szerver port" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 #, fuzzy msgid "Delete a row" msgstr "Törlés" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 #, fuzzy msgid "_Title" msgstr "_Cím módosítás" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 #, fuzzy msgid "_Description" msgstr "S_ivatag" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Keverés" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Játék paraméterek" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Szabályok" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Nyersanyagok" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Építmények" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioneers szerkesztő" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Hiba a betöltékor '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Hiba a mentéskor '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 #, fuzzy msgid "Games" msgstr "_Játék" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Játék megnyitása" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Megnyitás..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Mentés másként..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Men_tés másként..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Cím módosítás" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Új cím:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Pioneers szerkesztőről" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Ennek a fájlnak a megnyitása" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "fájlnév" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Szerkesztő a Pioneers játékokhoz" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Beállítások" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Fájl" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "Ú_j" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Új játék létrehozása" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Megnyitás..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "Ú_j" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Létező játék megnyitása" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Mentés" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Megnyitás..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Játék mentése" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Men_tés másként..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Mentés" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Mentés másként" #. Menu entry -#: ../editor/gtk/editor.c:1748 -#, fuzzy -msgid "Change _Title" -msgstr "Cím módosítás" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Men_tés másként..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Játék címének módosítása" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "_Ellenőrizd a győzelemhez szükséges pontokat" +#: ../editor/gtk/editor.ui.h:22 +#, fuzzy +msgid "Change _Title" +msgstr "Cím módosítás" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Ellenőizd, vajon a játék megnyerhető-e" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Kilépés" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Pioneers szerkesztőről" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Ellenőrizd a győzelemhez szükséges pontokat" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Információ a Pioneers szerkesztőről" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Ennek a fájlnak a megnyitása" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "fájlnév" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Szerkesztő a Pioneers játékokhoz" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Hiba a menű felépítésekor: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Beállítások" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Pioneers szerkesztőről" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Nyersanyagok száma" @@ -3364,53 +3377,53 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 #, fuzzy msgid "Daemonize the metaserver on start" msgstr "A metaszerver démonként induljon" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 #, fuzzy msgid "Redirect clients to another metaserver" msgstr "Irányítsd a klienseket egy másik metaszeverhez" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Használd ezt a host nevet új játék létrehozásához" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "host név" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Használd ezt a port tartományt új játék létrehozásához" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "tól-ig" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Debug syslog üzenetek" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Meta szerver a Pioneers játékhoz" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, fuzzy, c-format msgid "metaserver protocol:" msgstr "metaszerver protokoll:" @@ -3444,202 +3457,192 @@ msgid "Unregistering Avahi.\n" msgstr "" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Pioneers szerverről" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Információ a Pioneers szerverről" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Szerver leállítása" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Szerver indítása" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "A szerver leállítása" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "A szerver indítása" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "%s játékos belépett a következő gépről %s\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "%s játékos kilépett a következő gépről %s\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "%d. játékos most %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "Port a játék szerverhez" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Szerver regisztrálás" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Játék regisztrálása a meta szerverre" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "A közölt host név" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "A gép nyilvános neve (szükséges ha tűzfal mögül játszol)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 #, fuzzy msgid "Random turn order" msgstr "Játékosok sorrnedje véletlen" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Játékosok sorrnedje véletlen" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 #, fuzzy msgid "Shows all players and spectators connected to the server" msgstr "Minden szerverhez csatlakozott játékos és szemlélő megjelenítése" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Csatlakozva" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "A játékos jelenleg csatlakozva?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Név" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "A játékos neve" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Hely" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "A játékos host neve" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Szám" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "A játékos száma" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Szabály" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 #, fuzzy msgid "Player or spectator" msgstr "Játékos a nézőkből" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Pioneers kliens indítása" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "A Pioneers kliens indítása" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Chat engedélyezése" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Chat üzenetek engedélyezése" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Robot játékos hozzáadása" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Robot játékos hozzáadása a játékhoz" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Üzenetek a szervertől" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Játék beállítások" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Szerver paraméterek" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Aktuális játék" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Csatlakozott játékosok" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Számítógép játékosok" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Üzenetek" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "A pioneers játék szerver" @@ -3648,18 +3651,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "A játéknak vége.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- a Pioneers játékot futtató" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioneers szerver" @@ -3671,143 +3674,153 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Információ a Pioneers szerverről" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Pioneers szerverről" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Játék cím" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Játék fájl" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Szzerver port" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "A játékosok számánk felülbírálása" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Győzelemhez szükséges pontok felülbírálása" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Hetes szabály felülbírálása" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 #, fuzzy msgid "Override dice-deck handling" msgstr "Hetes szabály felülbírálása" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 #, fuzzy msgid "Override num-dice-decks handling" msgstr "Hetes szabály felülbírálása" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 #, fuzzy msgid "Override num-removed-dice-cards handling" msgstr "Hetes szabály felülbírálása" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Terep felülbírálása, 0=alapértelmezett 1=véletlen" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "N db robot játékos hozzáadása" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Szerver regisztrálása a meta szerverre" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Regisztrálj a meta-szerver névre (beleértve -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Használd ezt a host nevet regisztráláshoz" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Kilép miután a játékos nyert" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Kilép N másodperc múlva, ha nincsenek játékosok" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Verseny mód, robot játékos hozzáadása N perc elteltével" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "A szerver admin portja" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "A játék nem azonnal,hanem az admin porton érkező parancsra indul" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Add meg a játékosok számát, ahányan játszanak a játékban" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Meta szerver kapcsolók" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "meta-szerver kapcsolók" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Egyéb kapcsolók" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Egyéb kapcsolók" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "Fájlnév és játéknév nem adható meg egyszerre\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "A játék paramétereit nem lehet betölteni\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3817,7 +3830,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "meta-szerver kapcsolók" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3829,46 +3843,46 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "meta-szerver kapcsolók" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, fuzzy, c-format msgid "Register with the metaserver at %s.\n" msgstr "Regisztrálás a meta szerverrel %s, port %s\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 #, fuzzy msgid "Unregister from the metaserver.\n" msgstr "Ismeretlen üzenet a metaszervertől\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "túl hosszú chat" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "túl hosszú név" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ismeretlen bővítések figyelmen kívül hagyása" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "Az utolsó játékos is elment, a parti időzítője újraindítva." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Játék indul, computer játékosok hozzáadása." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "A játék %s percen belül kezdődik." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "A játék %s perc múlva kezdődik." @@ -3877,11 +3891,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Számítógép játékos" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3889,48 +3903,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Bocs, a játék vége." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Játékos a %s gépről visszautasíta: a játéknak vége\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Név nincs megváltoztatva: az új név már használatban" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Túl sokáig voltam játékosok nélkül...viszlát.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "A játék folytatása." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s újra csatlakoztatva." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Verzió eltérés: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Ez a játék hamarosan kezdődik." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Játék indítása" @@ -3951,6 +3965,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "A kockadobást az adminisztrátor határozta meg" +#~ msgid "Quit the program" +#~ msgstr "Kilépés a programból" + +#~ msgid "" +#~ msgstr ">több" + +#~ msgid "Increase the selected amount" +#~ msgstr "Kiválasztott mennyiség növelése" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Hiba a menű felépítésekor: %s" + #~ msgid "Join the selected game" #~ msgstr "Jelentkezés a kiválasztott játékba" diff -Nru pioneers-15.5/po/it.po pioneers-15.6/po/it.po --- pioneers-15.5/po/it.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/it.po 2020-08-02 12:37:55.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Pioneers 15.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2013-09-11 20:12:00+0200\n" "Last-Translator: Giancarlo Capella \n" "Language-Team: it \n" @@ -58,8 +58,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Abilita messaggi di debug" @@ -69,8 +69,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Mostra informazioni di versione" @@ -79,9 +79,9 @@ msgid "- Computer player for Pioneers" msgstr "- Giocatore AI di Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers, versione:" @@ -334,8 +334,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -368,7 +368,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Scollegato" @@ -398,7 +398,7 @@ msgstr "%s riceve %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s prende %s.\n" @@ -443,70 +443,70 @@ "Versione non corrispondente. Assicurarsi che client e server siano " "aggiornati.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Costruisci due colonie, ognuna con una connessione" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Costruisci una colonia con" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "una strada" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "un ponte" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "una nave" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " o" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "In attesa del tuo turno." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Seleziona la costruzione da cui rubare." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Seleziona la nave da cui rubare." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Posiziona il brigante." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Termina la costruzione della strada." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Costruisci una strada." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Costruisci due strade." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "E' il tuo turno." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Mi dispiace, %s disponibile.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "La partita è finita" @@ -560,7 +560,7 @@ msgid "%s took %s from %s.\n" msgstr "%s ha preso %s da %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Spettatore %d" @@ -570,7 +570,7 @@ msgid "spectator %d" msgstr "spettatore %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Giocatore %d" @@ -896,6 +896,11 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "qualunque materia prima" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -941,12 +946,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Inizia il turno %d per %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Errore avvio %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Seleziona una partita trovata in automatico" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) su %s:%s" @@ -979,110 +998,397 @@ msgid " said: " msgstr " dice: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Partita" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Inizia una nuova partita" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nuova Partita" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Lascia questa partita" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Lascia Partita" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Amministra server Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Amministra" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Cambia il tuo nome di giocatore" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "Nome _Giocatore" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Legenda terreno e costi di costruzione" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "Legen_da" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Impostazioni per la partita corrente" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "Impostazioni _Partita" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Istogramma dei tiri dei dadi" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "Istogramma _Tiri" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Esci" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Esci" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Azioni" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Tira i dadi" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Tira Dadi" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Commercio" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Indietro" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Finito" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Costruisci una strada" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Strada" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Costruisci una nave" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Nave" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Muovi una nave" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Muovi Nave" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Costruisci un ponte" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Ponte" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Costruisci una colonia" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Colonia" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Costruisci una città" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Città" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Compra una carta sviluppo" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Sviluppo" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Costruisci una fortificazione" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Fortificazione" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Impostazioni" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Mostra o nasconde la toolbar" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Toolbar" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Configura l'applicazione" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Prefere_nze" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Vista" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Imposta la finestra a schermo intero" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Schermo intero" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Visualizza la mappa intera" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Azzera" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Centra la mappa" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Centra" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "Ai_uto" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informazioni su Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Riguardo Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Visualizza il manuale" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metaserver su %s, porta %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Finito.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "Il metaserver non è più disponibile.\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "Il metaserver ha chiuso la connessione inaspettatamente.\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Ricezione dei nomi partita dal metaserver.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "Nuovo server di partita richiesto su %s porta %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "Ricevute informazioni incomplete sul nuovo server partita.\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Messaggio sconosciuto dal metaserver: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "Ricezione dati da una sessione inattiva: %s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "Troppe ridirezioni del metaserver.\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Riga di ridirezione errata: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Metaserver troppo vecchio per creare server (versione %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Dati inattesi dal metaserver: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normale" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Ritira i primi 2 turni" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Ritira tutti i 7" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Default" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Casuale" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Rediretto sul metaserver %s.\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Rediretto sul metaserver %s, porta %s.\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Ricezione della lista dei server Pioneers dal metaserver.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Numero di giocatori AI" @@ -1102,11 +1408,6 @@ msgid "Requesting new game server.\n" msgstr "Richiesta nuovo server di partita.\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Errore avvio %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1114,9 +1415,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "_Annulla" @@ -1141,7 +1442,7 @@ msgstr "_Nuova Partita Remota" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "_Unisciti" @@ -1207,7 +1508,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Regola sette" @@ -1248,104 +1549,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Nome Giocatore" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Inserisci il tuo nome" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Spettatore" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Imposta se vuoi essere uno spettatore" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Unisciti" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Unisciti ad una partita trovata automaticamente" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaserver" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Unisciti a Partita Pubblica" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Unisciti a partita pubblica" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Crea Partita" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Crea una partita" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Unisciti a Partita Privata" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Unisciti ad un partita privata" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Server host" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Nome dell'host della partita" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Porta server" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Porta dell'host della partita" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Partite recenti" @@ -1364,529 +1665,257 @@ msgid "Discard Resources" msgstr "Scarta Materie prime" -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "_OK" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Devi scartare %d materia prima" -msgstr[1] "Devi scartare %d materie prime" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Totale scarti" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "In attesa degli scarti dei giocatori" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Fine partita" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s ha vinto la partita con %d punti vittoria!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Onori a %s, Signore del Mondo conosciuto!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Scegli Materie prime" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Puoi scegliere %d materia prima" -msgstr[1] "Puoi scegliere %d materie prime" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Materie prime totali" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "In attesa di scelta dei giocatori" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Partita" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nuova Partita" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Inizia una nuova partita" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Lascia Partita" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Lascia questa partita" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Amministra" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Amministra server Pioneers" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "Nome _Giocatore" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Cambia il tuo nome di giocatore" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "Legen_da" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Legenda terreno e costi di costruzione" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "Impostazioni _Partita" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Impostazioni per la partita corrente" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "Istogramma _Tiri" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Istogramma dei tiri dei dadi" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Esci" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Esci dal programma" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Azioni" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Tira Dadi" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Tira i dadi" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Commercio" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Indietro" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Finito" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Strada" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Costruisci una strada" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Nave" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Costruisci una nave" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Muovi Nave" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Muovi una nave" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Ponte" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Costruisci un ponte" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Colonia" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Costruisci una colonia" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Città" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Costruisci una città" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Sviluppo" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Compra una carta sviluppo" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Fortificazione" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Costruisci una fortificazione" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Impostazioni" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Prefere_nze" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Configura l'applicazione" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Vista" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Azzera" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "Visualizza la mappa intera" - -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Centra" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "_OK" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Centra la mappa" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Devi scartare %d materia prima" +msgstr[1] "Devi scartare %d materie prime" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "Ai_uto" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Totale scarti" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Riguardo Pioneers" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "In attesa degli scarti dei giocatori" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informazioni su Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Fine partita" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Visualizza il manuale" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s ha vinto la partita con %d punti vittoria!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Schermo intero" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Onori a %s, Signore del Mondo conosciuto!" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Imposta la finestra a schermo intero" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Scegli Materie prime" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Toolbar" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Puoi scegliere %d materia prima" +msgstr[1] "Puoi scegliere %d materie prime" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Mostra o nasconde la toolbar" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Materie prime totali" + +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "In attesa di scelta dei giocatori" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Punti per vincere: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Messaggi" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Mappa" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Termina contrattazioni" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Quotazione" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Rifiuta commercio interno" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Legenda" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Benvenuto a Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Preferenze Pioneers" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "_Chiudi" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Scegli uno dei temi" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Visualizza legenda" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Visualizza legenda a lato della mappa" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Messaggi colorati" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Visualizza nuovi messaggi colorati" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Chatta a colori" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Visualizza i nuovi messaggi di chat a colori" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Riassunto giocatore colorato" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Usa i colori nel riassunto giocatore" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Toolbar con acceleratore" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Visualizza acceleratori nella toolbar" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Modalità silenziosa" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "Nessun suono emesso in modalità silenziosa" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Annuncia nuovi giocatori" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "" "Esegue un suono quando un nuovo giocatore o spettatore entra nella partita" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Mostra notifiche" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" "Mostra notifiche quando è il tuo turno o quando è disponibile un nuovo " "commercio" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Usa disposizione 16:9" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Usa la disposizione 16:9 per la finestra" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Riguardo Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Benvenuto a Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Istogramma dei Tiri" @@ -1899,7 +1928,7 @@ msgstr "Seleziona una nuova posizione per la nave." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "E' il tuo turno di posizionamento." @@ -1932,21 +1961,21 @@ msgstr "Mare" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Produzione terreno" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Costi di costruzione" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Fortificazione" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Carta sviluppo" @@ -1977,28 +2006,30 @@ msgstr "Volto:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variante:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Connetti come spettatore" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Metaserver Host" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Seleziona una partita a cui unirti." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Connessione" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Gioca una partita a Pioneers" @@ -2093,7 +2124,7 @@ msgstr "Materie prime" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Carte sviluppo" @@ -2119,66 +2150,76 @@ msgid "The bank is empty" msgstr "La banca è vuota" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s ha %s, e cerca %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Nuova offerta da %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Offerta da %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Voglio" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Dai loro" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Cancella" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Rifiuta Commercio Interno" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Giocatore" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Quotazione" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s per %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Scambio rifiutato" @@ -2193,240 +2234,220 @@ msgstr "Totale" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Ammontare in mano" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "più>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Incrementa l'ammontare selezionato" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Ammontare selezionato" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Ammontare selezionato totale" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "La banca non può essere svuotata" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Sì" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "No" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Sconosciuto" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Nessuna partita in corso..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Impostazioni generali" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Numero di giocatori:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Obiettivo punti vittoria:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Terreno casuale:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Permetti commercio tra i giocatori:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Permetti commercio solo prima di costruire/comprare:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Verifica la vittoria solo alla fine del turno:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Quantità per ogni materia prima:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Regola sette:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "Usa il mazzo dadi anziché i dadi:" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "Numero di mazzi dadi:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "Numero di carte dadi rimosse dopo la mischia:" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Usa i pirati per bloccare le navi:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonus per scoperta isole:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Quotazioni costruzioni" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Strade:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Colonie:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Città:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Fortificazioni:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Navi:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Ponti:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Mazzo carte sviluppo" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Carte costruzione di strade:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Carte monopolio:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Carte scoperta:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Carte cattedrale:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Carte università di Pioneer:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Carte parlamento:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Carte biblioteca:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Carte mercato:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Carte cavaliere:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Impostazioni per la partita corrente" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "chiedi %s gratis" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "cede %s gratis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "cede %s per %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Io voglio %s, dai loro %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Quotazione ricevuta da %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Chiedi Quotazioni" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Accetta Quotazione" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "_Termina Contrattazioni" @@ -2491,24 +2512,24 @@ "La partita utilizza la nuova regola '%s' che non è ancora supportata. " "Aggiorna il gioco.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Questa partita non può essere vinta." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Non c'è più terreno." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "E' possibile che questa partita non possa essere vinta." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" "Questa partita può essere solo vinta costruendo tutte le colonie e le città" -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2562,174 +2583,174 @@ msgstr "Giancarlo Capella" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Analisi Punti Vittoria" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Tutti i sette muovono il brigante o i pirati" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "Nei primi due turni tutti i sette vengono ritirati" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Tutti i sette vengono ritirati" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Terreno casuale" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Rende il terreno casuale" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Usa pirata" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Usa il pirata per bloccare le navi" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Commercio rigoroso" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Commercio permesso solo prima di costruire/comprare" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Commercio interno" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Commercio permesso tra i giocatori" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Vittoria alla fine del turno" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Verifica la vittoria solo alla fine del turno" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "Usa il mazzo dadi" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "Usa un mazzo di 36 carte dadi anziché dadi reali" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "Numero di mazzi dadi" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "Il numero di mazzi dadi (di 36 carte ciascuno)" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "Numero di carte dadi rimosse" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "Il numero di carte dadi rimosse dopo aver mischiato il mazzo" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Bonus per scoperta isole" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "Lista di punti bonus per la scoperta isole, separati da virgola" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "Controlla e corregge i bonus per la scoperta isole" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Numero di giocatori" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Il numero di giocatori" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Obiettivo punti vittoria" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "I punti per vincere la partita" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "E' possibile vincere questa partita?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "A" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "G" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "M" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "La" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Le" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Seleziona un metaserver" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Seleziona una partita" @@ -2838,30 +2859,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** TIPO MESSAGGIO SCONOSCIUTO ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Errore scrittura su socket: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "Impossibile inviare tutti i dati\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Overflow del buffer di lettura - disconnessione\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Errore lettura socket: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "Errore di connessione a %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "sconosciuto" @@ -2871,224 +2892,224 @@ msgstr "Connessione a %s, porta %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" "Overflow dello stack di stato. Dump dello stack inviato sullo standard " "error.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "Co_llina" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Campo" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Montagna" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Pascolo" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Foresta" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Deserto" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "M_are" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Oro" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Nulla" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Argilla (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Grano (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Minerale (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Lana (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "L_egno (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Qualunque (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "E" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NO" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "O" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SO" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "Piazza un esagono collina" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "Piazza un esagono campo" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "Piazza un esagono montagna" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "Piazza un esagono pascolo" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "Piazza un esagono foresta" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "Piazza un esagono deserto" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "Piazza un esagono mare" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "Piazza un esagono oro" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "Elimina l'esagono" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "Piazza un gettone 2" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "Piazza un gettone 3" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "Piazza un gettone 4" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "Piazza un gettone 5" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "Piazza un gettone 6" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "Piazza un gettone 8" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "Piazza un gettone 9" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "Piazza un gettone 10" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "Piazza un gettone 11" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "Piazza un gettone 12" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "Piazza un porto argilla 2:1" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "Piazza un porto grano 2:1" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "Piazza un porto minerale 2:1" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "Piazza un porto lana 2:1" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "Piazza un porto legno 2:1" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "Rimuove un porto" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "Posiziona un porto 3:1" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3096,242 +3117,231 @@ "Seleziona il tipo di terreno con il menù contestuale sul tasto sinistro o " "modifica la disponibilità di un nodo durante la fase di preparazione" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Inserisce una riga" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Cancella una riga" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Inserisce una colonna" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Cancella una colonna" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "_Titolo" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "_Descrizione" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "_Commenti" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Mescola" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Parametri di partita" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Regole" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Materie prime" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Costruzioni" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "Senza titolo" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Editor Pioneers" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Impossibile caricare '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Impossibile salvare '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Partite" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Non filtrati" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Carica partita" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 msgid "_Open" msgstr "_Apri" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Salva come..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 msgid "Save _As" msgstr "S_alva come" #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Cambia Titolo" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Nuovo titolo:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Riguardo Pioneers Editor" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Apri questo file" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "nome file" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor per le partite di Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Impostazioni" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Commenti" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_File" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Nuovo" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Crea una nuova partita" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Apri..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nuovo" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Apri una partita esistente" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Salva" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Apri..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Salva partita" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "S_alva come..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Salva" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Salva come" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "Cambia _Titolo" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "S_alva come..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Cambia il titolo della partita" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "_Verifica Obiettivo Punti Vittoria" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "Cambia _Titolo" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Verifica se la partita può essere vinta" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Esci" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Riguardo Pioneers Editor" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Verifica Obiettivo Punti Vittoria" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informazioni su Pioneers Editor" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Apri questo file" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "nome file" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor per le partite di Pioneers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Costruzione menù fallita: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Impostazioni" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Commenti" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Riguardo Pioneers Editor" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Conto materie prime" @@ -3344,51 +3354,51 @@ msgstr "partita;gioco;crea;modifica;disposizione;Pioneers;Coloni;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Demonizza il metaserver all'avvio" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Pidfile per la demonizzazione (implica -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Redirigi i client ad un altro metaserver" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Utilizza questo hostname creando nuove partite" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "hostname" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Usa queste porte creando nuove partite" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "da-a" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Messaggi di debug su syslog" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metaserver per Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "protocollo metaserver:" @@ -3422,66 +3432,56 @@ msgid "Unregistering Avahi.\n" msgstr "Disconnessione Avahi.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Riguardo Server Pioneers" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Informazioni sul Server Pioneers" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Ferma Server" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Avvia Server" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Ferma il server" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Avvia il server" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Entrato giocatore %s da %s\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Uscito giocatore %s da %s\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Giocatore %d è ora %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "La porta del server di partita" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Registra server" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registra questa partita sul metaserver" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Hostname riportato" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3489,134 +3489,134 @@ "firewall)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Rendi casuale l'ordine dei turni" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Rendi casuale l'ordine dei turni" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Visualizza tutti i giocatori e gli spettatori connessi" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Connesso" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Il giocatore è attualmente connesso?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Nome" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Nome del giocatore" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Postazione" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Nome del computer del giocatore" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Numero" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Numero del giocatore" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Ruolo" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Giocatore o spettatore" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Avvia Client Pioneers" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Avvia il client di Pioneers" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Abilita chat" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Abilita i messaggi chat" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Aggiungi Giocatore AI" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Aggiungi alla partita un giocatore controllato dal computer" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Messaggi dal server" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Impostazioni partita" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Parametri server" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Partita in corso" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Giocatori connessi" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Giocatori AI" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Messaggi" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 msgid "About the Pioneers Game Server" msgstr "Info sul Server di Pioneers" @@ -3624,18 +3624,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "La partita è finita.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Ospita una partita di Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Server Pioneers" @@ -3647,144 +3647,154 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "partita;gioco;server;host;Pioneers;Coloni;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Informazioni sul Server Pioneers" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Riguardo Server Pioneers" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Nome della partita" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "File di partita da usare" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Porta su cui ascoltare" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Forza il numero di giocatori" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Forza il numero di punti vittoria" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Forza la gestione della regola sette" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "Forza la gestione del mazzo dadi" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "Forza la gestione del numero mazzo dadi" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "Forza la gestione del numero carte dadi rimosse" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Forza il tipo di terreno, 0=default 1=casuale" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Aggiungi N giocatori AI" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Registra il server sul metaserver" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registra sul metaserver con nome (implica -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Usa questo hostname per la registrazione" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Esci quando un giocatore vince" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Esci dopo N secondi senza giocatori" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Modalità torneo, giocatori AI aggiunti dopo N secondi" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Porta di admin su cui ascoltare" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "Non iniziare la partita immediatamente, aspetta un comando dalla porta di " "amministrazione" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "" "Assegna il numero di giocatore secondo l'ordine di entrata nella partita" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Opzioni metaserver" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opzioni per il metaserver" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Opzioni generiche" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Opzioni generiche" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" "Impossibile impostare contemporaneamente il nome della partita e del file\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Impossibile caricare i parametri della partita\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3794,7 +3804,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "La connessione al metaserver è caduta.\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3805,45 +3816,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Riconnessione al metaserver in corso.\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registra sul metaserver %s.\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "Deregistra dal metaserver.\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "messaggio troppo lungo" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "nome troppo lungo" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "estensione sconosciuta ignorata" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "L'ultimo giocatore ha lasciato, il timer del torneo è stato resettato." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "Nessun giocatore umano presente. Addio." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "La partita inizia, aggiungo giocatori AI." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "La partita inizia tra %s minuti." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "La partita inizia tra %s minuto." @@ -3852,11 +3863,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Giocatore AI" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "Impossibile determinare l'hostname del giocatore: %s" @@ -3864,49 +3875,49 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Mi dispiace, la partita è terminata." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Giocatore da %s rifiutato: la partita è terminata\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Nome non variato: il nuovo nome è già in uso" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Rimasto in attesa senza giocatori per troppo tempo... addio.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" "L'ultimo giocatore umano ha lasciato. In attesa del ritorno di un giocatore." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Recupero partita." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s si è riconnesso." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Versione non corrispondente: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Questa partita inizierà presto." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Partita in preparazione" @@ -3927,6 +3938,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "Il tiro dei dadi è stato determinato dall'amministratore." +#~ msgid "Quit the program" +#~ msgstr "Esci dal programma" + +#~ msgid "" +#~ msgstr "più>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Incrementa l'ammontare selezionato" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Costruzione menù fallita: %s" + #~ msgid "Join the selected game" #~ msgstr "Unisciti alla partita selezionata" diff -Nru pioneers-15.5/po/ja.po pioneers-15.6/po/ja.po --- pioneers-15.5/po/ja.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/ja.po 2020-08-02 12:37:55.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Pioneers 15.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2013-09-16 02:46+0000\n" "Last-Translator: KAMO Tomoyuki \n" "Language-Team: Japanese \n" @@ -61,8 +61,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "デバッグメッセージを有効にする" @@ -72,8 +72,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "バージョン情報を表示する" @@ -82,9 +82,9 @@ msgid "- Computer player for Pioneers" msgstr "- Pioneers のコンピュータプレイヤー" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers バージョン:" @@ -337,8 +337,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -371,7 +371,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "オフライン" @@ -401,7 +401,7 @@ msgstr "%s は %s を受け取った。\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s は %s を取る。\n" @@ -444,70 +444,70 @@ msgid "Version mismatch. Please make sure client and server are up to date.\n" msgstr "バージョン不整合。クライアントとサーバが最新か確認してください。\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "以下を建設してください: 開拓地2つと、それぞれにつなげた" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "以下を建設してください: 開拓地1つと、それにつなげた" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "街道" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "橋" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "船" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " または" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "あなたのターンを待っている。" -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "強奪する建築物を選択してください。" -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "強奪する船を選択してください。" -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "盗賊を配置してください。" -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "街道の敷設を終了してください。" -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "街道を1つ敷設してください。" -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "街道を2つ敷設してください。" #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "あなたのターンです。" -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "すみません、%s 利用可能。\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "ゲーム終了。" @@ -561,7 +561,7 @@ msgid "%s took %s from %s.\n" msgstr "%s は %s を %s から奪った。\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "観戦者 %d" @@ -571,7 +571,7 @@ msgid "spectator %d" msgstr "観戦者 %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "プレイヤー %d" @@ -897,6 +897,12 @@ msgid "%s, %s" msgstr "%s、%s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "任意の資源 (バグ)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -942,12 +948,26 @@ msgid "Begin turn %d for %s.\n" msgstr "%2$s のターン %1$d 開始。\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "%s 開始時にエラー: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "自動的に発見したゲームを選択する" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%3$s:%4$s 上の %1$s (%2$s)" @@ -980,110 +1000,397 @@ msgid " said: " msgstr " は言った: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "ゲーム(_G)" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "新しいゲームを開始" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "新しいゲーム(_N)" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "このゲームを去る" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "ゲームを去る(_L)" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Pioneers サーバの管理" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "管理(_A)" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "プレイヤー名変更" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "プレイヤー名(_P)" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "地形の凡例と建設コスト" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "凡例(_E)" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "現在のゲーム設定" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "ゲーム設定(_S)" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "サイコロで出た目の度数分布図" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "サイコロヒストグラム(_D)" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "終了" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "終了(_Q)" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "行動(_A)" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "サイコロを振る" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "サイコロを振る" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "交易" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "やり直し" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "終了" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "街道を敷設する" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "街道" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "船を製造する" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "船" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "船を移動する" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "船移動" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "橋を建設する" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "橋" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "開拓地を建設する" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "開拓地" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "都市を建設する" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "都市" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "発展カードを購入する" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "発展" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "都市城壁を建設する" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "都市城壁" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "設定(_S)" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "ツールバーを表示するか否か" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "ツールバー(_T)" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "アプリケーションの設定" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "個人設定(_N)" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "表示(_V)" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "ウィンドウをフルスクリーンモードに設定する" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "フルスクリーン(_F)" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "マップ全体を表示する" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "リセット(_R)" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "マップを中央に表示する" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "中央化(_C)" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "ヘルプ(_H)" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Pioneers についての情報" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "Pioneers について(_A)" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "マニュアルを表示する" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "メタサーバ %s、ポート %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "終了。\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "メタサーバはもう利用できない。\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "メタサーバは予期せず接続を閉じた。\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "メタサーバからゲーム名を受信中。\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "新しいゲームサーバが %s のポート %s で要求されている。\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "新しいゲームについて不完全な情報を受信した。\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "メタサーバからの不明なメッセージ: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "非アクティブなセッションからデータを受信: %s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "メタサーバのリダイレクトが多すぎる。\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "不正なリダイレクト: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "メタサーバが古すぎてサーバを作ることができない (バージョン %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "メタサーバからの不明なデータ: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "通常" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "最初の2ターンは振り直し" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "すべてのターンで振り直し" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "デフォルト" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "ランダム" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "%s のメタサーバにリダイレクト。\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "%s のポート %s のメタサーバにリダイレクト。\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "メタサーバから Pioneers サーバの一覧を取得中。\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "コンピュータプレイヤーの数" @@ -1103,11 +1410,6 @@ msgid "Requesting new game server.\n" msgstr "新しいゲームサーバを要求中。\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "%s 開始時にエラー: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1115,9 +1417,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 #, fuzzy msgid "_Cancel" msgstr "取り消した。\n" @@ -1144,7 +1446,7 @@ msgstr "新規リモートゲーム(_N)" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 #, fuzzy msgid "_Join" msgstr "参加" @@ -1211,7 +1513,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "7の目のルール" @@ -1252,104 +1554,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "プレイヤー名" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "あなたの名前を入力" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "観戦者" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "観戦者として参加する場合はチェックマークをつける" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "参加" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "自動的に発見したゲームに参加する" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "メタサーバ" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "公開ゲームに参加" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "公開ゲームに参加する" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "ゲーム作成" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "ゲームを作成する" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "非公開ゲームに参加" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "非公開ゲームに参加する" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "サーバホスト" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "ゲームホストの名前" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "サーバポート" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "ゲームホストのポート" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "最近行ったゲーム" @@ -1368,524 +1670,253 @@ msgid "Discard Resources" msgstr "資源廃棄" -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "資源を %d 枚捨てなければならない" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "総廃棄数" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "プレイヤーの廃棄待ち" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "ゲーム終了" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s は勝利ポイント %d で勝利した!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "すばらしい %s、世界の支配者!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "資源選択" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "資源を %d 枚選択してください" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "資源合計" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "プレイヤー選択待ち" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "ゲーム(_G)" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "新しいゲーム(_N)" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "新しいゲームを開始" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "ゲームを去る(_L)" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "このゲームを去る" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "管理(_A)" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Pioneers サーバの管理" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "プレイヤー名(_P)" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "プレイヤー名変更" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "凡例(_E)" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "地形の凡例と建設コスト" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "ゲーム設定(_S)" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "現在のゲーム設定" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "サイコロヒストグラム(_D)" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "サイコロで出た目の度数分布図" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "終了(_Q)" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "プログラムを終了" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "行動(_A)" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "サイコロを振る" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "サイコロを振る" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "交易" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "やり直し" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "終了" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "街道" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "街道を敷設する" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "船" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "船を製造する" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "船移動" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "船を移動する" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "橋" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "橋を建設する" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "開拓地" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "開拓地を建設する" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "都市" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "都市を建設する" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "発展" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "発展カードを購入する" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "都市城壁" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "都市城壁を建設する" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "設定(_S)" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "個人設定(_N)" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "アプリケーションの設定" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "表示(_V)" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "リセット(_R)" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "マップ全体を表示する" - -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "中央化(_C)" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "マップを中央に表示する" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "資源を %d 枚捨てなければならない" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "ヘルプ(_H)" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "総廃棄数" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "Pioneers について(_A)" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "プレイヤーの廃棄待ち" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Pioneers についての情報" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "ゲーム終了" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "マニュアルを表示する" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s は勝利ポイント %d で勝利した!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "フルスクリーン(_F)" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "すばらしい %s、世界の支配者!" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "ウィンドウをフルスクリーンモードに設定する" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "資源選択" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "ツールバー(_T)" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "資源を %d 枚選択してください" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "ツールバーを表示するか否か" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "資源合計" + +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "プレイヤー選択待ち" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "勝利に必要なポイント: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "メッセージ" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "マップ" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "交易を終了する" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "見積もり" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "国内貿易を拒否する" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "凡例" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Pioneers へようこそ" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioneers 個人設定" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "テーマ:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "テーマを1つ選択する" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "凡例を表示" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "マップの隣に凡例ページを表示する" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "色付きメッセージ" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "新しいメッセージを色付きで表示する" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "プレイヤーの色でチャット" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "新しいチャットメッセージをプレイヤーの色で表示する" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "色付き概要" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "プレイヤー概要に色を使う" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "ショートカット付きツールバー" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "ツールバーにキーボードショートカットを表示する" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "サイレントモード" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "サイレントモードでは音が鳴らない" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "新しいプレイヤーをアナウンス" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "新しいプレイヤーや観戦者がゲームに入ったときに音を鳴らす" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "通知を表示" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "あなたのターンになったときや新しい交易が可能なときに通知を表示する" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "16:9 レイアウトを使用" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "16:9 の画面向きのレイアウトをウィンドウに使用" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "サイコロを振る" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Pioneers について" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "ようこそ Pioneers へ!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "サイコロヒストグラム" @@ -1898,7 +1929,7 @@ msgstr "船の新しい場所を選択してください。" #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "あなたの初期配置ターンです。" @@ -1931,21 +1962,21 @@ msgstr "海" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "地形と産出資源" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "建設コスト" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "都市城壁" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "発展カード" @@ -1976,28 +2007,30 @@ msgstr "顔:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "変更:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "観戦者として接続する" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "メタサーバホスト" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "参加するゲームを選択。" -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "接続" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Pioneers のゲームを遊ぶ" @@ -2092,7 +2125,7 @@ msgstr "資源カード" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "発展カード" @@ -2118,66 +2151,77 @@ msgid "The bank is empty" msgstr "山が空です" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s は %s を持っていて、%s を求めている" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "%s から新しい申し入れ。" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "%s から申し入れ。" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "欲しい" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "あげる" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "削除" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "チャット可" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "国内貿易拒否" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "プレイヤー" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "見積もり" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 で %s を %s に交換" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "交易拒否" @@ -2192,240 +2236,220 @@ msgstr "合計" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "手札の合計" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "増やす>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "選択量を増加" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "選択量" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "選択量の合計" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "山は空にできない" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "はい" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "いいえ" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "不明" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "進行中のゲームなし..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "一般設定" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "プレイヤーの番号:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "目標勝利ポイント:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "ランダム地形:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "プレイヤー間の交易を許可:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "建設や購入の前だけ交易を許可:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "ターンの最後にのみ勝利判定:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "各々の資源の総量:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "7の目のルール:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "サイコロの代わりにサイコロデッキを使う:" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "サイコロデッキの数:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "シャッフル後に取り除くサイコロカードの数:" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "船を止めるために海賊を使う:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "島発見ボーナス:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "建築物割り当て" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "街道:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "開拓地:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "都市:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "都市城壁:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "船:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "橋:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "発展カードデッキ" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "街道敷設カード:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "独占カード:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "収穫カード:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "教会カード:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "パイオニア大学カード:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "官舎カード:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "図書館カード:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "市場カード:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "騎士カード:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "現在のゲーム設定" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "無料で %s を 求める。" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "無料で %s をあげる。" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "%2$s をくれたら %1$s をあげる" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "欲しいのは %s、あげるのは %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "%s から見積もりを受けた。" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "見積もり呼びかけ(_C)" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "見積もり承諾(_A)" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "交易終了(_F)" @@ -2487,23 +2511,23 @@ "このゲームはまだサポートさてていない新しいルール '%s' を使っている。アップグ" "レードを検討してください。\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "このゲームは勝利不可能。" -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "陸地がない。" -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "このゲームは勝利者が出ない可能性がある。" -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "このゲームはすべての開拓地と都市を建設するだけで勝つことができる。" -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2560,174 +2584,174 @@ " Yasuhiko Takasugi https://launchpad.net/~takasugi" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "勝利ポイント解析" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "どのターンでも7の目が出たら盗賊・海賊を移動する" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "最初の2ターンでは7の目が出たら振り直し" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "どのターンでも7の目が出たら振り直し" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "ランダム地形" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "地形をランダムにする" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "海賊使用" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "船を止めるために海賊を使う" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "交易は厳密に" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "建設や購入の前だけ交易を許可する" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "国内貿易" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "プレイヤー間の交易を許可する" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "ターンの最後に勝利判定" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "ターンの最後にのみ勝利判定をする" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "サイコロデッキを使う" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "実際のサイコロの代わりに36枚のサイコロカードのデッキを使う" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "サイコロデッキの数" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "サイコロデッキの数 (それぞれのデッキはカード36枚)" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "取り除くサイコロカードの数" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "シャッフル後に取り除くサイコロカードの数" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "島発見ボーナス" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "島発見時のボーナスポイントのカンマ区切りのリスト" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "島発見ボーナスのチェックと修正" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "プレイヤー数" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "プレイヤー数" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "目標勝利ポイント" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "ゲーム勝利に必要なポイント" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "このゲームに勝利可能か?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "レンガ港|B" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "小麦港|G" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "鉱石港|O" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "羊毛港|W" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "木材港|L" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "メタサーバを選択" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "ゲーム選択" @@ -2836,30 +2860,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** メッセージの種類不明 ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "ソケットへの書き込み時にエラー: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "すべてのデータを送信しきれなかった\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "読み込みバッファあふれ - 切断\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "ソケット読み込み時にエラー: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "%s への接続時にエラー: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "不明" @@ -2869,222 +2893,222 @@ msgstr "%s のポート %s に接続\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "状態スタックオーバフロー。標準エラー出力にスタックダンプを送ります。\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "丘陵(_H)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "畑(_F)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "山地(_M)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "牧草地(_P)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "森林(_O)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "砂漠(_D)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "海(_S)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "金(_G)" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "なし(_N)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "レンガ(2:1)(_B)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "小麦(2:1)(_G)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "鉱石(2:1)(_O)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "羊毛(2:1)(_W)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "木材(2:1)(_L)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "一般(3:1)(_A)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "東" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "北東|NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "北西|NW" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "西|W" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "南西|SW" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "南東|SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "丘陵タイルを配置" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "畑タイルを配置" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "山地タイルを配置" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "牧草地タイルを配置" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "森林タイルを配置" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "砂漠タイルを配置" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "海タイルを配置" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "金タイルを配置" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "タイルを消去" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "2 のトークンを配置" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "3 のトークンを配置" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "4 のトークンを配置" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "5 のトークンを配置" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "6 のトークンを配置" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "8 のトークンを配置" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "9 のトークンを配置" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "10 のトークンを配置" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "11 のトークンを配置" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "12 のトークンを配置" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "レンガ 2:1 の港を配置" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "小麦 2:1 の港を配置" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "鉱石 2:1 の港を配置" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "羊毛 2:1 の港を配置" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "木材 2:1 の港を配置" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "港を除去" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "3:1 の港を配置" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3092,244 +3116,233 @@ "左クリックコンテクストメニューから地形を選択、もしくはノードを配置フェイズで" "使用するかしないかの切り替え" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "一行追加" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "一行削除" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "一列追加" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "一列削除" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "タイトル(_T)" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "説明(_D)" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "コメント(_C)" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "シャッフル" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "ゲームパラメータ" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "ルール" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "資源" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "建設" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "無題" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioneers エディタ" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "'%s' をロードできない" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "'%s' を保存できない" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "ゲーム" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "フィルタなし" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "ゲームを開く" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "開く(_O)..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "名前をつけて保存..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "名前をつけて保存(_A)..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "タイトルを変更" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "新しいタイトル:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Pioneers ゲームエディタについて" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "このファイルを開く" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "ファイル名" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Pioneers ゲームのエディタ" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "設定" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "コメント" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "ファイル(_F)" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "新規作成(_N)" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "新しいゲームを作成" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "開く(_O)..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "新規作成(_N)" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "既存のゲームを開く" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "保存(_S)" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "開く(_O)..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "ゲームを保存" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "名前をつけて保存(_A)..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "保存(_S)" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "名前をつけて保存" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "タイトルを変更(_T)" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "名前をつけて保存(_A)..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "ゲームタイトルを変更" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "目標勝利ポイントをチェック(_C)" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "タイトルを変更(_T)" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "ゲームに勝利したかどうかチェック" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "終了" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "Pioneers エディタについて(_A)" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "目標勝利ポイントをチェック(_C)" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Pioneers エディタについての情報" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "このファイルを開く" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "ファイル名" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Pioneers ゲームのエディタ" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "メニュー構築に失敗: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "設定" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "コメント" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "Pioneers エディタについて(_A)" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "資源数" @@ -3342,51 +3355,51 @@ msgstr "ゲーム;ボード;作成;編集;レイアウト;Pioneers;開拓者;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "メタサーバ開始時にデーモン化する" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "デーモン化するときに作成する PID ファイル (-d を含意)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "クライアントを他のメタサーバに転送する" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "新しいゲームを作成するときこのホスト名を使用する" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "ホスト名" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "新しいゲームを作成するときにこのポートの範囲を使用する" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "先頭-末尾" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "デバッグ syslog メッセージ" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Pioneers のメタサーバ" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "メタサーバプロトコル:" @@ -3420,200 +3433,190 @@ msgid "Unregistering Avahi.\n" msgstr "Avahi 登録解除。\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "Pioneers サーバについて(_A)" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Pioneers サーバについての情報" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "サーバ停止" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "サーバ開始" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "サーバを停止する" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "サーバを開始する" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "%2$s からプレイヤー %1$s が参加\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "%2$s からのプレイヤー %1$s が去った\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "プレイヤー %d は %s になった\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "ゲームサーバのポート" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "サーバ登録" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "このゲームをメタサーバ上に登録する" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "報告するホスト名" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" "このコンピュータの公開名 (ファイアーウォールの中からプレイする場合は必要)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "ランダムなターン順番" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "ターン順番をランダムにする" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "サーバに接続しているプレイヤーと観戦者をすべて表示している" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "接続" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "プレイヤーの接続状態" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "名前" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "プレイヤーの名前" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "場所" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "プレイヤーのホスト名" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "番号" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "プレイヤーの番号" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "役割" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "プレイヤーか観戦者か" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Pioneers クライアント起動" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Pioneers クライアントを起動する" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "チャット可" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "チャットを可能にする" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "コンピュータプレイヤー追加" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "ゲームにコンピュータプレイヤーを追加する" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "サーバからのメッセージ" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "ゲーム設定" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "サーバパラメータ" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "ゲーム進行中" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "プレイヤー接続" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "コンピュータプレイヤー" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "メッセージ" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "Pioneers ゲームサーバ" @@ -3621,18 +3624,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "ゲーム終了。\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Pioneers のゲームをホストする" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioneers サーバ" @@ -3644,140 +3647,150 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "ゲーム;ボード;サーバ;ホスト;Pioneers;開拓者;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Pioneers サーバについての情報" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "Pioneers サーバについて(_A)" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "使用するゲームタイトル" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "使用するゲームファイル" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "待ち受けるポート" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "プレイヤー数を上書きする" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "勝利ポイント数を上書きする" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "7の目ルールの扱いを上書きする" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "サイコロデッキの扱いを上書きする" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "サイコロデッキの数の扱いを上書きする" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "取り除くサイコロカードの数の扱いを上書きする" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "地形のタイプを上書きする、0=デフォルト 1=ランダム" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "コンピュータプレイヤーを N 人追加する" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "メタサーバにサーバを追加する" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "メタサーバ名を登録する (-r を含意)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "登録時にこのホスト名を利用する" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "プレイヤーが勝利した後に終了する" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "プレイヤーがいなくなった後、N 秒で終了する" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "トーナメントモード、N 分後にコンピュータプレイヤーを追加する" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "待ち受ける管理ポート" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "ゲームをすぐには開始せず、管理ポートへのコマンドを待つ" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "プレイヤー番号はゲームに参加した順番に割り振る" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "メタサーバオプション" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "メタサーバのオプション" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "様々なオプション" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "様々なオプション" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "ゲームタイトルとファイル名は同時に指定できない\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "ゲームのパラメータを読み込めない\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "管理インタフェースのネットワークポート (%s) が利用不可。\n" @@ -3786,7 +3799,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "メタサーバへの接続が失われた。\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3796,45 +3810,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "メタサーバに再接続試行中。\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "%s のメタサーバに登録。\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "メタサーバから登録解除。\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "チャットが長すぎる" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "名前が長すぎる" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "不明な拡張子を無視" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "最後のプレイヤーが去った。トーナメントタイマーはリセット。" -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "人間のプレイヤーがいない。さようなら。" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "ゲーム開始、コンピュータプレイヤー追加。" -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "%s 分以内にゲーム開始。" -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "%s 分以内にゲーム開始。" @@ -3842,11 +3856,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "コンピュータプレイヤー" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "以下のプレイヤーのホスト名を決定できない: %s" @@ -3854,48 +3868,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "すみません、ゲーム終了。" -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "%s のプレイヤーは拒否: ゲーム終了\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "名前変更不可: 新しい名前はすでに使用されてる" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "プレイヤーなしで長く止まりすぎ... さようなら。\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "最後の人間のプレイヤーが去った。プレイヤーが戻ってくるのを待っている。" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "ゲームを復帰。" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s が再接続した。" -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "バージョン不整合: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "このゲームはすぐに始まる。" #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "ゲーム準備" @@ -3916,6 +3930,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "サイコロの目は管理者が決定した。" +#~ msgid "Quit the program" +#~ msgstr "プログラムを終了" + +#~ msgid "" +#~ msgstr "増やす>" + +#~ msgid "Increase the selected amount" +#~ msgstr "選択量を増加" + +#~ msgid "Building menus failed: %s" +#~ msgstr "メニュー構築に失敗: %s" + #~ msgid "Join the selected game" #~ msgstr "選択したゲームに参加する" diff -Nru pioneers-15.5/po/LINGUAS pioneers-15.6/po/LINGUAS --- pioneers-15.5/po/LINGUAS 2014-05-05 06:13:30.000000000 +0000 +++ pioneers-15.6/po/LINGUAS 2019-06-30 09:21:46.000000000 +0000 @@ -14,5 +14,6 @@ ja nl pt +sk sv zh_CN diff -Nru pioneers-15.5/po/nl.po pioneers-15.6/po/nl.po --- pioneers-15.5/po/nl.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/nl.po 2020-08-02 12:37:55.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2003 Bas Wijnen # This file is distributed under the same license as the pioneers package. # Bas Wijnen , 2003-2004 -# Roland Clobus , 2005-2016 +# Roland Clobus , 2005-2020 # msgid "" msgstr "" -"Project-Id-Version: Pioneers 15.4\n" +"Project-Id-Version: Pioneers 15.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" -"PO-Revision-Date: 2016-06-10 18:27+0200\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" +"PO-Revision-Date: 2020-06-26 08:31+0200\n" "Last-Translator: Roland Clobus \n" "Language-Team: Bas Wijnen Roland Clobus \n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 2.3.1\n" #. Commandline pioneersai: chromosome-file #: ../client/ai/ai.c:90 @@ -60,8 +60,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Toon debug boodschappen" @@ -71,8 +71,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Versie-informatie weergeven" @@ -81,9 +81,9 @@ msgid "- Computer player for Pioneers" msgstr "- Computerspeler voor Pioniers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioniers versie:" @@ -337,8 +337,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -371,7 +371,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Er is geen verbinding met een server." @@ -401,7 +401,7 @@ msgstr "%s krijgt %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s neemt %s.\n" @@ -444,70 +444,70 @@ msgid "Version mismatch. Please make sure client and server are up to date.\n" msgstr "De versies van de de server en de client komen niet overeen.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Bouw twee dorpen, elk met een aangesloten" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Bouw een dorp met een aangesloten" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "straat" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "brug" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "schip" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " of" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Wacht op je beurt." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Kies een gebouw om te bestelen." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Kies een schip om te bestelen." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Plaats de struikrover." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Beëindig het bouwen van straten." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Bouw één straat." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Bouw twee straten." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Je bent aan de beurt." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Sorry, %s beschikbaar.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Het spel is afgelopen." @@ -561,7 +561,7 @@ msgid "%s took %s from %s.\n" msgstr "%3$s geeft %2$s aan %1$s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Toeschouwer %d" @@ -571,7 +571,7 @@ msgid "spectator %d" msgstr "toeschouwer %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Speler %d" @@ -898,6 +898,11 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "een willekeurige grondstof" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -943,12 +948,26 @@ msgid "Begin turn %d for %s.\n" msgstr "%2$s is aan de beurt voor beurt %1$d.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Fout bij het starten van %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioniers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Kies een automatisch ontdekt spel" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) op %s:%s" @@ -981,110 +1000,397 @@ msgid " said: " msgstr " zegt: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Spel" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Een nieuw spel starten" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nieuw spel" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Het spel verlaten" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "Spel ver_laten" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Een Pioniers server beheren" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Beheren" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Verander de naam van je speler" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "S_pelersnaam" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Terreinlegenda en bouwkosten" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "L_egenda" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Instellingen van het lopende spel" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Spelinstellingen" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogram van de dobbelsteen tot nu toe" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Dobbelsteen histogram" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Het programma afsluiten" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Afsluiten" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "H_andelingen" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Met de dobbelstenen rollen" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Rollen" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Handelen" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Ongedaan maken" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Klaar" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Een straat bouwen" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Straat" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Een schip bouwen" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Schip" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Met een schip varen" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Schip verplaatsen" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Een brug bouwen" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Brug" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Een dorp bouwen" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Dorp" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Een stad bouwen" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Stad" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Een ontwikkelingskaart kopen" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Ontwikkelingskaart" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Een stadsmuur bouwen" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Stadsmuur" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Instellingen" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "De knoppenbalk tonen of verbergen" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Knoppenbalk" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "De instellingen van het programma veranderen" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "_Voorkeuren" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Weergave" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Het hele scherm gebruiken" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Volledig scherm" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "De hele kaart bekijken" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Herstellen" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "De kaart centreren" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Centreren" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Help" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informatie over Pioniers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Over Pioniers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "De handleiding tonen" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metaserver op %s, poort %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Klaar.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "De metaserver is niet meer beschikbaar.\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "De metaserver heeft de verbinding onverwacht gesloten.\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "De metaserver stuurt de spelnamen door.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "Er is een nieuwe server aangevraagd op %s poort %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "Onvolledige informatie over de nieuwe spelserver ontvangen.\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Onbekende gegevens ontvangen van de metaserver: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "Ontvangen gegevens van een inactieve sessie: %s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "Teveel metaserver omleidingen.\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Foute omleiding: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "De metaserver is te oud om servers te starten (versie %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Onverwachte gegevens van de metaserver: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normaal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" -msgstr "Rol de eerste 2 beurten opnieuw" +msgstr "De eerste 2 beurten opnieuw rollen" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" -msgstr "Rol alle zevens opnieuw" +msgstr "Alle zevens opnieuw rollen" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Standaard" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Willekeurig" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "We worden doorgestuurd naar de metaserver op %s.\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "We worden doorgestuurd naar de metaserver op %s, poort %s.\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "De metaserver stuurt een lijst Pioniers servers.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Aantal computerspelers" @@ -1104,11 +1410,6 @@ msgid "Requesting new game server.\n" msgstr "Een nieuwe spelserver wordt aangevraagd.\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Fout bij het starten van %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1116,9 +1417,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "_Annuleren" @@ -1143,7 +1444,7 @@ msgstr "_Nieuw spel via metaserver" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "_Meespelen" @@ -1209,7 +1510,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Regel voor zevens" @@ -1250,104 +1551,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Spelersnaam" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Geef je naam" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Toeschouwer" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Meespelen als toeschouwer" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Meespelen" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Meespelen in een automatisch ontdekt spel" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaserver" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Meespelen in openbaar spel" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Meespelen in een openbaar spel" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Nieuw spel aanmaken" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Een nieuw spel aanmaken" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Privé spel" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Meespelen in een privé spel" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Server host" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Naam van de server van het spel" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Server poort" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Poort van de spel server" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Recente spellen" @@ -1363,530 +1664,261 @@ #. Dialog caption #: ../client/gtk/discard.c:77 -msgid "Discard Resources" -msgstr "Grondstoffen weggooien" - -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "_Ok" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Je moet %d grondstofkaart weggooien" -msgstr[1] "Je moet %d grondstofkaarten weggooien" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Totaal" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Wacht op spelers die kaarten weggooien" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Het spel is afgelopen" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s heeft gewonnen met %d punten!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Buig voor %s, heerser van de bekende wereld!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Grondstoffen kiezen" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Je mag %d grondstofkaart kiezen" -msgstr[1] "Je mag %d grondstofkaarten kiezen" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Totaal" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Wacht op anderen om grondstoffen te kiezen" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Spel" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nieuw spel" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Een nieuw spel starten" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "Spel ver_laten" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Het spel verlaten" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Beheren" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Een Pioniers server beheren" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "S_pelersnaam" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Verander de naam van je speler" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "L_egenda" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Terreinlegenda en bouwkosten" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Spelinstellingen" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Instellingen van het lopende spel" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Dobbelsteen histogram" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogram van de dobbelsteen tot nu toe" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Afsluiten" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Het programma afsluiten" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "H_andelingen" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Rollen" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Met de dobbelstenen rollen" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Handelen" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Ongedaan maken" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Klaar" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Straat" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Een straat bouwen" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Schip" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Een schip bouwen" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Schip verplaatsen" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Met een schip varen" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Brug" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Een brug bouwen" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Dorp" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Een dorp bouwen" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Stad" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Een stad bouwen" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Ontwikkelingskaart" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Een ontwikkelingskaart kopen" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Stadsmuur" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Een stadsmuur bouwen" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Instellingen" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "_Voorkeuren" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "De instellingen van het programma veranderen" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Weergave" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Herstellen" +msgid "Discard Resources" +msgstr "Grondstoffen weggooien" -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "De hele kaart bekijken" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "_Ok" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Centreren" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Je moet %d grondstofkaart weggooien" +msgstr[1] "Je moet %d grondstofkaarten weggooien" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "De kaart centreren" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Totaal" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Help" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Wacht op spelers die kaarten weggooien" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Over Pioniers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Het spel is afgelopen" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informatie over Pioniers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s heeft gewonnen met %d punten!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "De handleiding tonen" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Buig voor %s, heerser van de bekende wereld!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Volledig scherm" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Grondstoffen kiezen" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Het hele scherm gebruiken" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Je mag %d grondstofkaart kiezen" +msgstr[1] "Je mag %d grondstofkaarten kiezen" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Knoppenbalk" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Totaal" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "De knoppenbalk tonen of verbergen" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Wacht op anderen om grondstoffen te kiezen" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "De speler met %i punten wint" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Berichten" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Kaart" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Handelsfase _beëindigen" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Handelsaanbod" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Handel afwijzen" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Legenda" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Welkom bij Pioniers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioniers Voorkeuren" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "Sl_uiten" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Thema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Kies een van de thema's" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" -msgstr "Toon legenda" +msgstr "Legenda tonen" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "De legenda tonen naast de kaart" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Berichten in kleur" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Nieuwe berichten in kleur tonen" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Chat in de kleur van de speler" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "De nieuwe chat in de kleur van de speler tonen" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Spelersoverzicht in kleur" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Kleur in het spelersoverzicht gebruiken" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Knoppenbalk met sneltoetsen" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "De sneltoetsen in de knoppenbalk tonen" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Stilte" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "Alle geluiden uitschakelen" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Nieuwe spelers aankondigen" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "" "Geluid maken wanneer een nieuwe speler of toeschouwer het spel betreedt" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Berichten weergeven" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "Berichten tonen wanneer je aan de beurt bent of er nieuwe handel is" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "16:9 layout gebruiken" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Een 16:9 vriendelijke layout gebruiken" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "Elke beurt zelf met de dobbelstenen rollen" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" +"Automatisch met de dobbelstenen rollen, behalve als je een ridderkaart hebt" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" +"Automatisch met de dobbelstenen rollen, behalve als je een " +"ontwikkelingskaart hebt" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "Automatisch met de dobbelstenen rollen" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "Automatiseren van het rollen met de dobbelstenen" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Over Pioniers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Welkom bij Pioniers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioniers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Dobbelsteenhistogram" @@ -1899,7 +1931,7 @@ msgstr "Kies een nieuwe plek voor het schip." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "Je bent aan de beurt om op te zetten." @@ -1932,21 +1964,21 @@ msgstr "Zee" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Terreinopbrengsten" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Bouwkosten" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Stadsmuur" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Ontwikkelingskaart" @@ -1977,28 +2009,30 @@ msgstr "Gezicht:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variant:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Meespelen als toeschouwer" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Computernaam van de metaserver" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Kies een spel om in mee te spelen." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Bezig verbinding te maken" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Speel een spel Pioniers" @@ -2093,7 +2127,7 @@ msgstr "Grondstoffenkaarten" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Ontwikkelingskaarten" @@ -2119,66 +2153,78 @@ msgid "The bank is empty" msgstr "De bank is leeg" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s heeft %s en zoekt %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Nieuw aanbod van %s." #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Aanbod van %s." #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Ik wil" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Ik geef" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Intrekken" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "Donaties inschakelen" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" +"Wanneer ingeschakeld kan een grondstof weggegeven worden zonder er iets voor " +"terug te vragen" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Handel afwijzen" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Speler" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Handelsaanbod" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s in ruil voor %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Handel afgewezen" @@ -2193,240 +2239,220 @@ msgstr "Totaal" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Aantal in de hand" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "meer>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Verhoog het aantal van deze grondstof" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Aantal gekozen grondstoffen" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Totaal aantal gekozen grondstoffen" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "De bank kan niet leeg gemaakt worden" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Ja" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Nee" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Onbekend" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Er is geen spel bezig." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Algemene instellingen" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Aantal spelers:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Punten benodigd om te winnen:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Willekeurig terrein:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" -msgstr "Sta handel tussen spelers toe:" +msgstr "Handel tussen spelers toestaan:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Handelen alleen toegestaan voor het bouwen:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" -msgstr "Controleer op winst alleen aan het einde van de beurt:" +msgstr "Op winst controleren alleen aan het einde van de beurt:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Aantal grondstofkaarten van elke soort:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Regel voor zevens:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" -msgstr "Gebruik dobbelsteenkaarten in plaats van dobbelstenen:" +msgstr "Dobbelsteenkaarten gebruiken in plaats van dobbelstenen:" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "Aantal pakken dobbelsteenkaarten:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "Aantal kaarten dat verwijderd wordt na het schudden:" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" -msgstr "Gebruik de piraat om schepen te blokkeren:" +msgstr "De piraat gebruiken om schepen te blokkeren:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Eiland ontdekkingspunten:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Bouwbeperkingen" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Straten:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Dorpen:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Steden:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Stadsmuren:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Schepen:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Bruggen:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Ontwikkelingskaarten" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Stratenbouw:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Monopolie:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Goed jaar:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Kapel:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Universiteit:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Gouverneurshuis:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Bibliotheek:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Markt:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Ridder:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Huidige spelinstellingen" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "Vraag om gratis %s" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "Geef gratis %s" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "Geef %s in ruil voor %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Ik vraag %s en bied %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Nieuw aanbod van %s." #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "Om _voorstellen vragen" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "Voorstel _accepteren" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "Handelsfase beëindigen" @@ -2489,25 +2515,25 @@ "Het spel gebruikt de nieuwe regel '%s', die nog niet ondersteund is. Probeer " "een upgrade.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Dit spel kan niet gewonnen worden." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Er is geen land." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Het is mogelijk dat dit spel niet gewonnen kan worden." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" "Dit spel kan gewonnen worden door uitsluitend alle dorpen en steden te " "bouwen." -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2563,177 +2589,177 @@ "Bas Wijnen" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Winstpuntanalyse" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Bij een zeven wordt de struikrover of piraat verplaatst" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "In de eerste twee beurten worden zevens opnieuw gerold" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Alle zevens worden opnieuw gerold" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Terrein willekeurig maken" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Het terrein willekeurig verdelen" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Piraat gebruiken" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" -msgstr "Gebruik de piraat om schepen te blokkeren" +msgstr "De piraat gebruiken om schepen te blokkeren" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Handel voor bouwen" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Handelen alleen toegestaan voor het bouwen" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Handel tussen spelers" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Handel tussen spelers toestaan" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Aan het einde van de beurt winnen" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Controleer op winst alleen aan het einde van de beurt" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" -msgstr "Gebruik dobbelsteenkaarten" +msgstr "Dobbelsteenkaarten gebruiken" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" -"Gebruik een pak van 36 dobbelsteenkaarten in plaats van echte dobbelstenen" +"Een pak van 36 dobbelsteenkaarten gebruiken in plaats van echte dobbelstenen" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "Aantal pakken dobbelsteenkaarten" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" -msgstr "The aantal pakken dobbelsteenkaarten (van elk 36 kaarten)" +msgstr "Het aantal pakken dobbelsteenkaarten (van elk 36 kaarten)" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "Aantal verwijderde kaarten" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" "Het aantal dobbelsteenkaarten dat wordt verwijderd nadat de stapel is geschud" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Eiland ontdekkingspunten" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" "Een komma-gescheiden lijst van bonuspunten voor het ontdekken van eilanden" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "Controleer en corrigeer de eiland ontdekkingspunten" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Aantal spelers" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Het aantal spelers" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Aantal winstpunten" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Het aantal benodigde punten om te winnen" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Is het mogelijk dit spel te winnen?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "B" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "G" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "IJ" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "W" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "H" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Kies een metaserver" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Kies een spel" @@ -2842,30 +2868,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** ONBEKEND BERICHTTYPE ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Fout bij het schrijven naar netwerk: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "Kon niet alle gegevens versturen\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Leesbuffer is vol - de verbinding wordt verbroken\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Fout bij het lezen van netwerk: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "Fout bij het verbinden naar %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "onbekend" @@ -2875,223 +2901,223 @@ msgstr "Bezig te verbinden met %s, poort %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" "Toestandsstapel is vol. Toestanden op de stapel gaan naar standard error.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Heuvels" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Akker" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Berg" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Weide" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "B_os" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "Woes_tijn" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_Zee" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Goud" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "Gee_n" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "_Baksteen (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Graan (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Erts (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Wol (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Hout (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "Ha_ven (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "O" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NO" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NW" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "W" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "ZW" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "ZO" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "Een heuveltegel plaatsen" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "Een akkertegel plaatsen" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "Een bergtegel plaatsen" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "Een weidetegel plaatsen" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "Een bostegel plaatsen" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "Een woestijntegel plaatsen" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "Een zeetegel plaatsen" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "Een goudtegel plaatsen" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "Tegel leegmaken" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "Een 2 op de tegel plaatsen" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "Een 3 op de tegel plaatsen" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "Een 4 op de tegel plaatsen" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "Een 5 op de tegel plaatsen" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "Een 6 op de tegel plaatsen" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "Een 8 op de tegel plaatsen" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "Een 9 op de tegel plaatsen" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "Een 10 op de tegel plaatsen" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "Een 11 op de tegel plaatsen" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "Een 12 op de tegel plaatsen" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "Een baksteenhaven 2:1 op de tegel plaatsen" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "Een graanhaven 2:1 op de tegel plaatsen" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "Een ertshaven 2:1 op de tegel plaatsen" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "Een houthaven 2:1 op de tegel plaatsen" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "Een houthaven 2:1 op de tegel plaatsen" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "Een haven verwijderen" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "Een 3 op 1 haven op de tegel plaatsen" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3099,242 +3125,231 @@ "Het type terrein kiezen met het contextmenu op de linkermuisklik of een " "knooppunt omschakelen om deze gedurende het opzetten te mogen gebruiken" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Een rij toevoegen" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Een rij verwijderen" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Een kolom toevoegen" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Een kolom verwijderen" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "_Titel" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "Om_schrijving" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "_Opmerkingen" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Schudden" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Spelinstellingen" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Spelregels" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Grondstoffen" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Gebouwen" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "Naamloos" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioniers Editor" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Kan '%s' niet openen" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Kan '%s' niet opslaan" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Spelen" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Geen filter" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Spel openen" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 msgid "_Open" msgstr "_Openen" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Opslaan als..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 msgid "Save _As" msgstr "Opslaan _als" #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Titel veranderen" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Nieuwe titel:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Over Pioniers Editor" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Open dit bestand" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "bestandsnaam" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor voor spellen Pioniers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Instellingen" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Opmerkingen" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Bestand" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Nieuw" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Een nieuw spel aanmaken" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Openen..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nieuw" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Een bestaand spel openen" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "Op_slaan" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Openen..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Het spel opslaan" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Opslaan _als..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "Op_slaan" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Het spel onder een andere naam opslaan" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "_Titel veranderen" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Opslaan _als..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "De titel van het spel veranderen" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "Winstpunten _controleren" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "_Titel veranderen" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Controleer of het mogelijk is dit spel te winnen" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Het programma afsluiten" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Over Pioniers Editor" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "Winstpunten _controleren" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informatie over Pioniers Editor" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Open dit bestand" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "bestandsnaam" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor voor spellen Pioniers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Opbouw menu niet gelukt: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Instellingen" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Opmerkingen" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Over Pioniers Editor" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Aantal grondstoffen" @@ -3347,51 +3362,51 @@ msgstr "spel;bord;maken;bewerken;layout;Pioneers;Settlers;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Start de metaserver als achtergrond taak" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Aanmaken pid-bestand bij starten in de achtergrond (betekent -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Omleiding naar een andere metaserver" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" -msgstr "Gebruik deze hostname bij nieuwe spellen" +msgstr "Deze hostname gebruiken bij nieuwe spellen" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "hostname" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" -msgstr "Gebruik dit bereik voor de poorten van nieuwe spellen" +msgstr "Dit bereik gebruiken voor de poorten van nieuwe spellen" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "van-tot" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Toon debug boodschappen in de syslog" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metaserver voor Pioniers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "Metaserver protocol:" @@ -3425,66 +3440,56 @@ msgid "Unregistering Avahi.\n" msgstr "Avahi afmelden.\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Over Pioniers server" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Informatie over de Pioniers server" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Server stoppen" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Server starten" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "De server stoppen" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "De server starten" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Nieuwe speler: %s vanaf %s\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Speler %s vanaf %s heeft de verbinding verbroken\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Speler %d is nu %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "De poort van de server" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Server registreren" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Dit spel bij de metaserver aanmelden" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Gerapporteerde hostnaam" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3492,134 +3497,134 @@ "firewall)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Is de spelervolgorde willekeurig" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Is de spelervolgorde willekeurig" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Toont alle verbonden spelers en toeschouwers" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Verbonden" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Is de speler op het moment verbonden?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Naam" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Naam van de speler" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Computer" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Computernaam van de speler" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Nummer" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Speler nummer" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Rol" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Speler of toeschouwer" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Pioniers starten" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Pioniers starten" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Chat inschakelen" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "De computerspeler mag chat-boodschappen versturen" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Computerspeler toevoegen" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Een computerspeler aan het spel toevoegen" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Berichten van de server" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Spelinstellingen" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Serverinstellingen" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Lopend spel" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Huidige spelers" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Computerspelers" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Berichten" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 msgid "About the Pioneers Game Server" msgstr "Over de Pioniers server" @@ -3627,18 +3632,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "Het spel is afgelopen.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Creëer een spel Pioniers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioniers Server" @@ -3650,140 +3655,150 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "spel;bord;server;host;gastheer;Pioneers;Settlers;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Informatie over de Pioniers server" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Over Pioniers server" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Titel van het spel" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Bestandsnaam van het spel" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Poort" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Het aantal spelers" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Het aantal benodigde punten om te winnen" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Zeven regel" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "Dobbelsteenkaarten" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "Aantal pakken dobbelsteenkaarten" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "Aantal dobbelsteenkaarten dat verwijderd wordt" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Terrein type, 0=standaard 1=willekeurig" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Voeg N computerspelers toe" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" -msgstr "Registreer dit spel bij de metaserver" +msgstr "Dit spel bij de metaserver aanmelden" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registreer bij metaserver naam (betekent -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" -msgstr "Gebruik deze hostname bij registratie" +msgstr "Deze hostname gebruiken bij registratie" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Stop wanneer het spel gewonnen is" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Stop wanneer na N seconden geen spelers gekomen zijn" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Toernooi modus, computerspelers worden toegevoegd na N minuten" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Administratie poort" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "Start het spel na een commando via de administratie poort" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Geef de spelers nummers in de volgorde waarin ze het spel betreden" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Metaserver opties" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opties voor de metaserver" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Diverse opties" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Diverse opties" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "Kan niet én de titel én de bestandsnaam tegelijkertijd instellen\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Kan de parameters van het spel niet laden\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "De netwerkpoort (%s) voor de beheerderstoegang is niet beschikbaar.\n" @@ -3792,7 +3807,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "De connectie met de metaserver is verbroken.\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3803,58 +3819,58 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Probeert opnieuw contact te maken met de metaserver.\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "Aanmelden bij de metaserver op %s.\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "Afmelden bij de metaserver: %s\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "bericht te lang" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "naam te lang" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "onbekende extensie genegeerd" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "De laatste speler is vertrokken, de teller wordt opnieuw ingesteld." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "Geen mensen gevonden. Doei." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Het spel gaat beginnen, computerspelers worden toegevoegd." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." -msgstr "Het spel start over %s minuten" +msgstr "Het spel start over %s minuten." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." -msgstr "Het spel start over %s minuut" +msgstr "Het spel start over %s minuut." # #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Computerspeler" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "Kan de computernaam van de speler niet bepalen: %s" @@ -3862,50 +3878,50 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Helaas, het spel is al afgelopen." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Speler vanaf %s geweigerd: het spel is afgelopen\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Naam niet veranderd: de nieuwe naam is al in gebruik" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Na lang wachten zijn er nog steeds geen spelers... Doei.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" -"The laatste menselijke speler heeft het spel verlaten. Wacht op de terugkeer " +"De laatste menselijke speler heeft het spel verlaten. Wacht op de terugkeer " "van een speler." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Het spel wordt hervat." #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s is weer terug." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "De versies van de server en de client komen niet overeen: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Dit spel start binnenkort." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Voorbereiden spel" @@ -3926,6 +3942,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "De administrator heeft de dobbelsteenworp vastgesteld." +#~ msgid "Quit the program" +#~ msgstr "Het programma afsluiten" + +#~ msgid "" +#~ msgstr "meer>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Verhoog het aantal van deze grondstof" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Opbouw menu niet gelukt: %s" + #~ msgid "Join the selected game" #~ msgstr "In het gekozen spel meespelen" diff -Nru pioneers-15.5/po/pioneers.pot pioneers-15.6/po/pioneers.pot --- pioneers-15.5/po/pioneers.pot 2018-03-14 16:02:16.000000000 +0000 +++ pioneers-15.6/po/pioneers.pot 2020-08-02 12:59:37.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -58,8 +58,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "" @@ -69,8 +69,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "" @@ -79,9 +79,9 @@ msgid "- Computer player for Pioneers" msgstr "" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "" @@ -332,8 +332,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -361,7 +361,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "" @@ -391,7 +391,7 @@ msgstr "" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "" @@ -434,70 +434,70 @@ msgid "Version mismatch. Please make sure client and server are up to date.\n" msgstr "" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr "" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "" -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "" -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "" -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "" -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "" -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "" -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "" #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "" -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "" @@ -551,7 +551,7 @@ msgid "%s took %s from %s.\n" msgstr "" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "" @@ -561,7 +561,7 @@ msgid "spectator %d" msgstr "" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "" @@ -887,6 +887,11 @@ msgid "%s, %s" msgstr "" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -932,12 +937,26 @@ msgid "Begin turn %d for %s.\n" msgstr "" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "" @@ -970,110 +989,397 @@ msgid " said: " msgstr "" -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "" @@ -1093,11 +1399,6 @@ msgid "Requesting new game server.\n" msgstr "" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1105,9 +1406,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1132,7 +1433,7 @@ msgstr "" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "" @@ -1198,7 +1499,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "" @@ -1239,642 +1540,370 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 -msgid "Server host" -msgstr "" - -#. Tooltip -#: ../client/gtk/connect.c:1791 -msgid "Name of the host of the game" -msgstr "" - -#. Label -#. Commandline option of client: port of the server -#. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 -msgid "Server port" -msgstr "" - -#. Tooltip -#: ../client/gtk/connect.c:1812 -msgid "Port of the host of the game" -msgstr "" - -#. Tooltip -#. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 -msgid "Recent games" -msgstr "" - -#. Caption for list of bought development cards -#: ../client/gtk/develop.c:130 -msgid "Development cards" -msgstr "" - -#. Button text: play development card -#: ../client/gtk/develop.c:163 -msgid "Play Card" -msgstr "" - -#. Dialog caption -#: ../client/gtk/discard.c:77 -msgid "Discard Resources" -msgstr "" - -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "" -msgstr[1] "" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "" -msgstr[1] "" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 +msgid "Server host" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" +#. Tooltip +#: ../client/gtk/connect.c:1775 +msgid "Name of the host of the game" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" +#. Label +#. Commandline option of client: port of the server +#. server port label +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 +msgid "Server port" msgstr "" -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" +#. Tooltip +#: ../client/gtk/connect.c:1794 +msgid "Port of the host of the game" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" +#. Tooltip +#. Label +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 +msgid "Recent games" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" +#. Caption for list of bought development cards +#: ../client/gtk/develop.c:130 +msgid "Development cards" msgstr "" -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" +#. Button text: play development card +#: ../client/gtk/develop.c:163 +msgid "Play Card" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" +#. Dialog caption +#: ../client/gtk/discard.c:77 +msgid "Discard Resources" msgstr "" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "" +msgstr[1] "" + +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" msgstr "" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" msgstr "" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" msgstr "" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "" +msgstr[1] "" + +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" msgstr "" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" msgstr "" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "" @@ -1887,7 +1916,7 @@ msgstr "" #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "" @@ -1920,21 +1949,21 @@ msgstr "" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "" @@ -1965,28 +1994,30 @@ msgstr "" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "" -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "" @@ -2081,7 +2112,7 @@ msgstr "" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "" @@ -2107,66 +2138,76 @@ msgid "The bank is empty" msgstr "" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "" @@ -2181,240 +2222,220 @@ msgstr "" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "" #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "" @@ -2471,23 +2492,23 @@ "upgrading.\n" msgstr "" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "" -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "" -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "" -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2532,174 +2553,174 @@ msgstr "" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "" @@ -2808,30 +2829,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "" -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "" @@ -2841,463 +2862,452 @@ msgstr "" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 msgid "_Open" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "" #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 msgid "Save _As" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "" -#. Menu entry -#: ../editor/gtk/editor.c:1718 -msgid "_File" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" msgstr "" #. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" +#: ../editor/gtk/editor.ui.h:2 +msgid "_File" msgstr "" -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" msgstr "" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." msgstr "" #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" msgstr "" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." msgstr "" #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" msgstr "" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" msgstr "" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" msgstr "" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "" @@ -3310,51 +3320,51 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "" @@ -3388,217 +3398,207 @@ msgid "Unregistering Avahi.\n" msgstr "" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 msgid "About the Pioneers Game Server" msgstr "" #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "" @@ -3610,140 +3610,150 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3752,7 +3762,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3763,45 +3774,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "" -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "" -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "" -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "" @@ -3809,11 +3820,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3821,48 +3832,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "" -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "" -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "" #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "" diff -Nru pioneers-15.5/po/POTFILES.in pioneers-15.6/po/POTFILES.in --- pioneers-15.5/po/POTFILES.in 2018-03-07 16:48:34.000000000 +0000 +++ pioneers-15.6/po/POTFILES.in 2020-05-31 11:54:46.000000000 +0000 @@ -9,8 +9,10 @@ client/common/robber.c client/common/setup.c client/common/turn.c +client/gtk/audio.c client/gtk/avahi-browser.c client/gtk/chat.c +[type: gettext/glade]client/gtk/client.ui client/gtk/connect.c client/gtk/develop.c client/gtk/discard.c @@ -47,6 +49,7 @@ common/network.c common/state.c editor/gtk/editor.c +[type: gettext/glade]editor/gtk/editor.ui editor/gtk/game-buildings.c editor/gtk/game-devcards.c editor/gtk/game-resources.c @@ -56,6 +59,7 @@ server/avahi.c server/gtk/main.c server/gtk/pioneers-server-gtk.desktop.in +[type: gettext/glade]server/gtk/server.ui server/main.c server/meta.c server/player.c diff -Nru pioneers-15.5/po/pt.po pioneers-15.6/po/pt.po --- pioneers-15.5/po/pt.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/pt.po 2020-08-02 12:37:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Pioneers 14.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2012-05-22 10:11+0000\n" "Last-Translator: Filipe Roque \n" "Language-Team: Portuguese \n" @@ -58,8 +58,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Activar mensagens para depuração" @@ -69,8 +69,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Mostrar a versão" @@ -79,9 +79,9 @@ msgid "- Computer player for Pioneers" msgstr "- Adversário electrónico de Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Versão de Pioneers:" @@ -334,8 +334,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -368,7 +368,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Desconnectado" @@ -398,7 +398,7 @@ msgstr "%s recebe %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s tira %s.\n" @@ -443,70 +443,70 @@ "Versão não coincide, Por favor assegure-se de que o cliente e o servidor " "estão actualizados.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Construa dois estabelecimentos, cada um com uma conexão" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Construa um estabelecimento com uma conexão" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "caminho" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "ponte" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "barco" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " ou" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Esperando o teu turno." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Escolhe o edifício que queres roubar." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Seleccione o barco a roubar" -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Coloca o ladrão." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Termina a acção de construcção do caminho" -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Construir um segmento de caminho." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Construir dois segmentos de caminho." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "É o teu turno." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Desculpa, %s disponível.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Fim do jogo." @@ -560,7 +560,7 @@ msgid "%s took %s from %s.\n" msgstr "%s tirou %s de %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Espectador %d" @@ -570,7 +570,7 @@ msgid "spectator %d" msgstr "espectador %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Jogador %d" @@ -896,6 +896,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "qualquer recurso (bug)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -941,12 +947,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Começa o turno %d para %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Erro ao começar %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "Seleccione um jogo descoberto automaticamente" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) em %s:%s" @@ -979,111 +999,398 @@ msgid " said: " msgstr " disse: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Jogo" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Começar um novo jogo" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Novo jogo" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Deixar este jogo" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Deixar o jogo" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administrar servidor de Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Admin" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Escolhe o teu nome de jogador" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "Nome do _jogador" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Legenda do terreno e custos de construcção" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "L_egenda" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Preferências do jogo actual" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "_Preferências de jogo" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histograma dos lançamentos" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Histograma dos dados" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Sair" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Sair" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Acções" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Lançar os dados" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Lançar dados" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Trocas" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Desfazer" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Terminar" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Construir uma estrada" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Estrada" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Construir um barco" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Barco" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Mover um barco" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Mover barco" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Construir uma ponte" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Ponte" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Construir um estabelecimento" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Estabelecimento" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Construir uma cidade" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Cidade" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Comprar uma carta de desenvolvimento" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Desenvolvimento" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Construir uma muralha" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Muralha" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "Preferência_s" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Mostra ou esconde a barra de ferramentas" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Barra de ferramentas" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Configurar a aplicação" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Preferê_ncias" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Ver" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Coloca a janela em modo de ecrã inteiro" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Ecrã Inteiro" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Ver o mapa todo" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Restaurar" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Centrar o mapa" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Centrar" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "A_juda" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informação acerca de Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Acerca de Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Mostrar o manual" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Meta-servidor em %s, porta %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Terminado.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Recebendo nomes do jogo do Meta-servidor.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, fuzzy, c-format msgid "New game server requested on %s port %s.\n" msgstr "Novo servidor de jogo solicitado em %s porta %s.\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Mensagem desconhecida do Meta-servidor: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 #, fuzzy msgid "Too many metaserver redirects.\n" msgstr "Demasiados redireccionamentos do Meta-servidor\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Erro na linha de redireccionamento: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Meta-servidor muito velho para criar servidores (versão %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, fuzzy, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Mensagem desconhecida do Meta-servidor: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Relançar nos primeiros dois turnos" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Relançar todos os 7's" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Por defeito" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Aleatório" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, fuzzy, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Redireccionado para o Meta-servidor em %s, porta %s\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, fuzzy, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Redireccionado para o Meta-servidor em %s, porta %s\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Recebendo uma lista de servidores Pioneers do Meta-servidor.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "Número de computadores a jogar" @@ -1104,11 +1411,6 @@ msgid "Requesting new game server.\n" msgstr "Pedindo novo servidor de jogo\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "Erro ao começar %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1116,9 +1418,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1144,7 +1446,7 @@ msgstr "_Novo jogo remoto" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 #, fuzzy msgid "_Join" msgstr "Aderir" @@ -1211,7 +1513,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Regra dos setes" @@ -1252,104 +1554,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Nome de jogador" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Entra o teu nome de jogador" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Espectador" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "Seleccionar se deseja ser um espectador" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "Aderir" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "Aderir a um jogo descoberto automaticamente" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Meta-servidor" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Aderir a um jogo público" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Aderir a um jogo público" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Criar jogo" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Criar um jogo" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Aderir ao jogo privado" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Aderir a um jogo privado" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Servidor" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Nome do anfitrião do jogo" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Porto do Servidor" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Porta do anfitrião do jogo" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Jogos recentes" @@ -1371,525 +1673,254 @@ #. Button text #: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 #: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Tem de descartar %d recurso" -msgstr[1] "Tem de descartar %d recursos" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Descartamentos totais" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Esperando que os jogadores descartem" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Fim do jogo" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s ganhou o jogo com %d pontos!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Graças ao %s, Senhor do mundo conhecido!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Escolhe recursos" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Tem de escolher %d recurso" -msgstr[1] "Tem de escolher %d recursos" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Recursos totais" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Esperando que os jogadores escolham" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Jogo" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Novo jogo" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Começar um novo jogo" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Deixar o jogo" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Deixar este jogo" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Admin" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administrar servidor de Pioneers" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "Nome do _jogador" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Escolhe o teu nome de jogador" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "L_egenda" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Legenda do terreno e custos de construcção" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "_Preferências de jogo" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Preferências do jogo actual" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Histograma dos dados" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histograma dos lançamentos" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Sair" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Sair do programa" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Acções" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Lançar dados" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Lançar os dados" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Trocas" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Desfazer" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Terminar" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Estrada" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Construir uma estrada" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Barco" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Construir um barco" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Mover barco" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Mover um barco" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Ponte" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Construir uma ponte" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Estabelecimento" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Construir um estabelecimento" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Cidade" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Construir uma cidade" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Desenvolvimento" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Comprar uma carta de desenvolvimento" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Muralha" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Construir uma muralha" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "Preferência_s" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Preferê_ncias" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Configurar a aplicação" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "_Ver" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "_Restaurar" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "Ver o mapa todo" +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "_Centrar" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Tem de descartar %d recurso" +msgstr[1] "Tem de descartar %d recursos" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "Centrar o mapa" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Descartamentos totais" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "A_juda" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Esperando que os jogadores descartem" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Acerca de Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Fim do jogo" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Informação acerca de Pioneers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s ganhou o jogo com %d pontos!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Mostrar o manual" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Graças ao %s, Senhor do mundo conhecido!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "_Ecrã Inteiro" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Escolhe recursos" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "Coloca a janela em modo de ecrã inteiro" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Tem de escolher %d recurso" +msgstr[1] "Tem de escolher %d recursos" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Barra de ferramentas" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Recursos totais" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Mostra ou esconde a barra de ferramentas" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Esperando que os jogadores escolham" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Pontos necessários para ganhar: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Mensagens" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Mapa" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Terminar Negócio" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Quote" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Rejeitar Negócio Doméstico" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Legenda" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Bem-vindo ao Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Preferências de Pioneers" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Escolhe um dos temas" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Mostrar legenda" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Mostrar a legenda como uma página junto ao mapa" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Mensagens com cor" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Mostrar novas mensagens com cor" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Conversar na cor do jogador" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Mostrar novas mensagens de conversa na cor do jogador" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Sumário com cor" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Usar cor no sumário do jogador" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Barra de ferramentas com atalhos" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Mostrar atalhos directos do teclado na barra de ferramentas" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Modo Silencioso" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "Em modo silencioso nenhum som é feito" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Anunciar novos jogadores" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "Tocar um som quando um novo jogador ou espectador se juntar ao jogo" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "Mostrar notificações" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" "Mostrar notificações quando for o seu turno ou quando novos negócios " "estiverem disponíveis" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Usar a disposição 16:9" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Usar a disposição amigável 16:9 para a janela" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "Lançar os dados" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Acerca de Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Bem-vindo ao Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Histograma dos dados" @@ -1902,7 +1933,7 @@ msgstr "Seleccione uma nova localização para o barco" #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "É o seu turno para construir" @@ -1935,21 +1966,21 @@ msgstr "Mar" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Produção do terreno" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Custos de construção" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Muralha" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Carta de desenvolvimento" @@ -1980,28 +2011,30 @@ msgstr "Cara:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variante:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Ligar-se como espectador" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Anfitrião do Meta-servidor" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Seleccionar um jogo para aderir." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Conectando" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Jogar um jogo de Pioneers" @@ -2096,7 +2129,7 @@ msgstr "Cartas de recurso" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Cartas de desenvolvimento" @@ -2122,66 +2155,77 @@ msgid "The bank is empty" msgstr "O banco está vazio" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s tem %s e está à procura de %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "Nova oferta de %s" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "Oferta de %s" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Quero" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Dá-lhes" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Apagar" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Activar Conversa" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Rejeitar Negócio Doméstico" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Jogador" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Quotes" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s por %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Negócio rejeitado" @@ -2196,241 +2240,221 @@ msgstr "Total" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Cartas de recurso na mão" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "mais>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Incrementar a quantidade seleccionada" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Quantidade seleccionada" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Quantidade seleccionada total" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "O banco não pode ser esvaziado" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Sim" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Não" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Desconhecido" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Não há jogo a decorrer" #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Preferências gerais" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Número de jogadores:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Ponto de Vitória:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Terreno Aleatório:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Permitir trocas entre jogadores:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Trocas permitidas apenas antes de construir/comprar:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "Verificar a vitória apenas no fim do turno:" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Quantidade de cada recurso:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "Regra dos setes:" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 #, fuzzy msgid "Number of dice decks:" msgstr "Número de jogadores:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Usar o pirata para bloquear barcos:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bónus de Descoberta de Ilha:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Custos de construção" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Estradas:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Estabelecimentos:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Cidades:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Muralhas:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Barcos:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Pontes:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Baralho das Cartas de Desenvolvimento" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Cartas de Construção de Estradas:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Cartas de Monopólio:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Cartas de Ano de Abundância:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Cartas de Capela:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Cartas Universidade de Pioneers:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Cartas Palácio do Governador:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Cartas de Biblioteca:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Cartas de Mercado:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Cartas de Soldado:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Preferências do jogo actual" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "pede %s grátis" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "oferece %s grátis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "oferece %s por %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Quero %s, e dou %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "Oferta de preço recebido de %s" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Verificar Quotes" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Aceitar Quote" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "_Terminar Negócio" @@ -2493,23 +2517,23 @@ "O jogo usa a nova regra '%s', que não é suportada ainda. Considere " "actualizar.\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Este jogo não pode ser ganho" -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Não há terra" -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "É possível que este jogo não possa ser ganho" -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "Este jogo pode ser ganho apenas construindo estabelecimentos e cidades" -#: ../common/game.c:971 +#: ../common/game.c:970 #, fuzzy, c-format msgid "" "Required victory points: %d\n" @@ -2571,175 +2595,175 @@ " Tiago Silva https://launchpad.net/~tiagosilva" #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "Análise dos pontos de vitória" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Todos os 7 movem o ladrão ou o pirata" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "Nos primeiros dois turnos os setes são relançados" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Todos os 7 são relançados" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Terreno Aleatório?" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Terreno Aleatório?" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Usar Pirata" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Usar o pirata para bloquear barcos" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Negócio rigoroso" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Trocas permitidas apenas antes de construir/comprar?" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Negócio local" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Permitir trocas entre jogadores" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Vitória no fim do turno" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Verificar a vitória apenas no fim do turno" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 #, fuzzy msgid "Number of dice decks" msgstr "Número de computadores a jogar" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "Bónus de descoberta de ilhas" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "Uma lista separada por vírgulas de pontos bónus por descobrir ilhas" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "Verificar e corrigir bónus de descoberta de ilhas" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Número de jogadores" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "O número de jogadores" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Ponto de Vitória" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Os pontos necessários para ganhar o jogo" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "É possível ganhar este jogo?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "Ld" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "C" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "Mi" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "Ln" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Ma" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Escolha um meta-servidor" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Seleccione um jogo" @@ -2848,30 +2872,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** TIPO DE MENSAGEM DESCONHECIDO ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Erro a escrever no socket: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Ler buffer overflow - desconectando\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Erro lendo socket: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, fuzzy, c-format msgid "Error connecting to %s: %s\n" msgstr "Erro conectando a %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "Desconhecido" @@ -2881,470 +2905,459 @@ msgstr "Conectando a %s, porta %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "State stack overflow. Stack dump semt to standard error.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Colina" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Campo" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Montanha" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "_Pasto" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Floresta" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "_Deserto" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "M_ar" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Ouro" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Nada" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "Tijolo (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Cereais (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "Mine_rais (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Lã (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Madeira (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Qualquer (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "Este|E" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "Nordeste|NE" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "Noroeste|NO" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "Oeste|O" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "Sudoeste|SO" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "Sudeste|SE" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 #, fuzzy msgid "Remove a port" msgstr "Porto do Servidor" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "Inserir uma linha" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "Apagar uma linha" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "Inserir uma coluna" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "Apagar uma coluna" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 #, fuzzy msgid "_Title" msgstr "_Mudar título" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 #, fuzzy msgid "_Description" msgstr "_Deserto" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 #, fuzzy msgid "_Comments" msgstr "Comentários" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Baralhar" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Parâmetros de jogo" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Regras" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Recursos" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Construções" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Editor de Pioneers" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Falha ao carregar '%s'" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Falha ao gravar para '%s'" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "Jogos" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "Sem filtro" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Jogo aberto" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Abrir" #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Guardar Como..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Gravar _como..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Mudar o Título" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Novo título:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Acerca do Editor de Pioneers" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Abrir este ficheiro" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "Nome de ficheiro" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor para jogos de Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Preferências" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Comentários" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Ficheiro" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Novo" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Criar um novo jogo" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Abrir" +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Novo" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Abrir um jogo existente" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Gravar" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Abrir" #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Gravar jogo" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Gravar _como..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Gravar" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Gravar como" #. Menu entry -#: ../editor/gtk/editor.c:1748 -#, fuzzy -msgid "Change _Title" -msgstr "Mudar o Título" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Gravar _como..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Mudar título do jogo" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "Verificar objectivo dos Pontos de vitória" +#: ../editor/gtk/editor.ui.h:22 +#, fuzzy +msgid "Change _Title" +msgstr "Mudar o Título" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Verificar se o jogo pode ser ganho" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Sair" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Acerca do Editor de Pioneers" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "Verificar objectivo dos Pontos de vitória" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Informação acerca do Editor de Pioneers" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Abrir este ficheiro" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "Nome de ficheiro" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Editor para jogos de Pioneers" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Construção de menus falhada: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Preferências" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "Comentários" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Acerca do Editor de Pioneers" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Contagem de Recursos" @@ -3357,51 +3370,51 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Processificar o meta-servidor ao arrancar" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Pidfile a criar quando processificando (implica -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Redirecionar clientes para outro meta-servidor" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Usar este endereço quando criar novos jogos" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "endereço" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Usar esta gama de portas quando criar novos jogos" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "de-até" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Debug syslog messages" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Meta server para Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "protocolo meta-servidor:" @@ -3435,66 +3448,56 @@ msgid "Unregistering Avahi.\n" msgstr "Desregistrar o serviço Avahi.\\n\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Acerca do Servidor Pioneers" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Informação do Servidor Pioneers" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Parar servidor" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Iniciar o servidor" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Parar o servidor" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Iniciar o servidor" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Jogador %s de %s entrou\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Jogador %s de %s saiu\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Jogador %d está agora %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "A porta para o servidor de jogo" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Registrar o servidor" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registrar este jogo no Meta-servidor" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Nome de Anfitrião Reportado" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" @@ -3502,134 +3505,134 @@ "firewall)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "Ordem de turnos aleatória" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Desordenar a ordem de turnos" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Mostrar todos os jogadores e espectadores ligados ao jogo" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Conectado" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Está o jogador actualmemte conectado?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Nome" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Nome do jogador" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Local" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Nome do jogador anfitrião" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Número" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Número do jogador" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Função" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "Jogador ou espectador" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Iniciar o Cliente de Pioneers" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Iniciar o Cliente de Pioneers" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Activar Conversa" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Activar mensagens de conversa" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Adicionar adversário electrónico" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Adicionar um adversário electrónico ao jogo" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Mensagens do servidor" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Preferências de jogo" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Parâmetros do servidor" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Jogo actual" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Jogadores conectados" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Adversário electrónico" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Mensagens" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "O servidor de Jogo Pionners" @@ -3638,18 +3641,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "O jogo acabou.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Organizar um jogo de Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Servidor de Pioneers" @@ -3661,147 +3664,157 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Informação do Servidor Pioneers" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Acerca do Servidor Pioneers" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Título de jogo para usar" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Ficheiro de jogo para usar" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Porta para escutar" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Sobrepôr número de adversários" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Sobrepôr número de pontos necessários para ganhar" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Sobrepôr regra dos 7's" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 #, fuzzy msgid "Override dice-deck handling" msgstr "Sobrepôr regra dos 7's" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 #, fuzzy msgid "Override num-dice-decks handling" msgstr "Sobrepôr regra dos 7's" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 #, fuzzy msgid "Override num-removed-dice-cards handling" msgstr "Sobrepôr regra dos 7's" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Sobrepôr tipo de terreno, 0=omissão 1=aleatório" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Adicionar N adversários electrónicos" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Registrar o servidor com o Meta-servidor" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registro em nome de Meta-servidor (supõe -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Usar este nome de anfitrião quando se registrar" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Sair quando um jogador ganhar" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Sair depois de N segundos sem jogadores" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "" "Modo de campionato, adversários electrónicos adicionado depois de N minutos" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Porta Admin para escuta" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "Não iniciar o jogo imediatamemte, esperar um comando na porta de " "administrador" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Dar números de jogadores de acordo com a ordem em que entram em jogo" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Opções de Meta-servidor" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Opçoes para o Meta-servidor" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Opções variadas" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Opções variadas" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "" "Não é possível escolher o título do jogo e o nome do ficheiro em simultâneo\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Os parâmetros do jogo não estão a ser carregados\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3811,7 +3824,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Opçoes para o Meta-servidor" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3823,46 +3837,46 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Opçoes para o Meta-servidor" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, fuzzy, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registrar no Meta-servidor em %s, porta %s\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 #, fuzzy msgid "Unregister from the metaserver.\n" msgstr "Desregistrar do Meta-servidor\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "Conversa demasiado larga" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "Nome demasiado largo" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignorar extensão desconhecida" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "O último jogador saiu, o relógio foi reiniciado" -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "Sem jogadores humanos presentes. Adeus." -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "O jogo começa, adicionar adversários electrónicos." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "O jogo começa em %s minutos." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "O jogo começa em %s minuto." @@ -3871,11 +3885,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Adversário electrónico" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3883,48 +3897,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "O jogo acabou." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Jogador de %s recusado: jogo acabou\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Nome não mudado: novo nome está já em uso" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Estava à espera à muito tempo sem jogadores...Adeus.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "O último jogador humano saiu. À espera do regresso de um jogador." -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "Prosseguindo o jogo" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s reconectou-se." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Versão não coincide: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Este jogo começará em breve" #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Preparando jogo" @@ -3945,6 +3959,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "O lançamento dos dados foi determinado pelo administrador" +#~ msgid "Quit the program" +#~ msgstr "Sair do programa" + +#~ msgid "" +#~ msgstr "mais>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Incrementar a quantidade seleccionada" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Construção de menus falhada: %s" + #~ msgid "Join the selected game" #~ msgstr "Aderir ao jogo seleccionado" diff -Nru pioneers-15.5/po/sk.po pioneers-15.6/po/sk.po --- pioneers-15.5/po/sk.po 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/po/sk.po 2020-08-02 12:37:55.000000000 +0000 @@ -0,0 +1,3938 @@ +# Slovak translation for pioneers +# This file is distributed under the same license as the pioneers package. +# Jose Riha , 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: Pioneers 15.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" +"PO-Revision-Date: 2019-07-01 06:38+0200\n" +"Last-Translator: Jose Riha \n" +"Language-Team: \n" +"Language: sk_SK\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n>=2 && n<=4 ? 1 : 2);\n" +"X-Generator: Poedit 2.2.1\n" + +#. Commandline pioneersai: chromosome-file +#: ../client/ai/ai.c:90 +msgid "Chromosome File" +msgstr "Súbor Chromosome" + +#. Commandline pioneersai: server +#: ../client/ai/ai.c:93 +msgid "Server Host" +msgstr "Adresa servera" + +#. Commandline pioneersai: port +#: ../client/ai/ai.c:96 +msgid "Server Port" +msgstr "Port servera" + +#. Commandline pioneersai: name +#: ../client/ai/ai.c:99 +msgid "Computer name (mandatory)" +msgstr "Meno počítača (povinné)" + +#. Commandline pioneersai: time +#: ../client/ai/ai.c:102 +msgid "Time to wait between turns (in milliseconds)" +msgstr "Čas, počas ktorého sa čaká na ťah (v ms)" + +#. Commandline pioneersai: chat-free +#: ../client/ai/ai.c:105 +msgid "Stop computer player from talking" +msgstr "Zabrániť počítačovému hráčovi rozprávať" + +#. Commandline pioneersai: algorithm +#: ../client/ai/ai.c:108 +msgid "Type of computer player" +msgstr "Typ počítačového hráča" + +#. Commandline option of ai: enable debug logging +#. Commandline option of client: enable debug logging +#. Commandline option of metaserver: enable debug logging +#. Commandline option of server-gtk: enable debug logging +#. Commandline option of server: enable debug logging +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 +msgid "Enable debug messages" +msgstr "Povoliť správy ladenia" + +#. Commandline option of ai: version +#. Commandline option of client: version +#. Commandline option of editor: version +#. Commandline option of metaserver: version +#. Commandline option of server-gtk: version +#. Commandline option of server-console: version +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 +msgid "Show version information" +msgstr "Zobraziť informácie o verzii" + +#. Long description in the commandline for pioneersai: help +#: ../client/ai/ai.c:125 +msgid "- Computer player for Pioneers" +msgstr "- Počítačový hráč pre Pioneers" + +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 +#, c-format +msgid "Pioneers version:" +msgstr "Verzia Pioneers:" + +#. ai commandline error +#: ../client/ai/ai.c:160 +#, c-format +msgid "A name must be provided.\n" +msgstr "Meno musí byť zadané.\n" + +#: ../client/ai/ai.c:171 +#, c-format +msgid "Type of computer player: %s\n" +msgstr "Typ počítačového hráča: %s\n" + +#: ../client/ai/ai.c:202 +msgid "The game is already full. I'm leaving." +msgstr "Hra už je plná. Odchádzam." + +#. AI chat at the start of the turn +#: ../client/ai/ai.c:230 +msgid "Ok, let's go!" +msgstr "Dobre, poďme hrať!" + +#. AI chat at the start of the turn +#: ../client/ai/ai.c:232 +msgid "I'll beat you all now! ;)" +msgstr "A teraz vás porazím. Všetkých! ;)" + +#. AI chat at the start of the turn +#: ../client/ai/ai.c:234 +msgid "Now for another try..." +msgstr "Skúsim to zas..." + +#. AI chat when one resource is received +#: ../client/ai/ai.c:239 +msgid "At least I get something..." +msgstr "Aspoň ja som niečo dostal..." + +#. AI chat when one resource is received +#: ../client/ai/ai.c:241 +msgid "One is better than none..." +msgstr "Lepšie ako nič..." + +#. AI chat when more than one resource is received +#: ../client/ai/ai.c:246 +msgid "Wow!" +msgstr "Paráda!" + +#. AI chat when more than one resource is received +#: ../client/ai/ai.c:248 +msgid "Ey, I'm becoming rich ;)" +msgstr "Ech, tuším budem boháč ;-)" + +#. AI chat when more than one resource is received +#: ../client/ai/ai.c:250 +msgid "This is really a good year!" +msgstr "Toto je naozaj dobrý rok!" + +#. AI chat when other players receive more than one resource +#: ../client/ai/ai.c:255 +msgid "You really don't deserve that much!" +msgstr "Toľko si naozaj nezaslúžiš!" + +#. AI chat when other players receive more than one resource +#: ../client/ai/ai.c:257 +msgid "You don't know what to do with that many resources ;)" +msgstr "Poradíš si vôbec s toľkými surovinami? ;)" + +#. AI chat when other players receive more than one resource +#: ../client/ai/ai.c:259 +msgid "Ey, wait for my robber and lose all this again!" +msgstr "Hej, len počkaj na môjho zlodeja a zas o všetko prídeš!" + +#. AI chat when it moves the robber +#: ../client/ai/ai.c:264 +msgid "Hehe!" +msgstr "Haha!" + +#. AI chat when it moves the robber +#: ../client/ai/ai.c:266 +msgid "Go, robber, go!" +msgstr "Ideš, zlodej, ideš!" + +#. AI chat when the robber is moved to it +#: ../client/ai/ai.c:271 +msgid "You bastard!" +msgstr "Ty potkan!" + +#. AI chat when the robber is moved to it +#: ../client/ai/ai.c:273 +msgid "Can't you move that robber somewhere else?!" +msgstr "Nemôžeš dať toho zlodeja inam?!" + +#. AI chat when the robber is moved to it +#: ../client/ai/ai.c:275 +msgid "Why always me??" +msgstr "Prečo ja??" + +#. AI chat when it must discard resources +#: ../client/ai/ai.c:280 +msgid "Oh no!" +msgstr "Nie!!" + +#. AI chat when it must discard resources +#: ../client/ai/ai.c:282 +msgid "Grrr!" +msgstr "Vrrr!" + +#. AI chat when it must discard resources +#: ../client/ai/ai.c:284 +msgid "Who the hell rolled that 7??" +msgstr "Kto do čerta hodil tú sedmičku??" + +#. AI chat when it must discard resources +#: ../client/ai/ai.c:286 +msgid "Why always me?!?" +msgstr "Prečo to musím byť vždy ja?!?" + +#. AI chat when other players must discard +#: ../client/ai/ai.c:291 +msgid "Say good bye to your cards... :)" +msgstr "Rozlúč sa so svojimi kartami... :-)" + +#. AI chat when other players must discard +#: ../client/ai/ai.c:293 +msgid "*evilgrin*" +msgstr "*diabolský úškľabok*" + +#. AI chat when other players must discard +#: ../client/ai/ai.c:295 +msgid "/me says farewell to your cards ;)" +msgstr "/me vraví zbohom Tvojim kartám ;)" + +#. AI chat when other players must discard +#: ../client/ai/ai.c:297 +msgid "That's the price for being rich... :)" +msgstr "To je cena, ktorú platia bohatí... :)" + +#. AI chat when someone steals from it +#: ../client/ai/ai.c:302 +msgid "Ey! Where's that card gone?" +msgstr "Hm? Kam sa podela tá karta?" + +#. AI chat when someone steals from it +#: ../client/ai/ai.c:304 +msgid "Thieves! Thieves!!" +msgstr "Zlodej! Zlodej!!" + +#. AI chat when someone steals from it +#: ../client/ai/ai.c:306 +msgid "Wait for my revenge..." +msgstr "Pomsta bude sladká..." + +#. AI chat when someone plays the monopoly card +#: ../client/ai/ai.c:311 +msgid "Oh no :(" +msgstr "Áááále nie :(" + +#. AI chat when someone plays the monopoly card +#: ../client/ai/ai.c:313 +msgid "Must this happen NOW??" +msgstr "To sa vážne musí stať zrovna TERAZ??" + +#. AI chat when someone plays the monopoly card +#: ../client/ai/ai.c:315 +msgid "Args" +msgstr "Prčic" + +#. AI chat when it has the largest army +#: ../client/ai/ai.c:320 +msgid "Hehe, my soldiers rule!" +msgstr "Haha, moje vojsko je najlepšie!" + +#. AI chat when another player that the largest army +#: ../client/ai/ai.c:325 +msgid "First robbing us, then grabbing the points..." +msgstr "Najprv nás okradne, potom si ešte nahrabe body..." + +#. AI chat when it has the longest road +#: ../client/ai/ai.c:330 +msgid "See that road!" +msgstr "Sleduj tú cestu!" + +#. AI chat when another player has the longest road +#: ../client/ai/ai.c:335 +msgid "Pf, you won't win with roads alone..." +msgstr "Pche, samotná cesta Ti víťazstvo nezaručí..." + +#: ../client/ai/ai.c:434 +#, c-format +msgid "Received error from server: %s. Quitting\n" +msgstr "Prijatá chyba zo servera: %s. Končím\n" + +#. AI chat when it wins +#: ../client/ai/ai.c:446 ../client/ai/genetic.c:2766 +msgid "Yippie!" +msgstr "Hurá!" + +#. AI chat when another player wins +#: ../client/ai/ai.c:449 ../client/ai/genetic.c:2777 +msgid "My congratulations" +msgstr "Gratulujem" + +#: ../client/ai/genetic.c:1277 ../client/ai/greedy.c:961 +msgid "No settlements in stock to use for setup" +msgstr "Nie sú dediny na sklade pre fázu zakladania" + +#: ../client/ai/genetic.c:1284 ../client/ai/greedy.c:968 +msgid "There is no place to setup a settlement" +msgstr "Už nie je miesto na založenie dediny" + +#: ../client/ai/genetic.c:1311 ../client/ai/greedy.c:992 +msgid "No roads in stock to use for setup" +msgstr "Nie sú cesty na sklade pre fázu zakladania" + +#: ../client/ai/genetic.c:1329 ../client/ai/greedy.c:1009 +msgid "There is no place to setup a road" +msgstr "Už nie je miesto na postavenie cesty" + +#: ../client/ai/genetic.c:2651 ../client/ai/greedy.c:1784 +msgid "Rejecting trade.\n" +msgstr "Odmietam obchod.\n" + +#. Translators: don't translate '/help' +#: ../client/ai/lobbybot.c:80 +msgid "" +"Hello, welcome to the lobby. I am a simple robot. Type '/help' in the chat " +"to see the list of commands I know." +msgstr "" +"Ahojte, vitajte v lobby. Som jednoduchý robot. Napíšte '/help' do chatu pre " +"zobrazenie zoznamu príkazov, ktoré poznám." + +#. Translators: don't translate '/help' +#: ../client/ai/lobbybot.c:107 +msgid "'/help' shows this message again" +msgstr "'/help' opäť zobrazí túto správu" + +#. Translators: don't translate '/why' +#: ../client/ai/lobbybot.c:110 +msgid "'/why' explains the purpose of this strange board layout" +msgstr "'/why' vysvetlí dôvod tohto zvláštneho rozloženia na doske" + +#. Translators: don't translate '/news' +#: ../client/ai/lobbybot.c:113 +msgid "'/news' tells the last released version" +msgstr "'/news' zobrazí najnovšiu vydanú verziu" + +#. AI chat that explains '/why' +#: ../client/ai/lobbybot.c:119 +msgid "" +"This board is not intended to be a game that can be played. Instead, players " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " +"registers it at the metaserver. The other players can subsequently " +"disconnect from the lobby, and enter that game." +msgstr "" +"Táto hracia plocha neslúži pre hranie hry Pioneers, ale pre nájdenie ďalších " +"hráčov, ktorí sa tu môžu dohodnúť na tom, ktorú hru si zahrajú. Potom, jeden " +"z nich vytvorí server dohodnutej hry a registruje ju na metaserveri. Ostatní " +"hráči môžu lobby opustiť a pripojiť sa k tej hre." + +#: ../client/ai/lobbybot.c:130 +msgid "The last released version of Pioneers is" +msgstr "Poslednou vydanou verziou Pioneers je" + +#. The lobbybot leaves when a game is starting +#: ../client/ai/lobbybot.c:146 +msgid "The game is starting. I'm not needed anymore. Goodbye." +msgstr "Hra štartuje. Už ma nepotrebujete. Zbohom." + +#: ../client/common/client.c:105 +msgid "Waiting" +msgstr "Čakám" + +#: ../client/common/client.c:107 +msgid "Idle" +msgstr "Nečinný" + +#: ../client/common/client.c:532 +msgid "We have been kicked out of the game.\n" +msgstr "Boli sme vykopnutý z hry.\n" + +#. Network status: offline +#: ../client/common/client.c:535 ../client/common/client.c:990 +#: ../client/gtk/gui.c:1296 +msgid "Offline" +msgstr "Odpojený" + +#: ../client/common/client.c:556 +#, c-format +msgid "Error (%s): %s\n" +msgstr "Chyba (%s): %s\n" + +#: ../client/common/client.c:565 ../client/common/client.c:576 +#, c-format +msgid "Notice: %s\n" +msgstr "Oznam: %s\n" + +#: ../client/common/client.c:693 +#, c-format +msgid "%s does not receive any %s, because the bank is empty.\n" +msgstr "%s nedostane surovinu: %s, pretože bank je prázdny.\n" + +#: ../client/common/client.c:706 +#, c-format +msgid "%s only receives %s, because the bank didn't have any more.\n" +msgstr "%s dostane iba %s, pretože v banku už viac nebolo.\n" + +#: ../client/common/client.c:716 +#, c-format +msgid "%s receives %s.\n" +msgstr "%s získava %s.\n" + +#. Year of Plenty +#: ../client/common/client.c:724 ../client/common/client.c:2666 +#, c-format +msgid "%s takes %s.\n" +msgstr "%s si berie %s.\n" + +#: ../client/common/client.c:729 +#, c-format +msgid "%s spent %s.\n" +msgstr "%s použil(a) %s.\n" + +#: ../client/common/client.c:735 +#, c-format +msgid "%s is refunded %s.\n" +msgstr "%s dostal naspäť %s.\n" + +#. %s = Player name +#: ../client/common/client.c:753 +#, c-format +msgid "%s shuffled the dice deck.\n" +msgstr "%s zamiešal(a) balíček kariet.\n" + +#: ../client/common/client.c:772 +#, c-format +msgid "%s discarded %s.\n" +msgstr "%s sa zbavil(a) %s.\n" + +#: ../client/common/client.c:846 +#, c-format +msgid "%s has won the game with %d victory points!\n" +msgstr "%s vyhral(a) hru vďaka %d víťazným bodom!\n" + +#: ../client/common/client.c:945 +msgid "Loading" +msgstr "Načítavam" + +#: ../client/common/client.c:991 +msgid "Version mismatch." +msgstr "Nesedí verzia." + +#: ../client/common/client.c:993 +msgid "Version mismatch. Please make sure client and server are up to date.\n" +msgstr "" +"Nesúhlasné verzie. Prosím, ubezpečte sa, že klient aj server sú v aktuálnej " +"verzii.\n" + +#: ../client/common/client.c:1416 +msgid "Build two settlements, each with a connecting" +msgstr "Postavte dve dediny, ku každej pripojte" + +#: ../client/common/client.c:1419 +msgid "Build a settlement with a connecting" +msgstr "Postavde dedinu, ku ktorej pripojíte" + +#: ../client/common/client.c:1422 +msgid "road" +msgstr "cestu" + +#: ../client/common/client.c:1424 +msgid "bridge" +msgstr "most" + +#: ../client/common/client.c:1426 +msgid "ship" +msgstr "loď" + +#: ../client/common/client.c:1433 +msgid " or" +msgstr " alebo" + +#: ../client/common/client.c:1497 +msgid "Waiting for your turn." +msgstr "Čakám na Váš ťah." + +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 +msgid "Select the building to steal from." +msgstr "Vyberte si budovu, ktorú chcete vykradnúť." + +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 +msgid "Select the ship to steal from." +msgstr "Vyberte si loď, ktorú chcete vykradnúť." + +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 +msgid "Place the robber." +msgstr "Premiestnite zlodeja." + +#: ../client/common/client.c:1705 +msgid "Finish the road building action." +msgstr "Dokončite stavbu cesty." + +#: ../client/common/client.c:1707 +msgid "Build one road segment." +msgstr "Postavte jeden úsek cesty." + +#: ../client/common/client.c:1709 +msgid "Build two road segments." +msgstr "Postavte dva úseky cesty." + +#. Notification +#: ../client/common/client.c:1982 ../client/common/client.c:2076 +#: ../client/gtk/interface.c:432 +msgid "It is your turn." +msgstr "Ste na ťahu." + +#: ../client/common/client.c:2170 +#, c-format +msgid "Sorry, %s available.\n" +msgstr "Prepáčte, %s nie je dostupné.\n" + +#: ../client/common/client.c:2484 +msgid "The game is over." +msgstr "Hra skončila." + +#. This development card is unique +#: ../client/common/develop.c:67 +#, c-format +msgid "You bought the %s development card.\n" +msgstr "Kúpili ste si akčnú kartu %s.\n" + +#. This development card is not unique +#: ../client/common/develop.c:73 +#, c-format +msgid "You bought a %s development card.\n" +msgstr "Kúpili ste si akčnú kartu %s.\n" + +#: ../client/common/develop.c:103 +#, c-format +msgid "%s bought a development card.\n" +msgstr "%s kúpil(a) akčnú kartu.\n" + +#: ../client/common/develop.c:121 +#, c-format +msgid "%s played the %s development card.\n" +msgstr "%s použil(a) akčnú kartu %s.\n" + +#: ../client/common/develop.c:126 +#, c-format +msgid "%s played a %s development card.\n" +msgstr "%s použil(a) akčnú kartu %s.\n" + +#: ../client/common/develop.c:138 +msgid "You have run out of road segments.\n" +msgstr "Už nemáte ďalšie diely cesty.\n" + +#. I get the cards +#. $1=resources, $2=player that loses resources +#: ../client/common/develop.c:179 +#, c-format +msgid "You get %s from %s.\n" +msgstr "Získavate %s od %s.\n" + +#. I lose the cards +#. $1=player that steals, $2=resources +#: ../client/common/develop.c:185 +#, c-format +msgid "%s took %s from you.\n" +msgstr "%s Ti vzal(a) %s.\n" + +#: ../client/common/develop.c:192 +#, c-format +msgid "%s took %s from %s.\n" +msgstr "%s vzal(a) %s od %s.\n" + +#: ../client/common/player.c:125 ../server/player.c:568 +#, c-format +msgid "Spectator %d" +msgstr "Pozorovateľ %d" + +#: ../client/common/player.c:128 +#, c-format +msgid "spectator %d" +msgstr "pozorovateľ %d" + +#: ../client/common/player.c:137 ../server/player.c:571 +#, c-format +msgid "Player %d" +msgstr "Hráč %d" + +#: ../client/common/player.c:139 +#, c-format +msgid "player %d" +msgstr "hráč %d" + +#: ../client/common/player.c:216 +#, c-format +msgid "New spectator: %s.\n" +msgstr "Nový pozorovateľ: %s.\n" + +#: ../client/common/player.c:219 ../client/common/player.c:235 +#, c-format +msgid "%s is now %s.\n" +msgstr "%s je teraz %s.\n" + +#: ../client/common/player.c:232 +#, c-format +msgid "Player %d is now %s.\n" +msgstr "Hráč %d je teraz %s.\n" + +#: ../client/common/player.c:269 +#, c-format +msgid "%s has quit.\n" +msgstr "%s odišiel/la.\n" + +#: ../client/common/player.c:278 +msgid "There is no largest army.\n" +msgstr "Nikto nemá najväčšiu armádu.\n" + +#: ../client/common/player.c:281 +#, c-format +msgid "%s has the largest army.\n" +msgstr "%s má najväčšiu armádu.\n" + +#: ../client/common/player.c:302 +msgid "There is no longest road.\n" +msgstr "Nikto nemá najdlhšiu cestu.\n" + +#: ../client/common/player.c:305 +#, c-format +msgid "%s has the longest road.\n" +msgstr "%s má najdlhšiu cestu.\n" + +#: ../client/common/player.c:326 +#, c-format +msgid "Waiting for %s." +msgstr "Čaká sa na %s." + +#. We are not in on the action +#. someone stole a resource from someone else +#: ../client/common/player.c:354 +#, c-format +msgid "%s stole a resource from %s.\n" +msgstr "%s ukradol(la) vlnu od %s.\n" + +#. $1=resource, $2=player name +#: ../client/common/player.c:365 +#, c-format +msgid "You stole %s from %s.\n" +msgstr "Ukradol/la si %s od %s.\n" + +#. $1=player name, $2=resource +#: ../client/common/player.c:372 +#, c-format +msgid "%s stole %s from you.\n" +msgstr "%s Ti ukradol/la %s.\n" + +#: ../client/common/player.c:406 +#, c-format +msgid "%s gave %s nothing!?\n" +msgstr "%s nedal(a) hráčovi %s nič!?\n" + +#. $1=giving player, $2=receiving player, $3=resources +#: ../client/common/player.c:413 ../client/common/player.c:423 +#, c-format +msgid "%s gave %s %s for free.\n" +msgstr "%s dal(a) hráčovi %s zadarmo %s.\n" + +#: ../client/common/player.c:431 +#, c-format +msgid "%s gave %s %s in exchange for %s.\n" +msgstr "%s dal(a) hráčovi %s %s výmenou za %s.\n" + +#: ../client/common/player.c:462 +#, c-format +msgid "%s exchanged %s for %s.\n" +msgstr "%s vymenil(a) %s za %s.\n" + +#: ../client/common/player.c:482 +#, c-format +msgid "%s built a road.\n" +msgstr "%s postavil(a) cestu.\n" + +#: ../client/common/player.c:494 +#, c-format +msgid "%s built a ship.\n" +msgstr "%s postavil(a) loď.\n" + +#: ../client/common/player.c:507 +#, c-format +msgid "%s built a settlement.\n" +msgstr "%s postavil(a) dedinu.\n" + +#: ../client/common/player.c:526 +#, c-format +msgid "%s built a city.\n" +msgstr "%s postavil(a) mesto.\n" + +#: ../client/common/player.c:540 +#, c-format +msgid "%s built a city wall.\n" +msgstr "%s postavil(a) mestskú hradbu.\n" + +#. Error message +#: ../client/common/player.c:551 +#, c-format +msgid "player_build_add called with BUILD_NONE for user %s\n" +msgstr "bola zavolaná funkcia player_build_all s BUILD_NONE pre užívateľa %s\n" + +#: ../client/common/player.c:561 +#, c-format +msgid "%s built a bridge.\n" +msgstr "%s postavil(a) most.\n" + +#: ../client/common/player.c:587 +#, c-format +msgid "%s removed a road.\n" +msgstr "%s odstránil(a) cestu.\n" + +#: ../client/common/player.c:597 +#, c-format +msgid "%s removed a ship.\n" +msgstr "%s odstránil(a) loď.\n" + +#: ../client/common/player.c:607 +#, c-format +msgid "%s removed a settlement.\n" +msgstr "%s ostránil(a) dedinu.\n" + +#: ../client/common/player.c:618 +#, c-format +msgid "%s removed a city.\n" +msgstr "%s odstránil(a) mesto.\n" + +#: ../client/common/player.c:632 +#, c-format +msgid "%s removed a city wall.\n" +msgstr "%s odstránil(a) mestskú hradbu.\n" + +#. Error message +#: ../client/common/player.c:642 +#, c-format +msgid "player_build_remove called with BUILD_NONE for user %s\n" +msgstr "" +"bola zavolaná funkcia player_build_remove s BUILD_NONE pre užívateľa %s\n" + +#: ../client/common/player.c:651 +#, c-format +msgid "%s removed a bridge.\n" +msgstr "%s odstránil(a) most.\n" + +#: ../client/common/player.c:682 +#, c-format +msgid "%s has canceled a ship's movement.\n" +msgstr "%s zrušil(a) pohyb lode.\n" + +#: ../client/common/player.c:685 +#, c-format +msgid "%s moved a ship.\n" +msgstr "%s pohol(la) loďou.\n" + +#. tell the user that someone got something +#: ../client/common/player.c:705 +#, c-format +msgid "%s received %s.\n" +msgstr "%s získal %s.\n" + +#: ../client/common/player.c:724 +msgid "server asks to lose invalid point.\n" +msgstr "server žiada o zrušenie neplatného bodu.\n" + +#. tell the user the point is lost +#: ../client/common/player.c:730 +#, c-format +msgid "%s lost %s.\n" +msgstr "%s prišiel o %s.\n" + +#: ../client/common/player.c:753 +msgid "server asks to move invalid point.\n" +msgstr "server žiada o posun na neplatný bod.\n" + +#. tell the user someone (1) lost something (2) to someone else (3) +#: ../client/common/player.c:760 +#, c-format +msgid "%s lost %s to %s.\n" +msgstr "%s prišiel(la) o %s vďaka %s.\n" + +#: ../client/common/resource.c:35 +msgid "brick" +msgstr "tehly" + +#: ../client/common/resource.c:35 +msgid "Brick" +msgstr "Tehly" + +#: ../client/common/resource.c:36 +msgid "grain" +msgstr "obilie" + +#: ../client/common/resource.c:36 +msgid "Grain" +msgstr "Obilie" + +#: ../client/common/resource.c:37 +msgid "ore" +msgstr "ruda" + +#: ../client/common/resource.c:37 +msgid "Ore" +msgstr "Ruda" + +#: ../client/common/resource.c:38 +msgid "wool" +msgstr "vlna" + +#: ../client/common/resource.c:38 +msgid "Wool" +msgstr "Vlna" + +#: ../client/common/resource.c:39 +msgid "lumber" +msgstr "drevo" + +#: ../client/common/resource.c:39 +msgid "Lumber" +msgstr "Drevo" + +#: ../client/common/resource.c:40 +msgid "no resource (bug)" +msgstr "žiadna surovina (chyba)" + +#: ../client/common/resource.c:40 +msgid "No resource (bug)" +msgstr "Žiadna surovina (chyba)" + +#: ../client/common/resource.c:41 +msgid "any resource (bug)" +msgstr "ľubovoľná surovina (chyba)" + +#: ../client/common/resource.c:41 +msgid "Any resource (bug)" +msgstr "Ľubovoľná surovina (chyba)" + +#: ../client/common/resource.c:42 +msgid "gold" +msgstr "zlato" + +#: ../client/common/resource.c:42 ../client/gtk/legend.c:41 +msgid "Gold" +msgstr "Zlato" + +#: ../client/common/resource.c:47 +msgid "a brick card" +msgstr "tehly" + +#: ../client/common/resource.c:47 +#, c-format +msgid "%d brick cards" +msgstr "%d tehly" + +#: ../client/common/resource.c:48 +msgid "a grain card" +msgstr "obilie" + +#: ../client/common/resource.c:48 +#, c-format +msgid "%d grain cards" +msgstr "%d obilia" + +#: ../client/common/resource.c:49 +msgid "an ore card" +msgstr "rudu" + +#: ../client/common/resource.c:49 +#, c-format +msgid "%d ore cards" +msgstr "%d rudy" + +#: ../client/common/resource.c:50 +msgid "a wool card" +msgstr "vlnu" + +#: ../client/common/resource.c:50 +#, c-format +msgid "%d wool cards" +msgstr "%d vlny" + +#: ../client/common/resource.c:51 +msgid "a lumber card" +msgstr "drevo" + +#: ../client/common/resource.c:51 +#, c-format +msgid "%d lumber cards" +msgstr "%d drevá" + +#: ../client/common/resource.c:139 ../client/common/resource.c:225 +msgid "nothing" +msgstr "nič" + +#. Construct "A, B and C" for resources +#: ../client/common/resource.c:166 +#, c-format +msgid "%s and %s" +msgstr "%s a %s" + +#. Construct "A, B and C" for resources +#: ../client/common/resource.c:170 +#, c-format +msgid "%s, %s" +msgstr "%s, %s" + +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +msgid "any resource" +msgstr "ľubovoľná surovina" + +#: ../client/common/robber.c:62 +#, c-format +msgid "%s has undone the robber movement.\n" +msgstr "%s odvolal(a) presun zlodeja.\n" + +#: ../client/common/robber.c:65 +#, c-format +msgid "%s moved the robber.\n" +msgstr "%s presunul(a) zlodeja.\n" + +#: ../client/common/robber.c:75 +#, c-format +msgid "%s has undone the pirate movement.\n" +msgstr "%s odvolal(a) presun piráta.\n" + +#: ../client/common/robber.c:78 +#, c-format +msgid "%s moved the pirate.\n" +msgstr "%s presunul(a) piráta.\n" + +#: ../client/common/robber.c:85 +#, c-format +msgid "%s must move the robber." +msgstr "%s musí presunúť zlodeja." + +#: ../client/common/setup.c:146 +#, c-format +msgid "Setup for %s.\n" +msgstr "Fáza rozostavovania pre hráča %s.\n" + +#: ../client/common/setup.c:158 +#, c-format +msgid "Double setup for %s.\n" +msgstr "Fáza dvojitého rozostavovania pre hráča %s.\n" + +#: ../client/common/turn.c:37 +#, c-format +msgid "%s rolled %d.\n" +msgstr "%s hodil(a) %d.\n" + +#: ../client/common/turn.c:50 +#, c-format +msgid "Begin turn %d for %s.\n" +msgstr "Začiatok ťahu %d pre hráča %s.\n" + +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "Chyba pri štarte %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 +msgid "Select an automatically discovered game" +msgstr "Vyberte automaticky objavenú hru" + +#. $1=Game title, $2=version, $3=host_name, $4=port +#: ../client/gtk/avahi-browser.c:127 +#, c-format +msgid "%s (%s) on %s:%s" +msgstr "%s (%s) na %s:%s" + +#. Label text +#: ../client/gtk/chat.c:73 +msgid "Chat" +msgstr "Chat" + +#: ../client/gtk/chat.c:232 +msgid "Beeper test.\n" +msgstr "Test pípatka.\n" + +#: ../client/gtk/chat.c:235 +#, c-format +msgid "%s beeped you.\n" +msgstr "%s na Vás zapípal(a).\n" + +#: ../client/gtk/chat.c:239 +#, c-format +msgid "You beeped %s.\n" +msgstr "Zapípali ste na %s.\n" + +#: ../client/gtk/chat.c:245 +#, c-format +msgid "You could not beep %s.\n" +msgstr "Nemohli ste zapípať na %s.\n" + +#: ../client/gtk/chat.c:287 +msgid " said: " +msgstr " hovorí: " + +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Hra" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Začať novú hru" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nová hra" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Opustiť aktuálnu hru" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Opustiť hru" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Správa servera Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Admin" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Zmeňte meno svojho hráča" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "_Meno hráča" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Legenda krajiny a stavebných nákladov" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "L_egenda" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Nastavenia aktuálnej hry" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "Na_stavenia hry" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogram hodov kockou" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Histogram hodov" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Ukončiť" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "U_končiť" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Akcie" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Hodiť kockou" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Hod kockou" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Obchodovať" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Späť" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Ukončiť ťah" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Postaviť cestu" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Cesta" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Postaviť loď" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Loď" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Presunúť loď" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Presunúť loď" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Postaviť most" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Most" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Postaviť dedinu" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Dedina" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Postaviť mesto" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Mesto" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Kúpiť akčnú kartu" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Akcia" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Postaviť mestské hradby" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Mestské hradby" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Nastavenia" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Zobraziť alebo skryť lištu nástrojov" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "Lišta _nástrojov" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Nastaviť aplikáciu" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "_Voľby" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "_Zobraziť" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "Prepnúť okno do režimu na celú obrazovku" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "_Celá obrazovka" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "Zobraziť celú mapu" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "_Resetovať" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "Vystrediť mapu" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "_Vystrediť" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Pomocník" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Informácie o Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_O programe Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Zobraziť návod" + +#: ../client/gtk/connect.c:287 +#, c-format +msgid "Metaserver at %s, port %s" +msgstr "Metaserver na adrese %s, port %s" + +#: ../client/gtk/connect.c:297 +msgid "Finished.\n" +msgstr "Ukončený.\n" + +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 +msgid "The metaserver is not available anymore.\n" +msgstr "Metaserver už nie je dostupný.\n" + +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 +msgid "The metaserver closed the connection unexpectedly.\n" +msgstr "Metaserver neočakávane zavrel spojenie.\n" + +#: ../client/gtk/connect.c:381 +msgid "Receiving game names from the metaserver.\n" +msgstr "Získavam mená hier od metaservera.\n" + +#: ../client/gtk/connect.c:423 +#, c-format +msgid "New game server requested on %s port %s.\n" +msgstr "Nový herný server požadovaný na adrese %s, porte %s.\n" + +#: ../client/gtk/connect.c:433 +msgid "Incomplete information about the new game server received.\n" +msgstr "Obdržané neúplné informácie o novom hernom serveri.\n" + +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 +#, c-format +msgid "Unknown message from the metaserver: %s\n" +msgstr "Neznáma správa od metaservera: %s\n" + +#: ../client/gtk/connect.c:566 ../server/meta.c:182 +#, c-format +msgid "Receiving data from inactive session: %s\n" +msgstr "Získavam údaje z neaktívnej relácie: %s\n" + +#: ../client/gtk/connect.c:578 ../server/meta.c:196 +msgid "Too many metaserver redirects.\n" +msgstr "Príliš mnoho presmerovaní metaservera.\n" + +#: ../client/gtk/connect.c:607 ../server/meta.c:212 +#, c-format +msgid "Bad redirect line: %s\n" +msgstr "Zlý riadok presmerovania: %s\n" + +#: ../client/gtk/connect.c:632 +#, c-format +msgid "The metaserver is too old to create servers (version %d.%d)\n" +msgstr "" +"Verzia metaservera je príliš stará a neumožňuje vytváranie serverov (verzia " +"%d.%d)\n" + +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 +#, c-format +msgid "Unexpected data from the metaserver: %s\n" +msgstr "Neočakávané dáta od metaservera: %s\n" + +#. Sevens rule: normal +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 +msgid "Normal" +msgstr "Normálne" + +#. Sevens rule: reroll on 1st 2 turns +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 +msgid "Reroll on 1st 2 turns" +msgstr "Hádzať znovu prvé dve kolá" + +#. Sevens rule: reroll all 7s +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 +msgid "Reroll all 7s" +msgstr "Hádzať znovu pri každej sedmičke" + +#: ../client/gtk/connect.c:725 +msgid "Default" +msgstr "Štandardné" + +#: ../client/gtk/connect.c:728 +msgid "Random" +msgstr "Náhodné" + +#: ../client/gtk/connect.c:820 ../server/meta.c:303 +#, c-format +msgid "Redirected to the metaserver at %s.\n" +msgstr "Presmerovaný na metaserver na %s.\n" + +#: ../client/gtk/connect.c:825 ../server/meta.c:306 +#, c-format +msgid "Redirected to the metaserver at %s, port %s.\n" +msgstr "Presmerovaný na metaserver na %s, port %s.\n" + +#: ../client/gtk/connect.c:832 +msgid "Receiving a list of Pioneers servers from the metaserver.\n" +msgstr "Získavam zoznam serverov Pioneers z metaservera.\n" + +#. Label +#: ../client/gtk/connect.c:916 +msgid "Number of computer players" +msgstr "Počet počítačových hráčov" + +#. Tooltip +#: ../client/gtk/connect.c:935 +msgid "The number of computer players" +msgstr "Počet počítačových hráčov" + +#. Canceled retrieving information +#. * from the metaserver +#: ../client/gtk/connect.c:957 ../client/gtk/connect.c:992 +#: ../client/gtk/connect.c:1133 +msgid "Canceled.\n" +msgstr "Zrušené.\n" + +#: ../client/gtk/connect.c:960 +msgid "Requesting new game server.\n" +msgstr "Vysielam požiadavku na nový herný server.\n" + +#. Dialog caption +#: ../client/gtk/connect.c:1037 +msgid "Create a Public Game" +msgstr "Vytvoriť verejnú hru" + +#. Button text +#: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 +msgid "_Cancel" +msgstr "_Zrušiť" + +#. Button text +#: ../client/gtk/connect.c:1042 +msgid "C_reate" +msgstr "_Vytvoriť" + +#. Dialog caption +#: ../client/gtk/connect.c:1182 +msgid "Join a Public Game" +msgstr "Pripojiť sa k verejnej hre" + +#. Button text +#: ../client/gtk/connect.c:1185 +msgid "_Refresh" +msgstr "_Obnoviť" + +#. Button text +#: ../client/gtk/connect.c:1188 +msgid "_New Remote Game" +msgstr "_Nová vzdialená hra" + +#. Button text +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 +msgid "_Join" +msgstr "_Pripojiť sa" + +#. Tooltip +#: ../client/gtk/connect.c:1237 +msgid "Select a game to join" +msgstr "Vyberte hru, ku ktorej sa chcete pripojiť" + +#. Column name +#: ../client/gtk/connect.c:1241 +msgid "Map Name" +msgstr "Názov mapy" + +#. Tooltip for column 'Map Name' +#: ../client/gtk/connect.c:1249 +msgid "Name of the game" +msgstr "Názov hry" + +#. Column name +#: ../client/gtk/connect.c:1255 +msgid "Curr" +msgstr "Hráči" + +#. Tooltip for column 'Curr' +#: ../client/gtk/connect.c:1262 +msgid "Number of players in the game" +msgstr "Počet hráčov v hre" + +#. Column name +#: ../client/gtk/connect.c:1268 +msgid "Max" +msgstr "Max" + +#. Tooltip for column 'Max' +#: ../client/gtk/connect.c:1275 +msgid "Maximum players for the game" +msgstr "Maximálny počet hráčov v hre" + +#. Column name +#: ../client/gtk/connect.c:1279 +msgid "Terrain" +msgstr "Krajina" + +#. Tooltip for column 'Terrain' +#: ../client/gtk/connect.c:1287 +msgid "Random of default terrain" +msgstr "Náhodná alebo štandardná krajina" + +#. Column name +#: ../client/gtk/connect.c:1293 +msgid "Vic. Points" +msgstr "Body potrebné na výhru" + +#. Tooltip for column 'Vic. Points' +#: ../client/gtk/connect.c:1300 +msgid "Points needed to win" +msgstr "Bodov potrebných na výhru" + +#. Column name +#: ../client/gtk/connect.c:1304 +msgid "Sevens Rule" +msgstr "Pravidlo sedmičiek" + +#. Tooltip for column 'Sevens Rule' +#. Label +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 +msgid "Sevens rule" +msgstr "Pravidlo sedmičiek" + +#. Column name +#: ../client/gtk/connect.c:1316 +msgid "Host" +msgstr "Hostiteľ" + +#. Tooltip for column 'Host' +#: ../client/gtk/connect.c:1325 +msgid "Host of the game" +msgstr "Adresa hostiteľa" + +#. Column name +#: ../client/gtk/connect.c:1331 +msgid "Port" +msgstr "Port" + +#. Tooltip for column 'Port' +#: ../client/gtk/connect.c:1339 +msgid "Port of the game" +msgstr "Porty hry" + +#. Column name +#: ../client/gtk/connect.c:1343 +msgid "Version" +msgstr "Verzia" + +#. Tooltip for column 'Version' +#: ../client/gtk/connect.c:1351 +msgid "Version of the host" +msgstr "Verzia hostiteľa" + +#. Dialog caption +#: ../client/gtk/connect.c:1436 +msgid "Start a New Game" +msgstr "Spustiť novú hru" + +#. Label +#. Commandline option of client: name of the player +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 +msgid "Player name" +msgstr "Meno hráča" + +#. Tooltip +#: ../client/gtk/connect.c:1478 +msgid "Enter your name" +msgstr "Zadajte Vaše meno" + +#. Check button +#. Role of the player: spectator +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 +msgid "Spectator" +msgstr "Pozorovateľ" + +#: ../client/gtk/connect.c:1490 +msgid "Check if you want to be a spectator" +msgstr "Zapnite túto voľbu, ak chcete byť len pozorovateľom" + +#. Label +#: ../client/gtk/connect.c:1500 +msgid "Avahi" +msgstr "Avahi" + +#. Button +#: ../client/gtk/connect.c:1506 +msgid "Join" +msgstr "Pripojiť sa" + +#. Tooltip for button Join +#: ../client/gtk/connect.c:1510 +msgid "Join an automatically discovered game" +msgstr "Automaticky sa pripojiť k objavenej hre" + +#. Label +#. metaserver label +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 +msgid "Metaserver" +msgstr "Metaserver" + +#. Button +#: ../client/gtk/connect.c:1551 +msgid "Join Public Game" +msgstr "Pripojiť sa k verejnej hre" + +#. Tooltip +#: ../client/gtk/connect.c:1557 +msgid "Join a public game" +msgstr "Pripojiť sa k verejnej hre" + +#. Button +#: ../client/gtk/connect.c:1562 +msgid "Create Game" +msgstr "Vytvoriť hru" + +#. Tooltip +#: ../client/gtk/connect.c:1566 +msgid "Create a game" +msgstr "Vytvoriť hru" + +#. Button +#: ../client/gtk/connect.c:1575 +msgid "Join Private Game" +msgstr "Pripojiť sa k súkromnej hre" + +#. Tooltip +#. Dialog caption +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 +msgid "Join a private game" +msgstr "Pripojiť sa k súkromnej hre" + +#. Label +#. Commandline option of client: hostname of the server +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 +msgid "Server host" +msgstr "Adresa servera" + +#. Tooltip +#: ../client/gtk/connect.c:1775 +msgid "Name of the host of the game" +msgstr "Meno počítača s hrou" + +#. Label +#. Commandline option of client: port of the server +#. server port label +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 +msgid "Server port" +msgstr "Port na serveri" + +#. Tooltip +#: ../client/gtk/connect.c:1794 +msgid "Port of the host of the game" +msgstr "Port na serveri s hrou" + +#. Tooltip +#. Label +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 +msgid "Recent games" +msgstr "Nedávne hry" + +#. Caption for list of bought development cards +#: ../client/gtk/develop.c:130 +msgid "Development cards" +msgstr "Akčné karty" + +#. Button text: play development card +#: ../client/gtk/develop.c:163 +msgid "Play Card" +msgstr "Použiť kartu" + +#. Dialog caption +#: ../client/gtk/discard.c:77 +msgid "Discard Resources" +msgstr "Zahodiť suroviny" + +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "_OK" + +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Musíte sa zbaviť 1 suroviny" +msgstr[1] "Musíte sa zbaviť %d surovín" +msgstr[2] "Musíte sa zbaviť %d surovín" + +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Celkom zahodiť" + +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Čakám, kým hráči zahodia suroviny" + +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Koniec hry" + +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s vyhral(a) hru s %d víťaznými bodmi!" + +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Sláva Ti %s, Pán poznaného sveta!" + +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Vyberte suroviny" + +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Musíte vybrať 1 surovinu" +msgstr[1] "Musíte vybrať %d suroviny" +msgstr[2] "Musíte vybrať %d surovín" + +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Celkom surovín" + +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Čakám, kým si hráči vyberú" + +#. Victory points target in statusbar +#: ../client/gtk/gui.c:196 +#, c-format +msgid "Points needed to win: %i" +msgstr "Body potrebné na výhru: %i" + +#: ../client/gtk/gui.c:282 +msgid "Messages" +msgstr "Správy" + +#. Tab page name +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 +msgid "Map" +msgstr "Mapa" + +#. Tooltip +#: ../client/gtk/gui.c:407 +msgid "Finish trading" +msgstr "Ukončiť obchodovanie" + +#. Tab page name +#. Button text +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 +msgid "Quote" +msgstr "Ponuky" + +#. Tooltip +#: ../client/gtk/gui.c:419 +msgid "Reject domestic trade" +msgstr "Odmietnuť vnútorný obchod" + +#. Tab page name +#. Dialog caption +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 +msgid "Legend" +msgstr "Legenda" + +#. Tab page name, shown for the splash screen +#: ../client/gtk/gui.c:439 +msgid "Welcome to Pioneers" +msgstr "Víta Vás hra Pioneers" + +#. Caption of preferences dialog +#: ../client/gtk/gui.c:763 +msgid "Pioneers Preferences" +msgstr "Voľby Pioneers" + +#. Button text +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 +msgid "_Close" +msgstr "_Zavrieť" + +#. Label for changing the theme, in the preferences dialog +#: ../client/gtk/gui.c:797 +msgid "Theme:" +msgstr "Téma:" + +#. Tooltip for changing the theme in the preferences dialog +#: ../client/gtk/gui.c:818 +msgid "Choose one of the themes" +msgstr "Vyberte si jednu z tém" + +#. Label for the option to show the legend +#: ../client/gtk/gui.c:822 +msgid "Show legend" +msgstr "Zobraziť legendu" + +#. Tooltip for the option to show the legend +#: ../client/gtk/gui.c:831 +msgid "Show the legend as a page beside the map" +msgstr "Zobraziť legendu ako stránku vedľa mapy" + +#. Label for the option to display log messages in color +#: ../client/gtk/gui.c:836 +msgid "Messages with color" +msgstr "Farebné hlásenia" + +#. Tooltip for the option to display log messages in color +#: ../client/gtk/gui.c:845 +msgid "Show new messages with color" +msgstr "Odlíšiť nové správy farebne" + +#. Label for the option to display chat in color of player +#: ../client/gtk/gui.c:850 +msgid "Chat in color of player" +msgstr "Chat vo farbe hráča" + +#. Tooltip for the option to display chat in color of player +#: ../client/gtk/gui.c:860 +msgid "Show new chat messages in the color of the player" +msgstr "Zobrazovať správy v chate vo farbe hráča" + +#. Label for the option to display the summary with colors +#: ../client/gtk/gui.c:865 +msgid "Summary with color" +msgstr "Farebné zhrnutie" + +#. Tooltip for the option to display the summary with colors +#: ../client/gtk/gui.c:875 +msgid "Use colors in the player summary" +msgstr "Použiť farby v prehľade o hráčoch" + +#. Label for the option to display keyboard accelerators in the toolbar +#: ../client/gtk/gui.c:880 +msgid "Toolbar with shortcuts" +msgstr "Nástrojová lišta so skratkami" + +#. Tooltip for the option to display keyboard accelerators in the toolbar +#: ../client/gtk/gui.c:889 +msgid "Show keyboard shortcuts in the toolbar" +msgstr "Zobraziť klávesové skratky v nástrojovej lište" + +#. Label for the option to disable all sounds +#: ../client/gtk/gui.c:895 +msgid "Silent mode" +msgstr "Tichý režim" + +#. Tooltip for the option to disable all sounds +#: ../client/gtk/gui.c:901 +msgid "In silent mode no sounds are made" +msgstr "V tichom režime sú všetky zvuky vypnuté" + +#. Label for the option to announce when players/spectators enter +#: ../client/gtk/gui.c:907 +msgid "Announce new players" +msgstr "Oznamovať nových hráčov" + +#. Tooltip for the option to use sound when players/spectators enter +#: ../client/gtk/gui.c:916 +msgid "Make a sound when a new player or spectator enters the game" +msgstr "Zvukové znamenie ohlási príchod nového hráča alebo pozorovateľa" + +#. Label for the option to use the notifications. +#: ../client/gtk/gui.c:928 +msgid "Show notifications" +msgstr "Zobraziť notifikácie" + +#. Tooltip for notifications option. +#: ../client/gtk/gui.c:937 +msgid "Show notifications when it's your turn or when new trade is available" +msgstr "Zobraziť notifikáciu keď ste na ťahu alebo pri ponuke obchodovania" + +#. Label for the option to use the 16:9 layout. +#: ../client/gtk/gui.c:943 +msgid "Use 16:9 layout" +msgstr "Použiť rozloženie 16:9" + +#. Tooltip for 16:9 option. +#: ../client/gtk/gui.c:952 +msgid "Use a 16:9 friendly layout for the window" +msgstr "Použiť rozloženie vhodné pre okná v pomere 16:9" + +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +msgid "Roll the dice automatically" +msgstr "" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + +#. Caption of about box +#: ../client/gtk/gui.c:1018 +msgid "About Pioneers" +msgstr "O programe Pioneers" + +#. Initial text in status bar +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 +msgid "Welcome to Pioneers!" +msgstr "Vitajte v Pioneers!" + +#. Dialog caption +#: ../client/gtk/histogram.c:276 +msgid "Dice Histogram" +msgstr "Histogram hodov" + +#: ../client/gtk/interface.c:111 +msgid "Ship movement canceled." +msgstr "Pohyb lode bol zrušený." + +#: ../client/gtk/interface.c:119 ../client/gtk/interface.c:120 +msgid "Select a new location for the ship." +msgstr "Vyberte nové miesto pre loď." + +#. Notification +#: ../client/gtk/interface.c:956 +msgid "It is your turn to setup." +msgstr "Ste na ťahu." + +#: ../client/gtk/legend.c:34 +msgid "Hill" +msgstr "Pahorkatina" + +#: ../client/gtk/legend.c:35 +msgid "Field" +msgstr "Pole" + +#: ../client/gtk/legend.c:36 +msgid "Mountain" +msgstr "Hory" + +#: ../client/gtk/legend.c:37 +msgid "Pasture" +msgstr "Pastviny" + +#: ../client/gtk/legend.c:38 +msgid "Forest" +msgstr "Les" + +#: ../client/gtk/legend.c:39 +msgid "Desert" +msgstr "Púšť" + +#: ../client/gtk/legend.c:40 +msgid "Sea" +msgstr "More" + +#. Label +#: ../client/gtk/legend.c:116 +msgid "Terrain yield" +msgstr "Výnosy krajiny" + +#. Label +#: ../client/gtk/legend.c:148 +msgid "Building costs" +msgstr "Stavebné náklady" + +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 +#: ../editor/gtk/game-buildings.c:11 +msgid "City wall" +msgstr "Mestské hradby" + +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 +msgid "Development card" +msgstr "Akčná karta" + +#. Dialog caption +#. Name of the development card +#: ../client/gtk/monopoly.c:84 ../common/cards.c:86 +msgid "Monopoly" +msgstr "Monopoly" + +#. Label +#: ../client/gtk/monopoly.c:106 +msgid "Select the resource you wish to monopolize." +msgstr "Vyberte surovinu, ktorú chcete monopolizovať." + +#. Dialog caption +#: ../client/gtk/name.c:141 +msgid "Change Player Name" +msgstr "Zmena mena hráča" + +#. Label +#: ../client/gtk/name.c:172 +msgid "Player name:" +msgstr "Meno hráča:" + +#. Label: set player icon preferences +#: ../client/gtk/name.c:234 +msgid "Face:" +msgstr "Postavička:" + +#. Label: set player icon preferences +#: ../client/gtk/name.c:249 +msgid "Variant:" +msgstr "Varianta:" + +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 +msgid "Connect as a spectator" +msgstr "Pripojiť sa ako pozorovateľ" + +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 +msgid "Metaserver Host" +msgstr "" + +#: ../client/gtk/offline.c:77 +msgid "Select a game to join." +msgstr "Vyberte hru, ku ktorej sa chcete pripojiť." + +#: ../client/gtk/offline.c:93 +msgid "Connecting" +msgstr "Pripájam sa" + +#. Long description in the commandline for pioneers: help +#: ../client/gtk/offline.c:182 +msgid "- Play a game of Pioneers" +msgstr "- Zahrajte si hru Pioneers" + +#: ../client/gtk/pioneers.desktop.in.h:2 +msgid "Play a game of Pioneers" +msgstr "Zahrajte si hru Pioneers" + +#: ../client/gtk/pioneers.desktop.in.h:3 +msgid "game;board;play;Pioneers;Settlers;" +msgstr "game;board;play;Pioneers;Osadníci;Katan;hra;" + +#: ../client/gtk/player.c:52 +msgid "Settlements" +msgstr "Dediny" + +#: ../client/gtk/player.c:53 +msgid "Cities" +msgstr "Mestá" + +#: ../client/gtk/player.c:54 +msgid "City walls" +msgstr "Hradby" + +#: ../client/gtk/player.c:55 +msgid "Largest army" +msgstr "Najväčšia armáda" + +#: ../client/gtk/player.c:56 +msgid "Longest road" +msgstr "Najdlhšia cesta" + +#. Name of the development card +#: ../client/gtk/player.c:57 ../common/cards.c:92 +msgid "Chapel" +msgstr "Kostol" + +#: ../client/gtk/player.c:57 +msgid "Chapels" +msgstr "Kostoly" + +#. Name of the development card +#: ../client/gtk/player.c:58 ../common/cards.c:95 +msgid "Pioneer university" +msgstr "Univerzita" + +#: ../client/gtk/player.c:58 +msgid "Pioneer universities" +msgstr "Univerzity" + +#. Name of the development card +#: ../client/gtk/player.c:60 ../common/cards.c:98 +msgid "Governor's house" +msgstr "Radnica" + +#: ../client/gtk/player.c:60 +msgid "Governor's houses" +msgstr "Radnica" + +#. Name of the development card +#: ../client/gtk/player.c:61 ../common/cards.c:101 +msgid "Library" +msgstr "Knižnica" + +#: ../client/gtk/player.c:61 +msgid "Libraries" +msgstr "Knižnice" + +#. Name of the development card +#: ../client/gtk/player.c:62 ../common/cards.c:104 +msgid "Market" +msgstr "Trhovisko" + +#: ../client/gtk/player.c:62 +msgid "Markets" +msgstr "Trhoviská" + +#. Name of the development card +#: ../client/gtk/player.c:63 ../common/cards.c:107 +msgid "Soldier" +msgstr "Rytier" + +#: ../client/gtk/player.c:63 +msgid "Soldiers" +msgstr "Rytieri" + +#: ../client/gtk/player.c:64 +msgid "Resource card" +msgstr "Karta suroviny" + +#: ../client/gtk/player.c:64 +msgid "Resource cards" +msgstr "Karty surovín" + +#. Caption +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 +msgid "Development cards" +msgstr "Akčné karty" + +#. Caption for the overview of the points and card of other players +#: ../client/gtk/player.c:559 +msgid "Player summary" +msgstr "Prehľad o hráčoch" + +#. Dialog caption +#: ../client/gtk/plenty.c:61 +msgid "Year of Plenty" +msgstr "Rok hojnosti" + +#: ../client/gtk/plenty.c:92 +msgid "Please choose one resource from the bank" +msgstr "Prosím, vyberte si jednu surovinu z banku" + +#: ../client/gtk/plenty.c:95 +msgid "Please choose two resources from the bank" +msgstr "Prosím, vyberte si dve suroviny z banku" + +#: ../client/gtk/plenty.c:97 +msgid "The bank is empty" +msgstr "Bank je prázdny" + +#: ../client/gtk/quote.c:201 +#, c-format +msgid "%s has %s, and is looking for %s" +msgstr "%s má %s a potrebuje %s" + +#. Notification +#: ../client/gtk/quote.c:231 +#, c-format +msgid "New offer from %s." +msgstr "Ponuka obchodovania od %s." + +#. Notification +#: ../client/gtk/quote.c:259 +#, c-format +msgid "Offer from %s." +msgstr "Ponuka od %s." + +#. Label +#. Frame title, trade: I want to trade these resources +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 +msgid "I want" +msgstr "Potrebujem" + +#. Label +#. Frame title, trade: I want these resources in return +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 +msgid "Give them" +msgstr "Ponúkam" + +#. Button text +#: ../client/gtk/quote.c:370 +msgid "Delete" +msgstr "Vymazať" + +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +msgid "Enable Charity" +msgstr "" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + +#. Button text +#: ../client/gtk/quote.c:411 +msgid "Reject Domestic Trade" +msgstr "Odmietnuť vnútorný obchod" + +#. Now create columns +#. Table header: Player who trades +#. Role of the player: player +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 +msgid "Player" +msgstr "Hráč" + +#. Table header: Quote +#: ../client/gtk/quote-view.c:188 +msgid "Quotes" +msgstr "Ponuky" + +#. trade: maritime quote: %1 resources of type %2 for +#. * one resource of type %3 +#: ../client/gtk/quote-view.c:306 +#, c-format +msgid "%d:1 %s for %s" +msgstr "%d:1 %s za %s" + +#. Trade: a player has rejected trade +#: ../client/gtk/quote-view.c:445 +msgid "Rejected trade" +msgstr "Odmietnutý obchod" + +#. Caption for overview of the resources of the player +#: ../client/gtk/resource.c:71 +msgid "Resources" +msgstr "Suroviny" + +#. Label +#: ../client/gtk/resource.c:86 +msgid "Total" +msgstr "Celkom" + +#. Tooltip for the amount of resources in the hand +#: ../client/gtk/resource-table.c:175 +msgid "Amount in hand" +msgstr "Množstvo na ruke" + +#. Tooltip for the amount of resources in the bank +#: ../client/gtk/resource-table.c:190 +msgid "Amount in the bank" +msgstr "Množstvo v banku" + +#. Tooltip for the selected amount +#: ../client/gtk/resource-table.c:206 +msgid "Selected amount" +msgstr "Vybrané množstvo" + +#. Tooltip for the total selected amount +#: ../client/gtk/resource-table.c:250 +msgid "Total selected amount" +msgstr "Vybrané množstvo celkom" + +#. Tooltip when the bank cannot be emptied +#: ../client/gtk/resource-table.c:269 +msgid "The bank cannot be emptied" +msgstr "Bank nemôže zostať prázdny" + +#: ../client/gtk/settingscreen.c:72 +msgid "Yes" +msgstr "Áno" + +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 +msgid "No" +msgstr "Nie" + +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 +msgid "Unknown" +msgstr "Neznáme" + +#: ../client/gtk/settingscreen.c:117 +msgid "No game in progress..." +msgstr "Žiadna hra nie je aktívna..." + +#. Label +#: ../client/gtk/settingscreen.c:128 +msgid "General settings" +msgstr "Všeobecné nastavenia" + +#: ../client/gtk/settingscreen.c:145 +msgid "Number of players:" +msgstr "Počet hráčov:" + +#: ../client/gtk/settingscreen.c:149 +msgid "Victory point target:" +msgstr "Počet bodov na výhru:" + +#: ../client/gtk/settingscreen.c:153 +msgid "Random terrain:" +msgstr "Náhodná krajina:" + +#: ../client/gtk/settingscreen.c:157 +msgid "Allow trade between players:" +msgstr "Povoliť obchodovanie medzi hráčmi:" + +#: ../client/gtk/settingscreen.c:162 +msgid "Allow trade only before building or buying:" +msgstr "Povoliť obchodovanie iba pred stavaním alebo nákupom:" + +#: ../client/gtk/settingscreen.c:167 +msgid "Check victory only at end of turn:" +msgstr "Kontrolovať víťazstvo až na konci ťahu:" + +#: ../client/gtk/settingscreen.c:172 +msgid "Amount of each resource:" +msgstr "Množstvo každej suroviny:" + +#: ../client/gtk/settingscreen.c:186 +msgid "Sevens rule:" +msgstr "Pravidlo sedmičiek:" + +#: ../client/gtk/settingscreen.c:192 +msgid "Use dice deck instead of dice:" +msgstr "Používať balíček kariet miesto kociek:" + +#: ../client/gtk/settingscreen.c:197 +msgid "Number of dice decks:" +msgstr "Počet balíčkov kariet:" + +#: ../client/gtk/settingscreen.c:203 +msgid "Number of dice cards removed after shuffling:" +msgstr "Počet odobratých kariet z balíčku:" + +#: ../client/gtk/settingscreen.c:210 +msgid "Use the pirate to block ships:" +msgstr "Použiť piráta na zablokovanie lodí:" + +#: ../client/gtk/settingscreen.c:239 +msgid "Island discovery bonuses:" +msgstr "Bonusy za objavenie ostrova:" + +#. Label +#: ../client/gtk/settingscreen.c:255 +msgid "Building quotas" +msgstr "Kvóty na stavbu" + +#: ../client/gtk/settingscreen.c:272 +msgid "Roads:" +msgstr "Cesty:" + +#: ../client/gtk/settingscreen.c:277 +msgid "Settlements:" +msgstr "Dediny:" + +#: ../client/gtk/settingscreen.c:283 +msgid "Cities:" +msgstr "Mestá:" + +#: ../client/gtk/settingscreen.c:288 +msgid "City walls:" +msgstr "Mestské hradby:" + +#: ../client/gtk/settingscreen.c:294 +msgid "Ships:" +msgstr "Lode:" + +#: ../client/gtk/settingscreen.c:299 +msgid "Bridges:" +msgstr "Mosty:" + +#. Label +#: ../client/gtk/settingscreen.c:312 +msgid "Development card deck" +msgstr "Balíček akčných kariet" + +#: ../client/gtk/settingscreen.c:328 +msgid "Road building cards:" +msgstr "Karty Stavba ciest:" + +#: ../client/gtk/settingscreen.c:332 +msgid "Monopoly cards:" +msgstr "Karty Monopoly:" + +#: ../client/gtk/settingscreen.c:336 +msgid "Year of plenty cards:" +msgstr "Karty Rok hojnosti:" + +#: ../client/gtk/settingscreen.c:340 +msgid "Chapel cards:" +msgstr "Karty Kostol:" + +#: ../client/gtk/settingscreen.c:344 +msgid "Pioneer university cards:" +msgstr "Karty Univerzita:" + +#: ../client/gtk/settingscreen.c:348 +msgid "Governor's house cards:" +msgstr "Karty Radnica:" + +#: ../client/gtk/settingscreen.c:352 +msgid "Library cards:" +msgstr "Karty Knižnica:" + +#: ../client/gtk/settingscreen.c:356 +msgid "Market cards:" +msgstr "Karty Trhovisko:" + +#: ../client/gtk/settingscreen.c:360 +msgid "Soldier cards:" +msgstr "Karty Rytier:" + +#. Dialog caption +#: ../client/gtk/settingscreen.c:399 +msgid "Current Game Settings" +msgstr "Nastavenia aktuálnej hry" + +#. trade: you ask for something for free +#: ../client/gtk/trade.c:220 +#, c-format +msgid "ask for %s for free" +msgstr "požaduje %s zadarmo" + +#. trade: you give something away for free +#: ../client/gtk/trade.c:225 +#, c-format +msgid "give %s for free" +msgstr "dať %s zadarmo" + +#. trade: you trade something for something else +#: ../client/gtk/trade.c:230 +#, c-format +msgid "give %s for %s" +msgstr "vymeniť %s za %s" + +#. I want some resources, and give them some resources +#: ../client/gtk/trade.c:256 +#, c-format +msgid "I want %s, and give them %s" +msgstr "Potrebujem %s a ponúkam %s" + +#. Notification +#: ../client/gtk/trade.c:358 +#, c-format +msgid "Quote received from %s." +msgstr "Ponuka obchodu od %s." + +#. Button text, trade: call for quotes from other players +#: ../client/gtk/trade.c:564 +msgid "_Call for Quotes" +msgstr "_Prijímať ponuky" + +#. Button text: Trade page, accept selected quote +#: ../client/gtk/trade.c:609 +msgid "_Accept Quote" +msgstr "_Akceptovať ponuku" + +#. Button text: Trade page, finish trading +#: ../client/gtk/trade.c:615 +msgid "_Finish Trading" +msgstr "_Ukončiť obchodovanie" + +#. Name of the development card +#: ../common/cards.c:83 +msgid "Road building" +msgstr "Stavba ciest" + +#. Name of the development card +#: ../common/cards.c:89 +msgid "Year of plenty" +msgstr "Rok hojnosti" + +#. Description of the 'Road Building' development card +#: ../common/cards.c:118 +msgid "Build two new roads" +msgstr "Postavte dve nové cesty" + +#. Description of the 'Monopoly' development card +#: ../common/cards.c:121 +msgid "" +"Select a resource type and take every card of that type held by all other " +"players" +msgstr "" +"Vyberte si surovinu a získajte všetky karty tejto suroviny od ostatných " +"hráčov" + +#. Description of the 'Year of Plenty' development card +#: ../common/cards.c:125 +msgid "" +"Take two resource cards of any type from the bank (cards may be of the same " +"or different types)" +msgstr "" +"Vyberte si dve ľubovoľné suroviny z banku (môžu, no nemusia byť rovnakého " +"typu)" + +#. Description of a development card of 1 victory point +#: ../common/cards.c:134 +msgid "One victory point" +msgstr "Jeden víťazný bod" + +#. Description of the 'Soldier' development card +#: ../common/cards.c:137 +msgid "" +"Move the robber to a different space and take one resource card from another " +"player adjacent to that space" +msgstr "" +"Presuňte zlodeja na nové polícko a získajte jednu kartu suroviny od hráča, " +"ktorý susedí s týmto políčkom" + +#: ../common/game.c:523 +#, c-format +msgid "Obsolete rule: '%s'\n" +msgstr "Zastarané pravidlo: %s'\n" + +#: ../common/game.c:530 +#, c-format +msgid "" +"The game uses the new rule '%s', which is not yet supported. Consider " +"upgrading.\n" +msgstr "" + +#: ../common/game.c:923 ../common/game.c:954 +msgid "This game cannot be won." +msgstr "Táto hra sa nedá vyhrať." + +#: ../common/game.c:924 +msgid "There is no land." +msgstr "Nie je tu žiadna pevnina." + +#: ../common/game.c:958 +msgid "It is possible that this game cannot be won." +msgstr "Je možné, že túto hru nikto nevyhrá." + +#: ../common/game.c:964 +msgid "This game can be won by only building all settlements and cities." +msgstr "" +"Táto hra sa dá vyhrať iba vtedy keď hráč vybuduje všetky dediny a mestá." + +#: ../common/game.c:970 +#, c-format +msgid "" +"Required victory points: %d\n" +"Points obtained by building all: %d\n" +"Points in development cards: %u\n" +"Longest road/largest army: %d+%d\n" +"Maximum island discovery bonus: %d\n" +"Total: %d" +msgstr "" +"Počet bodov pre výhru: %d\n" +"Body získané za postavenie všetkého: %d\n" +"Body v akčných kartách: %u\n" +"Najdlhšia obchodná cesta/najväčšia armáda: %d+%d\n" +"Maximálny bonus za objavenie ostrovov: %d\n" +"Celkom: %d" + +#: ../common/game-list.c:111 +#, c-format +msgid "Looking for games in '%s'\n" +msgstr "Hľadám hry v '%s'\n" + +#: ../common/game-list.c:113 +#, c-format +msgid "Game directory '%s' not found\n" +msgstr "Adresár s dátami hry '%s' nebol nájdený\n" + +#: ../common/game-list.c:131 +#, c-format +msgid "Unable to load game: '%s'\n" +msgstr "Nepodarilo sa načítať hru: %s'\n" + +#: ../common/game-list.c:151 +msgid "No games available\n" +msgstr "Nie sú dostupné žiadne hry\n" + +#: ../common/gtk/aboutbox.c:53 +msgid "" +"Pioneers is based upon the excellent\n" +"Settlers of Catan board game.\n" +msgstr "" +"Pioneers je založené na skvelej\n" +"doskovej hre Osadníci z Katanu.\n" + +#. Translators: add your name here. Keep the list +#. * alphabetically, do not remove any names, and add +#. * \n after your name (except the last name). +#. +#: ../common/gtk/aboutbox.c:63 +msgid "translator-credits" +msgstr "Jose Riha" + +#. Caption for result of checking victory points +#: ../common/gtk/common_gtk.c:323 +msgid "Victory Point Analysis" +msgstr "Analýza víťazného bodu" + +#. Tooltip for sevens rule normal +#: ../common/gtk/game-rules.c:108 +msgid "All sevens move the robber or pirate" +msgstr "Všetky sedmičky presúvajú zlodeja alebo piráta" + +#. Tooltip for sevens rule reroll on 1st 2 turns +#: ../common/gtk/game-rules.c:112 +msgid "In the first two turns all sevens are rerolled" +msgstr "Počas prvých dvoch kôl sa po sedmičke hádže znovu" + +#. Tooltip for sevens rule reroll all +#: ../common/gtk/game-rules.c:116 +msgid "All sevens are rerolled" +msgstr "Po sedmičkách sa vždy hádže znova" + +#: ../common/gtk/game-rules.c:127 +msgid "Randomize terrain" +msgstr "Náhodná krajina" + +#: ../common/gtk/game-rules.c:127 +msgid "Randomize the terrain" +msgstr "Náhodná krajina" + +#: ../common/gtk/game-rules.c:130 +msgid "Use pirate" +msgstr "Použiť piráta" + +#: ../common/gtk/game-rules.c:131 +msgid "Use the pirate to block ships" +msgstr "Použiť piráta na zablokovanie lodí" + +#: ../common/gtk/game-rules.c:133 +msgid "Strict trade" +msgstr "Striktný obchod" + +#: ../common/gtk/game-rules.c:134 +msgid "Allow trade only before building or buying" +msgstr "Povoliť obchod iba pred stavaním alebo nákupom" + +#: ../common/gtk/game-rules.c:136 +msgid "Domestic trade" +msgstr "Domáci obchod" + +#: ../common/gtk/game-rules.c:137 +msgid "Allow trade between players" +msgstr "Povoliť obchod medzi hráčmi" + +#: ../common/gtk/game-rules.c:139 +msgid "Victory at end of turn" +msgstr "Víťazstvo na konci ťahu" + +#: ../common/gtk/game-rules.c:140 +msgid "Check for victory only at end of turn" +msgstr "Kontrolovať víťazstvo na konci ťahu" + +#: ../common/gtk/game-rules.c:143 +msgid "Use dice deck" +msgstr "Použiť balíček kariet" + +#: ../common/gtk/game-rules.c:145 +msgid "Use a deck of 36 dice cards instead of real dice" +msgstr "Použiť balíček 36 kariet s číslami miesto skutočných kociek" + +#. Label +#: ../common/gtk/game-rules.c:153 +msgid "Number of dice decks" +msgstr "Počet balíčkov" + +#: ../common/gtk/game-rules.c:169 +msgid "The number of dice decks (of 36 cards each)" +msgstr "Počet balíčkov (každý s 36 kartami)" + +#. Label +#: ../common/gtk/game-rules.c:176 +msgid "Number of removed dice cards" +msgstr "Počet odobratých kariet" + +#: ../common/gtk/game-rules.c:194 +msgid "The number of dice cards that are removed after shuffling the deck" +msgstr "Počet kariet, ktoré sú odobraté z balíčku kariet po zamiešaní" + +#. Label +#: ../common/gtk/game-rules.c:201 +msgid "Island discovery bonuses" +msgstr "Bonusy za objavenie ostrova" + +#. Tooltip for island bonus +#: ../common/gtk/game-rules.c:212 +msgid "A comma separated list of bonus points for discovering islands" +msgstr "Čiarkou oddelený zoznam bonusov za objavenie nových ostrovov" + +#. Tooltip for the check button +#: ../common/gtk/game-rules.c:230 +msgid "Check and correct island discovery bonuses" +msgstr "" + +#. Label text for customising a game +#: ../common/gtk/game-settings.c:109 +msgid "Number of players" +msgstr "Počet hráčov" + +#. Tooltip for 'Number of Players' +#: ../common/gtk/game-settings.c:127 +msgid "The number of players" +msgstr "Počet hráčov" + +#. Label for customising a game +#: ../common/gtk/game-settings.c:130 +msgid "Victory point target" +msgstr "Body na výhru" + +#. Tooltip for Victory Point Target +#: ../common/gtk/game-settings.c:149 +msgid "The points needed to win the game" +msgstr "Počet bodov potrebných na výhru" + +#. Tooltip for the check button +#: ../common/gtk/game-settings.c:163 +msgid "Is it possible to win this game?" +msgstr "Je možné vyhrať túto hru?" + +#. Port indicator for a resource: trade 2 for 1 +#: ../common/gtk/guimap.c:739 +msgid "2:1" +msgstr "2:1" + +#. Port indicator: trade 3 for 1 +#. General port indicator +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 +msgid "3:1" +msgstr "3:1" + +#. Port indicator for brick +#: ../common/gtk/guimap.c:747 +msgid "Brick port|B" +msgstr "T" + +#. Port indicator for grain +#: ../common/gtk/guimap.c:751 +msgid "Grain port|G" +msgstr "O" + +#. Port indicator for ore +#: ../common/gtk/guimap.c:755 +msgid "Ore port|O" +msgstr "R" + +#. Port indicator for wool +#: ../common/gtk/guimap.c:759 +msgid "Wool port|W" +msgstr "V" + +#. Port indicator for lumber +#: ../common/gtk/guimap.c:763 +msgid "Lumber port|L" +msgstr "D" + +#. Tooltip for the list of metaservers +#: ../common/gtk/metaserver.c:83 +msgid "Select a metaserver" +msgstr "Vyberte metaserver" + +#. Tooltip for the list of games +#: ../common/gtk/select-game.c:138 +msgid "Select a game" +msgstr "Vyberte hru" + +#. Log prefix +#: ../common/log.c:58 +msgid "*ERROR* " +msgstr "*CHYBA* " + +#. Log prefix +#: ../common/log.c:66 +msgid "Chat: " +msgstr "Chat: " + +#. Log prefix +#: ../common/log.c:70 +msgid "Resource: " +msgstr "Surovina: " + +#. Log prefix +#: ../common/log.c:74 +msgid "Build: " +msgstr "Postaviť: " + +#. Log prefix +#: ../common/log.c:78 +msgid "Dice: " +msgstr "Kocky: " + +#. Log prefix +#: ../common/log.c:82 +msgid "Steal: " +msgstr "Ukradnúť: " + +#. Log prefix +#: ../common/log.c:86 +msgid "Trade: " +msgstr "Obchodovať: " + +#. Log prefix +#: ../common/log.c:90 +msgid "Development: " +msgstr "Pokrok: " + +#. Log prefix +#: ../common/log.c:94 +msgid "Army: " +msgstr "Vojsko: " + +#. Log prefix +#: ../common/log.c:98 +msgid "Road: " +msgstr "Cesta: " + +#. Log prefix +#: ../common/log.c:102 +msgid "*BEEP* " +msgstr "*PÍP* " + +#. Log prefix +#: ../common/log.c:108 +msgid "Player 1: " +msgstr "Hráč 1: " + +#. Log prefix +#: ../common/log.c:112 +msgid "Player 2: " +msgstr "Hráč 2: " + +#. Log prefix +#: ../common/log.c:116 +msgid "Player 3: " +msgstr "Hráč 3: " + +#. Log prefix +#: ../common/log.c:120 +msgid "Player 4: " +msgstr "Hráč 4: " + +#. Log prefix +#: ../common/log.c:124 +msgid "Player 5: " +msgstr "Hráč 5: " + +#. Log prefix +#: ../common/log.c:128 +msgid "Player 6: " +msgstr "Hráč 6: " + +#. Log prefix +#: ../common/log.c:132 +msgid "Player 7: " +msgstr "Hráč 7: " + +#. Log prefix +#: ../common/log.c:136 +msgid "Player 8: " +msgstr "Hráč 8: " + +#. Log prefix +#: ../common/log.c:140 +msgid "Spectator: " +msgstr "Pozorovateľ: " + +#. Log prefix +#: ../common/log.c:144 +msgid "** UNKNOWN MESSAGE TYPE ** " +msgstr "** NEZNÁMY TYP SPRÁVY ** " + +#: ../common/network.c:148 +#, c-format +msgid "Error writing to socket: %s\n" +msgstr "Chyba pri zápise do socketu: %s\n" + +#: ../common/network.c:159 +msgid "Could not send all data\n" +msgstr "Nepodarilo sa odoslať všetky údaje\n" + +#: ../common/network.c:207 +msgid "Read buffer overflow - disconnecting\n" +msgstr "" + +#: ../common/network.c:231 +#, c-format +msgid "Error reading socket: %s\n" +msgstr "" + +#: ../common/network.c:383 +#, c-format +msgid "Error connecting to %s: %s\n" +msgstr "" + +#: ../common/network.c:571 ../common/network.c:572 +msgid "unknown" +msgstr "neznáme" + +#: ../common/state.c:203 +#, c-format +msgid "Connecting to %s, port %s\n" +msgstr "Pripájam sa k %s na porte %s\n" + +#. Error message +#: ../common/state.c:332 +msgid "State stack overflow. Stack dump sent to standard error.\n" +msgstr "" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:131 +msgid "_Hill" +msgstr "P_ahorkatina" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:133 +msgid "_Field" +msgstr "P_ole" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:135 +msgid "_Mountain" +msgstr "_Hory" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:137 +msgid "_Pasture" +msgstr "Pa_stvina" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:139 +msgid "F_orest" +msgstr "_Les" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:141 +msgid "_Desert" +msgstr "_Púšť" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:143 +msgid "_Sea" +msgstr "_More" + +#. Use an unique shortcut key for each resource +#: ../editor/gtk/editor.c:145 +msgid "_Gold" +msgstr "_Zlato" + +#. Use an unique shortcut key for each resource +#. Use an unique shortcut key for each port type +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 +msgid "_None" +msgstr "Ž_iadne" + +#. Use an unique shortcut key for each port type +#: ../editor/gtk/editor.c:152 +msgid "_Brick (2:1)" +msgstr "_Tehly (2:1)" + +#. Use an unique shortcut key for each port type +#: ../editor/gtk/editor.c:154 +msgid "_Grain (2:1)" +msgstr "_Obilie (2:1)" + +#. Use an unique shortcut key for each port type +#: ../editor/gtk/editor.c:156 +msgid "_Ore (2:1)" +msgstr "_Ruda (2:1)" + +#. Use an unique shortcut key for each port type +#: ../editor/gtk/editor.c:158 +msgid "_Wool (2:1)" +msgstr "_Vlna (2:1)" + +#. Use an unique shortcut key for each port type +#: ../editor/gtk/editor.c:160 +msgid "_Lumber (2:1)" +msgstr "_Drevo (2:1)" + +#. Use an unique shortcut key for each port type +#: ../editor/gtk/editor.c:164 +msgid "_Any (3:1)" +msgstr "Čo_koľvek (3:1)" + +#. East +#: ../editor/gtk/editor.c:169 +msgid "East|E" +msgstr "V" + +#. North east +#: ../editor/gtk/editor.c:171 +msgid "North East|NE" +msgstr "SV" + +#. North west +#: ../editor/gtk/editor.c:173 +msgid "North West|NW" +msgstr "SZ" + +#. West +#: ../editor/gtk/editor.c:175 +msgid "West|W" +msgstr "Z" + +#. South west +#: ../editor/gtk/editor.c:177 +msgid "South West|SW" +msgstr "JZ" + +#. South east +#: ../editor/gtk/editor.c:179 +msgid "South East|SE" +msgstr "JV" + +#: ../editor/gtk/editor.c:396 +msgid "Place a hill hex" +msgstr "Umiestniť políčko s pahorkatinou" + +#: ../editor/gtk/editor.c:397 +msgid "Place a field hex" +msgstr "Umiestniť políčko s poľom" + +#: ../editor/gtk/editor.c:398 +msgid "Place a mountain hex" +msgstr "Umiestniť políčko s horou" + +#: ../editor/gtk/editor.c:399 +msgid "Place a pasture hex" +msgstr "Umiestniť políčko s pastvinou" + +#: ../editor/gtk/editor.c:400 +msgid "Place a forest hex" +msgstr "Umiestniť políčko s lesom" + +#: ../editor/gtk/editor.c:401 +msgid "Place a desert hex" +msgstr "Umiestniť políčko s púšťou" + +#: ../editor/gtk/editor.c:402 +msgid "Place a sea hex" +msgstr "Umiestniť políčko s morom" + +#: ../editor/gtk/editor.c:403 +msgid "Place a gold hex" +msgstr "Umiestniť políčko so zlatom" + +#: ../editor/gtk/editor.c:404 +msgid "Clear the hex" +msgstr "Vyčistiť políčko" + +#: ../editor/gtk/editor.c:412 +msgid "Place a 2 chit" +msgstr "" + +#: ../editor/gtk/editor.c:413 +msgid "Place a 3 chit" +msgstr "" + +#: ../editor/gtk/editor.c:414 +msgid "Place a 4 chit" +msgstr "" + +#: ../editor/gtk/editor.c:415 +msgid "Place a 5 chit" +msgstr "" + +#: ../editor/gtk/editor.c:416 +msgid "Place a 6 chit" +msgstr "" + +#: ../editor/gtk/editor.c:418 +msgid "Place an 8 chit" +msgstr "" + +#: ../editor/gtk/editor.c:419 +msgid "Place a 9 chit" +msgstr "" + +#: ../editor/gtk/editor.c:420 +msgid "Place a 10 chit" +msgstr "" + +#: ../editor/gtk/editor.c:421 +msgid "Place an 11 chit" +msgstr "" + +#: ../editor/gtk/editor.c:422 +msgid "Place a 12 chit" +msgstr "" + +#: ../editor/gtk/editor.c:428 +msgid "Place a brick 2:1 port" +msgstr "Umiestniť prístav s tehlami 2:1" + +#: ../editor/gtk/editor.c:429 +msgid "Place a grain 2:1 port" +msgstr "Umiestniť prístav s obilím 2:1" + +#: ../editor/gtk/editor.c:430 +msgid "Place an ore 2:1 port" +msgstr "Umiestniť prístav s rudou 2:1" + +#: ../editor/gtk/editor.c:431 +msgid "Place a wool 2:1 port" +msgstr "Umiestniť prístav s vlnou 2:1" + +#: ../editor/gtk/editor.c:432 +msgid "Place a lumber 2:1 port" +msgstr "Umiestniť prístav s drevom 2:1" + +#. Tooltip to remove a port tile in the editor +#: ../editor/gtk/editor.c:434 +msgid "Remove a port" +msgstr "Odstrániť prístav" + +#: ../editor/gtk/editor.c:435 +msgid "Place a 3:1 port" +msgstr "Umiestniť prístav 3:1" + +#: ../editor/gtk/editor.c:472 +msgid "" +"Select the terrain type with the context menu on the left click or toggle a " +"node to exclude it from being used during the setup phase" +msgstr "" + +#: ../editor/gtk/editor.c:601 +msgid "Insert a row" +msgstr "Vložiť riadok" + +#: ../editor/gtk/editor.c:602 +msgid "Delete a row" +msgstr "Vymazať riadok" + +#: ../editor/gtk/editor.c:603 +msgid "Insert a column" +msgstr "Vložiť stĺpec" + +#: ../editor/gtk/editor.c:604 +msgid "Delete a column" +msgstr "Vymazať stĺpec" + +#. Label +#: ../editor/gtk/editor.c:1009 +msgid "_Title" +msgstr "_Názov" + +#. Label +#: ../editor/gtk/editor.c:1022 +msgid "_Description" +msgstr "_Popis" + +#. Label +#: ../editor/gtk/editor.c:1040 +msgid "_Comments" +msgstr "_Komentáre" + +#. Menu item +#: ../editor/gtk/editor.c:1171 +msgid "Shuffle" +msgstr "Zamiešať" + +#. Caption +#. Game settings frame +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 +msgid "Game parameters" +msgstr "Parametre hry" + +#. Caption +#. Rules frame +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 +msgid "Rules" +msgstr "Pravidlá" + +#. Caption +#: ../editor/gtk/editor.c:1332 +msgid "Resources" +msgstr "Suroviny" + +#. Caption +#: ../editor/gtk/editor.c:1335 +msgid "Buildings" +msgstr "Budovy" + +#. The game in the editor does not have a name yet +#: ../editor/gtk/editor.c:1352 +msgid "Untitled" +msgstr "Bez mena" + +#. Application caption +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 +msgid "Pioneers Editor" +msgstr "Editor Pioneers" + +#: ../editor/gtk/editor.c:1467 +#, c-format +msgid "Failed to load '%s'" +msgstr "" + +#: ../editor/gtk/editor.c:1518 +#, c-format +msgid "Failed to save to '%s'" +msgstr "" + +#. Name of the file filter: show only games +#: ../editor/gtk/editor.c:1544 +msgid "Games" +msgstr "Hry" + +#. Name of the file filter: show all files +#: ../editor/gtk/editor.c:1550 +msgid "Unfiltered" +msgstr "" + +#. Dialog caption +#: ../editor/gtk/editor.c:1580 +msgid "Open Game" +msgstr "Otvoriť hru" + +#. Button text +#: ../editor/gtk/editor.c:1587 +msgid "_Open" +msgstr "_Otvoriť" + +#. Dialog caption +#: ../editor/gtk/editor.c:1620 +msgid "Save As..." +msgstr "Uložiť ako..." + +#. Button text +#: ../editor/gtk/editor.c:1627 +msgid "Save _As" +msgstr "Uložiť _ako" + +#. Dialog caption +#: ../editor/gtk/editor.c:1668 +msgid "Change Title" +msgstr "Zmeniť názov" + +#. Label +#: ../editor/gtk/editor.c:1693 +msgid "New title:" +msgstr "Nové meno:" + +#. Caption of about box +#: ../editor/gtk/editor.c:1732 +msgid "About Pioneers Game Editor" +msgstr "" + +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Otvoriť tento súbor" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "názov_súboru" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Editor pre hry Pioneers" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Nastavenia" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "Komentáre" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:2 +msgid "_File" +msgstr "_Súbor" + +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 +msgid "Create a new game" +msgstr "Vytvoriť novú hru" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Nová" + +#. Tooltip for Open menu entry +#: ../editor/gtk/editor.ui.h:8 +msgid "Open an existing game" +msgstr "Otvoriť existujúcu hru" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Otvoriť..." + +#. Tooltip for Save menu entry +#: ../editor/gtk/editor.ui.h:12 +msgid "Save game" +msgstr "Uložiť hru" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Uložiť" + +#. Tooltip for Save As menu entry +#: ../editor/gtk/editor.ui.h:16 +msgid "Save as" +msgstr "Uložiť ako" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Uložiť _ako..." + +#. Tooltip for Change Title menu entry +#: ../editor/gtk/editor.ui.h:20 +msgid "Change game title" +msgstr "Zmeniť názov hry" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "Zmeniť _názov" + +#. Tooltip for Check Victory Point Target menu entry +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 +msgid "Check whether the game can be won" +msgstr "Skontrolovať, či je možné hru vyhrať" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Skontrolovať počet bodov pre výhru" + +#. Tooltip for About Pioneers Editor menu entry +#: ../editor/gtk/editor.ui.h:48 +msgid "Information about Pioneers Editor" +msgstr "Informácie o programe Pioneers Editor" + +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_O programe Pioneers Editor" + +#: ../editor/gtk/game-resources.c:50 +msgid "Resource count" +msgstr "Počet surovín" + +#: ../editor/gtk/pioneers-editor.desktop.in.h:2 +msgid "Create your own game for Pioneers" +msgstr "Vytvorte si vlastnú hru Pioneers" + +#: ../editor/gtk/pioneers-editor.desktop.in.h:3 +msgid "game;board;create;edit;layout;Pioneers;Settlers;" +msgstr "game;board;create;edit;layout;Pioneers;Osadníci;upraviť;" + +#. Commandline metaserver: daemon +#: ../metaserver/main.c:608 +msgid "Daemonize the metaserver on start" +msgstr "" + +#. Commandline metaserver: pidfile +#: ../metaserver/main.c:611 +msgid "Pidfile to create when daemonizing (implies -d)" +msgstr "" + +#. Commandline metaserver: redirect +#: ../metaserver/main.c:616 +msgid "Redirect clients to another metaserver" +msgstr "" + +#. Commandline metaserver: server +#: ../metaserver/main.c:619 +msgid "Use this hostname when creating new games" +msgstr "" + +#. Commandline metaserver: server argument +#: ../metaserver/main.c:621 +msgid "hostname" +msgstr "" + +#. Commandline metaserver: port-range +#: ../metaserver/main.c:624 +msgid "Use this port range when creating new games" +msgstr "" + +#. Commandline metaserver: port-range argument +#: ../metaserver/main.c:626 +msgid "from-to" +msgstr "" + +#. Commandline option of metaserver: syslog-debug +#: ../metaserver/main.c:632 +msgid "Debug syslog messages" +msgstr "" + +#. Long description in the commandline for metaserver: help +#: ../metaserver/main.c:667 +msgid "- Metaserver for Pioneers" +msgstr "" + +#: ../metaserver/main.c:683 +#, c-format +msgid "metaserver protocol:" +msgstr "" + +#: ../server/avahi.c:68 +msgid "Avahi registration successful.\n" +msgstr "" + +#: ../server/avahi.c:78 +#, c-format +msgid "Avahi service name collision, renaming service to '%s'.\n" +msgstr "" + +#. Some kind of failure happened while we were registering +#: ../server/avahi.c:89 +#, c-format +msgid "Avahi error: %s\n" +msgstr "" + +#: ../server/avahi.c:113 ../server/avahi.c:145 ../server/avahi.c:155 +#: ../server/avahi.c:191 ../server/avahi.c:212 ../server/avahi.c:226 +#, c-format +msgid "Avahi error: %s, %s\n" +msgstr "" + +#: ../server/avahi.c:213 ../server/avahi.c:227 +msgid "Unable to register Avahi server" +msgstr "" + +#: ../server/avahi.c:260 +msgid "Unregistering Avahi.\n" +msgstr "" + +#: ../server/gtk/main.c:189 +msgid "Stop Server" +msgstr "Vypnúť server" + +#: ../server/gtk/main.c:190 +msgid "Start Server" +msgstr "Spustiť server" + +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 +msgid "Stop the server" +msgstr "Vypnúť server" + +#: ../server/gtk/main.c:193 +msgid "Start the server" +msgstr "Spustiť server" + +#: ../server/gtk/main.c:350 +#, c-format +msgid "Player %s from %s entered\n" +msgstr "Vstúpil hráč %s z %s\n" + +#: ../server/gtk/main.c:357 +#, c-format +msgid "Player %s from %s left\n" +msgstr "Hráč %s z %s odišiel\n" + +#: ../server/gtk/main.c:364 +#, c-format +msgid "Player %d is now %s\n" +msgstr "Hráč %d je teraz %s\n" + +#: ../server/gtk/main.c:524 +msgid "The port for the game server" +msgstr "Port herného servera" + +#. register_toggle +#: ../server/gtk/main.c:533 +msgid "Register server" +msgstr "Zaregistrovať server" + +#: ../server/gtk/main.c:539 +msgid "Register this game at the metaserver" +msgstr "Zaregistrovať túto hru na metaserveri" + +#. hostname label +#: ../server/gtk/main.c:567 +msgid "Reported hostname" +msgstr "Nahlásené meno počítača" + +#: ../server/gtk/main.c:580 +msgid "" +"The public name of this computer (needed when playing behind a firewall)" +msgstr "Verejné meno (adresa) tohto počítača (potrebné pre hru za firewallom)" + +#. random toggle +#: ../server/gtk/main.c:599 +msgid "Random turn order" +msgstr "Náhodné poradie" + +#: ../server/gtk/main.c:604 +msgid "Randomize turn order" +msgstr "Náhodne zamiešať poradie hráčov" + +#. Tooltip for server connection overview +#: ../server/gtk/main.c:675 +msgid "Shows all players and spectators connected to the server" +msgstr "Zobraziť všetkých hráčov a pozorovateľov pripojených k serveru" + +#. Label for column Connected +#: ../server/gtk/main.c:680 +msgid "Connected" +msgstr "Pripojený" + +#. Tooltip for column Connected +#: ../server/gtk/main.c:687 +msgid "Is the player currently connected?" +msgstr "Je hráč momentálne pripojený?" + +#. Label for column Name +#: ../server/gtk/main.c:692 +msgid "Name" +msgstr "Meno" + +#. Tooltip for column Name +#: ../server/gtk/main.c:699 +msgid "Name of the player" +msgstr "Meno hráča" + +#. Label for column Location +#: ../server/gtk/main.c:703 +msgid "Location" +msgstr "Umiestnenie" + +#. Tooltip for column Location +#: ../server/gtk/main.c:710 +msgid "Host name of the player" +msgstr "Adresa počítača hráča" + +#. Label for column Number +#: ../server/gtk/main.c:716 +msgid "Number" +msgstr "Číslo" + +#. Tooltip for column Number +#: ../server/gtk/main.c:723 +msgid "Player number" +msgstr "Číslo hráča" + +#. Label for column Role +#: ../server/gtk/main.c:729 +msgid "Role" +msgstr "Úloha" + +#. Tooltip for column Role +#: ../server/gtk/main.c:733 +msgid "Player or spectator" +msgstr "Hráč alebo pozorovateľ" + +#. Button text +#: ../server/gtk/main.c:770 +msgid "Launch Pioneers Client" +msgstr "Spustiť klienta Pioneers" + +#. Tooltip +#: ../server/gtk/main.c:784 +msgid "Launch the Pioneers client" +msgstr "Spustiť klienta Pioneers" + +#. ai chat toggle +#: ../server/gtk/main.c:813 +msgid "Enable chat" +msgstr "Povoliť chat" + +#. Tooltip +#: ../server/gtk/main.c:820 +msgid "Enable chat messages" +msgstr "Povoliť písanie správ v chate" + +#. Button text +#: ../server/gtk/main.c:829 +msgid "Add Computer Player" +msgstr "Pridať počítačového hráča" + +#. Tooltip +#: ../server/gtk/main.c:837 +msgid "Add a computer player to the game" +msgstr "Pridať počítačového hráča do hry" + +#. Tooltip +#: ../server/gtk/main.c:870 +msgid "Messages from the server" +msgstr "Správy zo servera" + +#: ../server/gtk/main.c:906 +msgid "Game settings" +msgstr "Nastavenia hry" + +#. server frame +#: ../server/gtk/main.c:917 +msgid "Server parameters" +msgstr "Parametre servera" + +#: ../server/gtk/main.c:937 +msgid "Running game" +msgstr "Spustená hra" + +#. player connected frame +#: ../server/gtk/main.c:953 +msgid "Players connected" +msgstr "Pripojení hráči" + +#. ai frame +#: ../server/gtk/main.c:957 +msgid "Computer players" +msgstr "Počítačoví hráči" + +#. message frame +#: ../server/gtk/main.c:969 +msgid "Messages" +msgstr "Správy" + +#. Caption of about box +#: ../server/gtk/main.c:1095 +msgid "About the Pioneers Game Server" +msgstr "O programe Pioneers Game Server" + +#. Wait for all players to disconnect, +#. * then enable the UI +#. +#: ../server/gtk/main.c:1103 +msgid "The game is over.\n" +msgstr "Hra skončila.\n" + +#. Long description in the commandline for server-gtk: help +#. Long description in the commandline for server-console: help +#: ../server/gtk/main.c:1150 ../server/main.c:186 +msgid "- Host a game of Pioneers" +msgstr "" + +#. Name in the titlebar of the server +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +msgid "Pioneers Server" +msgstr "Server Pioneers" + +#: ../server/gtk/pioneers-server-gtk.desktop.in.h:2 +msgid "Host a game of Pioneers" +msgstr "" + +#: ../server/gtk/pioneers-server-gtk.desktop.in.h:3 +msgid "game;board;server;host;Pioneers;Settlers;" +msgstr "" + +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Informácie o programe Pioneers Server" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_O programe Pioneers Server" + +#. Commandline server-console: game-title +#: ../server/main.c:78 +msgid "Game title to use" +msgstr "" + +#. Commandline server-console: file +#: ../server/main.c:81 +msgid "Game file to use" +msgstr "" + +#. Commandline server-console: port +#: ../server/main.c:84 +msgid "Port to listen on" +msgstr "Port, na ktorom server počúva" + +#. Commandline server-console: players +#: ../server/main.c:87 +msgid "Override number of players" +msgstr "" + +#. Commandline server-console: points +#: ../server/main.c:90 +msgid "Override number of points needed to win" +msgstr "" + +#. Commandline server-console: seven-rule +#: ../server/main.c:93 +msgid "Override seven-rule handling" +msgstr "" + +#. Commandline server-console: dice-deck +#: ../server/main.c:96 +msgid "Override dice-deck handling" +msgstr "" + +#. Commandline server-console: num-dice-decks +#: ../server/main.c:99 +msgid "Override num-dice-decks handling" +msgstr "" + +#. Commandline server-console: num-removed-dice-cards +#: ../server/main.c:103 +msgid "Override num-removed-dice-cards handling" +msgstr "" + +#. Commandline server-console: terrain +#: ../server/main.c:106 +msgid "Override terrain type, 0=default 1=random" +msgstr "" + +#. Commandline server-console: computer-players +#: ../server/main.c:109 +msgid "Add N computer players" +msgstr "" + +#. Commandline server-console: register +#: ../server/main.c:119 +msgid "Register server with metaserver" +msgstr "" + +#. Commandline server-console: metaserver +#: ../server/main.c:122 +msgid "Register at metaserver name (implies -r)" +msgstr "" + +#. Commandline server-console: hostname +#: ../server/main.c:126 +msgid "Use this hostname when registering" +msgstr "Použiť tento názov počítača pri registrovaní" + +#. Commandline server-console: auto-quit +#: ../server/main.c:133 +msgid "Quit after a player has won" +msgstr "Ukončiť po víťazstve hráča" + +#. Commandline server-console: empty-timeout +#: ../server/main.c:136 +msgid "Quit after N seconds with no players" +msgstr "Ukončiť po uplynutí N sekúnd bez hráčov" + +#. Commandline server-console: tournament +#: ../server/main.c:139 +msgid "Tournament mode, computer players added after N minutes" +msgstr "" + +#. Commandline server-console: admin-port +#: ../server/main.c:143 +msgid "Admin port to listen on" +msgstr "" + +#. Commandline server-console: admin-wait +#: ../server/main.c:146 +msgid "Don't start game immediately, wait for a command on admin port" +msgstr "" + +#. Commandline server-console: fixed-seating-order +#: ../server/main.c:152 +msgid "Give players numbers according to the order they enter the game" +msgstr "" + +#. Commandline server-console: Short description of meta group +#: ../server/main.c:192 +msgid "Metaserver Options" +msgstr "" + +#. Commandline server-console: Long description of meta group +#: ../server/main.c:194 +msgid "Options for the metaserver" +msgstr "" + +#. Commandline server-console: Short description of misc group +#: ../server/main.c:203 +msgid "Miscellaneous Options" +msgstr "" + +#. Commandline server-console: Long description of misc group +#: ../server/main.c:205 +msgid "Miscellaneous options" +msgstr "" + +#. server-console commandline error +#: ../server/main.c:231 +#, c-format +msgid "Cannot set game title and filename at the same time\n" +msgstr "" + +#. server-console commandline error +#: ../server/main.c:248 +#, c-format +msgid "Cannot load the parameters for the game\n" +msgstr "" + +#. Error message +#: ../server/main.c:297 ../server/main.c:317 +#, c-format +msgid "The network port (%s) for the admin interface is not available.\n" +msgstr "" + +#: ../server/meta.c:58 +msgid "The connection to the metaserver is lost.\n" +msgstr "" + +#. The connection to the metaserver was lost +#: ../server/meta.c:63 +#, c-format +msgid "An attempt to reconnect is scheduled in %u second.\n" +msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../server/meta.c:83 +msgid "Attempting to reconnect to the metaserver.\n" +msgstr "" + +#: ../server/meta.c:315 +#, c-format +msgid "Register with the metaserver at %s.\n" +msgstr "" + +#: ../server/meta.c:326 +msgid "Unregister from the metaserver.\n" +msgstr "" + +#: ../server/player.c:143 +msgid "chat too long" +msgstr "" + +#: ../server/player.c:160 +msgid "name too long" +msgstr "" + +#: ../server/player.c:192 +msgid "ignoring unknown extension" +msgstr "" + +#: ../server/player.c:229 ../server/player.c:299 +msgid "The last player left, the tournament timer is reset." +msgstr "" + +#: ../server/player.c:263 ../server/player.c:644 +msgid "No human players present. Bye." +msgstr "" + +#: ../server/player.c:270 +msgid "Game starts, adding computer players." +msgstr "" + +#: ../server/player.c:312 +#, c-format +msgid "The game starts in %s minutes." +msgstr "" + +#: ../server/player.c:313 +#, c-format +msgid "The game starts in %s minute." +msgstr "Hra začína o %s minút(y)." + +#. Default name for the AI when the computer_names file +#. * is not found or empty. +#. +#: ../server/player.c:371 ../server/player.c:377 +msgid "Computer Player" +msgstr "Počítačový hráč" + +#: ../server/player.c:451 +#, c-format +msgid "Unable to determine the hostname of the player: %s" +msgstr "Nepodarilo sa určiť názov počítača hráča: %s" + +#. The game is over, don't accept new players +#. Message to send to the client when the game is already over +#. * when a connection is made. +#: ../server/player.c:477 +msgid "Sorry, game is over." +msgstr "Ľutujem, hra skončila." + +#: ../server/player.c:479 +#, c-format +msgid "Player from %s is refused: game is over\n" +msgstr "" + +#: ../server/player.c:521 +msgid "Name not changed: new name is already in use" +msgstr "Meno nezmenené: toto meno je už použité" + +#: ../server/player.c:639 ../server/server.c:38 +msgid "Was hanging around for too long without players... bye.\n" +msgstr "" + +#: ../server/player.c:726 +msgid "The last human player left. Waiting for the return of a player." +msgstr "Posledný ľudský hráč odišiel. Čakám, kým sa vráti." + +#: ../server/player.c:747 +msgid "Resuming the game." +msgstr "Hra pokračuje." + +#. %s is the name of the reconnecting player +#: ../server/player.c:873 +#, c-format +msgid "%s has reconnected." +msgstr "%s sa opäť pripojil(a)." + +#: ../server/player.c:973 +#, c-format +msgid "Version mismatch: %s" +msgstr "Nesúhlasia verzie: %s" + +#: ../server/player.c:1010 +msgid "This game will start soon." +msgstr "Táto hra čoskoro začne." + +#. Server: preparing game #..... +#: ../server/server.c:222 +msgid "Preparing game" +msgstr "Pripravujem hru" + +#: ../server/turn.c:254 +msgid "Island Discovery Bonus" +msgstr "Bonus za objavenie ostrova" + +#: ../server/turn.c:255 +msgid "Additional Island Bonus" +msgstr "Dodatočný bonus za ostrov" + +#: ../server/turn.c:386 +msgid "Tried to assign resources to NULL player.\n" +msgstr "" + +#. Cheat mode has been activated +#: ../server/turn.c:516 +msgid "The dice roll has been determined by the administrator." +msgstr "" + +#~ msgid "Quit the program" +#~ msgstr "Ukončiť program" + +#~ msgid "" +#~ msgstr "viac>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Zvýšiť vybrané množstvo" diff -Nru pioneers-15.5/po/sv.po pioneers-15.6/po/sv.po --- pioneers-15.5/po/sv.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/sv.po 2020-08-02 12:37:55.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Pioneers 0.12.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2011-10-30 15:06+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -60,8 +60,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "Aktivera felsökningsmeddelanden" @@ -71,8 +71,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "Visa versionsinformation" @@ -81,9 +81,9 @@ msgid "- Computer player for Pioneers" msgstr "- Datorspelare för Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers version:" @@ -336,8 +336,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -370,7 +370,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "Offline" @@ -400,7 +400,7 @@ msgstr "%s tar emot %s.\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s tar %s.\n" @@ -444,70 +444,70 @@ msgstr "" "Versionen stämmer inte. Se till att klient och server är uppdaterade.\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "Bygg två bosättningar, båda med en anslutande" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "Bygg en bosättning med en anslutande" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "väg" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "bro" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "skepp" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr " eller" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "Väntar på din tur." -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "Välj den byggnad du vill stjäla från." -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "Välj det skepp du vill stjäla från." -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "Placera ut rånaren." -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "Gör klar vägbyggnationen." -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "Bygg ett vägsegment." -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "Bygg två vägsegment." #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "Det är din tur." -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "Tyvärr, %s tillgänglig.\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "Spelet är slut." @@ -561,7 +561,7 @@ msgid "%s took %s from %s.\n" msgstr "%s tog %s från %s.\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "Åskådare %d" @@ -571,7 +571,7 @@ msgid "spectator %d" msgstr "åskådare %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "Spelare %d" @@ -897,6 +897,12 @@ msgid "%s, %s" msgstr "%s, %s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "någon resurs (fel)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -942,12 +948,26 @@ msgid "Begin turn %d for %s.\n" msgstr "Börja tur %d för %s.\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, fuzzy, c-format +msgid "Error starting %s: %s\n" +msgstr "Fel vid start av %s: %s" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "" @@ -980,111 +1000,398 @@ msgid " said: " msgstr " säger: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "_Spel" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "Starta ett nytt spel" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "_Nytt spel" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "Lämna detta spel" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "_Lämna spel" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "Administrera Pioneers-servern" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "_Administrera" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "Ändra ditt spelarnamn" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "_Spelarens namn" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "Terrängförklaring och byggnadskostnader" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "_Förklaring" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "Inställningar för nuvarande spel" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "S_pelinställningar" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "Histogram för tärningskast" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "_Tärningshistogram" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "Avsluta" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "_Avsluta" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "_Åtgärder" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "Kasta tärningen" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "Kasta tärning" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "Handla" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "Ångra" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "Klar" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "Bygg en väg" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "Väg" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "Bygg ett skepp" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "Skepp" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "Flytta ett skepp" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "Flytta skepp" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "Bygg en bro" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "Bro" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "Bygg en bosättning" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "Bosättning" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "Bygg en stad" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "Stad" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "Köp ett utvecklingskort" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "Utveckla" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "Bygg en stadsmur" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "Stadsmur" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "_Inställningar" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "Visa eller göm verktygsraden" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "_Verktygsrad" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "Konfigurera programmet" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "Inställ_ningar" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "_Hjälp" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Information om Pioneers" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "_Om Pioneers" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "Visa manualen" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "Metaserver på %s, port %s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "Klar.\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "Tar emot spelnamn från metaservern.\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, fuzzy, c-format msgid "New game server requested on %s port %s.\n" msgstr "Ny spelserver begärd på %s port %s\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "Okänt meddelande från metaservern: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 #, fuzzy msgid "Too many metaserver redirects.\n" msgstr "För många omdirigeringar för metaserver\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "Felaktig rad för omdirigering: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "Metaserver för gammal för att skapa servrar (version %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, fuzzy, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "Okänt meddelande från metaservern: %s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "Normal" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "Slå om på de första 2 turerna" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "Slå om alla 7:or" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "Förvald" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "Slumpad" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, fuzzy, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "Omdirigerad till metaserver på %s, port %s\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, fuzzy, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "Omdirigerad till metaserver på %s, port %s\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "Tar emot en lista av Pioneers-servrar från metaservern.\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 #, fuzzy msgid "Number of computer players" msgstr "Typ av datorspelare" @@ -1107,11 +1414,6 @@ msgid "Requesting new game server.\n" msgstr "Begär en ny spelserver\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, fuzzy, c-format -msgid "Error starting %s: %s\n" -msgstr "Fel vid start av %s: %s" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1119,9 +1421,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 msgid "_Cancel" msgstr "" @@ -1147,7 +1449,7 @@ msgstr "_Nytt fjärrspel" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 msgid "_Join" msgstr "" @@ -1213,7 +1515,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "Regel för 7:an" @@ -1255,105 +1557,105 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "Spelarnamn" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "Ange ditt namn" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "Åskådare" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 #, fuzzy msgid "Check if you want to be a spectator" msgstr "Vill du vara en åskådare?" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "Metaserver" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "Gå in i ett publikt spel" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "Gå in i ett publikt spel" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "Skapa spel" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "Skapa ett spel" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "Gå in i privat spel" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "Gå in i ett privat spel" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "Servervärd" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "Namn på värden som kör spelet" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "Serverport" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "Port på värden som kör spelet" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "Tidigare spel" @@ -1374,524 +1676,253 @@ #. Button text #: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, fuzzy, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "Du måste kasta %d resurser" -msgstr[1] "Du måste kasta %d resurser" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "Totala kastningar" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "Väntar på att spelare ska kasta" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "Spelet är över" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s har vunnit spelet med %d segerpoäng!" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "Länge leve %s, Härskare över världen!" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "Välj resurser" - -#: ../client/gtk/gold.c:96 -#, fuzzy, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "Du får välja %d resurser" -msgstr[1] "Du får välja %d resurser" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "Totala resurser" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "Väntar på att spelare ska välja" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "_Spel" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "_Nytt spel" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "Starta ett nytt spel" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "_Lämna spel" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "Lämna detta spel" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "_Administrera" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "Administrera Pioneers-servern" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "_Spelarens namn" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "Ändra ditt spelarnamn" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "_Förklaring" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "Terrängförklaring och byggnadskostnader" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "S_pelinställningar" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "Inställningar för nuvarande spel" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "_Tärningshistogram" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "Histogram för tärningskast" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "_Avsluta" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "Avsluta programmet" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "_Åtgärder" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "Kasta tärning" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "Kasta tärningen" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "Handla" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "Ångra" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "Klar" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "Väg" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "Bygg en väg" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "Skepp" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "Bygg ett skepp" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "Flytta skepp" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "Flytta ett skepp" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "Bro" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "Bygg en bro" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "Bosättning" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "Bygg en bosättning" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "Stad" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "Bygg en stad" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "Utveckla" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "Köp ett utvecklingskort" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "Stadsmur" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "Bygg en stadsmur" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "_Inställningar" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "Inställ_ningar" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "Konfigurera programmet" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" msgstr "" -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "" +#: ../client/gtk/discard.c:101 +#, fuzzy, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "Du måste kasta %d resurser" +msgstr[1] "Du måste kasta %d resurser" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "Totala kastningar" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "_Hjälp" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "Väntar på att spelare ska kasta" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "_Om Pioneers" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "Spelet är över" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Information om Pioneers" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s har vunnit spelet med %d segerpoäng!" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "Visa manualen" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "Länge leve %s, Härskare över världen!" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "Välj resurser" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "" +#: ../client/gtk/gold.c:96 +#, fuzzy, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "Du får välja %d resurser" +msgstr[1] "Du får välja %d resurser" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "_Verktygsrad" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "Totala resurser" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "Visa eller göm verktygsraden" +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "Väntar på att spelare ska välja" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "Poäng krävs för vinst: %i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "Meddelanden" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "Karta" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "Avsluta handel" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "Pris" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "Vägra inrikeshandel" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "Förklaring" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "Välkommen till Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Inställningar för Pioneers" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "Tema:" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "Välj ett av dessa teman" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "Visa förklaring" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "Visa förklaringen som en sida bredvid kartan" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "Meddelanden med färg" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "Visa nya meddelanden med färg" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "Chatt i spelarens färg" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "Visa nya chattmeddelanden i samma färg som spelaren" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "Sammanfattning i färg" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "Använd färger i spelarnas sammanfattning" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "Verktygsrad med genvägar" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "Visa tangentbordsgenvägar i verktygsraden" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "Tyst läge" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "I tyst läge kommer inga ljud att spelas upp" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "Annonsera nya spelare" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "Spela ett ljud när en ny spelare eller åskådare kommer in i spelet" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "Använd bredbildslayout" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "Använd en bredbildsvänlig layout för fönstret" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "Kasta tärningen" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "Om Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "Välkommen till Pioneers!" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "Tärningshistogram" @@ -1904,7 +1935,7 @@ msgstr "Välj en ny plats för skeppet." #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "" @@ -1937,21 +1968,21 @@ msgstr "Hav" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "Terrängavkastning" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "Byggnadskostnader" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "Stadsmur" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "Utvecklingskort" @@ -1982,28 +2013,30 @@ msgstr "Yta:" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "Variant:" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "Anslut som en åskådare" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "Metaservervärd" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "Välj ett spel att gå in i." -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "Ansluter" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- Spela en omgång av Pioneers" @@ -2099,7 +2132,7 @@ msgstr "Resurskort" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "Utvecklingskort" @@ -2125,66 +2158,77 @@ msgid "The bank is empty" msgstr "Banken är tom" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s har %s och letar efter %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "Jag vill ha" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "Ge dem" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "Ta bort" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "Aktivera chatt" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "Vägra inrikeshandel" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "Spelare" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "Pris" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s för %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "Vägrade handel" @@ -2199,243 +2243,223 @@ msgstr "Totalt" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "Mängd i handen" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "mer>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "Öka den valda mängden" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "Vald mängd" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "Totalt vald mängd" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "Banken kan inte tömmas" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "Ja" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "Nej" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "Okänd" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "Inget spel pågår..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "Allmänna inställningar" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "Antal spelare:" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "Poängmål för seger:" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "Slumpad terräng:" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "Tillåt handel mellan spelare:" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "Tillåt handel endast före byggnation eller köp:" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 #, fuzzy msgid "Check victory only at end of turn:" msgstr "Kontrollera seger endast vid turens slut" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "Mängd av varje resurs:" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 #, fuzzy msgid "Sevens rule:" msgstr "Regel för 7:an" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 #, fuzzy msgid "Number of dice decks:" msgstr "Antal spelare:" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "Använd piraten för att blockera skepp:" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "Bonusar för upptäckter av öar:" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "Byggkostnad" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "Vägar:" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "Bosättningar:" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "Städer:" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "Stadsmurar:" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "Skepp:" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "Broar:" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "Kortlek för utvecklingskort" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "Vägbyggnadskort:" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "Monopolkort:" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "Kort för Guldår:" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "Kapellkort:" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Kort för Pioneer Universitet:" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "Kort för Guvenörshus:" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "Bibliotekskort:" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "Marknadskort:" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "Soldatkort:" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "Inställningar för nuvarande spel" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "fråga efter %s gratis" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "ge %s gratis" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "ge %s för %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "Jag vill ha %s och ge dem %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "_Fråga efter pris" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "_Acceptera pris" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "Avsluta _handel" @@ -2492,25 +2516,25 @@ "upgrading.\n" msgstr "" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "Detta spel kan inte vinnas." -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "Det finns inget land." -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "Det är möjligt att det här spelet inte kan vinnas." -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "" "Det här spelet kan vinnas endast genom att bygga alla bosättningar och " "städer." -#: ../common/game.c:971 +#: ../common/game.c:970 #, fuzzy, c-format msgid "" "Required victory points: %d\n" @@ -2565,177 +2589,177 @@ msgstr "Daniel Nylander " #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "Alla 7:or flyttar rånaren eller piraten" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "De två första turerna slås alla 7:or om" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "Alla sjuor slås om" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "Slumpa terräng" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "Slumpa terrängen" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "Använd pirat" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "Använd piraten för att blockera skepp" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "Strikt handel" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "Tillåt handel endast före byggnation eller köp" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "Inrikeshandel" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "Tillåt handel mellan spelare" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "Seger vid turens slut" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "Kontrollera seger endast vid turens slut" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 #, fuzzy msgid "Number of dice decks" msgstr "Typ av datorspelare" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 #, fuzzy msgid "Island discovery bonuses" msgstr "Bonusar för upptäckter av öar:" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 #, fuzzy msgid "Check and correct island discovery bonuses" msgstr "Bonusar för upptäckter av öar:" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "Antal spelare" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "Antalet spelare" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "Poäng för vinst" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "Poäng som krävs för att vinna spelet" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "Är det möjligt att vinna det här spelet?" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "Te" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "Sä" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "Ma" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "Ul" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "Ti" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "Välj en metaserver" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "Välj ett spel" @@ -2844,30 +2868,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** OKÄND MEDDELANDETYP ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "Fel vid skrivning till uttag: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "Överflöde i läsbuffert - kopplar ned\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "Fel vid läsning av uttag: %s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, fuzzy, c-format msgid "Error connecting to %s: %s\n" msgstr "Fel vid anslutning till %s: %s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "okänd" @@ -2877,470 +2901,459 @@ msgstr "Ansluter till %s, port %s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "Överflöde i statusstack. Stackdump skickar till standard fel.\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "_Kulle" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "_Fält" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "_Berg" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "Be_tesmark" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "_Skog" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "Ök_en" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "_Hav" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "_Guld" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "_Ingen" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "Te_gel (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "_Spannmål (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "_Malm (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "_Ull (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "_Timmer (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "_Någon (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "Ö" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "NÖ" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "NV" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "V" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "SV" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "SÖ" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 #, fuzzy msgid "Remove a port" msgstr "Serverport" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" msgstr "" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 #, fuzzy msgid "_Title" msgstr "Ändra _titel" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 #, fuzzy msgid "_Description" msgstr "Ök_en" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "Blanda" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "Spelparametrar" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "Regler" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "Resurser" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "Byggnader" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Redigerare för Pioneers" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "Misslyckades att läsa in \"%s\"" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "Misslyckades att spara till \"%s" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 #, fuzzy msgid "Games" msgstr "_Spel" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "Öppna spel" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "_Öppna..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "Spara som..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "Spar_a som..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "Ändra titel" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "Ny titel:" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "Om redigeraren för Pioneers" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "Öppna denna fil" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "filnamn" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Redigerare för Pioneers-spel" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "Inställningar" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "_Fil" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "_Ny" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "Skapa ett nytt spel" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "_Öppna..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "_Ny" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "Öppna ett existerande spel" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "_Spara" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "_Öppna..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "Spara spel" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "Spar_a som..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "_Spara" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "Spara som" #. Menu entry -#: ../editor/gtk/editor.c:1748 -#, fuzzy -msgid "Change _Title" -msgstr "Ändra titel" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "Spar_a som..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "Ändra spelets titel" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "_Kontrollera poängmål för vinst" +#: ../editor/gtk/editor.ui.h:22 +#, fuzzy +msgid "Change _Title" +msgstr "Ändra titel" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "Kontrollera huruvida spelet kan vinnas" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "Avsluta" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "_Om redigeraren för Pioneers" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "_Kontrollera poängmål för vinst" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "Information om redigeraren för Pioneers" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "Öppna denna fil" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "filnamn" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Redigerare för Pioneers-spel" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "Misslyckade att bygga menyer: %s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "Inställningar" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "_Om redigeraren för Pioneers" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "Resurser" @@ -3353,51 +3366,51 @@ msgstr "" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "Kör metaserver som bakgrundsprocess vid start" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "Pid-fil att skapa vid bakgrundsprocess (betyder -d)" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "Omdirigerar klienter till en annan metaserver" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "Använd det här värdnamnet när nya spel skapas" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "värdnamn" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "Använd det här portintervallet när nya spel skapas" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "från-till" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "Felsökningsmeddelanden till syslog" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Metaserver för Pioneers" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "protokoll för metaserver:" @@ -3431,201 +3444,191 @@ msgid "Unregistering Avahi.\n" msgstr "" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "_Om Pioneers Server" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "Information om Pioneers Server" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "Stoppa server" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "Starta server" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "Stoppa servern" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "Starta servern" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "Spelaren %s från %s kom in\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "Spelaren %s från %s lämnade\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "Spelare %d är nu %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "Porten för spelservern" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "Registrera server" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "Registrera detta spel på metaservern" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "Rapporterat värdnamn" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "" "Det publika namnet för denna dator (behövs vid spel bakom en brandvägg)" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 #, fuzzy msgid "Random turn order" msgstr "Slumpa fram turordning" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "Slumpa fram turordning" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "Visar alla spelare och åskådare anslutna till servern" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "Ansluten" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "Är spelaren ansluten för närvarande?" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "Namn" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "Spelarens namn" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "Plats" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "Värdnamn för spelaren" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "Nummer" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "Spelarens nummer" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "Roll" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "Starta Pioneers-klient" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "Starta Pioneers-klienten" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "Aktivera chatt" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "Aktivera chattmeddelanden" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "Lägg till datorspelare" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "Lägg till en datorspelare till spelet" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "Meddelanden från servern" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "Spelinställningar" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "Serverparametrar" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "Pågående spel" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "Anslutna spelare" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "Datorspelare" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "Meddelanden" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "Pioneers spelserver" @@ -3634,18 +3637,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "Spelet är över.\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Stå värd för en omgång av Pioneers" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioneers-server" @@ -3657,144 +3660,154 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "Information om Pioneers Server" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "_Om Pioneers Server" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "Speltitel att använda" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "Spelfil att använda" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "Port att lyssna på" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "Åsidosätt antalet spelare" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "Åsidosätt antalet poäng som behövs för att vinna" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "Åsidosätt hantering av 7-regeln" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 #, fuzzy msgid "Override dice-deck handling" msgstr "Åsidosätt hantering av 7-regeln" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 #, fuzzy msgid "Override num-dice-decks handling" msgstr "Åsidosätt hantering av 7-regeln" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 #, fuzzy msgid "Override num-removed-dice-cards handling" msgstr "Åsidosätt hantering av 7-regeln" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "Åsidosätt terrängtyp, 0=standard 1=slumpad" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "Lägg till N datorspelare" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "Registrera server med metaserver" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "Registrera mot metaserver (förutsätter -r)" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "Använd detta värdnamn vid registrering" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "Avsluta efter att en spelare har vunnit" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "Avsluta efter N sekunder utan spelare" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "Turneringsläge, datorspelare läggs till efter N minuter" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "Administrationsport att lyssna på" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "" "Starta inte spelet direkt, vänta på ett kommando på administrationsporten" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "Ge spelare nummer enligt den ordning de kom in i spelet" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "Metaserveralternativ" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "Alternativ för metaservern" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "Diverse alternativ" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "Diverse alternativ" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "Kan inte ställa in speltitel och filnamn på samma gång\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "Kan inte läsa in parametrarna för spelet\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "" @@ -3804,7 +3817,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "Alternativ för metaservern" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3816,46 +3830,46 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "Alternativ för metaservern" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, fuzzy, c-format msgid "Register with the metaserver at %s.\n" msgstr "Registrera mot metaservern på %s, port %s\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 #, fuzzy msgid "Unregister from the metaserver.\n" msgstr "Avregistrera från metaserver\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "chatt för lång" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "namn för långt" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "ignorerar okänd utökning" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "Sista spelaren kvar, turneringens tidtagare nollställs." -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "Spelet startar, lägger till datorspelare." -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "Spelet startar om %s minuter." -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "Spelet startar om %s minut." @@ -3864,11 +3878,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "Datorspelare" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "" @@ -3876,48 +3890,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "Tyvärr, spelet är över." -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "Spelare från %s nekas: spelet är över\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "Namn inte ändrat: nytt namn används redan" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "Väntade för länge utan några spelare... adjö.\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s har återanslutit." -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "Versionen stämmer inte: %s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "Detta spel kommer strax att startas." #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "Förbereder spel" @@ -3938,6 +3952,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "Tärningskastet har bestämts av administratören." +#~ msgid "Quit the program" +#~ msgstr "Avsluta programmet" + +#~ msgid "" +#~ msgstr "mer>" + +#~ msgid "Increase the selected amount" +#~ msgstr "Öka den valda mängden" + +#~ msgid "Building menus failed: %s" +#~ msgstr "Misslyckade att bygga menyer: %s" + #~ msgid "Join the selected game" #~ msgstr "Gå in i valt spel" diff -Nru pioneers-15.5/po/zh_CN.po pioneers-15.6/po/zh_CN.po --- pioneers-15.5/po/zh_CN.po 2018-03-14 15:55:12.000000000 +0000 +++ pioneers-15.6/po/zh_CN.po 2020-08-02 12:37:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Pioneers 15.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-14 16:51+0100\n" +"POT-Creation-Date: 2020-08-02 14:26+0200\n" "PO-Revision-Date: 2012-01-12 13:22+0800\n" "Last-Translator: Gerald \n" "Language-Team: Chinese (Simplified) \n" @@ -57,8 +57,8 @@ #. Commandline option of metaserver: enable debug logging #. Commandline option of server-gtk: enable debug logging #. Commandline option of server: enable debug logging -#: ../client/ai/ai.c:111 ../client/gtk/offline.c:67 ../metaserver/main.c:631 -#: ../server/gtk/main.c:1170 ../server/main.c:159 +#: ../client/ai/ai.c:111 ../client/gtk/offline.c:66 ../metaserver/main.c:629 +#: ../server/gtk/main.c:1115 ../server/main.c:157 msgid "Enable debug messages" msgstr "启用调试信息" @@ -68,8 +68,8 @@ #. Commandline option of metaserver: version #. Commandline option of server-gtk: version #. Commandline option of server-console: version -#: ../client/ai/ai.c:114 ../client/gtk/offline.c:70 ../editor/gtk/editor.c:1843 -#: ../metaserver/main.c:637 ../server/gtk/main.c:1173 ../server/main.c:114 +#: ../client/ai/ai.c:114 ../client/gtk/offline.c:69 ../editor/gtk/editor.c:1770 +#: ../metaserver/main.c:635 ../server/gtk/main.c:1118 ../server/main.c:112 msgid "Show version information" msgstr "显示版本信息" @@ -78,9 +78,9 @@ msgid "- Computer player for Pioneers" msgstr "- 电脑 for Pioneers" -#: ../client/ai/ai.c:137 ../client/gtk/offline.c:196 -#: ../editor/gtk/editor.c:1888 ../metaserver/main.c:687 -#: ../server/gtk/main.c:1223 ../server/main.c:226 +#: ../client/ai/ai.c:137 ../client/gtk/offline.c:195 +#: ../editor/gtk/editor.c:1806 ../metaserver/main.c:679 +#: ../server/gtk/main.c:1161 ../server/main.c:218 #, c-format msgid "Pioneers version:" msgstr "Pioneers 版本:" @@ -332,8 +332,8 @@ #: ../client/ai/lobbybot.c:119 msgid "" "This board is not intended to be a game that can be played. Instead, players " -"can find eachother here, and decide which board they want to play. Then, one " -"of the players will host the proposed game by starting a server, and " +"can find each other here, and decide which board they want to play. Then, " +"one of the players will host the proposed game by starting a server, and " "registers it at the metaserver. The other players can subsequently " "disconnect from the lobby, and enter that game." msgstr "" @@ -364,7 +364,7 @@ #. Network status: offline #: ../client/common/client.c:535 ../client/common/client.c:990 -#: ../client/gtk/gui.c:1532 +#: ../client/gtk/gui.c:1296 msgid "Offline" msgstr "离线" @@ -394,7 +394,7 @@ msgstr "%s 得到了 %s。\n" #. Year of Plenty -#: ../client/common/client.c:724 ../client/common/client.c:2663 +#: ../client/common/client.c:724 ../client/common/client.c:2666 #, c-format msgid "%s takes %s.\n" msgstr "%s 拿了 %s。\n" @@ -437,70 +437,70 @@ msgid "Version mismatch. Please make sure client and server are up to date.\n" msgstr "版本不匹配，请确保客户端和服务端是最新的。\n" -#: ../client/common/client.c:1413 +#: ../client/common/client.c:1416 msgid "Build two settlements, each with a connecting" msgstr "建两个房子，分别连接着" -#: ../client/common/client.c:1416 +#: ../client/common/client.c:1419 msgid "Build a settlement with a connecting" msgstr "建一个房子，连接着" -#: ../client/common/client.c:1419 +#: ../client/common/client.c:1422 msgid "road" msgstr "一条路" -#: ../client/common/client.c:1421 +#: ../client/common/client.c:1424 msgid "bridge" msgstr "一座桥" -#: ../client/common/client.c:1423 +#: ../client/common/client.c:1426 msgid "ship" msgstr "一艘船" -#: ../client/common/client.c:1430 +#: ../client/common/client.c:1433 msgid " or" msgstr "或者" -#: ../client/common/client.c:1494 +#: ../client/common/client.c:1497 msgid "Waiting for your turn." msgstr "还没到你，你先等着。" -#: ../client/common/client.c:1546 ../client/gtk/interface.c:784 +#: ../client/common/client.c:1549 ../client/gtk/interface.c:821 msgid "Select the building to steal from." msgstr "选择要偷的建筑。" -#: ../client/common/client.c:1568 ../client/gtk/interface.c:774 +#: ../client/common/client.c:1571 ../client/gtk/interface.c:811 msgid "Select the ship to steal from." msgstr "选择要偷的船。" -#: ../client/common/client.c:1652 ../client/gtk/interface.c:816 +#: ../client/common/client.c:1655 ../client/gtk/interface.c:853 msgid "Place the robber." msgstr "放置强盗。" -#: ../client/common/client.c:1702 +#: ../client/common/client.c:1705 msgid "Finish the road building action." msgstr "完成修路行为。" -#: ../client/common/client.c:1704 +#: ../client/common/client.c:1707 msgid "Build one road segment." msgstr "修一段路。" -#: ../client/common/client.c:1706 +#: ../client/common/client.c:1709 msgid "Build two road segments." msgstr "修两段路。" #. Notification -#: ../client/common/client.c:1979 ../client/common/client.c:2073 +#: ../client/common/client.c:1982 ../client/common/client.c:2076 #: ../client/gtk/interface.c:432 msgid "It is your turn." msgstr "到你了。" -#: ../client/common/client.c:2167 +#: ../client/common/client.c:2170 #, c-format msgid "Sorry, %s available.\n" msgstr "抱歉，%s 还在。\n" -#: ../client/common/client.c:2481 +#: ../client/common/client.c:2484 msgid "The game is over." msgstr "游戏结束。" @@ -554,7 +554,7 @@ msgid "%s took %s from %s.\n" msgstr "%1$s 拿走了 %3$s 的 %2$s。\n" -#: ../client/common/player.c:125 ../server/player.c:567 +#: ../client/common/player.c:125 ../server/player.c:568 #, c-format msgid "Spectator %d" msgstr "观众 %d" @@ -564,7 +564,7 @@ msgid "spectator %d" msgstr "观众 %d" -#: ../client/common/player.c:137 ../server/player.c:570 +#: ../client/common/player.c:137 ../server/player.c:571 #, c-format msgid "Player %d" msgstr "玩家 %d" @@ -890,6 +890,12 @@ msgid "%s, %s" msgstr "%s，%s" +#. All resource types are active in the trade +#: ../client/common/resource.c:231 +#, fuzzy +msgid "any resource" +msgstr "任何资源 (bug)" + #: ../client/common/robber.c:62 #, c-format msgid "%s has undone the robber movement.\n" @@ -935,12 +941,26 @@ msgid "Begin turn %d for %s.\n" msgstr "开始 %2$s 的第 %1$d 回合。\n" -#: ../client/gtk/avahi-browser.c:83 +#. Error message when program %1 is started, reason is %2 +#: ../client/gtk/audio.c:68 ../client/gtk/audio.c:122 +#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:325 ../server/server.c:124 +#, c-format +msgid "Error starting %s: %s\n" +msgstr "启动错误 %s: %s\n" + +#. The name of the application +#. Name of the application +#: ../client/gtk/audio.c:75 ../client/gtk/gui.c:1352 +#: ../client/gtk/offline.c:202 ../client/gtk/pioneers.desktop.in.h:1 +msgid "Pioneers" +msgstr "Pioneers" + +#: ../client/gtk/avahi-browser.c:79 msgid "Select an automatically discovered game" msgstr "选择一个自动发现的游戏" #. $1=Game title, $2=version, $3=host_name, $4=port -#: ../client/gtk/avahi-browser.c:132 +#: ../client/gtk/avahi-browser.c:127 #, c-format msgid "%s (%s) on %s:%s" msgstr "%s (%s) @ %s:%s" @@ -973,110 +993,397 @@ msgid " said: " msgstr " 说: " -#: ../client/gtk/connect.c:286 +#. Menu entry +#: ../client/gtk/client.ui.h:2 ../server/gtk/server.ui.h:2 +msgid "_Game" +msgstr "游戏(_G)" + +#. Tooltip for New Game menu entry +#: ../client/gtk/client.ui.h:4 +msgid "Start a new game" +msgstr "开始一个新游戏" + +#. Menu entry +#: ../client/gtk/client.ui.h:6 +msgid "_New Game" +msgstr "新游戏(_N)" + +#. Tooltip for Leave Game menu entry +#: ../client/gtk/client.ui.h:8 +msgid "Leave this game" +msgstr "离开当前游戏" + +#. Menu entry +#: ../client/gtk/client.ui.h:10 +msgid "_Leave Game" +msgstr "离开游戏(_L)" + +#. Tooltip for Admin menu entry +#: ../client/gtk/client.ui.h:12 +msgid "Administer Pioneers server" +msgstr "管理员Pioneers服务器" + +#. Menu entry +#: ../client/gtk/client.ui.h:14 +msgid "_Admin" +msgstr "管理(_A)" + +#. Tooltip for Player Name menu entry +#: ../client/gtk/client.ui.h:16 +msgid "Change your player name" +msgstr "修改玩家姓名" + +#. Menu entry +#: ../client/gtk/client.ui.h:18 +msgid "_Player Name" +msgstr "玩家姓名(_P)" + +#. Tooltip for Legend menu entry +#: ../client/gtk/client.ui.h:20 +msgid "Terrain legend and building costs" +msgstr "地形图例和建筑消费" + +#. Menu entry +#: ../client/gtk/client.ui.h:22 +msgid "L_egend" +msgstr "图例(_E)" + +#. Tooltip for Game Settings menu entry +#: ../client/gtk/client.ui.h:24 +msgid "Settings for the current game" +msgstr "当前游戏的设置" + +#. Menu entry +#: ../client/gtk/client.ui.h:26 +msgid "_Game Settings" +msgstr "游戏设置(_G)" + +#. Tooltip for Dice Histogram menu entry +#: ../client/gtk/client.ui.h:28 +msgid "Histogram of dice rolls" +msgstr "骰子结果柱状图" + +#. Menu entry +#: ../client/gtk/client.ui.h:30 +msgid "_Dice Histogram" +msgstr "骰子柱状图(_D)" + +#. Tooltip for Quit menu entry +#: ../client/gtk/client.ui.h:32 ../editor/gtk/editor.ui.h:28 +#: ../server/gtk/server.ui.h:8 +msgid "Quit" +msgstr "退出" + +#. Menu entry +#: ../client/gtk/client.ui.h:34 ../editor/gtk/editor.ui.h:30 +#: ../server/gtk/server.ui.h:10 +msgid "_Quit" +msgstr "退出(_Q)" + +#. Menu entry +#: ../client/gtk/client.ui.h:36 +msgid "_Actions" +msgstr "行动(_A)" + +#. Tooltip for Roll Dice menu entry +#: ../client/gtk/client.ui.h:38 +msgid "Roll the dice" +msgstr "掷骰子" + +#. Menu entry +#: ../client/gtk/client.ui.h:40 ../client/gtk/gui.c:1140 +msgid "Roll Dice" +msgstr "掷骰子" + +#. Menu entry +#. Tab page name +#: ../client/gtk/client.ui.h:42 ../client/gtk/gui.c:405 +#: ../client/gtk/gui.c:1141 +msgid "Trade" +msgstr "交易" + +#. Menu entry +#: ../client/gtk/client.ui.h:44 ../client/gtk/gui.c:1142 +msgid "Undo" +msgstr "撤消" + +#. Menu entry +#: ../client/gtk/client.ui.h:46 ../client/gtk/gui.c:1143 +msgid "Finish" +msgstr "完成" + +#. Tooltip for Road menu entry +#: ../client/gtk/client.ui.h:48 +msgid "Build a road" +msgstr "修一条路" + +#. Menu entry +#: ../client/gtk/client.ui.h:50 ../client/gtk/gui.c:1144 +#: ../client/gtk/legend.c:165 ../editor/gtk/game-buildings.c:10 +msgid "Road" +msgstr "道路" + +#. Tooltip for Ship menu entry +#: ../client/gtk/client.ui.h:52 +msgid "Build a ship" +msgstr "造一条船" + +#. Menu entry +#: ../client/gtk/client.ui.h:54 ../client/gtk/gui.c:1145 +#: ../client/gtk/legend.c:168 ../editor/gtk/game-buildings.c:10 +msgid "Ship" +msgstr "轮船" + +#. Tooltip for Move Ship menu entry +#: ../client/gtk/client.ui.h:56 +msgid "Move a ship" +msgstr "移动一艘船" + +#. Menu entry +#: ../client/gtk/client.ui.h:58 ../client/gtk/gui.c:1146 +msgid "Move Ship" +msgstr "移动船" + +#. Tooltip for Bridge menu entry +#: ../client/gtk/client.ui.h:60 +msgid "Build a bridge" +msgstr "建一座桥" + +#. Menu entry +#: ../client/gtk/client.ui.h:62 ../client/gtk/gui.c:1147 +#: ../client/gtk/legend.c:171 ../editor/gtk/game-buildings.c:10 +msgid "Bridge" +msgstr "桥梁" + +#. Tooltip for Settlement menu entry +#: ../client/gtk/client.ui.h:64 +msgid "Build a settlement" +msgstr "建一个房子" + +#. Menu entry +#: ../client/gtk/client.ui.h:66 ../client/gtk/gui.c:1148 +#: ../client/gtk/legend.c:173 ../client/gtk/player.c:52 +#: ../editor/gtk/game-buildings.c:10 +msgid "Settlement" +msgstr "房子" + +#. Tooltip for City menu entry +#: ../client/gtk/client.ui.h:68 +msgid "Build a city" +msgstr "建一个城市" + +#. Menu entry +#: ../client/gtk/client.ui.h:70 ../client/gtk/gui.c:1149 +#: ../client/gtk/legend.c:175 ../client/gtk/player.c:53 +#: ../editor/gtk/game-buildings.c:11 +msgid "City" +msgstr "城市" + +#. Tooltip for Develop menu entry +#: ../client/gtk/client.ui.h:72 +msgid "Buy a development card" +msgstr "买一张发展卡" + +#. Menu entry +#: ../client/gtk/client.ui.h:74 ../client/gtk/gui.c:1150 +msgid "Develop" +msgstr "发展卡" + +#. Tooltip for City Wall menu entry +#: ../client/gtk/client.ui.h:76 +msgid "Build a city wall" +msgstr "修一堵城墙" + +#. Menu entry +#: ../client/gtk/client.ui.h:78 ../client/gtk/gui.c:1151 +msgid "City Wall" +msgstr "城墙" + +#. Menu entry +#: ../client/gtk/client.ui.h:80 +msgid "_Settings" +msgstr "设置(_S)" + +#. Tooltip for Toolbar menu entry +#: ../client/gtk/client.ui.h:82 +msgid "Show or hide the toolbar" +msgstr "显示或隐藏工具栏" + +#. Menu entry +#: ../client/gtk/client.ui.h:84 +msgid "_Toolbar" +msgstr "工具栏(_T)" + +#. Tooltip for Preferences menu entry +#: ../client/gtk/client.ui.h:86 +msgid "Configure the application" +msgstr "设置应用程序" + +#. Menu entry +#: ../client/gtk/client.ui.h:88 +msgid "Prefere_nces" +msgstr "偏好(_N)" + +#. Menu entry +#: ../client/gtk/client.ui.h:90 ../editor/gtk/editor.ui.h:32 +msgid "_View" +msgstr "查看(_V)" + +#. Tooltip for Fullscreen menu entry +#: ../client/gtk/client.ui.h:92 ../editor/gtk/editor.ui.h:34 +msgid "Set window to full screen mode" +msgstr "进入全屏模式" + +#. Menu entry +#: ../client/gtk/client.ui.h:94 ../editor/gtk/editor.ui.h:36 +msgid "_Fullscreen" +msgstr "全屏(_F)" + +#. Tooltip for Reset menu entry +#: ../client/gtk/client.ui.h:96 ../editor/gtk/editor.ui.h:38 +msgid "View the full map" +msgstr "查看完整地图" + +#. Menu entry +#: ../client/gtk/client.ui.h:98 ../editor/gtk/editor.ui.h:40 +msgid "_Reset" +msgstr "重置(_R)" + +#. Tooltip for Center menu entry +#: ../client/gtk/client.ui.h:100 ../editor/gtk/editor.ui.h:42 +msgid "Center the map" +msgstr "让地图居中" + +#. Menu entry +#: ../client/gtk/client.ui.h:102 ../editor/gtk/editor.ui.h:44 +msgid "_Center" +msgstr "居中(_C)" + +#. Menu entry +#: ../client/gtk/client.ui.h:104 ../editor/gtk/editor.ui.h:46 +#: ../server/gtk/server.ui.h:12 +msgid "_Help" +msgstr "帮助(_H)" + +#. Tooltip for About Pioneers menu entry +#: ../client/gtk/client.ui.h:106 +msgid "Information about Pioneers" +msgstr "Pioneers的信息" + +#. Menu entry +#: ../client/gtk/client.ui.h:108 +msgid "_About Pioneers" +msgstr "关于Pioneers(_A)" + +#. Tooltip for Help menu entry +#: ../client/gtk/client.ui.h:110 ../client/gtk/gui.c:1043 +msgid "Show the manual" +msgstr "显示游戏指南" + +#: ../client/gtk/connect.c:287 #, c-format msgid "Metaserver at %s, port %s" msgstr "中转服务器 @ %s:%s" -#: ../client/gtk/connect.c:296 +#: ../client/gtk/connect.c:297 msgid "Finished.\n" msgstr "完成。\n" -#: ../client/gtk/connect.c:311 ../client/gtk/connect.c:389 -#: ../client/gtk/connect.c:408 ../client/gtk/connect.c:979 +#: ../client/gtk/connect.c:312 ../client/gtk/connect.c:390 +#: ../client/gtk/connect.c:409 ../client/gtk/connect.c:979 msgid "The metaserver is not available anymore.\n" msgstr "这个中转服务器不再可用。\n" -#: ../client/gtk/connect.c:322 ../client/gtk/connect.c:443 -#: ../client/gtk/connect.c:770 +#: ../client/gtk/connect.c:323 ../client/gtk/connect.c:444 +#: ../client/gtk/connect.c:771 msgid "The metaserver closed the connection unexpectedly.\n" msgstr "中转服务器意外关闭连接。\n" -#: ../client/gtk/connect.c:380 +#: ../client/gtk/connect.c:381 msgid "Receiving game names from the metaserver.\n" msgstr "从中转服务器获取游戏名称。\n" -#: ../client/gtk/connect.c:422 +#: ../client/gtk/connect.c:423 #, c-format msgid "New game server requested on %s port %s.\n" msgstr "在 %s:%s 请求了建立新游戏。\n" -#: ../client/gtk/connect.c:432 +#: ../client/gtk/connect.c:433 msgid "Incomplete information about the new game server received.\n" msgstr "新游戏服务器信息获取不完整。\n" -#: ../client/gtk/connect.c:486 ../client/gtk/connect.c:492 ../server/meta.c:239 +#: ../client/gtk/connect.c:487 ../client/gtk/connect.c:493 ../server/meta.c:243 #, c-format msgid "Unknown message from the metaserver: %s\n" msgstr "从中转服务器收到未知信息: %s\n" -#: ../client/gtk/connect.c:565 ../server/meta.c:178 +#: ../client/gtk/connect.c:566 ../server/meta.c:182 #, c-format msgid "Receiving data from inactive session: %s\n" msgstr "从未激活的会话收到数据：%s\n" -#: ../client/gtk/connect.c:577 ../server/meta.c:192 +#: ../client/gtk/connect.c:578 ../server/meta.c:196 msgid "Too many metaserver redirects.\n" msgstr "中转服务器重置信息太多。\n" -#: ../client/gtk/connect.c:606 ../server/meta.c:208 +#: ../client/gtk/connect.c:607 ../server/meta.c:212 #, c-format msgid "Bad redirect line: %s\n" msgstr "错误的重置信息: %s\n" -#: ../client/gtk/connect.c:631 +#: ../client/gtk/connect.c:632 #, c-format msgid "The metaserver is too old to create servers (version %d.%d)\n" msgstr "中转服务器太旧，无法创建服务 (版本号 %d.%d)\n" -#: ../client/gtk/connect.c:670 ../client/gtk/connect.c:749 -#: ../client/gtk/connect.c:755 +#: ../client/gtk/connect.c:671 ../client/gtk/connect.c:750 +#: ../client/gtk/connect.c:756 #, c-format msgid "Unexpected data from the metaserver: %s\n" msgstr "来自中转服务器的未知数据：%s\n" #. Sevens rule: normal -#: ../client/gtk/connect.c:701 ../client/gtk/settingscreen.c:181 -#: ../common/gtk/game-rules.c:89 +#: ../client/gtk/connect.c:702 ../client/gtk/settingscreen.c:177 +#: ../common/gtk/game-rules.c:87 msgid "Normal" msgstr "正常" #. Sevens rule: reroll on 1st 2 turns -#: ../client/gtk/connect.c:706 ../client/gtk/settingscreen.c:183 -#: ../common/gtk/game-rules.c:95 +#: ../client/gtk/connect.c:707 ../client/gtk/settingscreen.c:179 +#: ../common/gtk/game-rules.c:93 msgid "Reroll on 1st 2 turns" msgstr "前2回合重投" #. Sevens rule: reroll all 7s -#: ../client/gtk/connect.c:710 ../client/gtk/settingscreen.c:185 -#: ../common/gtk/game-rules.c:102 +#: ../client/gtk/connect.c:711 ../client/gtk/settingscreen.c:181 +#: ../common/gtk/game-rules.c:100 msgid "Reroll all 7s" msgstr "重投所有的7" -#: ../client/gtk/connect.c:724 +#: ../client/gtk/connect.c:725 msgid "Default" msgstr "默认" -#: ../client/gtk/connect.c:727 +#: ../client/gtk/connect.c:728 msgid "Random" msgstr "随机" -#: ../client/gtk/connect.c:819 ../server/meta.c:299 +#: ../client/gtk/connect.c:820 ../server/meta.c:303 #, c-format msgid "Redirected to the metaserver at %s.\n" msgstr "重定向到中转服务器 @ %s:%s\n" -#: ../client/gtk/connect.c:824 ../server/meta.c:302 +#: ../client/gtk/connect.c:825 ../server/meta.c:306 #, c-format msgid "Redirected to the metaserver at %s, port %s.\n" msgstr "从中转服务器获取游戏服务器列表。\n" -#: ../client/gtk/connect.c:831 +#: ../client/gtk/connect.c:832 msgid "Receiving a list of Pioneers servers from the metaserver.\n" msgstr "正在从中转服务器获取Pioneers服务器列表。\n" #. Label -#: ../client/gtk/connect.c:914 +#: ../client/gtk/connect.c:916 msgid "Number of computer players" msgstr "电脑玩家数目" @@ -1096,11 +1403,6 @@ msgid "Requesting new game server.\n" msgstr "正在请求创建新游戏。\n" -#: ../client/gtk/connect.c:1015 ../server/gtk/main.c:370 ../server/server.c:123 -#, c-format -msgid "Error starting %s: %s\n" -msgstr "启动错误 %s: %s\n" - #. Dialog caption #: ../client/gtk/connect.c:1037 msgid "Create a Public Game" @@ -1108,9 +1410,9 @@ #. Button text #: ../client/gtk/connect.c:1040 ../client/gtk/connect.c:1191 -#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1744 -#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1521 -#: ../editor/gtk/editor.c:1562 ../editor/gtk/editor.c:1611 +#: ../client/gtk/connect.c:1440 ../client/gtk/connect.c:1731 +#: ../client/gtk/name.c:147 ../editor/gtk/editor.c:1584 +#: ../editor/gtk/editor.c:1624 ../editor/gtk/editor.c:1673 #, fuzzy msgid "_Cancel" msgstr "已取消。\n" @@ -1137,7 +1439,7 @@ msgstr "新建远程游戏(_N)" #. Button text -#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1748 +#: ../client/gtk/connect.c:1194 ../client/gtk/connect.c:1735 #, fuzzy msgid "_Join" msgstr "加入" @@ -1204,7 +1506,7 @@ #. Tooltip for column 'Sevens Rule' #. Label -#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:81 +#: ../client/gtk/connect.c:1312 ../common/gtk/game-rules.c:79 msgid "Sevens rule" msgstr "打7的规则" @@ -1245,104 +1547,104 @@ #. Label #. Commandline option of client: name of the player -#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:57 +#: ../client/gtk/connect.c:1464 ../client/gtk/offline.c:56 msgid "Player name" msgstr "玩家姓名" #. Tooltip -#: ../client/gtk/connect.c:1480 +#: ../client/gtk/connect.c:1478 msgid "Enter your name" msgstr "输入你的姓名" #. Check button #. Role of the player: spectator -#: ../client/gtk/connect.c:1483 ../server/gtk/main.c:682 +#: ../client/gtk/connect.c:1481 ../server/gtk/main.c:627 msgid "Spectator" msgstr "观众" -#: ../client/gtk/connect.c:1493 +#: ../client/gtk/connect.c:1490 msgid "Check if you want to be a spectator" msgstr "如果要当观众请选上" #. Label -#: ../client/gtk/connect.c:1504 +#: ../client/gtk/connect.c:1500 msgid "Avahi" msgstr "Avahi" #. Button -#: ../client/gtk/connect.c:1511 +#: ../client/gtk/connect.c:1506 msgid "Join" msgstr "加入" #. Tooltip for button Join -#: ../client/gtk/connect.c:1515 +#: ../client/gtk/connect.c:1510 msgid "Join an automatically discovered game" msgstr "加入一个自动发现的游戏" #. Label #. metaserver label -#: ../client/gtk/connect.c:1542 ../server/gtk/main.c:593 +#: ../client/gtk/connect.c:1533 ../server/gtk/main.c:545 msgid "Metaserver" msgstr "中转服务器" #. Button -#: ../client/gtk/connect.c:1564 +#: ../client/gtk/connect.c:1551 msgid "Join Public Game" msgstr "加入公共游戏" #. Tooltip -#: ../client/gtk/connect.c:1570 +#: ../client/gtk/connect.c:1557 msgid "Join a public game" msgstr "加入一个公共游戏" #. Button -#: ../client/gtk/connect.c:1575 +#: ../client/gtk/connect.c:1562 msgid "Create Game" msgstr "创建游戏" #. Tooltip -#: ../client/gtk/connect.c:1579 +#: ../client/gtk/connect.c:1566 msgid "Create a game" msgstr "创建一个游戏" #. Button -#: ../client/gtk/connect.c:1588 +#: ../client/gtk/connect.c:1575 msgid "Join Private Game" msgstr "加入私人游戏" #. Tooltip #. Dialog caption -#: ../client/gtk/connect.c:1592 ../client/gtk/connect.c:1737 +#: ../client/gtk/connect.c:1579 ../client/gtk/connect.c:1724 msgid "Join a private game" msgstr "加入一个私人游戏" #. Label #. Commandline option of client: hostname of the server -#: ../client/gtk/connect.c:1777 ../client/gtk/offline.c:51 +#: ../client/gtk/connect.c:1764 ../client/gtk/offline.c:51 msgid "Server host" msgstr "服务器主机" #. Tooltip -#: ../client/gtk/connect.c:1791 +#: ../client/gtk/connect.c:1775 msgid "Name of the host of the game" msgstr "游戏主机名称" #. Label #. Commandline option of client: port of the server #. server port label -#: ../client/gtk/connect.c:1795 ../client/gtk/offline.c:54 -#: ../server/gtk/main.c:555 +#: ../client/gtk/connect.c:1779 ../client/gtk/offline.c:53 +#: ../server/gtk/main.c:511 msgid "Server port" msgstr "服务器端口" #. Tooltip -#: ../client/gtk/connect.c:1812 +#: ../client/gtk/connect.c:1794 msgid "Port of the host of the game" msgstr "游戏主机端口" #. Tooltip #. Label -#: ../client/gtk/connect.c:1854 ../client/gtk/connect.c:1857 +#: ../client/gtk/connect.c:1835 ../client/gtk/connect.c:1838 msgid "Recent games" msgstr "最近的游戏" @@ -1361,524 +1663,253 @@ msgid "Discard Resources" msgstr "丢弃资源" -#. Button text -#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 -#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 -#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1614 -msgid "_OK" -msgstr "" - -#: ../client/gtk/discard.c:101 -#, c-format -msgid "You must discard %d resource" -msgid_plural "You must discard %d resources" -msgstr[0] "你必须丢弃%d个资源" - -#. Label -#: ../client/gtk/discard.c:110 -msgid "Total discards" -msgstr "全部丢弃" - -#. Caption for list of player that must discard cards -#: ../client/gtk/discard.c:235 -msgid "Waiting for players to discard" -msgstr "等待玩家丢弃" - -#. Dialog caption -#: ../client/gtk/gameover.c:34 -msgid "Game Over" -msgstr "游戏结束" - -#: ../client/gtk/gameover.c:52 -#, c-format -msgid "%s has won the game with %d victory points!" -msgstr "%s 得了 %d 分，赢得了游戏的胜利！" - -#: ../client/gtk/gameover.c:58 -#, c-format -msgid "All praise %s, Lord of the known world!" -msgstr "赞美 %s，世界的霸主！" - -#. Dialog caption -#: ../client/gtk/gold.c:72 -msgid "Choose Resources" -msgstr "选择资源" - -#: ../client/gtk/gold.c:96 -#, c-format -msgid "You may choose %d resource" -msgid_plural "You may choose %d resources" -msgstr[0] "你可以选择 %d 个资源" - -#. Text for total in choose gold dialog -#. Text for total in year of plenty dialog -#: ../client/gtk/gold.c:105 ../client/gtk/plenty.c:103 -msgid "Total resources" -msgstr "总资源数" - -#. Caption for list of player that must choose gold -#: ../client/gtk/gold.c:217 -msgid "Waiting for players to choose" -msgstr "等待玩家选择" - -#. Menu entry -#: ../client/gtk/gui.c:224 ../server/gtk/main.c:91 -msgid "_Game" -msgstr "游戏(_G)" - -#. Menu entry -#: ../client/gtk/gui.c:227 -msgid "_New Game" -msgstr "新游戏(_N)" - -#. Tooltip for New Game menu entry -#: ../client/gtk/gui.c:229 -msgid "Start a new game" -msgstr "开始一个新游戏" - -#. Menu entry -#: ../client/gtk/gui.c:232 -msgid "_Leave Game" -msgstr "离开游戏(_L)" - -#. Tooltip for Leave Game menu entry -#: ../client/gtk/gui.c:234 -msgid "Leave this game" -msgstr "离开当前游戏" - -#. Menu entry -#: ../client/gtk/gui.c:238 -msgid "_Admin" -msgstr "管理(_A)" - -#. Tooltip for Admin menu entry -#: ../client/gtk/gui.c:240 -msgid "Administer Pioneers server" -msgstr "管理员Pioneers服务器" - -#. Menu entry -#: ../client/gtk/gui.c:244 -msgid "_Player Name" -msgstr "玩家姓名(_P)" - -#. Tooltip for Player Name menu entry -#: ../client/gtk/gui.c:246 -msgid "Change your player name" -msgstr "修改玩家姓名" - -#. Menu entry -#: ../client/gtk/gui.c:249 -msgid "L_egend" -msgstr "图例(_E)" - -#. Tooltip for Legend menu entry -#: ../client/gtk/gui.c:251 -msgid "Terrain legend and building costs" -msgstr "地形图例和建筑消费" - -#. Menu entry -#: ../client/gtk/gui.c:254 -msgid "_Game Settings" -msgstr "游戏设置(_G)" - -#. Tooltip for Game Settings menu entry -#: ../client/gtk/gui.c:256 -msgid "Settings for the current game" -msgstr "当前游戏的设置" - -#. Menu entry -#: ../client/gtk/gui.c:259 -msgid "_Dice Histogram" -msgstr "骰子柱状图(_D)" - -#. Tooltip for Dice Histogram menu entry -#: ../client/gtk/gui.c:261 -msgid "Histogram of dice rolls" -msgstr "骰子结果柱状图" - -#. Menu entry -#: ../client/gtk/gui.c:264 ../editor/gtk/editor.c:1759 ../server/gtk/main.c:103 -msgid "_Quit" -msgstr "退出(_Q)" - -#. Tooltip for Quit menu entry -#. Tooltop for Quit menu entry -#: ../client/gtk/gui.c:266 ../server/gtk/main.c:105 -msgid "Quit the program" -msgstr "退出程序" - -#. Menu entry -#: ../client/gtk/gui.c:269 -msgid "_Actions" -msgstr "行动(_A)" - -#. Menu entry -#: ../client/gtk/gui.c:272 -msgid "Roll Dice" -msgstr "掷骰子" - -#. Tooltip for Roll Dice menu entry -#: ../client/gtk/gui.c:274 -msgid "Roll the dice" -msgstr "掷骰子" - -#. Menu entry -#. Tooltip for Trade menu entry -#. Tab page name -#: ../client/gtk/gui.c:277 ../client/gtk/gui.c:279 ../client/gtk/gui.c:710 -msgid "Trade" -msgstr "交易" - -#. Menu entry -#. Tooltip for Undo menu entry -#: ../client/gtk/gui.c:283 ../client/gtk/gui.c:285 -msgid "Undo" -msgstr "撤消" - -#. Menu entry -#. Tooltip for Finish menu entry -#: ../client/gtk/gui.c:288 ../client/gtk/gui.c:290 -msgid "Finish" -msgstr "完成" - -#. Menu entry -#: ../client/gtk/gui.c:293 ../client/gtk/legend.c:189 -#: ../editor/gtk/game-buildings.c:10 -msgid "Road" -msgstr "道路" - -#. Tooltip for Road menu entry -#: ../client/gtk/gui.c:295 -msgid "Build a road" -msgstr "修一条路" - -#. Menu entry -#: ../client/gtk/gui.c:298 ../client/gtk/legend.c:193 -#: ../editor/gtk/game-buildings.c:10 -msgid "Ship" -msgstr "轮船" - -#. Tooltip for Ship menu entry -#: ../client/gtk/gui.c:300 -msgid "Build a ship" -msgstr "造一条船" - -#. Menu entry -#: ../client/gtk/gui.c:303 -msgid "Move Ship" -msgstr "移动船" - -#. Tooltip for Move Ship menu entry -#: ../client/gtk/gui.c:305 -msgid "Move a ship" -msgstr "移动一艘船" - -#. Menu entry -#: ../client/gtk/gui.c:308 ../client/gtk/legend.c:196 -#: ../editor/gtk/game-buildings.c:10 -msgid "Bridge" -msgstr "桥梁" - -#. Tooltip for Bridge menu entry -#: ../client/gtk/gui.c:310 -msgid "Build a bridge" -msgstr "建一座桥" - -#. Menu entry -#: ../client/gtk/gui.c:313 ../client/gtk/legend.c:198 ../client/gtk/player.c:52 -#: ../editor/gtk/game-buildings.c:10 -msgid "Settlement" -msgstr "房子" - -#. Tooltip for Settlement menu entry -#: ../client/gtk/gui.c:316 -msgid "Build a settlement" -msgstr "建一个房子" - -#. Menu entry -#: ../client/gtk/gui.c:319 ../client/gtk/legend.c:199 ../client/gtk/player.c:53 -#: ../editor/gtk/game-buildings.c:11 -msgid "City" -msgstr "城市" - -#. Tooltip for City menu entry -#: ../client/gtk/gui.c:321 -msgid "Build a city" -msgstr "建一个城市" - -#. Menu entry -#: ../client/gtk/gui.c:324 -msgid "Develop" -msgstr "发展卡" - -#. Tooltip for Develop menu entry -#: ../client/gtk/gui.c:326 -msgid "Buy a development card" -msgstr "买一张发展卡" - -#. Menu entry -#: ../client/gtk/gui.c:329 -msgid "City Wall" -msgstr "城墙" - -#. Tooltip for City Wall menu entry -#: ../client/gtk/gui.c:331 -msgid "Build a city wall" -msgstr "修一堵城墙" - -#. Menu entry -#: ../client/gtk/gui.c:335 -msgid "_Settings" -msgstr "设置(_S)" - -#. Menu entry -#: ../client/gtk/gui.c:338 -msgid "Prefere_nces" -msgstr "偏好(_N)" - -#. Tooltip for Preferences menu entry -#: ../client/gtk/gui.c:340 -msgid "Configure the application" -msgstr "设置应用程序" - -#. Menu entry -#: ../client/gtk/gui.c:344 ../editor/gtk/editor.c:1721 -msgid "_View" -msgstr "查看(_V)" - -#. Menu entry -#: ../client/gtk/gui.c:347 ../editor/gtk/editor.c:1765 -msgid "_Reset" -msgstr "重置(_R)" - -#. Tooltip for Reset menu entry -#: ../client/gtk/gui.c:350 ../editor/gtk/editor.c:1768 -msgid "View the full map" -msgstr "查看完整地图" - -#. Menu entry -#: ../client/gtk/gui.c:353 ../editor/gtk/editor.c:1771 -msgid "_Center" -msgstr "居中(_C)" +#. Button text +#: ../client/gtk/discard.c:83 ../client/gtk/gameover.c:38 +#: ../client/gtk/gold.c:78 ../client/gtk/monopoly.c:88 ../client/gtk/name.c:150 +#: ../client/gtk/plenty.c:67 ../editor/gtk/editor.c:1676 +msgid "_OK" +msgstr "" -#. Tooltip for Center menu entry -#: ../client/gtk/gui.c:355 ../editor/gtk/editor.c:1773 -msgid "Center the map" -msgstr "让地图居中" +#: ../client/gtk/discard.c:101 +#, c-format +msgid "You must discard %d resource" +msgid_plural "You must discard %d resources" +msgstr[0] "你必须丢弃%d个资源" -#. Menu entry -#: ../client/gtk/gui.c:359 ../client/gtk/gui.c:368 ../editor/gtk/editor.c:1724 -#: ../server/gtk/main.c:94 -msgid "_Help" -msgstr "帮助(_H)" +#. Label +#: ../client/gtk/discard.c:109 +msgid "Total discards" +msgstr "全部丢弃" -#. Menu entry -#: ../client/gtk/gui.c:362 -msgid "_About Pioneers" -msgstr "关于Pioneers(_A)" +#. Caption for list of player that must discard cards +#: ../client/gtk/discard.c:234 +msgid "Waiting for players to discard" +msgstr "等待玩家丢弃" -#. Tooltip for About Pioneers menu entry -#: ../client/gtk/gui.c:364 -msgid "Information about Pioneers" -msgstr "Pioneers的信息" +#. Dialog caption +#: ../client/gtk/gameover.c:34 +msgid "Game Over" +msgstr "游戏结束" -#. Tooltip for Help menu entry -#: ../client/gtk/gui.c:370 ../client/gtk/gui.c:1258 -msgid "Show the manual" -msgstr "显示游戏指南" +#: ../client/gtk/gameover.c:52 +#, c-format +msgid "%s has won the game with %d victory points!" +msgstr "%s 得了 %d 分，赢得了游戏的胜利！" -#. Menu entry -#: ../client/gtk/gui.c:378 ../editor/gtk/editor.c:1791 -msgid "_Fullscreen" -msgstr "全屏(_F)" +#: ../client/gtk/gameover.c:58 +#, c-format +msgid "All praise %s, Lord of the known world!" +msgstr "赞美 %s，世界的霸主！" -#. Tooltip for Fullscreen menu entry -#: ../client/gtk/gui.c:381 ../editor/gtk/editor.c:1794 -msgid "Set window to full screen mode" -msgstr "进入全屏模式" +#. Dialog caption +#: ../client/gtk/gold.c:72 +msgid "Choose Resources" +msgstr "选择资源" -#. Menu entry -#: ../client/gtk/gui.c:386 -msgid "_Toolbar" -msgstr "工具栏(_T)" +#: ../client/gtk/gold.c:96 +#, c-format +msgid "You may choose %d resource" +msgid_plural "You may choose %d resources" +msgstr[0] "你可以选择 %d 个资源" -#. Tooltip for Toolbar menu entry -#: ../client/gtk/gui.c:388 -msgid "Show or hide the toolbar" -msgstr "显示或隐藏工具栏" +#. Text for total in choose gold dialog +#. Text for total in year of plenty dialog +#: ../client/gtk/gold.c:104 ../client/gtk/plenty.c:102 +msgid "Total resources" +msgstr "总资源数" + +#. Caption for list of player that must choose gold +#: ../client/gtk/gold.c:220 +msgid "Waiting for players to choose" +msgstr "等待玩家选择" #. Victory points target in statusbar -#: ../client/gtk/gui.c:491 +#: ../client/gtk/gui.c:196 #, c-format msgid "Points needed to win: %i" msgstr "胜利需要的分数：%i" -#: ../client/gtk/gui.c:577 +#: ../client/gtk/gui.c:282 msgid "Messages" msgstr "消息" #. Tab page name -#: ../client/gtk/gui.c:703 ../editor/gtk/editor.c:1946 +#: ../client/gtk/gui.c:398 ../editor/gtk/editor.c:1844 msgid "Map" msgstr "地图" #. Tooltip -#: ../client/gtk/gui.c:712 +#: ../client/gtk/gui.c:407 msgid "Finish trading" msgstr "完成交易" #. Tab page name #. Button text -#: ../client/gtk/gui.c:722 ../client/gtk/quote.c:339 +#: ../client/gtk/gui.c:417 ../client/gtk/quote.c:364 msgid "Quote" msgstr "报价" #. Tooltip -#: ../client/gtk/gui.c:724 +#: ../client/gtk/gui.c:419 msgid "Reject domestic trade" msgstr "拒绝内部交易" #. Tab page name #. Dialog caption -#: ../client/gtk/gui.c:734 ../client/gtk/legend.c:249 +#: ../client/gtk/gui.c:429 ../client/gtk/legend.c:224 msgid "Legend" msgstr "图例" #. Tab page name, shown for the splash screen -#: ../client/gtk/gui.c:744 +#: ../client/gtk/gui.c:439 msgid "Welcome to Pioneers" msgstr "欢迎来到Pioneers" #. Caption of preferences dialog -#: ../client/gtk/gui.c:1028 +#: ../client/gtk/gui.c:763 msgid "Pioneers Preferences" msgstr "Pioneers 偏好设置" #. Button text -#: ../client/gtk/gui.c:1034 ../client/gtk/histogram.c:252 -#: ../client/gtk/legend.c:253 ../client/gtk/settingscreen.c:413 +#: ../client/gtk/gui.c:769 ../client/gtk/histogram.c:280 +#: ../client/gtk/legend.c:228 ../client/gtk/settingscreen.c:404 msgid "_Close" msgstr "" #. Label for changing the theme, in the preferences dialog -#: ../client/gtk/gui.c:1059 +#: ../client/gtk/gui.c:797 msgid "Theme:" msgstr "主题：" #. Tooltip for changing the theme in the preferences dialog -#: ../client/gtk/gui.c:1082 +#: ../client/gtk/gui.c:818 msgid "Choose one of the themes" msgstr "选择一个主题" #. Label for the option to show the legend -#: ../client/gtk/gui.c:1086 +#: ../client/gtk/gui.c:822 msgid "Show legend" msgstr "显示图例" #. Tooltip for the option to show the legend -#: ../client/gtk/gui.c:1096 +#: ../client/gtk/gui.c:831 msgid "Show the legend as a page beside the map" msgstr "在地图旁以一个新页面来显示图例" #. Label for the option to display log messages in color -#: ../client/gtk/gui.c:1101 +#: ../client/gtk/gui.c:836 msgid "Messages with color" msgstr "彩色消息" #. Tooltip for the option to display log messages in color -#: ../client/gtk/gui.c:1111 +#: ../client/gtk/gui.c:845 msgid "Show new messages with color" msgstr "用彩色显示新消息" #. Label for the option to display chat in color of player -#: ../client/gtk/gui.c:1116 +#: ../client/gtk/gui.c:850 msgid "Chat in color of player" msgstr "用玩家颜色显示聊天" #. Tooltip for the option to display chat in color of player -#: ../client/gtk/gui.c:1127 +#: ../client/gtk/gui.c:860 msgid "Show new chat messages in the color of the player" msgstr "用玩家颜色显示新聊天消息" #. Label for the option to display the summary with colors -#: ../client/gtk/gui.c:1132 +#: ../client/gtk/gui.c:865 msgid "Summary with color" msgstr "彩色汇总" #. Tooltip for the option to display the summary with colors -#: ../client/gtk/gui.c:1143 +#: ../client/gtk/gui.c:875 msgid "Use colors in the player summary" msgstr "使用彩色显示玩家信息汇总" #. Label for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1148 +#: ../client/gtk/gui.c:880 msgid "Toolbar with shortcuts" msgstr "工具栏带快捷方式" #. Tooltip for the option to display keyboard accelerators in the toolbar -#: ../client/gtk/gui.c:1158 +#: ../client/gtk/gui.c:889 msgid "Show keyboard shortcuts in the toolbar" msgstr "在工具栏中显示键盘快捷键" #. Label for the option to disable all sounds -#: ../client/gtk/gui.c:1164 +#: ../client/gtk/gui.c:895 msgid "Silent mode" msgstr "安静模式" #. Tooltip for the option to disable all sounds -#: ../client/gtk/gui.c:1170 +#: ../client/gtk/gui.c:901 msgid "In silent mode no sounds are made" msgstr "在安静模式下不会发出声音" #. Label for the option to announce when players/spectators enter -#: ../client/gtk/gui.c:1176 +#: ../client/gtk/gui.c:907 msgid "Announce new players" msgstr "新玩家提示" #. Tooltip for the option to use sound when players/spectators enter -#: ../client/gtk/gui.c:1186 +#: ../client/gtk/gui.c:916 msgid "Make a sound when a new player or spectator enters the game" msgstr "当一个新玩家或者观众进入游戏时发出声音提示" #. Label for the option to use the notifications. -#: ../client/gtk/gui.c:1198 +#: ../client/gtk/gui.c:928 msgid "Show notifications" msgstr "显示通知" #. Tooltip for notifications option. -#: ../client/gtk/gui.c:1208 +#: ../client/gtk/gui.c:937 msgid "Show notifications when it's your turn or when new trade is available" msgstr "轮到你或者有可用的新交易时显示通知" #. Label for the option to use the 16:9 layout. -#: ../client/gtk/gui.c:1214 +#: ../client/gtk/gui.c:943 msgid "Use 16:9 layout" msgstr "使用16:9布局" #. Tooltip for 16:9 option. -#: ../client/gtk/gui.c:1224 +#: ../client/gtk/gui.c:952 msgid "Use a 16:9 friendly layout for the window" msgstr "为窗口使用16:9的友好布局" +#: ../client/gtk/gui.c:959 +msgid "Roll the dice manually each turn" +msgstr "" + +#: ../client/gtk/gui.c:967 +msgid "Roll the dice automatically, except when you have a soldier card" +msgstr "" + +#: ../client/gtk/gui.c:978 +msgid "Roll the dice automatically, except when you have a development card" +msgstr "" + +#: ../client/gtk/gui.c:988 +#, fuzzy +msgid "Roll the dice automatically" +msgstr "掷骰子" + +#. Tooltip for automatic roll option. +#: ../client/gtk/gui.c:1008 +msgid "Automate the rolling of the dice" +msgstr "" + #. Caption of about box -#: ../client/gtk/gui.c:1233 +#: ../client/gtk/gui.c:1018 msgid "About Pioneers" msgstr "关于 Pioneers" #. Initial text in status bar -#: ../client/gtk/gui.c:1544 ../client/gtk/offline.c:107 +#: ../client/gtk/gui.c:1308 ../client/gtk/offline.c:106 msgid "Welcome to Pioneers!" msgstr "欢迎来到Pioneers！" -#. The name of the application -#. Name of the application -#: ../client/gtk/gui.c:1606 ../client/gtk/offline.c:209 -#: ../client/gtk/pioneers.desktop.in.h:1 -msgid "Pioneers" -msgstr "Pioneers" - #. Dialog caption -#: ../client/gtk/histogram.c:248 +#: ../client/gtk/histogram.c:276 msgid "Dice Histogram" msgstr "骰子柱状图" @@ -1891,7 +1922,7 @@ msgstr "为船选择一个新位置。" #. Notification -#: ../client/gtk/interface.c:919 +#: ../client/gtk/interface.c:956 msgid "It is your turn to setup." msgstr "轮到你准备了。" @@ -1924,21 +1955,21 @@ msgstr "大海" #. Label -#: ../client/gtk/legend.c:132 +#: ../client/gtk/legend.c:116 msgid "Terrain yield" msgstr "地形产量" #. Label -#: ../client/gtk/legend.c:165 +#: ../client/gtk/legend.c:148 msgid "Building costs" msgstr "建造消费" -#: ../client/gtk/legend.c:203 ../client/gtk/player.c:54 +#: ../client/gtk/legend.c:179 ../client/gtk/player.c:54 #: ../editor/gtk/game-buildings.c:11 msgid "City wall" msgstr "城墙" -#: ../client/gtk/legend.c:206 ../client/gtk/player.c:65 +#: ../client/gtk/legend.c:181 ../client/gtk/player.c:65 msgid "Development card" msgstr "发展卡" @@ -1969,28 +2000,30 @@ msgstr "头像：" #. Label: set player icon preferences -#: ../client/gtk/name.c:250 +#: ../client/gtk/name.c:249 msgid "Variant:" msgstr "可变项：" -#: ../client/gtk/offline.c:61 +#. Commandline option of client: do we want to be a spectator +#: ../client/gtk/offline.c:60 msgid "Connect as a spectator" msgstr "作为一个观众连接" -#: ../client/gtk/offline.c:64 +#. Commandline option of client: hostname of the metaserver +#: ../client/gtk/offline.c:63 msgid "Metaserver Host" msgstr "中转服务器地址" -#: ../client/gtk/offline.c:78 +#: ../client/gtk/offline.c:77 msgid "Select a game to join." msgstr "选择一个游戏来加入。" -#: ../client/gtk/offline.c:94 +#: ../client/gtk/offline.c:93 msgid "Connecting" msgstr "正在连接" #. Long description in the commandline for pioneers: help -#: ../client/gtk/offline.c:183 +#: ../client/gtk/offline.c:182 msgid "- Play a game of Pioneers" msgstr "- 玩一场Pioneers" @@ -2085,7 +2118,7 @@ msgstr "资源卡" #. Caption -#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1305 +#: ../client/gtk/player.c:65 ../editor/gtk/editor.c:1338 msgid "Development cards" msgstr "发展卡" @@ -2111,66 +2144,77 @@ msgid "The bank is empty" msgstr "银行被淘空了" -#: ../client/gtk/quote.c:187 +#: ../client/gtk/quote.c:201 #, c-format msgid "%s has %s, and is looking for %s" msgstr "%s 有 %s，想要 %s" #. Notification -#: ../client/gtk/quote.c:217 +#: ../client/gtk/quote.c:231 #, c-format msgid "New offer from %s." msgstr "%s 提供了一个新方案。" #. Notification -#: ../client/gtk/quote.c:242 +#: ../client/gtk/quote.c:259 #, c-format msgid "Offer from %s." msgstr "%s 提供了一个方案。" #. Label #. Frame title, trade: I want to trade these resources -#: ../client/gtk/quote.c:316 ../client/gtk/trade.c:524 +#: ../client/gtk/quote.c:341 ../client/gtk/trade.c:549 msgid "I want" msgstr "我要" #. Label #. Frame title, trade: I want these resources in return -#: ../client/gtk/quote.c:326 ../client/gtk/trade.c:530 +#: ../client/gtk/quote.c:351 ../client/gtk/trade.c:555 msgid "Give them" msgstr "给他们" #. Button text -#: ../client/gtk/quote.c:345 +#: ../client/gtk/quote.c:370 msgid "Delete" msgstr "删除" +#: ../client/gtk/quote.c:377 ../client/gtk/trade.c:571 +#, fuzzy +msgid "Enable Charity" +msgstr "启用聊天" + +#. Tooltip for the option to enable charity +#: ../client/gtk/quote.c:388 ../client/gtk/trade.c:582 +msgid "" +"When checked, a resource can be given away without receiving anything back" +msgstr "" + #. Button text -#: ../client/gtk/quote.c:370 +#: ../client/gtk/quote.c:411 msgid "Reject Domestic Trade" msgstr "拒绝内部交易" #. Now create columns #. Table header: Player who trades #. Role of the player: player -#: ../client/gtk/quote-view.c:170 ../server/gtk/main.c:684 +#: ../client/gtk/quote-view.c:173 ../server/gtk/main.c:629 msgid "Player" msgstr "玩家" #. Table header: Quote -#: ../client/gtk/quote-view.c:185 +#: ../client/gtk/quote-view.c:188 msgid "Quotes" msgstr "报价" #. trade: maritime quote: %1 resources of type %2 for #. * one resource of type %3 -#: ../client/gtk/quote-view.c:303 +#: ../client/gtk/quote-view.c:306 #, c-format msgid "%d:1 %s for %s" msgstr "%d:1 %s 换 %s" #. Trade: a player has rejected trade -#: ../client/gtk/quote-view.c:442 +#: ../client/gtk/quote-view.c:445 msgid "Rejected trade" msgstr "已拒绝交易" @@ -2185,240 +2229,220 @@ msgstr "总数" #. Tooltip for the amount of resources in the hand -#: ../client/gtk/resource-table.c:180 +#: ../client/gtk/resource-table.c:175 msgid "Amount in hand" msgstr "手上的总数" -#. Button for decreasing the selected amount -#: ../client/gtk/resource-table.c:185 -msgid "" -msgstr "增加>" - -#. Tooltip for increasing the selected amount -#: ../client/gtk/resource-table.c:226 -msgid "Increase the selected amount" -msgstr "增加所选资源数量" - #. Tooltip for the selected amount -#: ../client/gtk/resource-table.c:243 +#: ../client/gtk/resource-table.c:206 msgid "Selected amount" msgstr "选择的数量" #. Tooltip for the total selected amount -#: ../client/gtk/resource-table.c:288 +#: ../client/gtk/resource-table.c:250 msgid "Total selected amount" msgstr "所选资源总数" #. Tooltip when the bank cannot be emptied -#: ../client/gtk/resource-table.c:307 +#: ../client/gtk/resource-table.c:269 msgid "The bank cannot be emptied" msgstr "银行不能被淘空" -#: ../client/gtk/settingscreen.c:74 +#: ../client/gtk/settingscreen.c:72 msgid "Yes" msgstr "是" -#: ../client/gtk/settingscreen.c:76 ../client/gtk/settingscreen.c:240 +#: ../client/gtk/settingscreen.c:74 ../client/gtk/settingscreen.c:236 msgid "No" msgstr "否" -#: ../client/gtk/settingscreen.c:87 ../client/gtk/settingscreen.c:187 +#: ../client/gtk/settingscreen.c:85 ../client/gtk/settingscreen.c:183 msgid "Unknown" msgstr "未知" -#: ../client/gtk/settingscreen.c:121 +#: ../client/gtk/settingscreen.c:117 msgid "No game in progress..." msgstr "没有正在进行的游戏..." #. Label -#: ../client/gtk/settingscreen.c:132 +#: ../client/gtk/settingscreen.c:128 msgid "General settings" msgstr "一般设置" -#: ../client/gtk/settingscreen.c:149 +#: ../client/gtk/settingscreen.c:145 msgid "Number of players:" msgstr "玩家数目：" -#: ../client/gtk/settingscreen.c:153 +#: ../client/gtk/settingscreen.c:149 msgid "Victory point target:" msgstr "目标胜利分数：" -#: ../client/gtk/settingscreen.c:157 +#: ../client/gtk/settingscreen.c:153 msgid "Random terrain:" msgstr "随机地形：" -#: ../client/gtk/settingscreen.c:161 +#: ../client/gtk/settingscreen.c:157 msgid "Allow trade between players:" msgstr "允许玩家之间交易：" -#: ../client/gtk/settingscreen.c:166 +#: ../client/gtk/settingscreen.c:162 msgid "Allow trade only before building or buying:" msgstr "仅允许在建筑或者购买之前进行交易：" -#: ../client/gtk/settingscreen.c:171 +#: ../client/gtk/settingscreen.c:167 msgid "Check victory only at end of turn:" msgstr "仅在回合结束时检查是否胜利：" -#: ../client/gtk/settingscreen.c:176 +#: ../client/gtk/settingscreen.c:172 msgid "Amount of each resource:" msgstr "每种资源的数量：" -#: ../client/gtk/settingscreen.c:190 +#: ../client/gtk/settingscreen.c:186 msgid "Sevens rule:" msgstr "打7的规则：" -#: ../client/gtk/settingscreen.c:196 +#: ../client/gtk/settingscreen.c:192 msgid "Use dice deck instead of dice:" msgstr "使用骰板代替骰子：" -#: ../client/gtk/settingscreen.c:201 +#: ../client/gtk/settingscreen.c:197 msgid "Number of dice decks:" msgstr "骰板数目：" -#: ../client/gtk/settingscreen.c:207 +#: ../client/gtk/settingscreen.c:203 msgid "Number of dice cards removed after shuffling:" msgstr "Number of dice cards removed after shuffling:" -#: ../client/gtk/settingscreen.c:214 +#: ../client/gtk/settingscreen.c:210 msgid "Use the pirate to block ships:" msgstr "使用海盗阻止船只：" -#: ../client/gtk/settingscreen.c:243 +#: ../client/gtk/settingscreen.c:239 msgid "Island discovery bonuses:" msgstr "发现岛屿的奖励：" #. Label -#: ../client/gtk/settingscreen.c:260 +#: ../client/gtk/settingscreen.c:255 msgid "Building quotas" msgstr "建筑定额" -#: ../client/gtk/settingscreen.c:277 +#: ../client/gtk/settingscreen.c:272 msgid "Roads:" msgstr "道路：" -#: ../client/gtk/settingscreen.c:283 +#: ../client/gtk/settingscreen.c:277 msgid "Settlements:" msgstr "房子：" -#: ../client/gtk/settingscreen.c:289 +#: ../client/gtk/settingscreen.c:283 msgid "Cities:" msgstr "城市：" -#: ../client/gtk/settingscreen.c:295 +#: ../client/gtk/settingscreen.c:288 msgid "City walls:" msgstr "城墙：" -#: ../client/gtk/settingscreen.c:301 +#: ../client/gtk/settingscreen.c:294 msgid "Ships:" msgstr "轮船：" -#: ../client/gtk/settingscreen.c:307 +#: ../client/gtk/settingscreen.c:299 msgid "Bridges:" msgstr "桥梁：" #. Label -#: ../client/gtk/settingscreen.c:320 +#: ../client/gtk/settingscreen.c:312 msgid "Development card deck" msgstr "发展卡堆" -#: ../client/gtk/settingscreen.c:336 +#: ../client/gtk/settingscreen.c:328 msgid "Road building cards:" msgstr "道路修建卡：" -#: ../client/gtk/settingscreen.c:340 +#: ../client/gtk/settingscreen.c:332 msgid "Monopoly cards:" msgstr "垄断卡：" -#: ../client/gtk/settingscreen.c:344 +#: ../client/gtk/settingscreen.c:336 msgid "Year of plenty cards:" msgstr "丰收年卡：" -#: ../client/gtk/settingscreen.c:348 +#: ../client/gtk/settingscreen.c:340 msgid "Chapel cards:" msgstr "教堂卡：" -#: ../client/gtk/settingscreen.c:352 +#: ../client/gtk/settingscreen.c:344 msgid "Pioneer university cards:" msgstr "Pioneer 大学卡：" -#: ../client/gtk/settingscreen.c:356 +#: ../client/gtk/settingscreen.c:348 msgid "Governor's house cards:" msgstr "政府大楼卡：" -#: ../client/gtk/settingscreen.c:360 +#: ../client/gtk/settingscreen.c:352 msgid "Library cards:" msgstr "图书馆卡：" -#: ../client/gtk/settingscreen.c:364 +#: ../client/gtk/settingscreen.c:356 msgid "Market cards:" msgstr "市场卡：" -#: ../client/gtk/settingscreen.c:368 +#: ../client/gtk/settingscreen.c:360 msgid "Soldier cards:" msgstr "战士卡：" #. Dialog caption -#: ../client/gtk/settingscreen.c:407 +#: ../client/gtk/settingscreen.c:399 msgid "Current Game Settings" msgstr "当前游戏设置" #. trade: you ask for something for free -#: ../client/gtk/trade.c:205 +#: ../client/gtk/trade.c:220 #, c-format msgid "ask for %s for free" msgstr "要白得 %s" #. trade: you give something away for free -#: ../client/gtk/trade.c:210 +#: ../client/gtk/trade.c:225 #, c-format msgid "give %s for free" msgstr "白给了 %s" #. trade: you trade something for something else -#: ../client/gtk/trade.c:215 +#: ../client/gtk/trade.c:230 #, c-format msgid "give %s for %s" msgstr "提供 %s，想要 %s" #. I want some resources, and give them some resources -#: ../client/gtk/trade.c:242 +#: ../client/gtk/trade.c:256 #, c-format msgid "I want %s, and give them %s" msgstr "我要 %s，我提供 %s" #. Notification -#: ../client/gtk/trade.c:348 +#: ../client/gtk/trade.c:358 #, c-format msgid "Quote received from %s." msgstr "从 %s 得到了报价。" #. Button text, trade: call for quotes from other players -#: ../client/gtk/trade.c:539 +#: ../client/gtk/trade.c:564 msgid "_Call for Quotes" msgstr "喊出报价(_C)" #. Button text: Trade page, accept selected quote -#: ../client/gtk/trade.c:568 +#: ../client/gtk/trade.c:609 msgid "_Accept Quote" msgstr "接受报价(_A)" #. Button text: Trade page, finish trading -#: ../client/gtk/trade.c:574 +#: ../client/gtk/trade.c:615 msgid "_Finish Trading" msgstr "完成交易(_F)" @@ -2475,23 +2499,23 @@ "upgrading.\n" msgstr "这个游戏使用了新规则“%s”，暂不支持，请考虑更新。\n" -#: ../common/game.c:924 ../common/game.c:955 +#: ../common/game.c:923 ../common/game.c:954 msgid "This game cannot be won." msgstr "这场游戏不可能赢了。" -#: ../common/game.c:925 +#: ../common/game.c:924 msgid "There is no land." msgstr "没有土地了。" -#: ../common/game.c:959 +#: ../common/game.c:958 msgid "It is possible that this game cannot be won." msgstr "这场游戏可能无法胜利了。" -#: ../common/game.c:965 +#: ../common/game.c:964 msgid "This game can be won by only building all settlements and cities." msgstr "只有所有房子和城市都建完了这场游戏才能胜利。" -#: ../common/game.c:971 +#: ../common/game.c:970 #, c-format msgid "" "Required victory points: %d\n" @@ -2544,174 +2568,174 @@ msgstr "Gerald " #. Caption for result of checking victory points -#: ../common/gtk/common_gtk.c:324 +#: ../common/gtk/common_gtk.c:323 msgid "Victory Point Analysis" msgstr "胜利点分析" #. Tooltip for sevens rule normal -#: ../common/gtk/game-rules.c:110 +#: ../common/gtk/game-rules.c:108 msgid "All sevens move the robber or pirate" msgstr "所有的7移动强盗或海盗" #. Tooltip for sevens rule reroll on 1st 2 turns -#: ../common/gtk/game-rules.c:114 +#: ../common/gtk/game-rules.c:112 msgid "In the first two turns all sevens are rerolled" msgstr "前两回合所有的7都重投" #. Tooltip for sevens rule reroll all -#: ../common/gtk/game-rules.c:118 +#: ../common/gtk/game-rules.c:116 msgid "All sevens are rerolled" msgstr "所有的7都重投" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize terrain" msgstr "随机地形" -#: ../common/gtk/game-rules.c:129 +#: ../common/gtk/game-rules.c:127 msgid "Randomize the terrain" msgstr "地形随机化" -#: ../common/gtk/game-rules.c:132 +#: ../common/gtk/game-rules.c:130 msgid "Use pirate" msgstr "使用海盗" -#: ../common/gtk/game-rules.c:133 +#: ../common/gtk/game-rules.c:131 msgid "Use the pirate to block ships" msgstr "使用海盗阻止船只" -#: ../common/gtk/game-rules.c:135 +#: ../common/gtk/game-rules.c:133 msgid "Strict trade" msgstr "严格交易" -#: ../common/gtk/game-rules.c:136 +#: ../common/gtk/game-rules.c:134 msgid "Allow trade only before building or buying" msgstr "只允许在建筑或者购买之前进行交易" -#: ../common/gtk/game-rules.c:138 +#: ../common/gtk/game-rules.c:136 msgid "Domestic trade" msgstr "内部交易" -#: ../common/gtk/game-rules.c:139 +#: ../common/gtk/game-rules.c:137 msgid "Allow trade between players" msgstr "允许玩家之间交易" -#: ../common/gtk/game-rules.c:141 +#: ../common/gtk/game-rules.c:139 msgid "Victory at end of turn" msgstr "回合结束后判断胜利条件" -#: ../common/gtk/game-rules.c:142 +#: ../common/gtk/game-rules.c:140 msgid "Check for victory only at end of turn" msgstr "仅在回合结束时检测是否胜利" -#: ../common/gtk/game-rules.c:145 +#: ../common/gtk/game-rules.c:143 msgid "Use dice deck" msgstr "使用骰板" -#: ../common/gtk/game-rules.c:147 +#: ../common/gtk/game-rules.c:145 msgid "Use a deck of 36 dice cards instead of real dice" msgstr "使用一个有36张骰卡的骰板代替真正的骰子" #. Label -#: ../common/gtk/game-rules.c:155 +#: ../common/gtk/game-rules.c:153 msgid "Number of dice decks" msgstr "骰板数目" -#: ../common/gtk/game-rules.c:172 +#: ../common/gtk/game-rules.c:169 msgid "The number of dice decks (of 36 cards each)" msgstr "骰板数目（每个骰板有36张骰卡）" #. Label -#: ../common/gtk/game-rules.c:180 +#: ../common/gtk/game-rules.c:176 msgid "Number of removed dice cards" msgstr "已使用的骰卡数目" -#: ../common/gtk/game-rules.c:199 +#: ../common/gtk/game-rules.c:194 msgid "The number of dice cards that are removed after shuffling the deck" msgstr "打乱骰卡后已使用的骰卡数目" #. Label -#: ../common/gtk/game-rules.c:207 +#: ../common/gtk/game-rules.c:201 msgid "Island discovery bonuses" msgstr "发现岛屿的奖励" #. Tooltip for island bonus -#: ../common/gtk/game-rules.c:219 +#: ../common/gtk/game-rules.c:212 msgid "A comma separated list of bonus points for discovering islands" msgstr "一个逗号隔开的列表，表示发现岛屿的奖励点数" #. Tooltip for the check button -#: ../common/gtk/game-rules.c:237 +#: ../common/gtk/game-rules.c:230 msgid "Check and correct island discovery bonuses" msgstr "检查并修正发现岛屿的奖励" #. Label text for customising a game -#: ../common/gtk/game-settings.c:105 +#: ../common/gtk/game-settings.c:109 msgid "Number of players" msgstr "玩家数目" #. Tooltip for 'Number of Players' -#: ../common/gtk/game-settings.c:124 +#: ../common/gtk/game-settings.c:127 msgid "The number of players" msgstr "玩家数目" #. Label for customising a game -#: ../common/gtk/game-settings.c:127 +#: ../common/gtk/game-settings.c:130 msgid "Victory point target" msgstr "目标胜利分数" #. Tooltip for Victory Point Target -#: ../common/gtk/game-settings.c:147 +#: ../common/gtk/game-settings.c:149 msgid "The points needed to win the game" msgstr "游戏胜利还需要的点数" #. Tooltip for the check button -#: ../common/gtk/game-settings.c:161 +#: ../common/gtk/game-settings.c:163 msgid "Is it possible to win this game?" msgstr "这场游戏还有可能赢吗？" #. Port indicator for a resource: trade 2 for 1 -#: ../common/gtk/guimap.c:742 +#: ../common/gtk/guimap.c:739 msgid "2:1" msgstr "2:1" #. Port indicator: trade 3 for 1 #. General port indicator -#: ../common/gtk/guimap.c:745 ../common/gtk/guimap.c:770 +#: ../common/gtk/guimap.c:742 ../common/gtk/guimap.c:767 msgid "3:1" msgstr "3:1" #. Port indicator for brick -#: ../common/gtk/guimap.c:750 +#: ../common/gtk/guimap.c:747 msgid "Brick port|B" msgstr "砖" #. Port indicator for grain -#: ../common/gtk/guimap.c:754 +#: ../common/gtk/guimap.c:751 msgid "Grain port|G" msgstr "麦" #. Port indicator for ore -#: ../common/gtk/guimap.c:758 +#: ../common/gtk/guimap.c:755 msgid "Ore port|O" msgstr "矿" #. Port indicator for wool -#: ../common/gtk/guimap.c:762 +#: ../common/gtk/guimap.c:759 msgid "Wool port|W" msgstr "羊" #. Port indicator for lumber -#: ../common/gtk/guimap.c:766 +#: ../common/gtk/guimap.c:763 msgid "Lumber port|L" msgstr "圆" #. Tooltip for the list of metaservers -#: ../common/gtk/metaserver.c:85 +#: ../common/gtk/metaserver.c:83 msgid "Select a metaserver" msgstr "选择一个中转服务器" #. Tooltip for the list of games -#: ../common/gtk/select-game.c:135 +#: ../common/gtk/select-game.c:138 msgid "Select a game" msgstr "选择一个游戏" @@ -2820,30 +2844,30 @@ msgid "** UNKNOWN MESSAGE TYPE ** " msgstr "** 未知的消息类型 ** " -#: ../common/network.c:143 +#: ../common/network.c:148 #, c-format msgid "Error writing to socket: %s\n" msgstr "写到socket时发生错误: %s\n" -#: ../common/network.c:154 +#: ../common/network.c:159 msgid "Could not send all data\n" msgstr "无法发送所有数据\n" -#: ../common/network.c:202 +#: ../common/network.c:207 msgid "Read buffer overflow - disconnecting\n" msgstr "读缓存时溢出 - 断开连接\n" -#: ../common/network.c:226 +#: ../common/network.c:231 #, c-format msgid "Error reading socket: %s\n" msgstr "读socket错误：%s\n" -#: ../common/network.c:378 +#: ../common/network.c:383 #, c-format msgid "Error connecting to %s: %s\n" msgstr "连接到%s发生错误：%s\n" -#: ../common/network.c:566 ../common/network.c:567 +#: ../common/network.c:571 ../common/network.c:572 msgid "unknown" msgstr "未知" @@ -2853,222 +2877,222 @@ msgstr "连接到 %s:%s\n" #. Error message -#: ../common/state.c:333 +#: ../common/state.c:332 msgid "State stack overflow. Stack dump sent to standard error.\n" msgstr "State栈溢出。栈堆已发送到标准错误。\n" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:113 +#: ../editor/gtk/editor.c:131 msgid "_Hill" msgstr "小山(_H)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:115 +#: ../editor/gtk/editor.c:133 msgid "_Field" msgstr "田野(_F)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:117 +#: ../editor/gtk/editor.c:135 msgid "_Mountain" msgstr "大山(_M)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:119 +#: ../editor/gtk/editor.c:137 msgid "_Pasture" msgstr "草原(_P)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:121 +#: ../editor/gtk/editor.c:139 msgid "F_orest" msgstr "森林(_O)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:123 +#: ../editor/gtk/editor.c:141 msgid "_Desert" msgstr "沙漠(_D)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:125 +#: ../editor/gtk/editor.c:143 msgid "_Sea" msgstr "大海(_S)" #. Use an unique shortcut key for each resource -#: ../editor/gtk/editor.c:127 +#: ../editor/gtk/editor.c:145 msgid "_Gold" msgstr "黄金(_G)" #. Use an unique shortcut key for each resource #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:129 ../editor/gtk/editor.c:144 +#: ../editor/gtk/editor.c:147 ../editor/gtk/editor.c:162 msgid "_None" msgstr "无(_N)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:134 +#: ../editor/gtk/editor.c:152 msgid "_Brick (2:1)" msgstr "砖头(_B) (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:136 +#: ../editor/gtk/editor.c:154 msgid "_Grain (2:1)" msgstr "麦子(_G) (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:138 +#: ../editor/gtk/editor.c:156 msgid "_Ore (2:1)" msgstr "矿石(_O) (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:140 +#: ../editor/gtk/editor.c:158 msgid "_Wool (2:1)" msgstr "羊毛(_W) (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:142 +#: ../editor/gtk/editor.c:160 msgid "_Lumber (2:1)" msgstr "圆木(_L) (2:1)" #. Use an unique shortcut key for each port type -#: ../editor/gtk/editor.c:146 +#: ../editor/gtk/editor.c:164 msgid "_Any (3:1)" msgstr "任意(_A) (3:1)" #. East -#: ../editor/gtk/editor.c:151 +#: ../editor/gtk/editor.c:169 msgid "East|E" msgstr "东" #. North east -#: ../editor/gtk/editor.c:153 +#: ../editor/gtk/editor.c:171 msgid "North East|NE" msgstr "东北" #. North west -#: ../editor/gtk/editor.c:155 +#: ../editor/gtk/editor.c:173 msgid "North West|NW" msgstr "西北" #. West -#: ../editor/gtk/editor.c:157 +#: ../editor/gtk/editor.c:175 msgid "West|W" msgstr "西" #. South west -#: ../editor/gtk/editor.c:159 +#: ../editor/gtk/editor.c:177 msgid "South West|SW" msgstr "西南" #. South east -#: ../editor/gtk/editor.c:161 +#: ../editor/gtk/editor.c:179 msgid "South East|SE" msgstr "东南" -#: ../editor/gtk/editor.c:368 +#: ../editor/gtk/editor.c:396 msgid "Place a hill hex" msgstr "放一个小山块" -#: ../editor/gtk/editor.c:369 +#: ../editor/gtk/editor.c:397 msgid "Place a field hex" msgstr "放一个田野块" -#: ../editor/gtk/editor.c:370 +#: ../editor/gtk/editor.c:398 msgid "Place a mountain hex" msgstr "放一个大山块" -#: ../editor/gtk/editor.c:371 +#: ../editor/gtk/editor.c:399 msgid "Place a pasture hex" msgstr "放一个草原块" -#: ../editor/gtk/editor.c:372 +#: ../editor/gtk/editor.c:400 msgid "Place a forest hex" msgstr "放一个森林块" -#: ../editor/gtk/editor.c:373 +#: ../editor/gtk/editor.c:401 msgid "Place a desert hex" msgstr "放一个沙漠块" -#: ../editor/gtk/editor.c:374 +#: ../editor/gtk/editor.c:402 msgid "Place a sea hex" msgstr "放一个海洋块" -#: ../editor/gtk/editor.c:375 +#: ../editor/gtk/editor.c:403 msgid "Place a gold hex" msgstr "放一个黄金块" -#: ../editor/gtk/editor.c:376 +#: ../editor/gtk/editor.c:404 msgid "Clear the hex" msgstr "清除这一块" -#: ../editor/gtk/editor.c:384 +#: ../editor/gtk/editor.c:412 msgid "Place a 2 chit" msgstr "放一个2点标记" -#: ../editor/gtk/editor.c:385 +#: ../editor/gtk/editor.c:413 msgid "Place a 3 chit" msgstr "放一个3点标记" -#: ../editor/gtk/editor.c:386 +#: ../editor/gtk/editor.c:414 msgid "Place a 4 chit" msgstr "放一个4点标记" -#: ../editor/gtk/editor.c:387 +#: ../editor/gtk/editor.c:415 msgid "Place a 5 chit" msgstr "放一个5点标记" -#: ../editor/gtk/editor.c:388 +#: ../editor/gtk/editor.c:416 msgid "Place a 6 chit" msgstr "放一个6点标记" -#: ../editor/gtk/editor.c:390 +#: ../editor/gtk/editor.c:418 msgid "Place an 8 chit" msgstr "放一个8点标记" -#: ../editor/gtk/editor.c:391 +#: ../editor/gtk/editor.c:419 msgid "Place a 9 chit" msgstr "放一个9点标记" -#: ../editor/gtk/editor.c:392 +#: ../editor/gtk/editor.c:420 msgid "Place a 10 chit" msgstr "放一个10点标记" -#: ../editor/gtk/editor.c:393 +#: ../editor/gtk/editor.c:421 msgid "Place an 11 chit" msgstr "放一个11点标记" -#: ../editor/gtk/editor.c:394 +#: ../editor/gtk/editor.c:422 msgid "Place a 12 chit" msgstr "放一个12点标记" -#: ../editor/gtk/editor.c:400 +#: ../editor/gtk/editor.c:428 msgid "Place a brick 2:1 port" msgstr "放一个砖头2:1港口" -#: ../editor/gtk/editor.c:401 +#: ../editor/gtk/editor.c:429 msgid "Place a grain 2:1 port" msgstr "放一个麦子2:1港口" -#: ../editor/gtk/editor.c:402 +#: ../editor/gtk/editor.c:430 msgid "Place an ore 2:1 port" msgstr "放一个矿石2:1港口" -#: ../editor/gtk/editor.c:403 +#: ../editor/gtk/editor.c:431 msgid "Place a wool 2:1 port" msgstr "放一个羊毛2:1港口" -#: ../editor/gtk/editor.c:404 +#: ../editor/gtk/editor.c:432 msgid "Place a lumber 2:1 port" msgstr "放一个圆木2:1港口" #. Tooltip to remove a port tile in the editor -#: ../editor/gtk/editor.c:406 +#: ../editor/gtk/editor.c:434 msgid "Remove a port" msgstr "移除一个港口" -#: ../editor/gtk/editor.c:407 +#: ../editor/gtk/editor.c:435 msgid "Place a 3:1 port" msgstr "放一个3:1港口" -#: ../editor/gtk/editor.c:437 +#: ../editor/gtk/editor.c:472 msgid "" "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" @@ -3076,244 +3100,233 @@ "Select the terrain type with the context menu on the left click or toggle a " "node to exclude it from being used during the setup phase" -#: ../editor/gtk/editor.c:572 +#: ../editor/gtk/editor.c:601 msgid "Insert a row" msgstr "插入一行" -#: ../editor/gtk/editor.c:573 +#: ../editor/gtk/editor.c:602 msgid "Delete a row" msgstr "删除一行" -#: ../editor/gtk/editor.c:574 +#: ../editor/gtk/editor.c:603 msgid "Insert a column" msgstr "插入一列" -#: ../editor/gtk/editor.c:575 +#: ../editor/gtk/editor.c:604 msgid "Delete a column" msgstr "删除一列" #. Label -#: ../editor/gtk/editor.c:978 +#: ../editor/gtk/editor.c:1009 msgid "_Title" msgstr "名称(_T)" #. Label -#: ../editor/gtk/editor.c:991 +#: ../editor/gtk/editor.c:1022 msgid "_Description" msgstr "描述(_D)" #. Label -#: ../editor/gtk/editor.c:1009 +#: ../editor/gtk/editor.c:1040 msgid "_Comments" msgstr "评论(_C)" #. Menu item -#: ../editor/gtk/editor.c:1139 +#: ../editor/gtk/editor.c:1171 msgid "Shuffle" msgstr "打乱" #. Caption #. Game settings frame -#: ../editor/gtk/editor.c:1294 ../server/gtk/main.c:968 +#: ../editor/gtk/editor.c:1327 ../server/gtk/main.c:913 msgid "Game parameters" msgstr "游戏参数" #. Caption #. Rules frame -#: ../editor/gtk/editor.c:1297 ../server/gtk/main.c:983 +#: ../editor/gtk/editor.c:1330 ../server/gtk/main.c:928 msgid "Rules" msgstr "规则" #. Caption -#: ../editor/gtk/editor.c:1299 +#: ../editor/gtk/editor.c:1332 msgid "Resources" msgstr "资源" #. Caption -#: ../editor/gtk/editor.c:1302 +#: ../editor/gtk/editor.c:1335 msgid "Buildings" msgstr "建筑" #. The game in the editor does not have a name yet -#: ../editor/gtk/editor.c:1319 +#: ../editor/gtk/editor.c:1352 msgid "Untitled" msgstr "未命名" #. Application caption -#: ../editor/gtk/editor.c:1324 ../editor/gtk/pioneers-editor.desktop.in.h:1 +#: ../editor/gtk/editor.c:1357 ../editor/gtk/pioneers-editor.desktop.in.h:1 msgid "Pioneers Editor" msgstr "Pioneers编辑器" -#: ../editor/gtk/editor.c:1434 +#: ../editor/gtk/editor.c:1467 #, c-format msgid "Failed to load '%s'" msgstr "打开“%s”失败" -#: ../editor/gtk/editor.c:1482 +#: ../editor/gtk/editor.c:1518 #, c-format msgid "Failed to save to '%s'" msgstr "保存到'%s'失败" #. Name of the file filter: show only games -#: ../editor/gtk/editor.c:1499 +#: ../editor/gtk/editor.c:1544 msgid "Games" msgstr "游戏" #. Name of the file filter: show all files -#: ../editor/gtk/editor.c:1505 +#: ../editor/gtk/editor.c:1550 msgid "Unfiltered" msgstr "所有" #. Dialog caption -#: ../editor/gtk/editor.c:1517 +#: ../editor/gtk/editor.c:1580 msgid "Open Game" msgstr "打开游戏" #. Button text -#: ../editor/gtk/editor.c:1524 +#: ../editor/gtk/editor.c:1587 #, fuzzy msgid "_Open" msgstr "打开(_O)..." #. Dialog caption -#: ../editor/gtk/editor.c:1558 +#: ../editor/gtk/editor.c:1620 msgid "Save As..." msgstr "另存为..." #. Button text -#: ../editor/gtk/editor.c:1565 +#: ../editor/gtk/editor.c:1627 #, fuzzy msgid "Save _As" msgstr "另存为(_A)..." #. Dialog caption -#: ../editor/gtk/editor.c:1606 +#: ../editor/gtk/editor.c:1668 msgid "Change Title" msgstr "修改名称" #. Label -#: ../editor/gtk/editor.c:1631 +#: ../editor/gtk/editor.c:1693 msgid "New title:" msgstr "新名称：" #. Caption of about box -#: ../editor/gtk/editor.c:1688 +#: ../editor/gtk/editor.c:1732 msgid "About Pioneers Game Editor" msgstr "关于Pioneers游戏编辑器" +#. Long help for commandline option (editor): filename +#: ../editor/gtk/editor.c:1765 +msgid "Open this file" +msgstr "打开这个文件" + +#. Commandline option for editor: filename +#. Commandline metaserver: pidfile argument +#: ../editor/gtk/editor.c:1767 ../metaserver/main.c:613 +msgid "filename" +msgstr "文件名" + +#. Long description in the command line: --help +#: ../editor/gtk/editor.c:1795 +msgid "- Editor for games of Pioneers" +msgstr "- Pioneers游戏编辑器" + +#. Tab page name +#: ../editor/gtk/editor.c:1849 +msgid "Settings" +msgstr "设置" + +#. Tab page name +#: ../editor/gtk/editor.c:1852 +msgid "Comments" +msgstr "评论" + #. Menu entry -#: ../editor/gtk/editor.c:1718 +#: ../editor/gtk/editor.ui.h:2 msgid "_File" msgstr "文件(_F)" -#. Menu entry -#: ../editor/gtk/editor.c:1728 -msgid "_New" -msgstr "新建(_N)" - -#: ../editor/gtk/editor.c:1729 +#. Tooltip for New menu entry +#: ../editor/gtk/editor.ui.h:4 msgid "Create a new game" msgstr "创建一个新游戏" #. Menu entry -#: ../editor/gtk/editor.c:1732 -msgid "_Open..." -msgstr "打开(_O)..." +#: ../editor/gtk/editor.ui.h:6 +msgid "_New" +msgstr "新建(_N)" #. Tooltip for Open menu entry -#: ../editor/gtk/editor.c:1734 +#: ../editor/gtk/editor.ui.h:8 msgid "Open an existing game" msgstr "打开一个现有的游戏" #. Menu entry -#: ../editor/gtk/editor.c:1737 -msgid "_Save" -msgstr "保存(_S)" +#: ../editor/gtk/editor.ui.h:10 +msgid "_Open..." +msgstr "打开(_O)..." #. Tooltip for Save menu entry -#: ../editor/gtk/editor.c:1739 +#: ../editor/gtk/editor.ui.h:12 msgid "Save game" msgstr "保存游戏" #. Menu entry -#: ../editor/gtk/editor.c:1742 -msgid "Save _As..." -msgstr "另存为(_A)..." +#: ../editor/gtk/editor.ui.h:14 +msgid "_Save" +msgstr "保存(_S)" #. Tooltip for Save As menu entry -#: ../editor/gtk/editor.c:1745 +#: ../editor/gtk/editor.ui.h:16 msgid "Save as" msgstr "另存为" #. Menu entry -#: ../editor/gtk/editor.c:1748 -msgid "Change _Title" -msgstr "修改名称(_T)" +#: ../editor/gtk/editor.ui.h:18 +msgid "Save _As..." +msgstr "另存为(_A)..." #. Tooltip for Change Title menu entry -#: ../editor/gtk/editor.c:1750 +#: ../editor/gtk/editor.ui.h:20 msgid "Change game title" msgstr "修改游戏名称" #. Menu entry -#: ../editor/gtk/editor.c:1753 ../server/gtk/main.c:97 -msgid "_Check Victory Point Target" -msgstr "检测目标胜利分数(_C)" +#: ../editor/gtk/editor.ui.h:22 +msgid "Change _Title" +msgstr "修改名称(_T)" #. Tooltip for Check Victory Point Target menu entry -#. Tooltop for Check Victory Point Target menu entry -#: ../editor/gtk/editor.c:1756 ../server/gtk/main.c:100 +#: ../editor/gtk/editor.ui.h:24 ../server/gtk/server.ui.h:4 msgid "Check whether the game can be won" msgstr "检测游戏是否可能赢" -#. Tooltip for Quit menu entry -#: ../editor/gtk/editor.c:1761 -msgid "Quit" -msgstr "退出" - #. Menu entry -#: ../editor/gtk/editor.c:1783 -msgid "_About Pioneers Editor" -msgstr "关于Pioneers编辑器(_A)" +#: ../editor/gtk/editor.ui.h:26 ../server/gtk/server.ui.h:6 +msgid "_Check Victory Point Target" +msgstr "检测目标胜利分数(_C)" #. Tooltip for About Pioneers Editor menu entry -#: ../editor/gtk/editor.c:1785 +#: ../editor/gtk/editor.ui.h:48 msgid "Information about Pioneers Editor" msgstr "关于Pioneers编辑器的信息" -#. Long help for commandline option (editor): filename -#: ../editor/gtk/editor.c:1838 -msgid "Open this file" -msgstr "打开这个文件" - -#. Commandline option for editor: filename -#. Commandline metaserver: pidfile argument -#: ../editor/gtk/editor.c:1840 ../metaserver/main.c:615 -msgid "filename" -msgstr "文件名" - -#. Long description in the command line: --help -#: ../editor/gtk/editor.c:1877 -msgid "- Editor for games of Pioneers" -msgstr "- Pioneers游戏编辑器" - -#. Error message -#: ../editor/gtk/editor.c:1921 ../server/gtk/main.c:1256 -#, c-format -msgid "Building menus failed: %s" -msgstr "创建菜单失败：%s" - -#. Tab page name -#: ../editor/gtk/editor.c:1951 -msgid "Settings" -msgstr "设置" - -#. Tab page name -#: ../editor/gtk/editor.c:1954 -msgid "Comments" -msgstr "评论" +#. Menu entry +#: ../editor/gtk/editor.ui.h:50 +msgid "_About Pioneers Editor" +msgstr "关于Pioneers编辑器(_A)" -#: ../editor/gtk/game-resources.c:48 +#: ../editor/gtk/game-resources.c:50 msgid "Resource count" msgstr "资源数" @@ -3326,51 +3339,51 @@ msgstr "game;board;create;edit;layout;Pioneers;Settlers;" #. Commandline metaserver: daemon -#: ../metaserver/main.c:610 +#: ../metaserver/main.c:608 msgid "Daemonize the metaserver on start" msgstr "启动时后台运行中转服务器" #. Commandline metaserver: pidfile -#: ../metaserver/main.c:613 +#: ../metaserver/main.c:611 msgid "Pidfile to create when daemonizing (implies -d)" msgstr "守护时创建的Pid文件（相当于-d）" #. Commandline metaserver: redirect -#: ../metaserver/main.c:618 +#: ../metaserver/main.c:616 msgid "Redirect clients to another metaserver" msgstr "重定向客户端到另一个中转服务器" #. Commandline metaserver: server -#: ../metaserver/main.c:621 +#: ../metaserver/main.c:619 msgid "Use this hostname when creating new games" msgstr "创建新游戏时使用这个主机名" #. Commandline metaserver: server argument -#: ../metaserver/main.c:623 +#: ../metaserver/main.c:621 msgid "hostname" msgstr "主机名" #. Commandline metaserver: port-range -#: ../metaserver/main.c:626 +#: ../metaserver/main.c:624 msgid "Use this port range when creating new games" msgstr "创建新游戏时使用这个范围内的端口" #. Commandline metaserver: port-range argument -#: ../metaserver/main.c:628 +#: ../metaserver/main.c:626 msgid "from-to" msgstr "从-到" #. Commandline option of metaserver: syslog-debug -#: ../metaserver/main.c:634 +#: ../metaserver/main.c:632 msgid "Debug syslog messages" msgstr "调试系统日志消息" #. Long description in the commandline for metaserver: help -#: ../metaserver/main.c:675 +#: ../metaserver/main.c:667 msgid "- Metaserver for Pioneers" msgstr "- Pioneers的中转服务器" -#: ../metaserver/main.c:691 +#: ../metaserver/main.c:683 #, c-format msgid "metaserver protocol:" msgstr "中转服务器协议：" @@ -3404,199 +3417,189 @@ msgid "Unregistering Avahi.\n" msgstr "取消注册Avahi。\n" -#. Menu entry -#: ../server/gtk/main.c:108 -msgid "_About Pioneers Server" -msgstr "关于Pioneers服务器(_A)" - -#. Tooltop for About Pioneers Server menu entry -#: ../server/gtk/main.c:110 -msgid "Information about Pioneers Server" -msgstr "关于Pioneers服务器的信息" - -#: ../server/gtk/main.c:234 +#: ../server/gtk/main.c:189 msgid "Stop Server" msgstr "停止服务器" -#: ../server/gtk/main.c:235 +#: ../server/gtk/main.c:190 msgid "Start Server" msgstr "启动服务器" -#: ../server/gtk/main.c:237 ../server/gtk/main.c:996 +#: ../server/gtk/main.c:192 ../server/gtk/main.c:941 msgid "Stop the server" msgstr "停止服务器" -#: ../server/gtk/main.c:238 +#: ../server/gtk/main.c:193 msgid "Start the server" msgstr "启动服务器" -#: ../server/gtk/main.c:395 +#: ../server/gtk/main.c:350 #, c-format msgid "Player %s from %s entered\n" msgstr "玩家 %s 来自 %s 进入了\n" -#: ../server/gtk/main.c:402 +#: ../server/gtk/main.c:357 #, c-format msgid "Player %s from %s left\n" msgstr "玩家 %s 来自 %s 离开了\n" -#: ../server/gtk/main.c:409 +#: ../server/gtk/main.c:364 #, c-format msgid "Player %d is now %s\n" msgstr "玩家 %d 现在叫 %s\n" -#: ../server/gtk/main.c:570 +#: ../server/gtk/main.c:524 msgid "The port for the game server" msgstr "游戏服务器的端口" #. register_toggle -#: ../server/gtk/main.c:579 +#: ../server/gtk/main.c:533 msgid "Register server" msgstr "注册服务器" -#: ../server/gtk/main.c:587 +#: ../server/gtk/main.c:539 msgid "Register this game at the metaserver" msgstr "在中转服务器注册这个游戏" #. hostname label -#: ../server/gtk/main.c:618 +#: ../server/gtk/main.c:567 msgid "Reported hostname" msgstr "回报的主机名" -#: ../server/gtk/main.c:633 +#: ../server/gtk/main.c:580 msgid "" "The public name of this computer (needed when playing behind a firewall)" msgstr "这台计算机的公开名称（在防火墙后游戏时需要）" #. random toggle -#: ../server/gtk/main.c:652 +#: ../server/gtk/main.c:599 msgid "Random turn order" msgstr "随机顺序" -#: ../server/gtk/main.c:659 +#: ../server/gtk/main.c:604 msgid "Randomize turn order" msgstr "打乱游戏顺序" #. Tooltip for server connection overview -#: ../server/gtk/main.c:730 +#: ../server/gtk/main.c:675 msgid "Shows all players and spectators connected to the server" msgstr "显示连接到服务器的所有玩家和观众" #. Label for column Connected -#: ../server/gtk/main.c:735 +#: ../server/gtk/main.c:680 msgid "Connected" msgstr "已连接" #. Tooltip for column Connected -#: ../server/gtk/main.c:742 +#: ../server/gtk/main.c:687 msgid "Is the player currently connected?" msgstr "玩家现在已连接？" #. Label for column Name -#: ../server/gtk/main.c:747 +#: ../server/gtk/main.c:692 msgid "Name" msgstr "名字" #. Tooltip for column Name -#: ../server/gtk/main.c:754 +#: ../server/gtk/main.c:699 msgid "Name of the player" msgstr "玩家姓名" #. Label for column Location -#: ../server/gtk/main.c:758 +#: ../server/gtk/main.c:703 msgid "Location" msgstr "位置" #. Tooltip for column Location -#: ../server/gtk/main.c:765 +#: ../server/gtk/main.c:710 msgid "Host name of the player" msgstr "玩家主机名" #. Label for column Number -#: ../server/gtk/main.c:771 +#: ../server/gtk/main.c:716 msgid "Number" msgstr "编号" #. Tooltip for column Number -#: ../server/gtk/main.c:778 +#: ../server/gtk/main.c:723 msgid "Player number" msgstr "玩家编号" #. Label for column Role -#: ../server/gtk/main.c:784 +#: ../server/gtk/main.c:729 msgid "Role" msgstr "角色" #. Tooltip for column Role -#: ../server/gtk/main.c:788 +#: ../server/gtk/main.c:733 msgid "Player or spectator" msgstr "玩家或观众" #. Button text -#: ../server/gtk/main.c:825 +#: ../server/gtk/main.c:770 msgid "Launch Pioneers Client" msgstr "启动Pioneers客户端" #. Tooltip -#: ../server/gtk/main.c:839 +#: ../server/gtk/main.c:784 msgid "Launch the Pioneers client" msgstr "启动Pioneers客户端" #. ai chat toggle -#: ../server/gtk/main.c:868 +#: ../server/gtk/main.c:813 msgid "Enable chat" msgstr "启用聊天" #. Tooltip -#: ../server/gtk/main.c:875 +#: ../server/gtk/main.c:820 msgid "Enable chat messages" msgstr "启用聊天消息" #. Button text -#: ../server/gtk/main.c:884 +#: ../server/gtk/main.c:829 msgid "Add Computer Player" msgstr "添加电脑玩家" #. Tooltip -#: ../server/gtk/main.c:892 +#: ../server/gtk/main.c:837 msgid "Add a computer player to the game" msgstr "添加一个电脑玩家到游戏中" #. Tooltip -#: ../server/gtk/main.c:925 +#: ../server/gtk/main.c:870 msgid "Messages from the server" msgstr "来自服务器的消息" -#: ../server/gtk/main.c:961 +#: ../server/gtk/main.c:906 msgid "Game settings" msgstr "游戏设置" #. server frame -#: ../server/gtk/main.c:972 +#: ../server/gtk/main.c:917 msgid "Server parameters" msgstr "服务器参数" -#: ../server/gtk/main.c:992 +#: ../server/gtk/main.c:937 msgid "Running game" msgstr "游戏正在运行" #. player connected frame -#: ../server/gtk/main.c:1008 +#: ../server/gtk/main.c:953 msgid "Players connected" msgstr "已连接的玩家" #. ai frame -#: ../server/gtk/main.c:1012 +#: ../server/gtk/main.c:957 msgid "Computer players" msgstr "电脑玩家" #. message frame -#: ../server/gtk/main.c:1024 +#: ../server/gtk/main.c:969 msgid "Messages" msgstr "消息" #. Caption of about box -#: ../server/gtk/main.c:1150 +#: ../server/gtk/main.c:1095 #, fuzzy msgid "About the Pioneers Game Server" msgstr "Pioneers游戏服务器" @@ -3604,18 +3607,18 @@ #. Wait for all players to disconnect, #. * then enable the UI #. -#: ../server/gtk/main.c:1158 +#: ../server/gtk/main.c:1103 msgid "The game is over.\n" msgstr "游戏已结束。\n" #. Long description in the commandline for server-gtk: help #. Long description in the commandline for server-console: help -#: ../server/gtk/main.c:1212 ../server/main.c:194 +#: ../server/gtk/main.c:1150 ../server/main.c:186 msgid "- Host a game of Pioneers" msgstr "- Pioneers的一个游戏主机" #. Name in the titlebar of the server -#: ../server/gtk/main.c:1236 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 +#: ../server/gtk/main.c:1175 ../server/gtk/pioneers-server-gtk.desktop.in.h:1 msgid "Pioneers Server" msgstr "Pioneers服务器" @@ -3627,140 +3630,150 @@ msgid "game;board;server;host;Pioneers;Settlers;" msgstr "game;board;server;host;Pioneers;Settlers;" +#. Tooltip for About Pioneers Server menu entry +#: ../server/gtk/server.ui.h:14 +msgid "Information about Pioneers Server" +msgstr "关于Pioneers服务器的信息" + +#. Menu entry +#: ../server/gtk/server.ui.h:16 +msgid "_About Pioneers Server" +msgstr "关于Pioneers服务器(_A)" + #. Commandline server-console: game-title -#: ../server/main.c:80 +#: ../server/main.c:78 msgid "Game title to use" msgstr "使用的游戏名称" #. Commandline server-console: file -#: ../server/main.c:83 +#: ../server/main.c:81 msgid "Game file to use" msgstr "使用的游戏文件" #. Commandline server-console: port -#: ../server/main.c:86 +#: ../server/main.c:84 msgid "Port to listen on" msgstr "监听的端口" #. Commandline server-console: players -#: ../server/main.c:89 +#: ../server/main.c:87 msgid "Override number of players" msgstr "重置玩家数目" #. Commandline server-console: points -#: ../server/main.c:92 +#: ../server/main.c:90 msgid "Override number of points needed to win" msgstr "重置胜利所需的分数" #. Commandline server-console: seven-rule -#: ../server/main.c:95 +#: ../server/main.c:93 msgid "Override seven-rule handling" msgstr "重置打7的规则处理" #. Commandline server-console: dice-deck -#: ../server/main.c:98 +#: ../server/main.c:96 msgid "Override dice-deck handling" msgstr "Override dice-deck handling" #. Commandline server-console: num-dice-decks -#: ../server/main.c:101 +#: ../server/main.c:99 msgid "Override num-dice-decks handling" msgstr "Override num-dice-decks handling" #. Commandline server-console: num-removed-dice-cards -#: ../server/main.c:105 +#: ../server/main.c:103 msgid "Override num-removed-dice-cards handling" msgstr "Override num-removed-dice-cards handling" #. Commandline server-console: terrain -#: ../server/main.c:108 +#: ../server/main.c:106 msgid "Override terrain type, 0=default 1=random" msgstr "重置地形类型，0=默认 1=随机" #. Commandline server-console: computer-players -#: ../server/main.c:111 +#: ../server/main.c:109 msgid "Add N computer players" msgstr "添加N个电脑玩家" #. Commandline server-console: register -#: ../server/main.c:121 +#: ../server/main.c:119 msgid "Register server with metaserver" msgstr "通过中转服务器注册服务器" #. Commandline server-console: metaserver -#: ../server/main.c:124 +#: ../server/main.c:122 msgid "Register at metaserver name (implies -r)" msgstr "用来注册的中转服务器名字（相当于-r）" #. Commandline server-console: hostname -#: ../server/main.c:128 +#: ../server/main.c:126 msgid "Use this hostname when registering" msgstr "注册时使用这个主机名" #. Commandline server-console: auto-quit -#: ../server/main.c:135 +#: ../server/main.c:133 msgid "Quit after a player has won" msgstr "一个玩家胜利后退出" #. Commandline server-console: empty-timeout -#: ../server/main.c:138 +#: ../server/main.c:136 msgid "Quit after N seconds with no players" msgstr "N秒后没有玩家则退出" #. Commandline server-console: tournament -#: ../server/main.c:141 +#: ../server/main.c:139 msgid "Tournament mode, computer players added after N minutes" msgstr "比赛模式，N分钟后添加电脑玩家" #. Commandline server-console: admin-port -#: ../server/main.c:145 +#: ../server/main.c:143 msgid "Admin port to listen on" msgstr "用来监听的管理端口" #. Commandline server-console: admin-wait -#: ../server/main.c:148 +#: ../server/main.c:146 msgid "Don't start game immediately, wait for a command on admin port" msgstr "不要立即开始游戏，等待管理端口接收命令" #. Commandline server-console: fixed-seating-order -#: ../server/main.c:154 +#: ../server/main.c:152 msgid "Give players numbers according to the order they enter the game" msgstr "根据玩家加入时的命令来决定玩家编号" #. Commandline server-console: Short description of meta group -#: ../server/main.c:200 +#: ../server/main.c:192 msgid "Metaserver Options" msgstr "中转服务器选项" #. Commandline server-console: Long description of meta group -#: ../server/main.c:202 +#: ../server/main.c:194 msgid "Options for the metaserver" msgstr "中转服务器选项" #. Commandline server-console: Short description of misc group -#: ../server/main.c:211 +#: ../server/main.c:203 msgid "Miscellaneous Options" msgstr "杂项" #. Commandline server-console: Long description of misc group -#: ../server/main.c:213 +#: ../server/main.c:205 msgid "Miscellaneous options" msgstr "其他选项" #. server-console commandline error -#: ../server/main.c:239 +#: ../server/main.c:231 #, c-format msgid "Cannot set game title and filename at the same time\n" msgstr "不能同时设置游戏名称和文件名\n" #. server-console commandline error -#: ../server/main.c:256 +#: ../server/main.c:248 #, c-format msgid "Cannot load the parameters for the game\n" msgstr "无法加载游戏参数\n" #. Error message -#: ../server/main.c:305 ../server/main.c:324 +#: ../server/main.c:297 ../server/main.c:317 #, c-format msgid "The network port (%s) for the admin interface is not available.\n" msgstr "管理界面的网络端口（%s）不可用。\n" @@ -3769,7 +3782,8 @@ msgid "The connection to the metaserver is lost.\n" msgstr "中转服务器的连接丢失。\n" -#: ../server/meta.c:64 +#. The connection to the metaserver was lost +#: ../server/meta.c:63 #, c-format msgid "An attempt to reconnect is scheduled in %u second.\n" msgid_plural "An attempt to reconnect is scheduled in %u seconds.\n" @@ -3779,45 +3793,45 @@ msgid "Attempting to reconnect to the metaserver.\n" msgstr "正在重试连接到中转服务器。\n" -#: ../server/meta.c:311 +#: ../server/meta.c:315 #, c-format msgid "Register with the metaserver at %s.\n" msgstr "注册到中转服务器%s。\n" -#: ../server/meta.c:322 +#: ../server/meta.c:326 msgid "Unregister from the metaserver.\n" msgstr "从中转服务器取消注册。\n" -#: ../server/player.c:142 +#: ../server/player.c:143 msgid "chat too long" msgstr "聊天内容太长" -#: ../server/player.c:159 +#: ../server/player.c:160 msgid "name too long" msgstr "名字太长" -#: ../server/player.c:191 +#: ../server/player.c:192 msgid "ignoring unknown extension" msgstr "忽略未知扩展" -#: ../server/player.c:228 ../server/player.c:298 +#: ../server/player.c:229 ../server/player.c:299 msgid "The last player left, the tournament timer is reset." msgstr "最后一个玩家离开了，比赛计时器被重置。" -#: ../server/player.c:262 ../server/player.c:643 +#: ../server/player.c:263 ../server/player.c:644 msgid "No human players present. Bye." msgstr "没有出现人类玩家。不玩了。" -#: ../server/player.c:269 +#: ../server/player.c:270 msgid "Game starts, adding computer players." msgstr "游戏开始，添加电脑玩家。" -#: ../server/player.c:311 +#: ../server/player.c:312 #, c-format msgid "The game starts in %s minutes." msgstr "游戏将在%s分钟内开始。" -#: ../server/player.c:312 +#: ../server/player.c:313 #, c-format msgid "The game starts in %s minute." msgstr "游戏将在 %s 分钟内开始。" @@ -3825,11 +3839,11 @@ #. Default name for the AI when the computer_names file #. * is not found or empty. #. -#: ../server/player.c:370 ../server/player.c:376 +#: ../server/player.c:371 ../server/player.c:377 msgid "Computer Player" msgstr "电脑玩家" -#: ../server/player.c:450 +#: ../server/player.c:451 #, c-format msgid "Unable to determine the hostname of the player: %s" msgstr "无法获取玩家的主机名：%s" @@ -3837,48 +3851,48 @@ #. The game is over, don't accept new players #. Message to send to the client when the game is already over #. * when a connection is made. -#: ../server/player.c:476 +#: ../server/player.c:477 msgid "Sorry, game is over." msgstr "抱歉，游戏已结束。" -#: ../server/player.c:478 +#: ../server/player.c:479 #, c-format msgid "Player from %s is refused: game is over\n" msgstr "来自 %s 的玩家被拒了：游戏已结束\n" -#: ../server/player.c:520 +#: ../server/player.c:521 msgid "Name not changed: new name is already in use" msgstr "名字未修改：新名字已被使用" -#: ../server/player.c:638 ../server/server.c:38 +#: ../server/player.c:639 ../server/server.c:38 msgid "Was hanging around for too long without players... bye.\n" msgstr "长时间没有玩家过来... 不玩了。\n" -#: ../server/player.c:723 +#: ../server/player.c:726 msgid "The last human player left. Waiting for the return of a player." msgstr "最后一个人类玩家离开了。等待一个玩家回来。" -#: ../server/player.c:744 +#: ../server/player.c:747 msgid "Resuming the game." msgstr "游戏继续。" #. %s is the name of the reconnecting player -#: ../server/player.c:870 +#: ../server/player.c:873 #, c-format msgid "%s has reconnected." msgstr "%s 重新连接上了。" -#: ../server/player.c:970 +#: ../server/player.c:973 #, c-format msgid "Version mismatch: %s" msgstr "版本不匹配：%s" -#: ../server/player.c:1007 +#: ../server/player.c:1010 msgid "This game will start soon." msgstr "游戏即将开始。" #. Server: preparing game #..... -#: ../server/server.c:221 +#: ../server/server.c:222 msgid "Preparing game" msgstr "准备游戏" @@ -3899,6 +3913,24 @@ msgid "The dice roll has been determined by the administrator." msgstr "骰子被管理员内定了。" +#~ msgid "Quit the program" +#~ msgstr "退出程序" + +#~ msgid "" +#~ msgstr "增加>" + +#~ msgid "Increase the selected amount" +#~ msgstr "增加所选资源数量" + +#~ msgid "Building menus failed: %s" +#~ msgstr "创建菜单失败：%s" + #~ msgid "Join the selected game" #~ msgstr "加入所选的游戏" diff -Nru pioneers-15.5/server/gtk/main.c pioneers-15.6/server/gtk/main.c --- pioneers-15.5/server/gtk/main.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/server/gtk/main.c 2020-06-21 09:18:27.000000000 +0000 @@ -23,17 +23,14 @@ #include "config.h" #include "version.h" -#ifdef HAVE_LOCALE_H -#include -#endif #include #include -#include #include "aboutbox.h" #include "game.h" #include "game-list.h" #include "common_gtk.h" +#include "gettext.h" #include "config-gnome.h" #include "server.h" @@ -46,7 +43,10 @@ #define MAINICON_FILE "pioneers-server.png" -static GtkWidget *toplevel; /* top level window */ +/* Callback functions from the resource file */ +G_MODULE_EXPORT void check_vp_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void quit_cb(GObject * gobject, gpointer user_data); +G_MODULE_EXPORT void help_about_cb(GObject * gobject, gpointer user_data); static GtkWidget *settings_notebook; /* relevant settings */ @@ -71,9 +71,6 @@ /* Local function prototypes */ static void add_game_to_list(gpointer name, gpointer user_data); -static void check_vp_cb(GObject * caller, gpointer main_window); -static void quit_cb(void); -static void help_about_cb(void); enum { PLAYER_COLUMN_CONNECTED, @@ -84,48 +81,6 @@ PLAYER_COLUMN_LAST }; -/* Normal items */ -static GtkActionEntry entries[] = { - {"GameMenu", NULL, - /* Menu entry */ - N_("_Game"), NULL, NULL, NULL}, - {"HelpMenu", NULL, - /* Menu entry */ - N_("_Help"), NULL, NULL, NULL}, - {"GameCheckVP", NULL, - /* Menu entry */ - N_("_Check Victory Point Target"), - NULL, - /* Tooltop for Check Victory Point Target menu entry */ - N_("Check whether the game can be won"), G_CALLBACK(check_vp_cb)}, - {"GameQuit", NULL, - /* Menu entry */ - N_("_Quit"), "Q", - /* Tooltop for Quit menu entry */ - N_("Quit the program"), quit_cb}, - {"HelpAbout", NULL, - /* Menu entry */ - N_("_About Pioneers Server"), NULL, - /* Tooltop for About Pioneers Server menu entry */ - N_("Information about Pioneers Server"), help_about_cb} -}; - -/* *INDENT-OFF* */ -static const char *ui_description = -"" -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -""; -/* *INDENT-ON* */ - static void port_entry_changed_cb(GtkWidget * widget, G_GNUC_UNUSED gpointer user_data) { @@ -365,8 +320,8 @@ /* Spawn the child. */ if (!g_spawn_async(NULL, child_argv, NULL, child_flags, NULL, NULL, NULL, &error)) { - /* Error message when program %1 is started, reason is %2 */ log_message(MSG_ERROR, + /* Error message when program %1 is started, reason is %2 */ _("Error starting %s: %s\n"), child_argv[0], error->message); g_error_free(error); @@ -526,7 +481,7 @@ */ static GtkWidget *build_server_frame(void) { - /* table */ + /* grid */ /* server port label */ /* - port entry */ /* register toggle */ @@ -536,7 +491,7 @@ /* - hostname entry */ /* random toggle */ - GtkWidget *table; + GtkWidget *grid; GtkWidget *label; GtkWidget *toggle; GtkWidget *port_entry; @@ -544,28 +499,27 @@ gint novar; gchar *metaserver_name; - /* table */ - table = gtk_table_new(6, 2, FALSE); - gtk_widget_show(table); - gtk_container_set_border_width(GTK_CONTAINER(table), 3); - gtk_table_set_row_spacings(GTK_TABLE(table), 3); - gtk_table_set_col_spacings(GTK_TABLE(table), 5); + /* grid */ + grid = gtk_grid_new(); + gtk_widget_set_hexpand(grid, FALSE); + gtk_widget_show(grid); + gtk_container_set_border_width(GTK_CONTAINER(grid), 3); + gtk_grid_set_row_spacing(GTK_GRID(grid), 3); + gtk_grid_set_column_spacing(GTK_GRID(grid), 5); /* server port label */ label = gtk_label_new(_("Server port")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); /* port entry */ port_entry = gtk_entry_new(); g_signal_connect(G_OBJECT(port_entry), "changed", G_CALLBACK(port_entry_changed_cb), NULL); gtk_widget_show(port_entry); - gtk_table_attach(GTK_TABLE(table), port_entry, 1, 2, 0, 1, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, - 0); + gtk_widget_set_hexpand(port_entry, TRUE); + gtk_grid_attach(GTK_GRID(grid), port_entry, 1, 0, 1, 1); gtk_widget_set_tooltip_text(port_entry, _("The port for the game server")); @@ -578,9 +532,7 @@ /* register_toggle */ toggle = gtk_check_button_new_with_label(_("Register server")); gtk_widget_show(toggle); - gtk_table_attach(GTK_TABLE(table), toggle, 0, 2, 1, 2, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, - 0); + gtk_grid_attach(GTK_GRID(grid), toggle, 0, 1, 2, 1); g_signal_connect(G_OBJECT(toggle), "toggled", G_CALLBACK(register_toggle_cb), NULL); gtk_widget_set_tooltip_text(toggle, @@ -592,16 +544,13 @@ /* metaserver label */ label = gtk_label_new(_("Metaserver")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, 0, 2, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); /* meta entry */ meta_entry = metaserver_new(); gtk_widget_show(meta_entry); - gtk_table_attach(GTK_TABLE(table), meta_entry, 1, 2, 2, 3, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, - 0); + gtk_grid_attach(GTK_GRID(grid), meta_entry, 1, 2, 1, 1); gtk_widget_set_sensitive(meta_entry, register_server); /* initialize meta entry */ @@ -617,18 +566,16 @@ /* hostname label */ label = gtk_label_new(_("Reported hostname")); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, - GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_grid_attach(GTK_GRID(grid), label, 0, 3, 1, 1); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); /* hostname entry */ overridden_hostname_entry = gtk_entry_new(); g_signal_connect(G_OBJECT(overridden_hostname_entry), "changed", G_CALLBACK(overridden_hostname_changed_cb), NULL); gtk_widget_show(overridden_hostname_entry); - gtk_table_attach(GTK_TABLE(table), overridden_hostname_entry, 1, 2, - 3, 4, GTK_EXPAND | GTK_FILL, - GTK_EXPAND | GTK_FILL, 0, 0); + gtk_grid_attach(GTK_GRID(grid), overridden_hostname_entry, 1, 3, 1, + 1); gtk_widget_set_tooltip_text(overridden_hostname_entry, _("" "The public name of this computer " @@ -651,9 +598,7 @@ /* random toggle */ toggle = gtk_check_button_new_with_label(_("Random turn order")); gtk_widget_show(toggle); - gtk_table_attach(GTK_TABLE(table), toggle, 0, 2, 4, 5, - GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, - 0); + gtk_grid_attach(GTK_GRID(grid), toggle, 0, 4, 2, 1); g_signal_connect(G_OBJECT(toggle), "toggled", G_CALLBACK(random_toggle_cb), NULL); gtk_widget_set_tooltip_text(toggle, _("Randomize turn order")); @@ -663,7 +608,7 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), random_order); - return table; + return grid; } static void @@ -1091,8 +1036,7 @@ params_free(params); } -static void check_vp_cb(G_GNUC_UNUSED GObject * caller, - gpointer main_window) +void check_vp_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { GameParams *params; @@ -1135,17 +1079,18 @@ game_rules_get_island_discovery_bonus(GAMERULES(game_rules)); update_game_settings(params); - check_victory_points(params, main_window); + check_victory_points(params, GTK_WINDOW(user_data)); } -static void quit_cb(void) +void quit_cb(G_GNUC_UNUSED GObject * gobject, + G_GNUC_UNUSED gpointer user_data) { gtk_main_quit(); } -static void help_about_cb(void) +void help_about_cb(G_GNUC_UNUSED GObject * gobject, gpointer user_data) { - aboutbox_display(GTK_WINDOW(toplevel), + aboutbox_display(GTK_WINDOW(user_data), /* Caption of about box */ _("About the Pioneers Game Server")); } @@ -1165,23 +1110,21 @@ } static GOptionEntry commandline_entries[] = { - {"debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, + { "debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, /* Commandline option of server-gtk: enable debug logging */ - N_("Enable debug messages"), NULL}, - {"version", '\0', 0, G_OPTION_ARG_NONE, &show_version, + N_("Enable debug messages"), NULL }, + { "version", '\0', 0, G_OPTION_ARG_NONE, &show_version, /* Commandline option of server-gtk: version */ - N_("Show version information"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Show version information"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; int main(int argc, char *argv[]) { gchar *icon_file; + GtkWidget *toplevel; GtkWidget *vbox; - GtkWidget *menubar; - GtkActionGroup *action_group; - GtkUIManager *ui_manager; - GtkAccelGroup *accel_group; + GtkBuilder *builder; GError *error = NULL; GOptionContext *context; Game *game; @@ -1200,13 +1143,8 @@ /* Initialize frontend inspecific things */ server_init(); -#ifdef ENABLE_NLS - setlocale(LC_ALL, ""); - /* Gtk+ handles the locale, we must bind the translations */ - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif + /* Initialize translations */ + gettext_init(); /* Long description in the commandline for server-gtk: help */ context = g_option_context_new(_("- Host a game of Pioneers")); @@ -1229,34 +1167,13 @@ set_enable_debug(enable_debug); - prepare_gtk_for_close_button_on_tab(); - - toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL); + builder = + gtk_builder_new_from_resource + ("/net/sourceforge/pio/server/gtk/server.ui"); + toplevel = GTK_WIDGET(gtk_builder_get_object(builder, "toplevel")); /* Name in the titlebar of the server */ gtk_window_set_title(GTK_WINDOW(toplevel), _("Pioneers Server")); - - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add(GTK_CONTAINER(toplevel), vbox); - - action_group = gtk_action_group_new("MenuActions"); - gtk_action_group_set_translation_domain(action_group, PACKAGE); - gtk_action_group_add_actions(action_group, entries, - G_N_ELEMENTS(entries), toplevel); - - ui_manager = gtk_ui_manager_new(); - gtk_ui_manager_insert_action_group(ui_manager, action_group, 0); - - accel_group = gtk_ui_manager_get_accel_group(ui_manager); - gtk_window_add_accel_group(GTK_WINDOW(toplevel), accel_group); - - error = NULL; - if (!gtk_ui_manager_add_ui_from_string - (ui_manager, ui_description, -1, &error)) { - /* Error message */ - g_message(_("Building menus failed: %s"), error->message); - g_error_free(error); - return 1; - } + gtk_builder_connect_signals(builder, toplevel); config_init("pioneers-server"); @@ -1270,10 +1187,8 @@ } g_free(icon_file); - menubar = gtk_ui_manager_get_widget(ui_manager, "/MainMenu"); - gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0); - game = NULL; + vbox = GTK_WIDGET(gtk_builder_get_object(builder, "vbox")); gtk_box_pack_start(GTK_BOX(vbox), build_interface(GTK_WINDOW(toplevel), &game), TRUE, TRUE, 0); diff -Nru pioneers-15.5/server/gtk/Makefile.am pioneers-15.6/server/gtk/Makefile.am --- pioneers-15.5/server/gtk/Makefile.am 2018-03-07 16:48:34.000000000 +0000 +++ pioneers-15.6/server/gtk/Makefile.am 2020-04-14 19:52:51.000000000 +0000 @@ -27,10 +27,28 @@ pioneers_server_gtk_CPPFLAGS = $(gtk_cflags) $(avahi_cflags) -I $(srcdir)/server pioneers_server_gtk_LDADD = libpioneers_server.a $(gtk_libs) $(avahi_libs) +server_resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/server/gtk/server.gresource.xml) +server/gtk/server-resources.c: server/gtk/server.gresource.xml $(server_resource_files) + $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name server $(srcdir)/server/gtk/server.gresource.xml +server/gtk/server-resources.h: server/gtk/server.gresource.xml $(server_resource_files) + $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name server $(srcdir)/server/gtk/server.gresource.xml + +pioneers_server_gtk_BUILT_RESOURCES = \ + server/gtk/server-resources.c \ + server/gtk/server-resources.h + pioneers_server_gtk_SOURCES = \ server/gtk/main.c \ server/gtk/pioneers-server.ico \ - server/gtk/pioneers-server.rc + server/gtk/pioneers-server.rc \ + $(pioneers_server_gtk_BUILT_RESOURCES) + +EXTRA_DIST += \ + $(server_resource_files) \ + server/gtk/server.gresource.xml + +CLEANFILES += \ + $(pioneers_server_gtk_BUILT_RESOURCES) if USE_WINDOWS_ICON pioneers_server_gtk_LDADD += server/gtk/pioneers-server.res Binary files /tmp/tmprNzjQx/ytk7fihRg_/pioneers-15.5/server/gtk/pioneers-server.48x48_apps.png and /tmp/tmprNzjQx/qpK4jKD3ob/pioneers-15.6/server/gtk/pioneers-server.48x48_apps.png differ Binary files /tmp/tmprNzjQx/ytk7fihRg_/pioneers-15.5/server/gtk/pioneers-server.png and /tmp/tmprNzjQx/qpK4jKD3ob/pioneers-15.6/server/gtk/pioneers-server.png differ diff -Nru pioneers-15.5/server/gtk/server.gresource.xml pioneers-15.6/server/gtk/server.gresource.xml --- pioneers-15.5/server/gtk/server.gresource.xml 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/server/gtk/server.gresource.xml 2020-04-14 19:46:15.000000000 +0000 @@ -0,0 +1,6 @@ + + + + server/gtk/server.ui + + diff -Nru pioneers-15.5/server/gtk/server-resources.c pioneers-15.6/server/gtk/server-resources.c --- pioneers-15.5/server/gtk/server-resources.c 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/server/gtk/server-resources.c 2020-08-02 12:59:36.000000000 +0000 @@ -0,0 +1,730 @@ +#include + +#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) +# define SECTION __attribute__ ((section (".gresource.server"), aligned (8))) +#else +# define SECTION +#endif + +#ifdef _MSC_VER +static const SECTION union { const guint8 data[4477]; const double alignment; void * const ptr;} server_resource_data = { { + 0107, 0126, 0141, 0162, 0151, 0141, 0156, 0164, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, + 0030, 0000, 0000, 0000, 0344, 0000, 0000, 0000, 0000, 0000, 0000, 0050, 0007, 0000, 0000, 0000, + 0000, 0000, 0000, 0000, 0001, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 0004, 0000, 0000, 0000, + 0004, 0000, 0000, 0000, 0006, 0000, 0000, 0000, 0006, 0000, 0000, 0000, 0164, 0175, 0161, 0023, + 0004, 0000, 0000, 0000, 0344, 0000, 0000, 0000, 0004, 0000, 0114, 0000, 0350, 0000, 0000, 0000, + 0354, 0000, 0000, 0000, 0112, 0216, 0217, 0013, 0003, 0000, 0000, 0000, 0354, 0000, 0000, 0000, + 0004, 0000, 0114, 0000, 0360, 0000, 0000, 0000, 0364, 0000, 0000, 0000, 0322, 0205, 0350, 0124, + 0006, 0000, 0000, 0000, 0364, 0000, 0000, 0000, 0011, 0000, 0166, 0000, 0000, 0001, 0000, 0000, + 0123, 0021, 0000, 0000, 0324, 0265, 0002, 0000, 0377, 0377, 0377, 0377, 0123, 0021, 0000, 0000, + 0001, 0000, 0114, 0000, 0124, 0021, 0000, 0000, 0130, 0021, 0000, 0000, 0135, 0337, 0307, 0275, + 0001, 0000, 0000, 0000, 0130, 0021, 0000, 0000, 0014, 0000, 0114, 0000, 0144, 0021, 0000, 0000, + 0150, 0021, 0000, 0000, 0332, 0377, 0152, 0145, 0000, 0000, 0000, 0000, 0150, 0021, 0000, 0000, + 0007, 0000, 0114, 0000, 0160, 0021, 0000, 0000, 0164, 0021, 0000, 0000, 0117, 0323, 0165, 0040, + 0005, 0000, 0000, 0000, 0164, 0021, 0000, 0000, 0004, 0000, 0114, 0000, 0170, 0021, 0000, 0000, + 0174, 0021, 0000, 0000, 0160, 0151, 0157, 0057, 0005, 0000, 0000, 0000, 0156, 0145, 0164, 0057, + 0004, 0000, 0000, 0000, 0163, 0145, 0162, 0166, 0145, 0162, 0056, 0165, 0151, 0000, 0000, 0000, + 0103, 0020, 0000, 0000, 0000, 0000, 0000, 0000, 0074, 0077, 0170, 0155, 0154, 0040, 0166, 0145, + 0162, 0163, 0151, 0157, 0156, 0075, 0042, 0061, 0056, 0060, 0042, 0040, 0145, 0156, 0143, 0157, + 0144, 0151, 0156, 0147, 0075, 0042, 0125, 0124, 0106, 0055, 0070, 0042, 0077, 0076, 0012, 0074, + 0041, 0055, 0055, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0164, 0145, 0144, 0040, 0167, 0151, + 0164, 0150, 0040, 0147, 0154, 0141, 0144, 0145, 0040, 0063, 0056, 0062, 0062, 0056, 0062, 0040, + 0012, 0012, 0160, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0055, 0163, 0145, 0162, 0166, 0145, + 0162, 0055, 0147, 0164, 0153, 0040, 0055, 0040, 0115, 0141, 0151, 0156, 0040, 0167, 0151, 0156, + 0144, 0157, 0167, 0012, 0103, 0157, 0160, 0171, 0162, 0151, 0147, 0150, 0164, 0040, 0050, 0103, + 0051, 0040, 0062, 0060, 0062, 0060, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, + 0157, 0142, 0165, 0163, 0012, 0012, 0124, 0150, 0151, 0163, 0040, 0160, 0162, 0157, 0147, 0162, + 0141, 0155, 0040, 0151, 0163, 0040, 0146, 0162, 0145, 0145, 0040, 0163, 0157, 0146, 0164, 0167, + 0141, 0162, 0145, 0073, 0040, 0171, 0157, 0165, 0040, 0143, 0141, 0156, 0040, 0162, 0145, 0144, + 0151, 0163, 0164, 0162, 0151, 0142, 0165, 0164, 0145, 0040, 0151, 0164, 0040, 0141, 0156, 0144, + 0057, 0157, 0162, 0012, 0155, 0157, 0144, 0151, 0146, 0171, 0040, 0151, 0164, 0040, 0165, 0156, + 0144, 0145, 0162, 0040, 0164, 0150, 0145, 0040, 0164, 0145, 0162, 0155, 0163, 0040, 0157, 0146, + 0040, 0164, 0150, 0145, 0040, 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0154, + 0040, 0120, 0165, 0142, 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0012, + 0141, 0163, 0040, 0160, 0165, 0142, 0154, 0151, 0163, 0150, 0145, 0144, 0040, 0142, 0171, 0040, + 0164, 0150, 0145, 0040, 0106, 0162, 0145, 0145, 0040, 0123, 0157, 0146, 0164, 0167, 0141, 0162, + 0145, 0040, 0106, 0157, 0165, 0156, 0144, 0141, 0164, 0151, 0157, 0156, 0073, 0040, 0145, 0151, + 0164, 0150, 0145, 0162, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, 0040, 0062, 0012, 0157, + 0146, 0040, 0164, 0150, 0145, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0054, 0040, 0157, + 0162, 0040, 0050, 0141, 0164, 0040, 0171, 0157, 0165, 0162, 0040, 0157, 0160, 0164, 0151, 0157, + 0156, 0051, 0040, 0141, 0156, 0171, 0040, 0154, 0141, 0164, 0145, 0162, 0040, 0166, 0145, 0162, + 0163, 0151, 0157, 0156, 0056, 0012, 0012, 0124, 0150, 0151, 0163, 0040, 0160, 0162, 0157, 0147, + 0162, 0141, 0155, 0040, 0151, 0163, 0040, 0144, 0151, 0163, 0164, 0162, 0151, 0142, 0165, 0164, + 0145, 0144, 0040, 0151, 0156, 0040, 0164, 0150, 0145, 0040, 0150, 0157, 0160, 0145, 0040, 0164, + 0150, 0141, 0164, 0040, 0151, 0164, 0040, 0167, 0151, 0154, 0154, 0040, 0142, 0145, 0040, 0165, + 0163, 0145, 0146, 0165, 0154, 0054, 0012, 0142, 0165, 0164, 0040, 0127, 0111, 0124, 0110, 0117, + 0125, 0124, 0040, 0101, 0116, 0131, 0040, 0127, 0101, 0122, 0122, 0101, 0116, 0124, 0131, 0073, + 0040, 0167, 0151, 0164, 0150, 0157, 0165, 0164, 0040, 0145, 0166, 0145, 0156, 0040, 0164, 0150, + 0145, 0040, 0151, 0155, 0160, 0154, 0151, 0145, 0144, 0040, 0167, 0141, 0162, 0162, 0141, 0156, + 0164, 0171, 0040, 0157, 0146, 0012, 0115, 0105, 0122, 0103, 0110, 0101, 0116, 0124, 0101, 0102, + 0111, 0114, 0111, 0124, 0131, 0040, 0157, 0162, 0040, 0106, 0111, 0124, 0116, 0105, 0123, 0123, + 0040, 0106, 0117, 0122, 0040, 0101, 0040, 0120, 0101, 0122, 0124, 0111, 0103, 0125, 0114, 0101, + 0122, 0040, 0120, 0125, 0122, 0120, 0117, 0123, 0105, 0056, 0040, 0040, 0123, 0145, 0145, 0040, + 0164, 0150, 0145, 0012, 0107, 0116, 0125, 0040, 0107, 0145, 0156, 0145, 0162, 0141, 0154, 0040, + 0120, 0165, 0142, 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, 0156, 0163, 0145, 0040, 0146, + 0157, 0162, 0040, 0155, 0157, 0162, 0145, 0040, 0144, 0145, 0164, 0141, 0151, 0154, 0163, 0056, + 0012, 0012, 0131, 0157, 0165, 0040, 0163, 0150, 0157, 0165, 0154, 0144, 0040, 0150, 0141, 0166, + 0145, 0040, 0162, 0145, 0143, 0145, 0151, 0166, 0145, 0144, 0040, 0141, 0040, 0143, 0157, 0160, + 0171, 0040, 0157, 0146, 0040, 0164, 0150, 0145, 0040, 0107, 0116, 0125, 0040, 0107, 0145, 0156, + 0145, 0162, 0141, 0154, 0040, 0120, 0165, 0142, 0154, 0151, 0143, 0040, 0114, 0151, 0143, 0145, + 0156, 0163, 0145, 0012, 0141, 0154, 0157, 0156, 0147, 0040, 0167, 0151, 0164, 0150, 0040, 0164, + 0150, 0151, 0163, 0040, 0160, 0162, 0157, 0147, 0162, 0141, 0155, 0073, 0040, 0151, 0146, 0040, + 0156, 0157, 0164, 0054, 0040, 0167, 0162, 0151, 0164, 0145, 0040, 0164, 0157, 0040, 0164, 0150, + 0145, 0040, 0106, 0162, 0145, 0145, 0040, 0123, 0157, 0146, 0164, 0167, 0141, 0162, 0145, 0012, + 0106, 0157, 0165, 0156, 0144, 0141, 0164, 0151, 0157, 0156, 0054, 0040, 0111, 0156, 0143, 0056, + 0054, 0040, 0065, 0061, 0040, 0106, 0162, 0141, 0156, 0153, 0154, 0151, 0156, 0040, 0123, 0164, + 0162, 0145, 0145, 0164, 0054, 0040, 0106, 0151, 0146, 0164, 0150, 0040, 0106, 0154, 0157, 0157, + 0162, 0054, 0040, 0102, 0157, 0163, 0164, 0157, 0156, 0054, 0040, 0115, 0101, 0040, 0040, 0060, + 0062, 0061, 0061, 0060, 0055, 0061, 0063, 0060, 0061, 0054, 0040, 0125, 0123, 0101, 0056, 0012, + 0012, 0101, 0165, 0164, 0150, 0157, 0162, 0072, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, + 0103, 0154, 0157, 0142, 0165, 0163, 0012, 0012, 0055, 0055, 0076, 0012, 0074, 0151, 0156, 0164, + 0145, 0162, 0146, 0141, 0143, 0145, 0076, 0074, 0162, 0145, 0161, 0165, 0151, 0162, 0145, 0163, + 0040, 0154, 0151, 0142, 0075, 0042, 0147, 0164, 0153, 0053, 0042, 0040, 0166, 0145, 0162, 0163, + 0151, 0157, 0156, 0075, 0042, 0063, 0056, 0062, 0060, 0042, 0057, 0076, 0074, 0041, 0055, 0055, + 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0154, 0151, 0143, 0145, 0156, + 0163, 0145, 0055, 0164, 0171, 0160, 0145, 0040, 0147, 0160, 0154, 0166, 0062, 0040, 0055, 0055, + 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, + 0156, 0141, 0155, 0145, 0040, 0160, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0055, 0163, 0145, + 0162, 0166, 0145, 0162, 0055, 0147, 0164, 0153, 0040, 0055, 0055, 0076, 0074, 0041, 0055, 0055, + 0040, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0055, 0144, 0145, 0163, 0143, 0162, + 0151, 0160, 0164, 0151, 0157, 0156, 0040, 0115, 0141, 0151, 0156, 0040, 0167, 0151, 0156, 0144, + 0157, 0167, 0040, 0055, 0055, 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, 0164, 0145, 0162, + 0146, 0141, 0143, 0145, 0055, 0143, 0157, 0160, 0171, 0162, 0151, 0147, 0150, 0164, 0040, 0062, + 0060, 0062, 0060, 0040, 0122, 0157, 0154, 0141, 0156, 0144, 0040, 0103, 0154, 0157, 0142, 0165, + 0163, 0040, 0055, 0055, 0076, 0074, 0041, 0055, 0055, 0040, 0151, 0156, 0164, 0145, 0162, 0146, + 0141, 0143, 0145, 0055, 0141, 0165, 0164, 0150, 0157, 0162, 0163, 0040, 0122, 0157, 0154, 0141, + 0156, 0144, 0040, 0103, 0154, 0157, 0142, 0165, 0163, 0040, 0055, 0055, 0076, 0074, 0157, 0142, + 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0127, + 0151, 0156, 0144, 0157, 0167, 0042, 0040, 0151, 0144, 0075, 0042, 0164, 0157, 0160, 0154, 0145, + 0166, 0145, 0154, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, + 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0164, 0151, 0164, + 0154, 0145, 0142, 0141, 0162, 0042, 0076, 0074, 0160, 0154, 0141, 0143, 0145, 0150, 0157, 0154, + 0144, 0145, 0162, 0057, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0102, 0157, 0170, 0042, 0040, 0151, 0144, 0075, 0042, 0166, + 0142, 0157, 0170, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0157, 0162, 0151, 0145, 0156, 0164, 0141, 0164, + 0151, 0157, 0156, 0042, 0076, 0166, 0145, 0162, 0164, 0151, 0143, 0141, 0154, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, + 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, + 0153, 0115, 0145, 0156, 0165, 0102, 0141, 0162, 0042, 0040, 0151, 0144, 0075, 0042, 0155, 0141, + 0151, 0156, 0055, 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, + 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0143, 0150, 0151, + 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, 0163, + 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, + 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, + 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, + 0042, 0076, 0137, 0107, 0141, 0155, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, + 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, + 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, + 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0163, 0165, 0142, + 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, + 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0042, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, + 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, + 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, + 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, + 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, + 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, + 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, 0164, + 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, + 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, + 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0103, 0150, + 0145, 0143, 0153, 0040, 0126, 0151, 0143, 0164, 0157, 0162, 0171, 0040, 0120, 0157, 0151, 0156, + 0164, 0040, 0124, 0141, 0162, 0147, 0145, 0164, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, + 0164, 0162, 0171, 0042, 0076, 0103, 0150, 0145, 0143, 0153, 0040, 0167, 0150, 0145, 0164, 0150, + 0145, 0162, 0040, 0164, 0150, 0145, 0040, 0147, 0141, 0155, 0145, 0040, 0143, 0141, 0156, 0040, + 0142, 0145, 0040, 0167, 0157, 0156, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, + 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, + 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, + 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0137, 0103, 0150, 0145, 0143, 0153, 0040, 0126, 0151, 0143, 0164, 0157, 0162, 0171, 0040, + 0120, 0157, 0151, 0156, 0164, 0040, 0124, 0141, 0162, 0147, 0145, 0164, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, + 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, + 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, + 0144, 0154, 0145, 0162, 0075, 0042, 0143, 0150, 0145, 0143, 0153, 0137, 0166, 0160, 0137, 0143, + 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0123, 0145, 0160, 0141, 0162, + 0141, 0164, 0157, 0162, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, 0151, + 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, 0042, + 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, + 0144, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, + 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, + 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0121, + 0165, 0151, 0164, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, + 0121, 0165, 0151, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, + 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, + 0121, 0165, 0151, 0164, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, + 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, + 0147, 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, + 0141, 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0161, 0165, + 0151, 0164, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, 0160, 0145, 0144, 0075, 0042, + 0156, 0157, 0042, 0057, 0076, 0074, 0141, 0143, 0143, 0145, 0154, 0145, 0162, 0141, 0164, 0157, + 0162, 0040, 0153, 0145, 0171, 0075, 0042, 0161, 0042, 0040, 0163, 0151, 0147, 0156, 0141, 0154, + 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, 0164, 0145, 0042, 0040, 0155, 0157, 0144, 0151, + 0146, 0151, 0145, 0162, 0163, 0075, 0042, 0107, 0104, 0113, 0137, 0103, 0117, 0116, 0124, 0122, + 0117, 0114, 0137, 0115, 0101, 0123, 0113, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, + 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, + 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, 0154, 0141, 0163, + 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, 0164, 0145, 0155, 0042, 0076, + 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, + 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, + 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0154, 0141, 0142, 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, + 0141, 0164, 0141, 0142, 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, + 0155, 0145, 0156, 0164, 0163, 0075, 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, + 0171, 0042, 0076, 0137, 0110, 0145, 0154, 0160, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, + 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, + 0145, 0075, 0042, 0165, 0163, 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, + 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0163, 0165, + 0142, 0155, 0145, 0156, 0165, 0042, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, 0040, 0143, + 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0042, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0166, + 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, 0165, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, 0137, 0146, 0157, 0143, 0165, 0163, + 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0157, 0142, 0152, 0145, 0143, 0164, + 0040, 0143, 0154, 0141, 0163, 0163, 0075, 0042, 0107, 0164, 0153, 0115, 0145, 0156, 0165, 0111, + 0164, 0145, 0155, 0042, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, + 0141, 0155, 0145, 0075, 0042, 0166, 0151, 0163, 0151, 0142, 0154, 0145, 0042, 0076, 0124, 0162, + 0165, 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0143, 0141, 0156, + 0137, 0146, 0157, 0143, 0165, 0163, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0164, 0157, 0157, 0154, 0164, 0151, 0160, 0137, + 0164, 0145, 0170, 0164, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, + 0154, 0145, 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, + 0163, 0075, 0042, 0124, 0157, 0157, 0154, 0164, 0151, 0160, 0040, 0146, 0157, 0162, 0040, 0101, + 0142, 0157, 0165, 0164, 0040, 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0040, 0123, 0145, + 0162, 0166, 0145, 0162, 0040, 0155, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, + 0076, 0111, 0156, 0146, 0157, 0162, 0155, 0141, 0164, 0151, 0157, 0156, 0040, 0141, 0142, 0157, + 0165, 0164, 0040, 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0040, 0123, 0145, 0162, 0166, + 0145, 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0154, 0141, 0142, + 0145, 0154, 0042, 0040, 0164, 0162, 0141, 0156, 0163, 0154, 0141, 0164, 0141, 0142, 0154, 0145, + 0075, 0042, 0171, 0145, 0163, 0042, 0040, 0143, 0157, 0155, 0155, 0145, 0156, 0164, 0163, 0075, + 0042, 0115, 0145, 0156, 0165, 0040, 0145, 0156, 0164, 0162, 0171, 0042, 0076, 0137, 0101, 0142, + 0157, 0165, 0164, 0040, 0120, 0151, 0157, 0156, 0145, 0145, 0162, 0163, 0040, 0123, 0145, 0162, + 0166, 0145, 0162, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, + 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0165, 0163, + 0145, 0137, 0165, 0156, 0144, 0145, 0162, 0154, 0151, 0156, 0145, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0163, 0151, 0147, + 0156, 0141, 0154, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0141, 0143, 0164, 0151, 0166, 0141, + 0164, 0145, 0042, 0040, 0150, 0141, 0156, 0144, 0154, 0145, 0162, 0075, 0042, 0150, 0145, 0154, + 0160, 0137, 0141, 0142, 0157, 0165, 0164, 0137, 0143, 0142, 0042, 0040, 0163, 0167, 0141, 0160, + 0160, 0145, 0144, 0075, 0042, 0156, 0157, 0042, 0057, 0076, 0074, 0057, 0157, 0142, 0152, 0145, + 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, + 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, + 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, + 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, + 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0145, + 0170, 0160, 0141, 0156, 0144, 0042, 0076, 0106, 0141, 0154, 0163, 0145, 0074, 0057, 0160, 0162, + 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, + 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0146, 0151, 0154, 0154, 0042, 0076, 0124, 0162, 0165, + 0145, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0076, 0074, 0160, 0162, 0157, + 0160, 0145, 0162, 0164, 0171, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0160, 0157, 0163, 0151, + 0164, 0151, 0157, 0156, 0042, 0076, 0060, 0074, 0057, 0160, 0162, 0157, 0160, 0145, 0162, 0164, + 0171, 0076, 0074, 0057, 0160, 0141, 0143, 0153, 0151, 0156, 0147, 0076, 0074, 0057, 0143, 0150, + 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, 0143, + 0150, 0151, 0154, 0144, 0076, 0074, 0057, 0157, 0142, 0152, 0145, 0143, 0164, 0076, 0074, 0057, + 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, 0145, 0076, 0012, 0000, 0000, 0050, 0165, 0165, + 0141, 0171, 0051, 0057, 0001, 0000, 0000, 0000, 0163, 0157, 0165, 0162, 0143, 0145, 0146, 0157, + 0162, 0147, 0145, 0057, 0000, 0000, 0000, 0000, 0163, 0145, 0162, 0166, 0145, 0162, 0057, 0000, + 0006, 0000, 0000, 0000, 0147, 0164, 0153, 0057, 0002, 0000, 0000, 0000 +} }; +#else /* _MSC_VER */ +static const SECTION union { const guint8 data[4477]; const double alignment; void * const ptr;} server_resource_data = { + "\107\126\141\162\151\141\156\164\000\000\000\000\000\000\000\000" + "\030\000\000\000\344\000\000\000\000\000\000\050\007\000\000\000" + "\000\000\000\000\001\000\000\000\002\000\000\000\004\000\000\000" + "\004\000\000\000\006\000\000\000\006\000\000\000\164\175\161\023" + "\004\000\000\000\344\000\000\000\004\000\114\000\350\000\000\000" + "\354\000\000\000\112\216\217\013\003\000\000\000\354\000\000\000" + "\004\000\114\000\360\000\000\000\364\000\000\000\322\205\350\124" + "\006\000\000\000\364\000\000\000\011\000\166\000\000\001\000\000" + "\123\021\000\000\324\265\002\000\377\377\377\377\123\021\000\000" + "\001\000\114\000\124\021\000\000\130\021\000\000\135\337\307\275" + "\001\000\000\000\130\021\000\000\014\000\114\000\144\021\000\000" + "\150\021\000\000\332\377\152\145\000\000\000\000\150\021\000\000" + "\007\000\114\000\160\021\000\000\164\021\000\000\117\323\165\040" + "\005\000\000\000\164\021\000\000\004\000\114\000\170\021\000\000" + "\174\021\000\000\160\151\157\057\005\000\000\000\156\145\164\057" + "\004\000\000\000\163\145\162\166\145\162\056\165\151\000\000\000" + "\103\020\000\000\000\000\000\000\074\077\170\155\154\040\166\145" + "\162\163\151\157\156\075\042\061\056\060\042\040\145\156\143\157" + "\144\151\156\147\075\042\125\124\106\055\070\042\077\076\012\074" + "\041\055\055\040\107\145\156\145\162\141\164\145\144\040\167\151" + "\164\150\040\147\154\141\144\145\040\063\056\062\062\056\062\040" + "\012\012\160\151\157\156\145\145\162\163\055\163\145\162\166\145" + "\162\055\147\164\153\040\055\040\115\141\151\156\040\167\151\156" + "\144\157\167\012\103\157\160\171\162\151\147\150\164\040\050\103" + "\051\040\062\060\062\060\040\122\157\154\141\156\144\040\103\154" + "\157\142\165\163\012\012\124\150\151\163\040\160\162\157\147\162" + "\141\155\040\151\163\040\146\162\145\145\040\163\157\146\164\167" + "\141\162\145\073\040\171\157\165\040\143\141\156\040\162\145\144" + "\151\163\164\162\151\142\165\164\145\040\151\164\040\141\156\144" + "\057\157\162\012\155\157\144\151\146\171\040\151\164\040\165\156" + "\144\145\162\040\164\150\145\040\164\145\162\155\163\040\157\146" + "\040\164\150\145\040\107\116\125\040\107\145\156\145\162\141\154" + "\040\120\165\142\154\151\143\040\114\151\143\145\156\163\145\012" + "\141\163\040\160\165\142\154\151\163\150\145\144\040\142\171\040" + "\164\150\145\040\106\162\145\145\040\123\157\146\164\167\141\162" + "\145\040\106\157\165\156\144\141\164\151\157\156\073\040\145\151" + "\164\150\145\162\040\166\145\162\163\151\157\156\040\062\012\157" + "\146\040\164\150\145\040\114\151\143\145\156\163\145\054\040\157" + "\162\040\050\141\164\040\171\157\165\162\040\157\160\164\151\157" + "\156\051\040\141\156\171\040\154\141\164\145\162\040\166\145\162" + "\163\151\157\156\056\012\012\124\150\151\163\040\160\162\157\147" + "\162\141\155\040\151\163\040\144\151\163\164\162\151\142\165\164" + "\145\144\040\151\156\040\164\150\145\040\150\157\160\145\040\164" + "\150\141\164\040\151\164\040\167\151\154\154\040\142\145\040\165" + "\163\145\146\165\154\054\012\142\165\164\040\127\111\124\110\117" + "\125\124\040\101\116\131\040\127\101\122\122\101\116\124\131\073" + "\040\167\151\164\150\157\165\164\040\145\166\145\156\040\164\150" + "\145\040\151\155\160\154\151\145\144\040\167\141\162\162\141\156" + "\164\171\040\157\146\012\115\105\122\103\110\101\116\124\101\102" + "\111\114\111\124\131\040\157\162\040\106\111\124\116\105\123\123" + "\040\106\117\122\040\101\040\120\101\122\124\111\103\125\114\101" + "\122\040\120\125\122\120\117\123\105\056\040\040\123\145\145\040" + "\164\150\145\012\107\116\125\040\107\145\156\145\162\141\154\040" + "\120\165\142\154\151\143\040\114\151\143\145\156\163\145\040\146" + "\157\162\040\155\157\162\145\040\144\145\164\141\151\154\163\056" + "\012\012\131\157\165\040\163\150\157\165\154\144\040\150\141\166" + "\145\040\162\145\143\145\151\166\145\144\040\141\040\143\157\160" + "\171\040\157\146\040\164\150\145\040\107\116\125\040\107\145\156" + "\145\162\141\154\040\120\165\142\154\151\143\040\114\151\143\145" + "\156\163\145\012\141\154\157\156\147\040\167\151\164\150\040\164" + "\150\151\163\040\160\162\157\147\162\141\155\073\040\151\146\040" + "\156\157\164\054\040\167\162\151\164\145\040\164\157\040\164\150" + "\145\040\106\162\145\145\040\123\157\146\164\167\141\162\145\012" + "\106\157\165\156\144\141\164\151\157\156\054\040\111\156\143\056" + "\054\040\065\061\040\106\162\141\156\153\154\151\156\040\123\164" + "\162\145\145\164\054\040\106\151\146\164\150\040\106\154\157\157" + "\162\054\040\102\157\163\164\157\156\054\040\115\101\040\040\060" + "\062\061\061\060\055\061\063\060\061\054\040\125\123\101\056\012" + "\012\101\165\164\150\157\162\072\040\122\157\154\141\156\144\040" + "\103\154\157\142\165\163\012\012\055\055\076\012\074\151\156\164" + "\145\162\146\141\143\145\076\074\162\145\161\165\151\162\145\163" + "\040\154\151\142\075\042\147\164\153\053\042\040\166\145\162\163" + "\151\157\156\075\042\063\056\062\060\042\057\076\074\041\055\055" + "\040\151\156\164\145\162\146\141\143\145\055\154\151\143\145\156" + "\163\145\055\164\171\160\145\040\147\160\154\166\062\040\055\055" + "\076\074\041\055\055\040\151\156\164\145\162\146\141\143\145\055" + "\156\141\155\145\040\160\151\157\156\145\145\162\163\055\163\145" + "\162\166\145\162\055\147\164\153\040\055\055\076\074\041\055\055" + "\040\151\156\164\145\162\146\141\143\145\055\144\145\163\143\162" + "\151\160\164\151\157\156\040\115\141\151\156\040\167\151\156\144" + "\157\167\040\055\055\076\074\041\055\055\040\151\156\164\145\162" + "\146\141\143\145\055\143\157\160\171\162\151\147\150\164\040\062" + "\060\062\060\040\122\157\154\141\156\144\040\103\154\157\142\165" + "\163\040\055\055\076\074\041\055\055\040\151\156\164\145\162\146" + "\141\143\145\055\141\165\164\150\157\162\163\040\122\157\154\141" + "\156\144\040\103\154\157\142\165\163\040\055\055\076\074\157\142" + "\152\145\143\164\040\143\154\141\163\163\075\042\107\164\153\127" + "\151\156\144\157\167\042\040\151\144\075\042\164\157\160\154\145" + "\166\145\154\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042\076" + "\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\143\150\151\154\144\040\164\171\160\145\075\042\164\151\164" + "\154\145\142\141\162\042\076\074\160\154\141\143\145\150\157\154" + "\144\145\162\057\076\074\057\143\150\151\154\144\076\074\143\150" + "\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\102\157\170\042\040\151\144\075\042\166" + "\142\157\170\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\157\162\151\145\156\164\141\164" + "\151\157\156\042\076\166\145\162\164\151\143\141\154\074\057\160" + "\162\157\160\145\162\164\171\076\074\143\150\151\154\144\076\074" + "\157\142\152\145\143\164\040\143\154\141\163\163\075\042\107\164" + "\153\115\145\156\165\102\141\162\042\040\151\144\075\042\155\141" + "\151\156\055\155\145\156\165\042\076\074\160\162\157\160\145\162" + "\164\171\040\156\141\155\145\075\042\166\151\163\151\142\154\145" + "\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\143\141\156\137\146\157\143\165\163\042\076\106\141\154\163" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\143\150\151" + "\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163\163" + "\075\042\107\164\153\115\145\156\165\111\164\145\155\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141" + "\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155" + "\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171" + "\042\076\137\107\141\155\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145" + "\075\042\165\163\145\137\165\156\144\145\162\154\151\156\145\042" + "\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171\076" + "\074\143\150\151\154\144\040\164\171\160\145\075\042\163\165\142" + "\155\145\156\165\042\076\074\157\142\152\145\143\164\040\143\154" + "\141\163\163\075\042\107\164\153\115\145\156\165\042\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151" + "\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042" + "\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164\040" + "\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111\164" + "\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156\141" + "\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156\137" + "\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137\164" + "\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142\154" + "\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163" + "\075\042\124\157\157\154\164\151\160\040\146\157\162\040\103\150" + "\145\143\153\040\126\151\143\164\157\162\171\040\120\157\151\156" + "\164\040\124\141\162\147\145\164\040\155\145\156\165\040\145\156" + "\164\162\171\042\076\103\150\145\143\153\040\167\150\145\164\150" + "\145\162\040\164\150\145\040\147\141\155\145\040\143\141\156\040" + "\142\145\040\167\157\156\074\057\160\162\157\160\145\162\164\171" + "\076\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075" + "\042\154\141\142\145\154\042\040\164\162\141\156\163\154\141\164" + "\141\142\154\145\075\042\171\145\163\042\040\143\157\155\155\145" + "\156\164\163\075\042\115\145\156\165\040\145\156\164\162\171\042" + "\076\137\103\150\145\143\153\040\126\151\143\164\157\162\171\040" + "\120\157\151\156\164\040\124\141\162\147\145\164\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\165\163\145\137\165\156\144\145\162" + "\154\151\156\145\042\076\124\162\165\145\074\057\160\162\157\160" + "\145\162\164\171\076\074\163\151\147\156\141\154\040\156\141\155" + "\145\075\042\141\143\164\151\166\141\164\145\042\040\150\141\156" + "\144\154\145\162\075\042\143\150\145\143\153\137\166\160\137\143" + "\142\042\040\163\167\141\160\160\145\144\075\042\156\157\042\057" + "\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154" + "\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\123\145\160\141\162" + "\141\164\157\162\115\145\156\165\111\164\145\155\042\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166\151" + "\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162\157" + "\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163\042" + "\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\057\157\142\152\145\143\164\076\074\057\143\150\151\154" + "\144\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111" + "\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137" + "\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040\121" + "\165\151\164\040\155\145\156\165\040\145\156\164\162\171\042\076" + "\121\165\151\164\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\154" + "\141\142\145\154\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\115\145\156\165\040\145\156\164\162\171\042\076\137" + "\121\165\151\164\074\057\160\162\157\160\145\162\164\171\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\165" + "\163\145\137\165\156\144\145\162\154\151\156\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\163\151" + "\147\156\141\154\040\156\141\155\145\075\042\141\143\164\151\166" + "\141\164\145\042\040\150\141\156\144\154\145\162\075\042\161\165" + "\151\164\137\143\142\042\040\163\167\141\160\160\145\144\075\042" + "\156\157\042\057\076\074\141\143\143\145\154\145\162\141\164\157" + "\162\040\153\145\171\075\042\161\042\040\163\151\147\156\141\154" + "\075\042\141\143\164\151\166\141\164\145\042\040\155\157\144\151" + "\146\151\145\162\163\075\042\107\104\113\137\103\117\116\124\122" + "\117\114\137\115\101\123\113\042\057\076\074\057\157\142\152\145" + "\143\164\076\074\057\143\150\151\154\144\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\057\157\142" + "\152\145\143\164\076\074\057\143\150\151\154\144\076\074\143\150" + "\151\154\144\076\074\157\142\152\145\143\164\040\143\154\141\163" + "\163\075\042\107\164\153\115\145\156\165\111\164\145\155\042\076" + "\074\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042" + "\166\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165" + "\163\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\154\141\142\145\154\042\040\164\162\141\156\163\154" + "\141\164\141\142\154\145\075\042\171\145\163\042\040\143\157\155" + "\155\145\156\164\163\075\042\115\145\156\165\040\145\156\164\162" + "\171\042\076\137\110\145\154\160\074\057\160\162\157\160\145\162" + "\164\171\076\074\160\162\157\160\145\162\164\171\040\156\141\155" + "\145\075\042\165\163\145\137\165\156\144\145\162\154\151\156\145" + "\042\076\124\162\165\145\074\057\160\162\157\160\145\162\164\171" + "\076\074\143\150\151\154\144\040\164\171\160\145\075\042\163\165" + "\142\155\145\156\165\042\076\074\157\142\152\145\143\164\040\143" + "\154\141\163\163\075\042\107\164\153\115\145\156\165\042\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\166" + "\151\163\151\142\154\145\042\076\124\162\165\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\143\141\156\137\146\157\143\165\163" + "\042\076\106\141\154\163\145\074\057\160\162\157\160\145\162\164" + "\171\076\074\143\150\151\154\144\076\074\157\142\152\145\143\164" + "\040\143\154\141\163\163\075\042\107\164\153\115\145\156\165\111" + "\164\145\155\042\076\074\160\162\157\160\145\162\164\171\040\156" + "\141\155\145\075\042\166\151\163\151\142\154\145\042\076\124\162" + "\165\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\143\141\156" + "\137\146\157\143\165\163\042\076\106\141\154\163\145\074\057\160" + "\162\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164" + "\171\040\156\141\155\145\075\042\164\157\157\154\164\151\160\137" + "\164\145\170\164\042\040\164\162\141\156\163\154\141\164\141\142" + "\154\145\075\042\171\145\163\042\040\143\157\155\155\145\156\164" + "\163\075\042\124\157\157\154\164\151\160\040\146\157\162\040\101" + "\142\157\165\164\040\120\151\157\156\145\145\162\163\040\123\145" + "\162\166\145\162\040\155\145\156\165\040\145\156\164\162\171\042" + "\076\111\156\146\157\162\155\141\164\151\157\156\040\141\142\157" + "\165\164\040\120\151\157\156\145\145\162\163\040\123\145\162\166" + "\145\162\074\057\160\162\157\160\145\162\164\171\076\074\160\162" + "\157\160\145\162\164\171\040\156\141\155\145\075\042\154\141\142" + "\145\154\042\040\164\162\141\156\163\154\141\164\141\142\154\145" + "\075\042\171\145\163\042\040\143\157\155\155\145\156\164\163\075" + "\042\115\145\156\165\040\145\156\164\162\171\042\076\137\101\142" + "\157\165\164\040\120\151\157\156\145\145\162\163\040\123\145\162" + "\166\145\162\074\057\160\162\157\160\145\162\164\171\076\074\160" + "\162\157\160\145\162\164\171\040\156\141\155\145\075\042\165\163" + "\145\137\165\156\144\145\162\154\151\156\145\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\163\151\147" + "\156\141\154\040\156\141\155\145\075\042\141\143\164\151\166\141" + "\164\145\042\040\150\141\156\144\154\145\162\075\042\150\145\154" + "\160\137\141\142\157\165\164\137\143\142\042\040\163\167\141\160" + "\160\145\144\075\042\156\157\042\057\076\074\057\157\142\152\145" + "\143\164\076\074\057\143\150\151\154\144\076\074\057\157\142\152" + "\145\143\164\076\074\057\143\150\151\154\144\076\074\057\157\142" + "\152\145\143\164\076\074\057\143\150\151\154\144\076\074\057\157" + "\142\152\145\143\164\076\074\160\141\143\153\151\156\147\076\074" + "\160\162\157\160\145\162\164\171\040\156\141\155\145\075\042\145" + "\170\160\141\156\144\042\076\106\141\154\163\145\074\057\160\162" + "\157\160\145\162\164\171\076\074\160\162\157\160\145\162\164\171" + "\040\156\141\155\145\075\042\146\151\154\154\042\076\124\162\165" + "\145\074\057\160\162\157\160\145\162\164\171\076\074\160\162\157" + "\160\145\162\164\171\040\156\141\155\145\075\042\160\157\163\151" + "\164\151\157\156\042\076\060\074\057\160\162\157\160\145\162\164" + "\171\076\074\057\160\141\143\153\151\156\147\076\074\057\143\150" + "\151\154\144\076\074\057\157\142\152\145\143\164\076\074\057\143" + "\150\151\154\144\076\074\057\157\142\152\145\143\164\076\074\057" + "\151\156\164\145\162\146\141\143\145\076\012\000\000\050\165\165" + "\141\171\051\057\001\000\000\000\163\157\165\162\143\145\146\157" + "\162\147\145\057\000\000\000\000\163\145\162\166\145\162\057\000" + "\006\000\000\000\147\164\153\057\002\000\000\000" }; +#endif /* !_MSC_VER */ + +static GStaticResource static_resource = { server_resource_data.data, sizeof (server_resource_data.data) - 1 /* nul terminator */, NULL, NULL, NULL }; + +G_MODULE_EXPORT +GResource *server_get_resource (void); +GResource *server_get_resource (void) +{ + return g_static_resource_get_resource (&static_resource); +} +/* + If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and + destructors, in a usable way, including e.g. on library unload. If not you're on + your own. + + Some compilers need #pragma to handle this, which does not work with macros, + so the way you need to use this is (for constructors): + + #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA + #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor) + #endif + G_DEFINE_CONSTRUCTOR(my_constructor) + static void my_constructor(void) { + ... + } + +*/ + +#ifndef __GTK_DOC_IGNORE__ + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void); +#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void); + +#elif defined (_MSC_VER) && (_MSC_VER >= 1500) +/* Visual studio 2008 and later has _Pragma */ + +#include + +#define G_HAS_CONSTRUCTORS 1 + +/* We do some weird things to avoid the constructors being optimized + * away on VS2015 if WholeProgramOptimization is enabled. First we + * make a reference to the array from the wrapper to make sure its + * references. Then we use a pragma to make sure the wrapper function + * symbol is always included at the link stage. Also, the symbols + * need to be extern (but not dllexport), even though they are not + * really used from another object file. + */ + +/* We need to account for differences between the mangling of symbols + * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed + * with an underscore but symbols on x64 are not. + */ +#ifdef _WIN64 +#define G_MSVC_SYMBOL_PREFIX "" +#else +#define G_MSVC_SYMBOL_PREFIX "_" +#endif + +#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) +#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX) + +#define G_MSVC_CTOR(_func,_sym_prefix) \ + static void _func(void); \ + extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper; + +#define G_MSVC_DTOR(_func,_sym_prefix) \ + static void _func(void); \ + extern int (* _array ## _func)(void); \ + int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ + __pragma(section(".CRT$XCU",read)) \ + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined (_MSC_VER) + +#define G_HAS_CONSTRUCTORS 1 + +/* Pre Visual studio 2008 must use #pragma section */ +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _wrapper(void) { _func(); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper; + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + section(".CRT$XCU",read) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); \ + static int _func ## _constructor(void) { atexit (_func); return 0; } \ + __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + +#elif defined(__SUNPRO_C) + +/* This is not tested, but i believe it should work, based on: + * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c + */ + +#define G_HAS_CONSTRUCTORS 1 + +#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1 +#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1 + +#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \ + init(_func) +#define G_DEFINE_CONSTRUCTOR(_func) \ + static void _func(void); + +#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \ + fini(_func) +#define G_DEFINE_DESTRUCTOR(_func) \ + static void _func(void); + +#else + +/* constructors not supported for this compiler */ + +#endif + +#endif /* __GTK_DOC_IGNORE__ */ + +#ifdef G_HAS_CONSTRUCTORS + +#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor) +#endif +G_DEFINE_CONSTRUCTOR(resource_constructor) +#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA +#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor) +#endif +G_DEFINE_DESTRUCTOR(resource_destructor) + +#else +#warning "Constructor not supported on this compiler, linking in resources will not work" +#endif + +static void resource_constructor (void) +{ + g_static_resource_init (&static_resource); +} + +static void resource_destructor (void) +{ + g_static_resource_fini (&static_resource); +} diff -Nru pioneers-15.5/server/gtk/server-resources.h pioneers-15.6/server/gtk/server-resources.h --- pioneers-15.5/server/gtk/server-resources.h 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/server/gtk/server-resources.h 2020-08-02 12:59:36.000000000 +0000 @@ -0,0 +1,7 @@ +#ifndef __RESOURCE_server_H__ +#define __RESOURCE_server_H__ + +#include + +extern GResource *server_get_resource (void); +#endif diff -Nru pioneers-15.5/server/gtk/server.ui pioneers-15.6/server/gtk/server.ui --- pioneers-15.5/server/gtk/server.ui 1970-01-01 00:00:00.000000000 +0000 +++ pioneers-15.6/server/gtk/server.ui 2020-04-14 19:46:15.000000000 +0000 @@ -0,0 +1,120 @@ + + + + + + + + + + + False + + + + + + True + False + vertical + + + True + False + + + True + False + _Game + True + + + True + False + + + True + False + Check whether the game can be won + _Check Victory Point Target + True + + + + + + True + False + + + + + True + False + Quit + _Quit + True + + + + + + + + + + + True + False + _Help + True + + + True + False + + + True + False + Information about Pioneers Server + _About Pioneers Server + True + + + + + + + + + + False + True + 0 + + + + + + diff -Nru pioneers-15.5/server/main.c pioneers-15.6/server/main.c --- pioneers-15.5/server/main.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/server/main.c 2020-06-20 10:52:00.000000000 +0000 @@ -23,9 +23,6 @@ #include "config.h" #include "version.h" -#ifdef HAVE_LOCALE_H -#include -#endif #include #include #include @@ -46,6 +43,7 @@ #include "common_glib.h" #include "glib-driver.h" +#include "gettext.h" #include "admin.h" @@ -75,89 +73,89 @@ static gboolean show_version = FALSE; static GOptionEntry commandline_game_entries[] = { - {"game-title", 'g', 0, G_OPTION_ARG_STRING, &game_title, + { "game-title", 'g', 0, G_OPTION_ARG_STRING, &game_title, /* Commandline server-console: game-title */ - N_("Game title to use"), NULL}, - {"file", 0, 0, G_OPTION_ARG_STRING, &game_file, + N_("Game title to use"), NULL }, + { "file", 0, 0, G_OPTION_ARG_STRING, &game_file, /* Commandline server-console: file */ - N_("Game file to use"), NULL}, - {"port", 'p', 0, G_OPTION_ARG_STRING, &server_port, + N_("Game file to use"), NULL }, + { "port", 'p', 0, G_OPTION_ARG_STRING, &server_port, /* Commandline server-console: port */ - N_("Port to listen on"), PIONEERS_DEFAULT_GAME_PORT}, - {"players", 'P', 0, G_OPTION_ARG_INT, &num_players, + N_("Port to listen on"), PIONEERS_DEFAULT_GAME_PORT }, + { "players", 'P', 0, G_OPTION_ARG_INT, &num_players, /* Commandline server-console: players */ - N_("Override number of players"), NULL}, - {"points", 'v', 0, G_OPTION_ARG_INT, &num_points, + N_("Override number of players"), NULL }, + { "points", 'v', 0, G_OPTION_ARG_INT, &num_points, /* Commandline server-console: points */ - N_("Override number of points needed to win"), NULL}, - {"seven-rule", 'R', 0, G_OPTION_ARG_INT, &sevens_rule, + N_("Override number of points needed to win"), NULL }, + { "seven-rule", 'R', 0, G_OPTION_ARG_INT, &sevens_rule, /* Commandline server-console: seven-rule */ - N_("Override seven-rule handling"), "0|1|2"}, - {"use-dice-deck", 'd', 0, G_OPTION_ARG_INT, &use_dice_deck, + N_("Override seven-rule handling"), "0|1|2" }, + { "use-dice-deck", 'd', 0, G_OPTION_ARG_INT, &use_dice_deck, /* Commandline server-console: dice-deck */ - N_("Override dice-deck handling"), "0|1"}, - {"dice-deck", 'D', 0, G_OPTION_ARG_INT, &num_dice_decks, + N_("Override dice-deck handling"), "0|1" }, + { "dice-deck", 'D', 0, G_OPTION_ARG_INT, &num_dice_decks, /* Commandline server-console: num-dice-decks */ - N_("Override num-dice-decks handling"), "0|1"}, - {"num-removed-dice-cards", 'C', 0, G_OPTION_ARG_INT, + N_("Override num-dice-decks handling"), "0|1" }, + { "num-removed-dice-cards", 'C', 0, G_OPTION_ARG_INT, &num_removed_dice_cards, /* Commandline server-console: num-removed-dice-cards */ - N_("Override num-removed-dice-cards handling"), NULL}, - {"terrain", 'T', 0, G_OPTION_ARG_INT, &terrain, + N_("Override num-removed-dice-cards handling"), NULL }, + { "terrain", 'T', 0, G_OPTION_ARG_INT, &terrain, /* Commandline server-console: terrain */ - N_("Override terrain type, 0=default 1=random"), "0|1"}, - {"computer-players", 'c', 0, G_OPTION_ARG_INT, &num_ai_players, + N_("Override terrain type, 0=default 1=random"), "0|1" }, + { "computer-players", 'c', 0, G_OPTION_ARG_INT, &num_ai_players, /* Commandline server-console: computer-players */ - N_("Add N computer players"), "N"}, - {"version", '\0', 0, G_OPTION_ARG_NONE, &show_version, + N_("Add N computer players"), "N" }, + { "version", '\0', 0, G_OPTION_ARG_NONE, &show_version, /* Commandline option of server-console: version */ - N_("Show version information"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Show version information"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; static GOptionEntry commandline_meta_entries[] = { - {"register", 'r', 0, G_OPTION_ARG_NONE, ®ister_server, + { "register", 'r', 0, G_OPTION_ARG_NONE, ®ister_server, /* Commandline server-console: register */ - N_("Register server with metaserver"), NULL}, - {"metaserver", 'm', 0, G_OPTION_ARG_STRING, &metaserver_name, + N_("Register server with metaserver"), NULL }, + { "metaserver", 'm', 0, G_OPTION_ARG_STRING, &metaserver_name, /* Commandline server-console: metaserver */ N_("Register at metaserver name (implies -r)"), - PIONEERS_DEFAULT_METASERVER}, - {"hostname", 'n', 0, G_OPTION_ARG_STRING, &hostname, + PIONEERS_DEFAULT_METASERVER }, + { "hostname", 'n', 0, G_OPTION_ARG_STRING, &hostname, /* Commandline server-console: hostname */ - N_("Use this hostname when registering"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Use this hostname when registering"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; static GOptionEntry commandline_other_entries[] = { - {"auto-quit", 'x', 0, G_OPTION_ARG_NONE, &quit_when_done, + { "auto-quit", 'x', 0, G_OPTION_ARG_NONE, &quit_when_done, /* Commandline server-console: auto-quit */ - N_("Quit after a player has won"), NULL}, - {"empty-timeout", 'k', 0, G_OPTION_ARG_INT, &timeout, + N_("Quit after a player has won"), NULL }, + { "empty-timeout", 'k', 0, G_OPTION_ARG_INT, &timeout, /* Commandline server-console: empty-timeout */ - N_("Quit after N seconds with no players"), "N"}, - {"tournament", 't', 0, G_OPTION_ARG_INT, &tournament_time, + N_("Quit after N seconds with no players"), "N" }, + { "tournament", 't', 0, G_OPTION_ARG_INT, &tournament_time, /* Commandline server-console: tournament */ N_("Tournament mode, computer players added after N minutes"), - "N"}, - {"admin-port", 'a', 0, G_OPTION_ARG_STRING, &admin_port, + "N" }, + { "admin-port", 'a', 0, G_OPTION_ARG_STRING, &admin_port, /* Commandline server-console: admin-port */ - N_("Admin port to listen on"), PIONEERS_DEFAULT_ADMIN_PORT}, - {"admin-wait", 's', 0, G_OPTION_ARG_NONE, &disable_game_start, + N_("Admin port to listen on"), PIONEERS_DEFAULT_ADMIN_PORT }, + { "admin-wait", 's', 0, G_OPTION_ARG_NONE, &disable_game_start, /* Commandline server-console: admin-wait */ N_("" "Don't start game immediately, wait for a command on admin port"), - NULL}, - {"fixed-seating-order", 0, 0, G_OPTION_ARG_NONE, + NULL }, + { "fixed-seating-order", 0, 0, G_OPTION_ARG_NONE, &fixed_seating_order, /* Commandline server-console: fixed-seating-order */ N_("" "Give players numbers according to the order they enter the game"), - NULL}, - {"debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, + NULL }, + { "debug", '\0', 0, G_OPTION_ARG_NONE, &enable_debug, /* Commandline option of server: enable debug logging */ - N_("Enable debug messages"), NULL}, - {NULL, '\0', 0, 0, NULL, NULL, NULL} + N_("Enable debug messages"), NULL }, + { NULL, '\0', 0, 0, NULL, NULL, NULL } }; int main(int argc, char *argv[]) @@ -179,17 +177,11 @@ g_type_init(); -#ifdef ENABLE_NLS - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - textdomain(PACKAGE); - - /* have gettext return strings in UTF-8 */ - bind_textdomain_codeset(PACKAGE, "UTF-8"); -#endif - server_init(); + /* Initialize translations */ + gettext_init(); + /* Long description in the commandline for server-console: help */ context = g_option_context_new(_("- Host a game of Pioneers")); g_option_context_add_main_entries(context, @@ -310,6 +302,7 @@ } } game->no_player_timeout = timeout; + start_timeout(game); num_ai_players = CLAMP(num_ai_players, 0, (gint) game->params->num_players); diff -Nru pioneers-15.5/server/meta.c pioneers-15.6/server/meta.c --- pioneers-15.5/server/meta.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/server/meta.c 2020-06-21 09:18:27.000000000 +0000 @@ -60,10 +60,10 @@ } log_message(MSG_INFO, /* The connection to the metaserver was lost */ - ngettext - ("An attempt to reconnect is scheduled in %u second.\n", - "An attempt to reconnect is scheduled in %u seconds.\n", - reconnect_interval), reconnect_interval); + ngettext("" + "An attempt to reconnect is scheduled in %u second.\n", + "An attempt to reconnect is scheduled in %u seconds.\n", + reconnect_interval), reconnect_interval); reconnect_timer = g_timeout_add(reconnect_interval * 1000, timed_out, game); } @@ -82,6 +82,10 @@ log_message(MSG_INFO, _("Attempting to reconnect to the metaserver.\n")); reconnect_interval *= 2; + /* The maximum reconnection time is 24 hours */ + if (reconnect_interval > 24 * 3600) { + reconnect_interval = 24 * 3600; + } if (!meta_connect(game)) { start_reconnect_timer(game); } diff -Nru pioneers-15.5/server/player.c pioneers-15.6/server/player.c --- pioneers-15.5/server/player.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/server/player.c 2020-06-06 16:19:22.000000000 +0000 @@ -84,7 +84,8 @@ skip = 0; } idx = 0; - while (player_taken[idx] || skip-- != 0) + ++skip; + while (player_taken[idx] || --skip != 0) ++idx; return idx; } @@ -663,6 +664,9 @@ return; } + /* Mark the player as disconnected */ + player->disconnected = TRUE; + /* If the player was in the middle of a trade, pop the state machine and inform others as necessary */ state = sm_current(player->sm); @@ -693,8 +697,7 @@ || state == (StateFunc) mode_select_pirated) robber_undo(player); - /* Mark the player as disconnected */ - player->disconnected = TRUE; + /* Inform the metaserver */ game->num_players--; meta_report_num_players(game->num_players); diff -Nru pioneers-15.5/server/server.c pioneers-15.6/server/server.c --- pioneers-15.5/server/server.c 2018-03-14 13:44:46.000000000 +0000 +++ pioneers-15.6/server/server.c 2020-05-13 11:23:51.000000000 +0000 @@ -93,6 +93,7 @@ params_free(game->params); net_service_free(game->service); game->service = NULL; + g_free(game->develop_deck); g_free(game); }