Packman Build Service PMBS

aMule.spec Changed

update.diff.xz Changed

@@ -1,130460 +0,0 @@
-diff --git a/docs/AUTHORS b/docs/AUTHORS
-index 200460f..0751c56 100644
---- a/docs/AUTHORS
-+++ b/docs/AUTHORS
-@@ -10,6 +10,7 @@ Current (aMule) author(s):
- | Developer(s):                                                                    |
- |    Johannes Krampf    aka wuischke          <wuischke@amule.org>                 |
- |    Martin Brieg       aka Stu Redman        <sturedman@amule.org>                |
-+|    Balla Marcell      aka ^marcell^         <marcell@amule.org>                  |
- |                                                                                  |
- | Web Administration:                                                              |
- |    Angel Vidal Veiga  aka Kry               <kry@amule.org>                      |
-@@ -29,7 +30,7 @@ Current (aMule) author(s):
- |    Leonid Froenchenko aka lfroen            <lfroen@gmail.com>                   |
- |    K. B.              aka deltaHF           <deltahf@amule.org>                  |
- |    George L.          aka croaker           <croaker@users.berlios.de>           |
--|    JT                 aka lemofan           <lemonfan@users.berlios.de>          |
-+|    JT                 aka lemonfan          <lemonfan@users.berlios.de>          |
- |    Luca Vagnozzi      aka shakraw           <shakraw@users.sourceforge.net>      |
- |    Nikolay Igotti     aka olonho            <nike@lyola.com>                     |
- |    Norbert Lataille   aka nonal             <Norbert.Lataille@m4x.org>           |
-diff --git a/docs/Changelog b/docs/Changelog
-index f0b7e2f..ef4dd59 100644
---- a/docs/Changelog
-+++ b/docs/Changelog
-@@ -27,6 +27,8 @@ Version 2.4.0 - The river knows.
- 		  for host when cross-compiling
- 		* Fix bug #1711: Kad Info tab should display my own user ID
- 		* Fix wrong sized images in the priscilla skin
-+		* Fix bug #1423: Add the possibility to not create sparse files
-+		* Fix bug #1743: crash when importing part files
- 
- 	iz0bbz:
- 		* Fix WinSock library version detection with MinGW-w64
-diff --git a/docs/README b/docs/README
-index 7c4deea..fc17499 100644
---- a/docs/README
-+++ b/docs/README
-@@ -90,7 +90,7 @@
-     The other options are pretty self-explanatory. If you don't know what it
-     does, don't touch it as a general rule. More information on getting started
-     can be found in the aMule wiki:
--      http://wiki.amule.org/index.php/Getting_Started
-+      http://wiki.amule.org/wiki/Getting_Started
- 
-     Don't forget to connect to a server, or you probably won't download too much.
- 
-@@ -144,7 +144,7 @@
-  Tranfers icons
- ----------------
-   To find descriptions of the various icons found inside aMule, take a look at
--  http://wiki.amule.org/index.php/Getting_Started#Icons_and_What_They_Signify
-+  http://wiki.amule.org/wiki/Getting_Started#Icons_and_What_They_Signify
- 
- 
-  License
-@@ -248,20 +248,18 @@
-   a note about how you fixed the problem.
- 
- 
-- IRC, Links and Contact
-+ Links and Contact
- -------------
--  IRC: Channel #aMule on FREENODE IRC Network (irc.freenode.net)
--
-   aMule homepage
-       http://www.amule.org
- 
-   aMule related links
--      http://wiki.amule.org/index.php/FAQ_eD2k-Kademlia
--      http://wiki.amule.org/index.php/aMule
--      http://wiki.amule.org/index.php/FAQ_aMule
--      http://wiki.amule.org/index.php/FAQ_utils
--      http://wiki.amule.org/index.php/Getting_Started
--      http://wiki.amule.org/index.php/aMule_problems
-+      http://wiki.amule.org/wiki/FAQ_eD2k-Kademlia
-+      http://wiki.amule.org/wiki/aMule
-+      http://wiki.amule.org/wiki/FAQ_aMule
-+      http://wiki.amule.org/wiki/FAQ_utils
-+      http://wiki.amule.org/wiki/Getting_Started
-+      http://wiki.amule.org/wiki/aMule_problems
- 
-   wxWidgets toolkit homepage
-       http://www.wxwidgets.org
-@@ -281,4 +279,4 @@
-   illegal activities.
- 
- 
---- Last modified Thu Sep 29 05:22:45 CEST 2011 --
-+-- Last modified Thu Apr 7 18:06:32 CEST 2016 --
-diff --git a/po/amule.pot b/po/amule.pot
-index b2cca23..d5b2d41 100644
---- a/po/amule.pot
-+++ b/po/amule.pot
-@@ -1,18 +1,17 @@
- # SOME DESCRIPTIVE TITLE.
- # Copyright (C) YEAR Free Software Foundation, Inc.
--# This file is distributed under the same license as the aMule package.
-+# This file is distributed under the same license as the PACKAGE package.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
- #, fuzzy
- msgid ""
- msgstr ""
--"Project-Id-Version: aMule VERSION\n"
-+"Project-Id-Version: aMule SVN\n"
- "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
--"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
--"Language: LL\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=CHARSET\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -44,102 +43,102 @@ msgid ""
- "lowid."
- msgstr ""
- 
--#: src/amule.cpp:229
-+#: src/amule.cpp:230
- msgid "Now, exiting main app..."
- msgstr ""
- 
--#: src/amule.cpp:248
-+#: src/amule.cpp:249
- #, c-format
- msgid "Terminating amuleweb instance with pid '%ld' ... "
- msgstr ""
- 
--#: src/amule.cpp:251
-+#: src/amule.cpp:252
- #, c-format
- msgid "Killing amuleweb instance with pid '%ld' ... "
- msgstr ""
- 
--#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
-+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
- msgid "Failed"
- msgstr ""
- 
--#: src/amule.cpp:259
-+#: src/amule.cpp:260
- msgid "aMule OnExit: Terminating core."
- msgstr ""
- 
--#: src/amule.cpp:330
-+#: src/amule.cpp:333
- msgid "aMule shutdown completed."
- msgstr ""
- 
--#: src/amule.cpp:334
-+#: src/amule.cpp:337
- msgid "Memory debug results for aMule exit:"
- msgstr ""
- 
--#: src/amule.cpp:433
-+#: src/amule.cpp:443
-+msgid ""
-+"Your locale has been changed to System Default due to a configuration "
-+"change. Sorry."
-+msgstr ""
-+
-+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
-+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-+#: src/ServerListCtrl.cpp:149
-+msgid "Info"
-+msgstr ""
-+
-+#: src/amule.cpp:449
- msgid ""
- "\n"
- "EC configuration"
- msgstr ""
- 
--#: src/amule.cpp:436
-+#: src/amule.cpp:452
- msgid "Password set and external connections enabled."
- msgstr ""
- 
--#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
- #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
- msgid "WARNING"
- msgstr ""
- 
--#: src/amule.cpp:493
--msgid ""
--"Your locale has been changed to System Default due to a configuration "
--"change. Sorry."
--msgstr ""
--
--#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
--#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
--#: src/ServerListCtrl.cpp:149
--msgid "Info"
--msgstr ""
--

aMule.tar.xz/BUILDING_MACOSX.txt Changed

aMule.tar.xz/autogen.sh Changed

@@ -26,9 +26,9 @@
 
 # Determine version of gettext.
 gettext_version=`gettext --version | head -n 1 | sed -e 's/[^0]*$0\.[0-9][^ ]*$.*/\1/'`
-confver=`cat configure.in | grep '^AM_GNU_GETTEXT_VERSION(' | sed -e 's/^AM_GNU_GETTEXT_VERSION($[^()]*$)/\1/p' | sed -e 's/^\[$.*$\]$/\1/' | sed -e 1q`
+confver=`cat configure.ac | grep '^AM_GNU_GETTEXT_VERSION(' | sed -e 's/^AM_GNU_GETTEXT_VERSION($[^()]*$)/\1/p' | sed -e 's/^\[$.*$\]$/\1/' | sed -e 1q`
 
-# Require version as specified in configure.in.
+# Require version as specified in configure.ac.
 if expr "$confver" \> "$gettext_version" >/dev/null; then
   gettext --version | head -n 1
   echo "Fatal error: gettext version "$confver" or higher is required."
@@ -60,9 +60,9 @@
 #        CONFIG_FILES=intl/Makefile CONFIG_HEADERS= /bin/sh ./config.status
 #    fi
 #   gettextize --intl -f --no-changelog
-#   echo "restoring Makefile.am and configure.in"
+#   echo "restoring Makefile.am and configure.ac"
 #   cp -f Makefile.am~ Makefile.am
-#   cp -f configure.in~ configure.in
+#   cp -f configure.ac~ configure.ac
 #fi
 
 echo "Running aclocal -I m4"

aMule.tar.xz/automake/dist-hook.am Changed

aMule.tar.xz/configure.ac Added

@@ -0,0 +1,597 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+#
+# This file is part of the aMule Project.
+#
+# Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+#
+# Any parts of this program derived from the xMule, lMule or eMule project,
+# or contributed by third-party developers are copyrighted by their
+# respective authors.
+#
+# 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
+#
+
+AC_INIT([aMule],[SVN],[admin@amule.org])
+AM_INIT_AUTOMAKE
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+
+AC_PREREQ(2.59)
+
+AC_CONFIG_SRCDIR([src/amule.cpp])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AM_MAINTAINER_MODE
+
+dnl Check host system.
+MULE_CHECK_SYSTEM
+
+dnl Checks for programs.
+dnl Workaround for these checks may alter CFLAGS and CXXFLAGS, especially if they were empty
+MULE_BACKUP([CFLAGS])
+MULE_BACKUP([CXXFLAGS])
+MULE_BACKUP([BUILD_CFLAGS])
+AC_PROG_CXX
+AC_PROG_CXXCPP
+AC_PROG_CC
+AC_PROG_CPP
+AS_IF([test "$cross_compiling" = yes], [AC_PROG_BUILD_CC], [BUILD_CC="$CC" ; BUILD_EXEEXT=$EXEEXT])
+MULE_RESTORE([CFLAGS])
+MULE_RESTORE([CXXFLAGS])
+MULE_RESTORE([BUILD_CFLAGS])
+AC_PROG_AWK
+AC_PROG_EGREP
+AC_PROG_MAKE_SET
+AC_PROG_LEX
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+AC_PROG_SED
+AC_PROG_YACC
+
+dnl Find the right ranlib, even when cross-compiling
+dnl And for some other tools for cross compilation
+AC_CHECK_TOOL(RANLIB, ranlib)
+AC_CHECK_TOOL(STRIP, strip)
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(LD, ld)
+
+dnl Selectable components
+MULE_ARG_ENABLE([monolithic],	[yes],	[disable building of the monolithic aMule app], [MONOLITHIC])
+MULE_ARG_ENABLE([amule-daemon],	[no],	[compile aMule daemon version], [AMULE_DAEMON])
+MULE_ARG_ENABLE([amulecmd],	[no],	[compile aMule command line client], [COMPILE_CMD])
+MULE_ARG_ENABLE([webserver],	[no],	[compile aMule WebServer], [WEB])
+MULE_ARG_ENABLE([amule-gui],	[no],	[compile aMule remote GUI], [AMULE_GUI])
+MULE_ARG_ENABLE([cas],		[no],	[compile C aMule Statistics], [CAS])
+MULE_ARG_ENABLE([wxcas],	[no],	[compile aMule GUI Statistics], [WXCAS])
+MULE_ARG_ENABLE([ed2k],		[yes],	[don't compile aMule ed2k links handler], [ED2K])
+MULE_ARG_ENABLE([alc],		[no],	[compile aMuleLinkCreator GUI version], [ALC])
+MULE_ARG_ENABLE([alcc],		[no],	[compile aMuleLinkCreator for console], [ALCC])
+MULE_ARG_ENABLE([xas],		[no],	[install xas XChat2 plugin], [XAS])
+MULE_ARG_ENABLE([fileview],	[no],	[compile aMule file viewer for console (EXPERIMENTAL)], [FILEVIEW])
+MULE_ARG_ENABLE([plasmamule],	[no],	[compile aMule plasma applet and engine])
+
+# Run all the tests with static linkage if we want a statically linked binary
+MULE_ARG_ENABLE([static], [no], [produce a statically linked executable])
+MULE_IF_ENABLED([static], [MULE_APPEND([LDFLAGS], [-static])])
+
+KDE_CONFIG_OPTIONS
+QT_CONFIG_OPTIONS
+
+# Default is yes, because they're most likely compatible.
+# However, this is only used when cross-compiling.
+AC_ARG_WITH(
+	[gnu-malloc],
+	[AS_HELP_STRING([--without-gnu-malloc],
+		[Don't assume that we use GNU libc compatible malloc/realloc when cross-compiling])],
+	[gnumalloc=$withval], [gnumalloc=yes])
+
+
+# Checking for libs before all other stuff to break
+# configure as soon as possible in case of a missing one
+# to avoid losing too much time
+
+# Check for gd
+MULE_IF_ENABLED([cas], [
+	MULE_CHECK_GDLIB([2.0.0], [
+		CAS_DEFS="-D__GD__"
+		MULE_PREPEND([GDLIB_LIBS], [-lgd])
+	], [CAS_DEFS=])
+	AS_IF([test -z "$CAS_DEFS"],
+		[MULE_WARNING(
+			[gd-lib >= 2.0.0, or a functional gd.h (from gd-devel) not found.
+			Please check that gdlib-config is in your default path, check out LD_LIBRARY_PATH or equivalent variable.
+			Or this might also be that your gdlib-config has other name.
+			Please try again with --with-gdlib-config=/usr/bin/gdlib-config (replace /usr/bin/gdlib-config with a valid path to your gdlib-config).
+			If you use compiled packages check if you have devel pack installed.
+			To download the latest version check http://www.boutell.com/gd for sources.])])
+])
+AC_SUBST([CAS_DEFS])dnl
+
+dnl Tests explicitly requiring C. They test features of the C compiler.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
+
+dnl Use C++ for all other tests, since we use C++ to actually compile the
+dnl sources.  There might be differences between the compilers, thus if
+dnl something works in C it doesn't automatically mean it also works in C++.
+dnl
+dnl The only exception is cas which is written in pure C.
+AC_LANG_PUSH([C++])
+
+
+# Check for zlib
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amulecmd, webserver, amule-gui],
+	[MULE_CHECK_ZLIB([1.1.4],, [AC_MSG_ERROR([zlib >= 1.1.4 is required for aMule])])])
+
+
+# Check for libpng
+MULE_IF_ENABLED([webserver],
+	[MULE_CHECK_LIBPNG([1.2.0], [AMULEWEB_DEFS="-DWITH_LIBPNG"], [
+		MULE_WARNING(
+			[libpng >= 1.2.0 not found.
+			amuleweb will be compiled but file download progress bar images will NOT be generated.])
+		])
+	])
+AC_SUBST([AMULEWEB_DEFS])dnl
+
+
+# Check for perl File::Copy
+AC_MSG_CHECKING([for File::Copy])
+AS_IF([perl -e "require File::Copy" 2>/dev/null], [AC_MSG_RESULT([ok])],
+	[MULE_WARNING(
+		[File::Copy perl module is required by the mldonkey_importer script.
+		If you want to use this script please install File::Copy from CPAN.])])
+
+
+# Check for GeoIP (required for IP2Country capability)
+MULE_IF_ENABLED_ANY([monolithic, amule-gui], [MULE_CHECK_GEOIP])
+
+
+# Check for wx
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, amulecmd, webserver, alc, alcc, wxcas, fileview],
+	[WX_CONFIG_OPTIONS
+	WX_STANDARD_OPTIONS([toolkit,wxshared,wxdebug,wxversion])
+	# Force using a static wxWidgets library if the executable is to be linked statically.
+	MULE_IF_ENABLED([static], [WX_SHARED=0])
+	# Force using a unicode build of the library
+	MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, amulecmd, webserver, fileview], [WX_UNICODE=1])
+	DEBUG=$WX_DEBUG
+	WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+	WX_CONFIG_CHECK([2.8.12], [wxWin=1],,, [$WXCONFIG_FLAGS])
+	AS_IF([test "$wxWin" != 1],
+		[AC_MSG_ERROR([
+		wxWidgets must be installed on your system but wx-config
+		script couldn't be found. Please check that wx-config is
+		in path or specified by --with-wx-config=path flag, the
+		directory where wxWidgets libraries are installed (returned
+		by 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+		equivalent variable and wxWidgets version is 2.8.12 or above.
+		])]
+	)
+	AS_IF([test "${WX_VERSION_FULL}" = "2.9.0"], [AC_MSG_ERROR([
+		This version of wxWidgets is known to not work with aMule.
+		Please upgrade to a newer version.]
+		)]
+	)
+	WX_DETECT_STANDARD_OPTION_VALUES
+
+	# We also need wxBase
+	WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs adv,core,net`
+	WXBASE_LIBS=`$WX_CONFIG_WITH_ARGS --libs net`
+	WXBASE_CPPFLAGS="$WX_CPPFLAGS -DwxUSE_GUI=0"
+
+	MULERCFLAGS=`$WX_CONFIG_WITH_ARGS --cflags | $AWK ['{ for (i = 1; i <= NF; i++) if (index($i, "-I") != 1 && index($i, "-D") != 1) $i = ""; print }']`
+])
+AC_SUBST([WXBASE_LIBS])dnl

aMule.tar.xz/configure.in Deleted

@@ -1,597 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-#
-# This file is part of the aMule Project.
-#
-# Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
-#
-# Any parts of this program derived from the xMule, lMule or eMule project,
-# or contributed by third-party developers are copyrighted by their
-# respective authors.
-#
-# 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
-#
-
-AC_INIT([aMule],[SVN],[admin@amule.org])
-AM_INIT_AUTOMAKE
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
-
-AC_PREREQ(2.59)
-
-AC_CONFIG_SRCDIR([src/amule.cpp])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AM_MAINTAINER_MODE
-
-dnl Check host system.
-MULE_CHECK_SYSTEM
-
-dnl Checks for programs.
-dnl Workaround for these checks may alter CFLAGS and CXXFLAGS, especially if they were empty
-MULE_BACKUP([CFLAGS])
-MULE_BACKUP([CXXFLAGS])
-MULE_BACKUP([BUILD_CFLAGS])
-AC_PROG_CXX
-AC_PROG_CXXCPP
-AC_PROG_CC
-AC_PROG_CPP
-AS_IF([test "$cross_compiling" = yes], [AC_PROG_BUILD_CC], [BUILD_CC="$CC" ; BUILD_EXEEXT=$EXEEXT])
-MULE_RESTORE([CFLAGS])
-MULE_RESTORE([CXXFLAGS])
-MULE_RESTORE([BUILD_CFLAGS])
-AC_PROG_AWK
-AC_PROG_EGREP
-AC_PROG_MAKE_SET
-AC_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_SED
-AC_PROG_YACC
-
-dnl Find the right ranlib, even when cross-compiling
-dnl And for some other tools for cross compilation
-AC_CHECK_TOOL(RANLIB, ranlib)
-AC_CHECK_TOOL(STRIP, strip)
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(LD, ld)
-
-dnl Selectable components
-MULE_ARG_ENABLE([monolithic],	[yes],	[disable building of the monolithic aMule app], [MONOLITHIC])
-MULE_ARG_ENABLE([amule-daemon],	[no],	[compile aMule daemon version], [AMULE_DAEMON])
-MULE_ARG_ENABLE([amulecmd],	[no],	[compile aMule command line client], [COMPILE_CMD])
-MULE_ARG_ENABLE([webserver],	[no],	[compile aMule WebServer], [WEB])
-MULE_ARG_ENABLE([amule-gui],	[no],	[compile aMule remote GUI], [AMULE_GUI])
-MULE_ARG_ENABLE([cas],		[no],	[compile C aMule Statistics], [CAS])
-MULE_ARG_ENABLE([wxcas],	[no],	[compile aMule GUI Statistics], [WXCAS])
-MULE_ARG_ENABLE([ed2k],		[yes],	[don't compile aMule ed2k links handler], [ED2K])
-MULE_ARG_ENABLE([alc],		[no],	[compile aMuleLinkCreator GUI version], [ALC])
-MULE_ARG_ENABLE([alcc],		[no],	[compile aMuleLinkCreator for console], [ALCC])
-MULE_ARG_ENABLE([xas],		[no],	[install xas XChat2 plugin], [XAS])
-MULE_ARG_ENABLE([fileview],	[no],	[compile aMule file viewer for console (EXPERIMENTAL)], [FILEVIEW])
-MULE_ARG_ENABLE([plasmamule],	[no],	[compile aMule plasma applet and engine])
-
-# Run all the tests with static linkage if we want a statically linked binary
-MULE_ARG_ENABLE([static], [no], [produce a statically linked executable])
-MULE_IF_ENABLED([static], [MULE_APPEND([LDFLAGS], [-static])])
-
-KDE_CONFIG_OPTIONS
-QT_CONFIG_OPTIONS
-
-# Default is yes, because they're most likely compatible.
-# However, this is only used when cross-compiling.
-AC_ARG_WITH(
-	[gnu-malloc],
-	[AS_HELP_STRING([--without-gnu-malloc],
-		[Don't assume that we use GNU libc compatible malloc/realloc when cross-compiling])],
-	[gnumalloc=$withval], [gnumalloc=yes])
-
-
-# Checking for libs before all other stuff to break
-# configure as soon as possible in case of a missing one
-# to avoid losing too much time
-
-# Check for gd
-MULE_IF_ENABLED([cas], [
-	MULE_CHECK_GDLIB([2.0.0], [
-		CAS_DEFS="-D__GD__"
-		MULE_PREPEND([GDLIB_LIBS], [-lgd])
-	], [CAS_DEFS=])
-	AS_IF([test -z "$CAS_DEFS"],
-		[MULE_WARNING(
-			[gd-lib >= 2.0.0, or a functional gd.h (from gd-devel) not found.
-			Please check that gdlib-config is in your default path, check out LD_LIBRARY_PATH or equivalent variable.
-			Or this might also be that your gdlib-config has other name.
-			Please try again with --with-gdlib-config=/usr/bin/gdlib-config (replace /usr/bin/gdlib-config with a valid path to your gdlib-config).
-			If you use compiled packages check if you have devel pack installed.
-			To download the latest version check http://www.boutell.com/gd for sources.])])
-])
-AC_SUBST([CAS_DEFS])dnl
-
-dnl Tests explicitly requiring C. They test features of the C compiler.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_C_VOLATILE
-
-dnl Use C++ for all other tests, since we use C++ to actually compile the
-dnl sources.  There might be differences between the compilers, thus if
-dnl something works in C it doesn't automatically mean it also works in C++.
-dnl
-dnl The only exception is cas which is written in pure C.
-AC_LANG_PUSH([C++])
-
-
-# Check for zlib
-MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amulecmd, webserver, amule-gui],
-	[MULE_CHECK_ZLIB([1.1.4],, [AC_MSG_ERROR([zlib >= 1.1.4 is required for aMule])])])
-
-
-# Check for libpng
-MULE_IF_ENABLED([webserver],
-	[MULE_CHECK_LIBPNG([1.2.0], [AMULEWEB_DEFS="-DWITH_LIBPNG"], [
-		MULE_WARNING(
-			[libpng >= 1.2.0 not found.
-			amuleweb will be compiled but file download progress bar images will NOT be generated.])
-		])
-	])
-AC_SUBST([AMULEWEB_DEFS])dnl
-
-
-# Check for perl File::Copy
-AC_MSG_CHECKING([for File::Copy])
-AS_IF([perl -e "require File::Copy" 2>/dev/null], [AC_MSG_RESULT([ok])],
-	[MULE_WARNING(
-		[File::Copy perl module is required by the mldonkey_importer script.
-		If you want to use this script please install File::Copy from CPAN.])])
-
-
-# Check for GeoIP (required for IP2Country capability)
-MULE_IF_ENABLED_ANY([monolithic, amule-gui], [MULE_CHECK_GEOIP])
-
-
-# Check for wx
-MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, amulecmd, webserver, alc, alcc, wxcas, fileview],
-	[WX_CONFIG_OPTIONS
-	WX_STANDARD_OPTIONS([toolkit,wxshared,wxdebug,wxversion])
-	# Force using a static wxWidgets library if the executable is to be linked statically.
-	MULE_IF_ENABLED([static], [WX_SHARED=0])
-	# Force using a unicode build of the library
-	MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, amulecmd, webserver, fileview], [WX_UNICODE=1])
-	DEBUG=$WX_DEBUG
-	WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
-	WX_CONFIG_CHECK([2.8.12], [wxWin=1],,, [$WXCONFIG_FLAGS])
-	AS_IF([test "$wxWin" != 1],
-		[AC_MSG_ERROR([
-		wxWidgets must be installed on your system but wx-config
-		script couldn't be found. Please check that wx-config is
-		in path or specified by --with-wx-config=path flag, the
-		directory where wxWidgets libraries are installed (returned
-		by 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-		equivalent variable and wxWidgets version is 2.8.12 or above.
-		])]
-	)
-	AS_IF([test "${WX_VERSION_FULL}" = "2.9.0"], [AC_MSG_ERROR([
-		This version of wxWidgets is known to not work with aMule.
-		Please upgrade to a newer version.]
-		)]
-	)
-	WX_DETECT_STANDARD_OPTION_VALUES
-
-	# We also need wxBase
-	WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs adv,core,net`
-	WXBASE_LIBS=`$WX_CONFIG_WITH_ARGS --libs net`
-	WXBASE_CPPFLAGS="$WX_CPPFLAGS -DwxUSE_GUI=0"
-
-	MULERCFLAGS=`$WX_CONFIG_WITH_ARGS --cflags | $AWK ['{ for (i = 1; i <= NF; i++) if (index($i, "-I") != 1 && index($i, "-D") != 1) $i = ""; print }']`
-])
-AC_SUBST([WXBASE_LIBS])dnl

aMule.tar.xz/docs/AUTHORS Changed

@@ -10,6 +10,7 @@
 | Developer(s):                                                                    |
 |    Johannes Krampf    aka wuischke          <wuischke@amule.org>                 |
 |    Martin Brieg       aka Stu Redman        <sturedman@amule.org>                |
+|    Balla Marcell      aka ^marcell^         <marcell@amule.org>                  |
 |                                                                                  |
 | Web Administration:                                                              |
 |    Angel Vidal Veiga  aka Kry               <kry@amule.org>                      |
@@ -29,7 +30,7 @@
 |    Leonid Froenchenko aka lfroen            <lfroen@gmail.com>                   |
 |    K. B.              aka deltaHF           <deltahf@amule.org>                  |
 |    George L.          aka croaker           <croaker@users.berlios.de>           |
-|    JT                 aka lemofan           <lemonfan@users.berlios.de>          |
+|    JT                 aka lemonfan          <lemonfan@users.berlios.de>          |
 |    Luca Vagnozzi      aka shakraw           <shakraw@users.sourceforge.net>      |
 |    Nikolay Igotti     aka olonho            <nike@lyola.com>                     |
 |    Norbert Lataille   aka nonal             <Norbert.Lataille@m4x.org>           |

aMule.tar.xz/docs/Changelog Changed

@@ -2,6 +2,15 @@
 ----------
 201?-??-??
 
+	GonoszTopi:
+		* Fix restoring toolbar orientation on 'Cancel'
+
+--------------------------------------------------------------------------------
+
+Version 2.3.2 - The "don't close tabs" version.
+----------
+2016-09-16
+
 	circulosmeos:
 		* amuleweb cookies read behind a "lowercase" proxy (http/2 compliant)
 
@@ -27,6 +36,12 @@
 		  for host when cross-compiling
 		* Fix bug #1711: Kad Info tab should display my own user ID
 		* Fix wrong sized images in the priscilla skin
+		* Fix bug #1423: Add the possibility to not create sparse files
+		* Fix bug #1743: crash when importing part files
+		* Review assertions in the eD2k and Kademlia code and remove
+		  those that could be triggered by a malformed incoming packet
+		* Fix a possible uninitialized variable access and a definite
+		  memory leak in the UPnP code
 
 	iz0bbz:
 		* Fix WinSock library version detection with MinGW-w64
@@ -40,6 +55,9 @@
 		* Compilation fix on Linux Slackware 64bit and MacOS 10.9.4
 		* Fix configure on Mac
 
+	sc0w:
+		* Add ability to use middle-click to close search tabs
+
 	Stu Redman:
 		* Display hashing progress in progress bars
 		* Assertion from background thread now prints a message and not just closes the app
@@ -60,7 +78,7 @@
 		* Fixed ASIO compilation with libcxx
 
 	Tianming Xie:
-		* Fix for debian bug #795061: There is nor rule to generate Scanner.h
+		* Fix for debian bug #795061: There is no rule to generate Scanner.h
 
 --------------------------------------------------------------------------------

aMule.tar.xz/docs/README Changed

@@ -90,7 +90,7 @@
     The other options are pretty self-explanatory. If you don't know what it
     does, don't touch it as a general rule. More information on getting started
     can be found in the aMule wiki:
-      http://wiki.amule.org/index.php/Getting_Started
+      http://wiki.amule.org/wiki/Getting_Started
 
     Don't forget to connect to a server, or you probably won't download too much.
 
@@ -144,7 +144,7 @@
  Tranfers icons
 ----------------
   To find descriptions of the various icons found inside aMule, take a look at
-  http://wiki.amule.org/index.php/Getting_Started#Icons_and_What_They_Signify
+  http://wiki.amule.org/wiki/Getting_Started#Icons_and_What_They_Signify
 
 
  License
@@ -248,20 +248,18 @@
   a note about how you fixed the problem.
 
 
- IRC, Links and Contact
+ Links and Contact
 -------------
-  IRC: Channel #aMule on FREENODE IRC Network (irc.freenode.net)
-
   aMule homepage
       http://www.amule.org
 
   aMule related links
-      http://wiki.amule.org/index.php/FAQ_eD2k-Kademlia
-      http://wiki.amule.org/index.php/aMule
-      http://wiki.amule.org/index.php/FAQ_aMule
-      http://wiki.amule.org/index.php/FAQ_utils
-      http://wiki.amule.org/index.php/Getting_Started
-      http://wiki.amule.org/index.php/aMule_problems
+      http://wiki.amule.org/wiki/FAQ_eD2k-Kademlia
+      http://wiki.amule.org/wiki/aMule
+      http://wiki.amule.org/wiki/FAQ_aMule
+      http://wiki.amule.org/wiki/FAQ_utils
+      http://wiki.amule.org/wiki/Getting_Started
+      http://wiki.amule.org/wiki/aMule_problems
 
   wxWidgets toolkit homepage
       http://www.wxwidgets.org
@@ -281,4 +279,4 @@
   illegal activities.
 
 
--- Last modified Thu Sep 29 05:22:45 CEST 2011 --
+-- Last modified Thu Apr 7 18:06:32 CEST 2016 --

aMule.tar.xz/docs/README.Asio.txt Changed

@@ -8,7 +8,7 @@
 
 The goal is to have an aMule which can be configured to use either wx Sockets
 or ASIO sockets for all major tasks (this may exclude things like http download).
-And with ASIO sockets it should perform better at least in some aspects 
+And with ASIO sockets it should perform better at least in some aspects
 (stability, speed, CPU, memory) for this endeavour to make sense.
 
 There are no plans to "boostify" aMule. Boost is encapsulated in the implementation
@@ -31,7 +31,7 @@
 
 Compilation:
 
-Get current boost lib from www.boost.org . Extract it to your favorite 
+Get current boost lib from www.boost.org . Extract it to your favorite
 place (like ~/amule/boost_1_49_0).
 Boost.Asio is header-only. It requires Boost.System for its error codes,
 but we include the single .cpp directly, so we don't need to build
@@ -42,5 +42,5 @@
 or
   ./configure --with-boost=/path/to/boost/sources
 
-Important: aMule prints "Asio thread started" in log and console on startup. 
+Important: aMule prints "Asio thread started" in log and console on startup.
 If it doesn't you have probably configured it to use wx sockets!

aMule.tar.xz/docs/Releases.dia Changed

aMule.tar.xz/docs/man/amule.1 Changed

aMule.tar.xz/docs/man/amule.de.1 Changed

aMule.tar.xz/docs/man/amule.es.1 Changed

aMule.tar.xz/docs/man/amule.fr.1 Changed

aMule.tar.xz/docs/man/amule.hu.1 Changed

aMule.tar.xz/docs/man/amule.it.1 Changed

aMule.tar.xz/docs/man/amule.ro.1 Changed

aMule.tar.xz/docs/man/amule.ru.1 Changed

aMule.tar.xz/docs/man/amule.tr.1 Changed

aMule.tar.xz/docs/man/amule.zh_TW.1 Changed

aMule.tar.xz/docs/man/amulecmd.1 Changed

aMule.tar.xz/docs/man/amulecmd.de.1 Changed

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH AMULECMD 1 "November 2011" "aMuleCmd v2.3.1" "aMule Hilfsprogramme"
+.TH AMULECMD 1 "September 2016" "aMuleCmd v2.3.2" "aMule Hilfsprogramme"
 .als B_untranslated B
 .als RB_untranslated RB
 .als SS_untranslated SS
@@ -99,10 +99,11 @@
 Die Verbindung wird zu allen Netzwerken aufgebaut, die in den Einstellungen
 aktiviert wurden.
 
-With the optional parameter you can specify which network to connect
-to. Giving a server address in the form of IP:Port (where IP is either a
-dotted decimal IPv4 address or a resolvable DNS name) aMule will connect to
-that server only.
+Mit dem optionalen Parameter kannst du das Netzwerk angeben, zu welchem eine
+Verbindung aufgebaut werden soll. Wenn du eine Server\-Adresse als IP:Port
+angibst (wobei IP entweder eine durch punktierte dezimale IPv4 Adresse oder
+ein auflösbarer DNS Name ist), so wird aMule sich nur zu diesem Server
+verbinden.
 .SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
 Trennt die Verbindung zu allen Netzwerken mit denen du verbunden bist, oder
 nur zu dem, welches angegeben wurde.

aMule.tar.xz/docs/man/amulecmd.es.1 Changed

aMule.tar.xz/docs/man/amulecmd.fr.1 Changed

aMule.tar.xz/docs/man/amulecmd.hu.1 Changed

aMule.tar.xz/docs/man/amulecmd.it.1 Changed

aMule.tar.xz/docs/man/amulecmd.ro.1 Changed

aMule.tar.xz/docs/man/amulecmd.ru.1 Changed

aMule.tar.xz/docs/man/amulecmd.tr.1 Changed

aMule.tar.xz/docs/man/amulecmd.zh_TW.1 Changed

aMule.tar.xz/docs/man/amuled.1 Changed

aMule.tar.xz/docs/man/amuled.de.1 Changed

aMule.tar.xz/docs/man/amuled.es.1 Changed

aMule.tar.xz/docs/man/amuled.fr.1 Changed

aMule.tar.xz/docs/man/amuled.hu.1 Changed

aMule.tar.xz/docs/man/amuled.it.1 Changed

aMule.tar.xz/docs/man/amuled.ro.1 Changed

aMule.tar.xz/docs/man/amuled.ru.1 Changed

aMule.tar.xz/docs/man/amuled.tr.1 Changed

aMule.tar.xz/docs/man/amuled.zh_TW.1 Changed

aMule.tar.xz/docs/man/amulegui.1 Changed

aMule.tar.xz/docs/man/amulegui.de.1 Changed

aMule.tar.xz/docs/man/amulegui.es.1 Changed

aMule.tar.xz/docs/man/amulegui.fr.1 Changed

aMule.tar.xz/docs/man/amulegui.hu.1 Changed

aMule.tar.xz/docs/man/amulegui.it.1 Changed

aMule.tar.xz/docs/man/amulegui.ro.1 Changed

aMule.tar.xz/docs/man/amulegui.ru.1 Changed

aMule.tar.xz/docs/man/amulegui.tr.1 Changed

aMule.tar.xz/docs/man/amulegui.zh_TW.1 Changed

aMule.tar.xz/docs/man/amuleweb.1 Changed

aMule.tar.xz/docs/man/amuleweb.de.1 Changed

aMule.tar.xz/docs/man/amuleweb.es.1 Changed

aMule.tar.xz/docs/man/amuleweb.fr.1 Changed

aMule.tar.xz/docs/man/amuleweb.hu.1 Changed

aMule.tar.xz/docs/man/amuleweb.it.1 Changed

aMule.tar.xz/docs/man/amuleweb.ro.1 Changed

aMule.tar.xz/docs/man/amuleweb.ru.1 Changed

aMule.tar.xz/docs/man/amuleweb.tr.1 Changed

aMule.tar.xz/docs/man/amuleweb.zh_TW.1 Changed

aMule.tar.xz/docs/man/ed2k.1 Changed

aMule.tar.xz/docs/man/ed2k.de.1 Changed

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH ED2K 1 "November 2011" "aMule eD2k Verweis parser v1.5.1" "aMule Hilfsprogramme"
+.TH ED2K 1 "September 2016" "aMule eD2k Verweis parser v1.5.1" "aMule Hilfsprogramme"
 .als B_untranslated B
 .als RB_untranslated RB
 .SH NAME
@@ -13,7 +13,7 @@
 [\fB\-c\fP \fI<Pfad>\fP] [\fB\-t\fP \fI<Num>\fP]
 .RB_untranslated [ \-e ]
 .RB_untranslated [ \-l ]
-\fI<eD2k\-link>\fP
+\fI<eD2k\-Verweis>\fP
 
 .B_untranslated ed2k
 .RB_untranslated [ \-h ]
@@ -21,8 +21,9 @@
 .B_untranslated ed2k
 .RB_untranslated [ \-v ]
 .SH BESCHREIBUNG
-Sends the given \fI<eD2k\-link>\fP to aMule, i.e. writes it to the file
-~/.aMule/ED2KLinks, which will be checked by aMule every second for links.
+Sendet den übergebenen \fI<eD2k\-Verweis>\fP an aMule, d.h. schreibt ihn
+in die Datei ~/.aMule/ED2KLinks, welche von aMule jede Sekunde auf neue
+Verweise geprüft wird.
 .TP 
 \fB[ \-c\fP \fI<Pfad>\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP \fB]\fP
 Liest die Konfiguration <Pfad> anstelle des Home.
@@ -44,7 +45,7 @@
 .B_untranslated [ \-v\fR, \fB\-\-version ]\fR
 Zeigt die derzeitige Versionsnummer an.
 .TP 
-\fB[ eD2k\-link ]\fP
+\fB[ eD2k\-Verweis ]\fP
 Fügt einen eD2k\-Verweis zur Downloadliste hinzu.
 .PP
 Der eD2k\-Verweis darf enthalten:

aMule.tar.xz/docs/man/ed2k.es.1 Changed

aMule.tar.xz/docs/man/ed2k.fr.1 Changed

aMule.tar.xz/docs/man/ed2k.hu.1 Changed

aMule.tar.xz/docs/man/ed2k.it.1 Changed

aMule.tar.xz/docs/man/ed2k.ro.1 Changed

aMule.tar.xz/docs/man/ed2k.ru.1 Changed

aMule.tar.xz/docs/man/ed2k.tr.1 Changed

aMule.tar.xz/docs/man/ed2k.zh_TW.1 Changed

aMule.tar.xz/docs/man/po/manpages-de.po Changed

@@ -4,13 +4,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-de\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
-"PO-Revision-Date: 2010-01-29 23:02+0100\n"
-"Last-Translator: Balla Marcell <bmk@chello.hu>\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
+"PO-Revision-Date: 2016-09-14 21:00+0100\n"
+"Last-Translator: Balla Marcell <marcell.balla@gmx.at>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
@@ -27,16 +28,15 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr ""
+msgid "September 2016"
+msgstr "September 2016"
 
 # type: TH
 #. type: TH
 #: amule.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule v2.3.0"
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.0"
+#, no-wrap
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 # type: TH
 #. type: TH
@@ -85,10 +85,8 @@
 
 #. type: Plain text
 #: amule.1:17 amuled.1:19
-#, fuzzy
-#| msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-Link>]"
 msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-link>]"
-msgstr "[B<-t> I<E<lt>numE<gt>>] [B<eD2k-Verweis>]"
+msgstr "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-Verweis>]"
 
 # type: SH
 #. type: SH
@@ -200,10 +198,9 @@
 
 #. type: TP
 #: amule.1:55 amuled.1:63 ed2k.1:39
-#, fuzzy, no-wrap
-#| msgid "B<[ eD2k-Link ]>"
+#, no-wrap
 msgid "B<[ eD2k-link ]>"
-msgstr "B<[ eD2k-Link ]>"
+msgstr "B<[ eD2k-Verweis ]>"
 
 # type: Plain text
 #. type: Plain text
@@ -387,10 +384,9 @@
 # type: TH
 #. type: TH
 #: amulecmd.1:1
-#, fuzzy, no-wrap
-#| msgid "aMuleCmd v2.3.0"
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.0"
+#, no-wrap
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 # type: TH
 #. type: TH
@@ -660,6 +656,11 @@
 "decimal IPv4 address or a resolvable DNS name) aMule will connect to that "
 "server only."
 msgstr ""
+"Mit dem optionalen Parameter kannst du das Netzwerk angeben, zu welchem eine "
+"Verbindung aufgebaut werden soll. Wenn du eine Server-Adresse als IP:Port "
+"angibst (wobei IP entweder eine durch punktierte dezimale IPv4 Adresse oder "
+"ein auflösbarer DNS Name ist), so wird aMule sich nur zu diesem Server "
+"verbinden."
 
 # type: Plain text
 #. type: Plain text
@@ -1157,10 +1158,9 @@
 # type: TH
 #. type: TH
 #: amuled.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule Daemon v2.3.0"
-msgid "aMule Daemon v2.3.1"
-msgstr "aMule Dämon v2.3.0"
+#, no-wrap
+msgid "aMule Daemon v2.3.2"
+msgstr "aMule Dämon v2.3.2"
 
 # type: TH
 #. type: TH
@@ -1225,10 +1225,9 @@
 # type: TH
 #. type: TH
 #: amulegui.1:1
-#, fuzzy, no-wrap
-#| msgid "aMuleGUI v2.3.0"
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.0"
+#, no-wrap
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 # type: TH
 #. type: TH
@@ -1292,10 +1291,9 @@
 # type: TH
 #. type: TH
 #: amuleweb.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule webserver v2.3.0"
-msgid "aMule webserver v2.3.1"
-msgstr "aMule Webserver v2.3.0"
+#, no-wrap
+msgid "aMule webserver v2.3.2"
+msgstr "aMule Webserver v2.3.2"
 
 # type: Plain text
 #. type: Plain text
@@ -1358,16 +1356,12 @@
 # type: Plain text
 #. type: Plain text
 #: amuleweb.1:77
-#, fuzzy
-#| msgid ""
-#| "Loads the template named I<E<lt>nameE<gt>>. See also the section B<SKIN "
-#| "SUPPORT.>"
 msgid ""
 "Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
 "for details."
 msgstr ""
 "Lädt die mit I<E<lt>NameE<gt>> spezifizierte Vorlage. Siehe auch Abschnitt "
-"B<SKIN UNTERSTÜTZUNG>"
+"B<SKIN UNTERSTÜTZUNG> für Details."
 
 # type: TP
 #. type: TP
@@ -1379,16 +1373,12 @@
 # type: Plain text
 #. type: Plain text
 #: amuleweb.1:80
-#, fuzzy
-#| msgid ""
-#| "Webserver's HTTP port. This is the port you can point your browser to "
-#| "(default: I<4711>)."
 msgid ""
 "Webserver's HTTP port. This is the port you must point your browser to "
 "(default: I<4711>)."
 msgstr ""
-"HTTP Port des Webservers. Der Port der mit dem Browser erreichbar sein soll "
-"(Standard: I<4711>)"
+"HTTP Port des Webservers. Der Port der im Browser angegeben werden muss "
+"(Standard: I<4711>)."
 
 #. type: Plain text
 #: amuleweb.1:84
@@ -1613,26 +1603,19 @@
 # type: TP
 #. type: Plain text
 #: ed2k.1:13
-#, fuzzy
-#| msgid "I<E<lt>eD2k-LinkE<gt>>"
 msgid "I<E<lt>eD2k-linkE<gt>>"
 msgstr "I<E<lt>eD2k-VerweisE<gt>>"
 
 # type: Plain text
 #. type: Plain text
 #: ed2k.1:21
-#, fuzzy
-#| msgid ""
-#| "Sends the given I<E<lt>eD2k_linkE<gt>> to aMule, i.e. writes it to the "
-#| "file ~/.aMule/ED2KLinks, which will be checked by aMule every second for "
-#| "links."
 msgid ""
 "Sends the given I<E<lt>eD2k-linkE<gt>> to aMule, i.e. writes it to the file "
 "~/.aMule/ED2KLinks, which will be checked by aMule every second for links."
 msgstr ""
-"Sendet den übergebenen I<E<lt>eD2k_VerweisE<gt>> an aMule, d.h. schreibt ihn "
-"in Datei ~/.aMule/ED2KLinks, welche von aMule sekündlich auf neue Einträge "
-"geprüft wird."
+"Sendet den übergebenen I<E<lt>eD2k-VerweisE<gt>> an aMule, d.h. schreibt ihn "
+"in die Datei ~/.aMule/ED2KLinks, welche von aMule jede Sekunde auf neue "
+"Verweise geprüft wird."
 
 #. type: Plain text
 #: ed2k.1:30

aMule.tar.xz/docs/man/po/manpages-es.po Changed

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2010-03-21 19:37+0100\n"
 "Last-Translator: Mad-Soft <mad.soft@gmail.com>\n"
 "Language-Team: Spanish <es_ES@li.org>\n"
@@ -31,15 +31,14 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr ""
+msgid "September 2016"
+msgstr "Septiembre 2016"
 
 #. type: TH
 #: amule.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule v2.3.0"
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.0"
+#, no-wrap
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 #. type: TH
 #: amule.1:1
@@ -351,10 +350,9 @@
 
 #. type: TH
 #: amulecmd.1:1
-#, fuzzy, no-wrap
-#| msgid "aMuleCmd v2.3.0"
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.0"
+#, no-wrap
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 #. type: TH
 #: amulecmd.1:1 amuleweb.1:1 ed2k.1:1
@@ -991,10 +989,9 @@
 
 #. type: TH
 #: amuled.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule Daemon v2.3.0"
-msgid "aMule Daemon v2.3.1"
-msgstr "Demonio aMule v2.3.0"
+#, no-wrap
+msgid "aMule Daemon v2.3.2"
+msgstr "Demonio aMule v2.3.2"
 
 #. type: TH
 #: amuled.1:1
@@ -1048,10 +1045,9 @@
 
 #. type: TH
 #: amulegui.1:1
-#, fuzzy, no-wrap
-#| msgid "aMuleGUI v2.3.0"
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.0"
+#, no-wrap
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 #. type: TH
 #: amulegui.1:1
@@ -1103,10 +1099,9 @@
 
 #. type: TH
 #: amuleweb.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule webserver v2.3.0"
-msgid "aMule webserver v2.3.1"
-msgstr "Servidor web aMule v2.3.0"
+#, no-wrap
+msgid "aMule webserver v2.3.2"
+msgstr "Servidor web aMule v2.3.2"
 
 #. type: Plain text
 #: amuleweb.1:6
@@ -1487,23 +1482,11 @@
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1:18
-#, fuzzy
-#| msgid ""
-#| "B<xas> is a plugin for xchat. For loading see your xchat documentation. "
-#| "After loading type /xas and it will send statistics to the channel you "
-#| "are in. These are taken from your Online Signature file.  For this to "
-#| "work, you must enable the \"Online Signature\" option in aMules "
-#| "preferences."
 msgid ""
 "B<cas> is a program for displaying the contents of your aMule online "
 "signature file to console (in a human readable form). For this to work, you "
 "must enable the \"Online Signature\" option in aMule's preferences."
 msgstr ""
-"B<xas> es un plugin para xchat. Para cargar ver la documentación de xchat. "
-"Después de cargar teclea /xas y esto enviará las estadísticas al canal en el "
-"que tú estás. Se obtienen de tu archivo de firma Online. Para que esto "
-"funcione, debes habilitar la opción \"Firma Online\" en las opciones de "
-"aMule."
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1:22
@@ -1565,23 +1548,11 @@
 
 #. type: Plain text
 #: ../../src/utils/wxCas/docs/wxcas.1:11
-#, fuzzy
-#| msgid ""
-#| "B<xas> is a plugin for xchat. For loading see your xchat documentation. "
-#| "After loading type /xas and it will send statistics to the channel you "
-#| "are in. These are taken from your Online Signature file.  For this to "
-#| "work, you must enable the \"Online Signature\" option in aMules "
-#| "preferences."
 msgid ""
 "B<wxcas> is a program for displaying the contents of your online signature "
 "file in a nice wx Window on your Desktop.  For this to work, you must enable "
 "the \"Online Signature\" option in aMule's preferences."
 msgstr ""
-"B<xas> es un plugin para xchat. Para cargar ver la documentación de xchat. "
-"Después de cargar teclea /xas y esto enviará las estadísticas al canal en el "
-"que tú estás. Se obtienen de tu archivo de firma Online. Para que esto "
-"funcione, debes habilitar la opción \"Firma Online\" en las opciones de "
-"aMule."
 
 #. type: Plain text
 #: ../../src/utils/wxCas/docs/wxcas.1:14
@@ -1636,7 +1607,7 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""

aMule.tar.xz/docs/man/po/manpages-fr.po Changed

@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2011-11-09 18:43+0100\n"
 "Last-Translator: Dylan Aïssi <bob.dybian@gmail.com>\n"
 "Language-Team: Français\n"
@@ -30,14 +30,14 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr "Novembre 2011"
+msgid "September 2016"
+msgstr "Septembre 2016"
 
 #. type: TH
 #: amule.1:1
 #, no-wrap
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.1"
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 #. type: TH
 #: amule.1:1
@@ -350,8 +350,8 @@
 #. type: TH
 #: amulecmd.1:1
 #, no-wrap
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.1"
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 #. type: TH
 #: amulecmd.1:1 amuleweb.1:1 ed2k.1:1
@@ -1038,8 +1038,8 @@
 #. type: TH
 #: amuled.1:1
 #, no-wrap
-msgid "aMule Daemon v2.3.1"
-msgstr "aMule Daemon v2.3.1"
+msgid "aMule Daemon v2.3.2"
+msgstr "aMule Daemon v2.3.2"
 
 #. type: TH
 #: amuled.1:1
@@ -1096,8 +1096,8 @@
 #. type: TH
 #: amulegui.1:1
 #, no-wrap
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.1"
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 #. type: TH
 #: amulegui.1:1
@@ -1158,8 +1158,8 @@
 #. type: TH
 #: amuleweb.1:1
 #, no-wrap
-msgid "aMule webserver v2.3.1"
-msgstr "aMule webserver v2.3.1"
+msgid "aMule webserver v2.3.2"
+msgstr "aMule webserver v2.3.2"
 
 #. type: Plain text
 #: amuleweb.1:6
@@ -1724,11 +1724,11 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""
 "Pour l'activer à chaque démarrage de xchat vous devez juste lancer le script "
-"autstart-xas (dans /usr/bin si vous l'avez installé avec with --prefix=/usr)."
+"autostart-xas (dans /usr/bin si vous l'avez installé avec with --prefix=/usr)."
 
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:16

aMule.tar.xz/docs/man/po/manpages-hu.po Changed

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po 4a\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2011-11-09 01:14+0100\n"
 "Last-Translator: Dévai Tamás <gonosztopi@amule.org>\n"
 "Language-Team: none\n"
@@ -27,14 +27,14 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr "2011. november"
+msgid "September 2016"
+msgstr "2016. szeptember"
 
 #. type: TH
 #: amule.1:1
 #, no-wrap
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.1"
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 #. type: TH
 #: amule.1:1
@@ -346,8 +346,8 @@
 #. type: TH
 #: amulecmd.1:1
 #, no-wrap
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.1"
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 #. type: TH
 #: amulecmd.1:1 amuleweb.1:1 ed2k.1:1
@@ -1026,8 +1026,8 @@
 #. type: TH
 #: amuled.1:1
 #, no-wrap
-msgid "aMule Daemon v2.3.1"
-msgstr "aMule Daemon v2.3.1"
+msgid "aMule Daemon v2.3.2"
+msgstr "aMule Daemon v2.3.2"
 
 #. type: TH
 #: amuled.1:1
@@ -1082,8 +1082,8 @@
 #. type: TH
 #: amulegui.1:1
 #, no-wrap
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.1"
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 #. type: TH
 #: amulegui.1:1
@@ -1143,8 +1143,8 @@
 #. type: TH
 #: amuleweb.1:1
 #, no-wrap
-msgid "aMule webserver v2.3.1"
-msgstr "aMule web kiszolgáló v2.3.1"
+msgid "aMule webserver v2.3.2"
+msgstr "aMule web kiszolgáló v2.3.2"
 
 #. type: Plain text
 #: amuleweb.1:6
@@ -1694,7 +1694,7 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""
 "Ha az xchat minden indításakor szeretnéd automatikusan betölteni, futtasd az "

aMule.tar.xz/docs/man/po/manpages-it.po Changed

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule SVN\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2011-11-04 12:11+0100\n"
 "Last-Translator: Stefano Corti <iz0bbz@libero.it>\n"
 "Language-Team: none\n"
@@ -29,15 +29,15 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr "Novembre 2011"
+msgid "September 2016"
+msgstr "Settembre 2016"
 
 # type: TH
 #. type: TH
 #: amule.1:1
 #, no-wrap
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.1"
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 # type: TH
 #. type: TH
@@ -396,8 +396,8 @@
 #. type: TH
 #: amulecmd.1:1
 #, no-wrap
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.1"
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 # type: TH
 #. type: TH
@@ -1183,8 +1183,8 @@
 #. type: TH
 #: amuled.1:1
 #, no-wrap
-msgid "aMule Daemon v2.3.1"
-msgstr "aMule Daemon v2.3.1"
+msgid "aMule Daemon v2.3.2"
+msgstr "aMule Daemon v2.3.2"
 
 # type: TH
 #. type: TH
@@ -1252,8 +1252,8 @@
 #. type: TH
 #: amulegui.1:1
 #, no-wrap
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.1"
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 # type: TH
 #. type: TH
@@ -1322,8 +1322,8 @@
 #. type: TH
 #: amuleweb.1:1
 #, no-wrap
-msgid "aMule webserver v2.3.1"
-msgstr "aMule webserver v2.3.1"
+msgid "aMule webserver v2.3.2"
+msgstr "aMule webserver v2.3.2"
 
 # type: Plain text
 #. type: Plain text
@@ -1963,7 +1963,7 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""
 "Per abilitarlo ad ogni avvio di xchat dovete eseguire lo script autostart-"

aMule.tar.xz/docs/man/po/manpages-ro.po Changed

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2014-10-26 21:58+0200\n"
 "Last-Translator: Angelescu Constantin <titus0818@yahoo.com>\n"
 "Language-Team: Romanian <kde-i18n-doc@kde.org>\n"
@@ -29,14 +29,14 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr "Noiembrie 2011"
+msgid "September 2016"
+msgstr "Septembrie 2016"
 
 #. type: TH
 #: amule.1:1
 #, no-wrap
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.1"
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 #. type: TH
 #: amule.1:1
@@ -346,8 +346,8 @@
 #. type: TH
 #: amulecmd.1:1
 #, no-wrap
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.1"
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 #. type: TH
 #: amulecmd.1:1 amuleweb.1:1 ed2k.1:1
@@ -1026,8 +1026,8 @@
 #. type: TH
 #: amuled.1:1
 #, no-wrap
-msgid "aMule Daemon v2.3.1"
-msgstr "aMule Daemon v2.3.1"
+msgid "aMule Daemon v2.3.2"
+msgstr "aMule Daemon v2.3.2"
 
 #. type: TH
 #: amuled.1:1
@@ -1085,8 +1085,8 @@
 #. type: TH
 #: amulegui.1:1
 #, no-wrap
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.1"
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 #. type: TH
 #: amulegui.1:1
@@ -1146,8 +1146,8 @@
 #. type: TH
 #: amuleweb.1:1
 #, no-wrap
-msgid "aMule webserver v2.3.1"
-msgstr "aMule webserver v2.3.1"
+msgid "aMule webserver v2.3.2"
+msgstr "aMule webserver v2.3.2"
 
 #. type: Plain text
 #: amuleweb.1:6
@@ -1706,11 +1706,11 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""
 "Pentru a fi activată la fiecare pornirea xchat puteți doar să rulați "
-"scriptul autstart-xas (în /usr/bin dacă a fost instalat cu --prefix=/usr)."
+"scriptul autostart-xas (în /usr/bin dacă a fost instalat cu --prefix=/usr)."
 
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:16

aMule.tar.xz/docs/man/po/manpages-ru.po Changed

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: manpages-ru\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2011-04-11 19:02+0100\n"
 "Last-Translator: Radist Morse <radist.morse@gmail.com>\n"
 "Language-Team: Russian <LL@li.org>\n"
@@ -32,15 +32,14 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr ""
+msgid "September 2016"
+msgstr "сентябрь 2016"
 
 #. type: TH
 #: amule.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule v2.3.0"
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.0"
+#, no-wrap
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 #. type: TH
 #: amule.1:1
@@ -349,10 +348,9 @@
 
 #. type: TH
 #: amulecmd.1:1
-#, fuzzy, no-wrap
-#| msgid "aMuleCmd v2.3.0"
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.0"
+#, no-wrap
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 #. type: TH
 #: amulecmd.1:1 amuleweb.1:1 ed2k.1:1
@@ -1024,10 +1022,9 @@
 
 #. type: TH
 #: amuled.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule Daemon v2.3.0"
-msgid "aMule Daemon v2.3.1"
-msgstr "Демон aMule v2.3.0"
+#, no-wrap
+msgid "aMule Daemon v2.3.2"
+msgstr "Демон aMule v2.3.2"
 
 #. type: TH
 #: amuled.1:1
@@ -1084,10 +1081,9 @@
 
 #. type: TH
 #: amulegui.1:1
-#, fuzzy, no-wrap
-#| msgid "aMuleGUI v2.3.0"
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.0"
+#, no-wrap
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 #. type: TH
 #: amulegui.1:1
@@ -1146,10 +1142,9 @@
 
 #. type: TH
 #: amuleweb.1:1
-#, fuzzy, no-wrap
-#| msgid "aMule webserver v2.3.0"
-msgid "aMule webserver v2.3.1"
-msgstr "Вебсервер aMule v2.3.0"
+#, no-wrap
+msgid "aMule webserver v2.3.2"
+msgstr "Вебсервер aMule v2.3.2"
 
 #. type: Plain text
 #: amuleweb.1:6
@@ -1693,11 +1688,11 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""
 "Чтобы включать его при каждом запуске xchat вы можете просто выполнить "
-"скрипт autstart-xas (в папке /usr/bin если вы установили с --prefix=/usr)."
+"скрипт autostart-xas (в папке /usr/bin если вы установили с --prefix=/usr)."
 
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:16

aMule.tar.xz/docs/man/po/manpages-tr.po Changed

@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2012-03-23 10:36+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -28,14 +28,14 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr "Kasım 2011"
+msgid "September 2016"
+msgstr "Eylül 2016"
 
 #. type: TH
 #: amule.1:1
 #, no-wrap
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.1"
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 #. type: TH
 #: amule.1:1
@@ -347,8 +347,8 @@
 #. type: TH
 #: amulecmd.1:1
 #, no-wrap
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.1"
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 #. type: TH
 #: amulecmd.1:1 amuleweb.1:1 ed2k.1:1
@@ -1022,8 +1022,8 @@
 #. type: TH
 #: amuled.1:1
 #, no-wrap
-msgid "aMule Daemon v2.3.1"
-msgstr "aMule Daemon v2.3.1"
+msgid "aMule Daemon v2.3.2"
+msgstr "aMule Daemon v2.3.2"
 
 #. type: TH
 #: amuled.1:1
@@ -1080,8 +1080,8 @@
 #. type: TH
 #: amulegui.1:1
 #, no-wrap
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.1"
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 #. type: TH
 #: amulegui.1:1
@@ -1142,8 +1142,8 @@
 #. type: TH
 #: amuleweb.1:1
 #, no-wrap
-msgid "aMule webserver v2.3.1"
-msgstr "aMule webserver v2.3.1"
+msgid "aMule webserver v2.3.2"
+msgstr "aMule webserver v2.3.2"
 
 #. type: Plain text
 #: amuleweb.1:6
@@ -1700,10 +1700,10 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""
-"xchat programının her başlayışında yüklenmesi için autstart-xas scriptini "
+"xchat programının her başlayışında yüklenmesi için autostart-xas scriptini "
 "çalıştırmanız yeterli olacaktır (--prefix=/usr ile kurduysanız /usr/bin "
 "dizininde bulunur)."

aMule.tar.xz/docs/man/po/manpages-zh_TW.po Changed

@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: aMule Manual zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: 2011-12-27 14:53+0800\n"
 "Last-Translator: Wayne Su <mstarmstar@gmail.com>\n"
 "Language-Team: \n"
@@ -35,14 +35,14 @@
 #: ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1
 #: ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
-msgstr "2011 十一月"
+msgid "September 2016"
+msgstr "2016 九月"
 
 #. type: TH
 #: amule.1:1
 #, no-wrap
-msgid "aMule v2.3.1"
-msgstr "aMule v2.3.1"
+msgid "aMule v2.3.2"
+msgstr "aMule v2.3.2"
 
 #. type: TH
 #: amule.1:1
@@ -340,8 +340,8 @@
 #. type: TH
 #: amulecmd.1:1
 #, no-wrap
-msgid "aMuleCmd v2.3.1"
-msgstr "aMuleCmd v2.3.1"
+msgid "aMuleCmd v2.3.2"
+msgstr "aMuleCmd v2.3.2"
 
 #. type: TH
 #: amulecmd.1:1 amuleweb.1:1 ed2k.1:1
@@ -989,8 +989,8 @@
 #. type: TH
 #: amuled.1:1
 #, no-wrap
-msgid "aMule Daemon v2.3.1"
-msgstr "aMule Daemon v2.3.1"
+msgid "aMule Daemon v2.3.2"
+msgstr "aMule Daemon v2.3.2"
 
 #. type: TH
 #: amuled.1:1
@@ -1047,8 +1047,8 @@
 #. type: TH
 #: amulegui.1:1
 #, no-wrap
-msgid "aMuleGUI v2.3.1"
-msgstr "aMuleGUI v2.3.1"
+msgid "aMuleGUI v2.3.2"
+msgstr "aMuleGUI v2.3.2"
 
 #. type: TH
 #: amulegui.1:1
@@ -1105,8 +1105,8 @@
 #. type: TH
 #: amuleweb.1:1
 #, no-wrap
-msgid "aMule webserver v2.3.1"
-msgstr "aMule webserver v2.3.1"
+msgid "aMule webserver v2.3.2"
+msgstr "aMule webserver v2.3.2"
 
 #. type: Plain text
 #: amuleweb.1:6
@@ -1522,8 +1522,8 @@
 "I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
 "written to."
 msgstr ""
-"除存線上簽名識別圖片。你也可以在選項中加入 I<=E<lt>路徑E<gt>> 來指定要儲存的地"
-"方。"
+"除存線上簽名識別圖片。你也可以在選項中加入 I<=E<lt>路徑E<gt>> 來指定要儲存的"
+"地方。"
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1:26
@@ -1532,8 +1532,8 @@
 "I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
 "written to."
 msgstr ""
-"有統計資訊與圖片的 HTML 檔案。你也可以在選項中加入 I<=E<lt>路徑E<gt>> 來指定要"
-"儲存的地方。"
+"有統計資訊與圖片的 HTML 檔案。你也可以在選項中加入 I<=E<lt>路徑E<gt>> 來指定"
+"要儲存的地方。"
 
 #. type: Plain text
 #: ../../src/utils/cas/docs/cas.1:34
@@ -1633,10 +1633,10 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""
-"你可以執行 autstart-xas (如果是用 --prefix=/usr 安裝程式，就在 /usr/bin 下) "
+"你可以執行 autostart-xas (如果是用 --prefix=/usr 安裝程式，就在 /usr/bin 下) "
 "在每次啟動 xchat 時都啟用它。"
 
 #. type: Plain text

aMule.tar.xz/docs/man/po/manpages.pot Changed

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"POT-Creation-Date: 2016-09-15 11:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@
 #. type: TH
 #: amule.1:1 amulecmd.1:1 amuled.1:1 amulegui.1:1 amuleweb.1:1 ed2k.1:1 ../../src/utils/aLinkCreator/docs/alc.1:1 ../../src/utils/aLinkCreator/docs/alcc.1:1 ../../src/utils/cas/docs/cas.1:1 ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
 #, no-wrap
-msgid "November 2011"
+msgid "September 2016"
 msgstr ""
 
 #. type: TH
 #: amule.1:1
 #, no-wrap
-msgid "aMule v2.3.1"
+msgid "aMule v2.3.2"
 msgstr ""
 
 #. type: TH
@@ -277,7 +277,7 @@
 #. type: TH
 #: amulecmd.1:1
 #, no-wrap
-msgid "aMuleCmd v2.3.1"
+msgid "aMuleCmd v2.3.2"
 msgstr ""
 
 #. type: TH
@@ -885,7 +885,7 @@
 #. type: TH
 #: amuled.1:1
 #, no-wrap
-msgid "aMule Daemon v2.3.1"
+msgid "aMule Daemon v2.3.2"
 msgstr ""
 
 #. type: TH
@@ -941,7 +941,7 @@
 #. type: TH
 #: amulegui.1:1
 #, no-wrap
-msgid "aMuleGUI v2.3.1"
+msgid "aMuleGUI v2.3.2"
 msgstr ""
 
 #. type: TH
@@ -996,7 +996,7 @@
 #. type: TH
 #: amuleweb.1:1
 #, no-wrap
-msgid "aMule webserver v2.3.1"
+msgid "aMule webserver v2.3.2"
 msgstr ""
 
 #. type: Plain text
@@ -1483,7 +1483,7 @@
 #. type: Plain text
 #: ../../src/utils/xas/docs/xas.1:14
 msgid ""
-"To enable it on every startup of xchat you can just run the autstart-xas "
+"To enable it on every startup of xchat you can just run the autostart-xas "
 "script (in /usr/bin if you installed with --prefix=/usr)."
 msgstr ""

aMule.tar.xz/m4/wxwin.m4 Changed

@@ -3,7 +3,6 @@
 dnl                  Francesco Montorsi,
 dnl                  Bob McCown (Mac-testing)
 dnl Creation date:   24/11/2001
-dnl RCS-ID:          $Id$
 dnl ---------------------------------------------------------------------------
 
 dnl ===========================================================================
@@ -35,7 +34,7 @@
 
 
 dnl ---------------------------------------------------------------------------
-dnl Macros for wxWidgets detection. Typically used in configure.in as:
+dnl Macros for wxWidgets detection. Typically used in configure.ac as:
 dnl
 dnl     AC_ARG_ENABLE(...)
 dnl     AC_ARG_WITH(...)
@@ -122,7 +121,7 @@
 AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
 [
     wx_ver_ok=""
-    if test "x$WX_VERSION_FULL" != x ; then
+    if test "x$WX_VERSION" != x ; then
       if test $wx_config_major_version -gt $1; then
         wx_ver_ok=yes
       else
@@ -152,9 +151,9 @@
 dnl case the macro won't even waste time on tests for its existence.
 dnl
 dnl Optional WX-LIBS argument contains comma- or space-separated list of
-dnl wxWidgets libraries to link against (it may include contrib libraries). If
-dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
-dnl link with all of the core wxWidgets libraries.
+dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
+dnl and WX_LIBS_STATIC will contain flags to link with all of the core
+dnl wxWidgets libraries.
 dnl
 dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
 dnl invocation command in present. It can be used to fine-tune lookup of
@@ -202,23 +201,25 @@
   fi
 
   if test "$WX_CONFIG_PATH" != "no" ; then
-    WX_VERSION_FULL=""
+    WX_VERSION=""
 
-    min_wx_version=ifelse([$1], ,2.8.0,$1)
+    min_wx_version=ifelse([$1], ,2.2.1,$1)
     if test -z "$5" ; then
       AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
     else
       AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
     fi
 
-    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
+    dnl don't add the libraries ($4) to this variable as this would result in
+    dnl an error when it's used with --version below
+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
 
-    WX_VERSION_FULL=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
-    wx_config_major_version=`echo $WX_VERSION_FULL | \
+    WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+    wx_config_major_version=`echo $WX_VERSION | \
            sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
-    wx_config_minor_version=`echo $WX_VERSION_FULL | \
+    wx_config_minor_version=`echo $WX_VERSION | \
            sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
-    wx_config_micro_version=`echo $WX_VERSION_FULL | \
+    wx_config_micro_version=`echo $WX_VERSION | \
            sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'`
 
     wx_requested_major_version=`echo $min_wx_version | \
@@ -233,34 +234,91 @@
                               [$wx_requested_micro_version])
 
     if test -n "$wx_ver_ok"; then
+      AC_MSG_RESULT(yes (version $WX_VERSION))
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
+
+      dnl is this even still appropriate?  --static is a real option now
+      dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
+      dnl what the user actually wants, making this redundant at best.
+      dnl For now keep it in case anyone actually used it in the past.
+      AC_MSG_CHECKING([for wxWidgets static library])
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
+      if test "x$WX_LIBS_STATIC" = "x"; then
+        AC_MSG_RESULT(no)
+      else
+        AC_MSG_RESULT(yes)
+      fi
 
-      AC_MSG_RESULT(yes (version $WX_VERSION_FULL))
-      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+      dnl starting with version 2.2.6 wx-config has --cppflags argument
+      wx_has_cppflags=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_cppflags=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -gt 2; then
+              wx_has_cppflags=yes
+           else
+              if test $wx_config_minor_version -eq 2; then
+                 if test $wx_config_micro_version -ge 6; then
+                    wx_has_cppflags=yes
+                 fi
+              fi
+           fi
+        fi
+      fi
+
+      dnl starting with version 2.7.0 wx-config has --rescomp option
+      wx_has_rescomp=""
+      if test $wx_config_major_version -gt 2; then
+        wx_has_rescomp=yes
+      else
+        if test $wx_config_major_version -eq 2; then
+           if test $wx_config_minor_version -ge 7; then
+              wx_has_rescomp=yes
+           fi
+        fi
+      fi
+      if test "x$wx_has_rescomp" = x ; then
+         dnl cannot give any useful info for resource compiler
+         WX_RESCOMP=
+      else
+         WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+      fi
 
-      WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+      if test "x$wx_has_cppflags" = x ; then
+         dnl no choice but to define all flags like CFLAGS
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
+         WX_CPPFLAGS=$WX_CFLAGS
+         WX_CXXFLAGS=$WX_CFLAGS
 
-      WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
-      WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
-      WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+         WX_CFLAGS_ONLY=$WX_CFLAGS
+         WX_CXXFLAGS_ONLY=$WX_CFLAGS
+      else
+         dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
+         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
 
-      WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
-      WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
+         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
+      fi
 
       ifelse([$2], , :, [$2])
 
     else
 
-       if test "x$WX_VERSION_FULL" = x; then
+       if test "x$WX_VERSION" = x; then
           dnl no wx-config at all
           AC_MSG_RESULT(no)
        else
-          AC_MSG_RESULT(no (version $WX_VERSION_FULL is not new enough))
+          AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
        fi
 
        WX_CFLAGS=""
        WX_CPPFLAGS=""
        WX_CXXFLAGS=""
        WX_LIBS=""
+       WX_LIBS_STATIC=""
        WX_RESCOMP=""
 
        if test ! -z "$5"; then
@@ -296,6 +354,7 @@
     WX_CPPFLAGS=""
     WX_CXXFLAGS=""
     WX_LIBS=""
+    WX_LIBS_STATIC=""
     WX_RESCOMP=""
 
     ifelse([$3], , :, [$3])
@@ -308,15 +367,18 @@
   AC_SUBST(WX_CFLAGS_ONLY)
   AC_SUBST(WX_CXXFLAGS_ONLY)
   AC_SUBST(WX_LIBS)
-  AC_SUBST(WX_VERSION_FULL)
+  AC_SUBST(WX_LIBS_STATIC)
+  AC_SUBST(WX_VERSION)
   AC_SUBST(WX_RESCOMP)
 
   dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
-  dnl to support wxpresets bakefiles
+  dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness):
   WX_VERSION_MAJOR="$wx_config_major_version"
   WX_VERSION_MINOR="$wx_config_minor_version"
+  WX_VERSION_MICRO="$wx_config_micro_version"
   AC_SUBST(WX_VERSION_MAJOR)
   AC_SUBST(WX_VERSION_MINOR)
+  AC_SUBST(WX_VERSION_MICRO)

aMule.tar.xz/platforms/MacOSX/aMule-Xcode/00WARNING.txt Added

aMule.tar.xz/platforms/MacOSX/cocoa-mule/00WARNING.txt Added

aMule.tar.xz/platforms/Windows/MSVC10/00WARNING.txt Added

aMule.tar.xz/platforms/Windows/MSVC12/README - MSVC.txt Changed

@@ -1,8 +1,8 @@
-How to build aMule with Visual Studio 2010 Express Edition
+How to build aMule with Visual Studio 2013 Express Edition
 
 See also http://www.amule.org/wiki/index.php/HowTo_compile_with_Visual_Studio
 
-This solution for Microsoft's Visual Studio 2010 has been configured to be as easy as possible to set up. 
+This solution for Microsoft's Visual Studio 2013 has been configured to be as easy as possible to set up.
 
 However, given the size of the aMule project and the libraries it uses, along with limitations in the way Visual Studio works,
 a couple of items must be setup separately. Additionally, some source code files might need patching due to incompatibilities 
@@ -18,9 +18,9 @@
 
 - <Root folder> - Your main folder. You can name it whatever you want.
  | 
- | - wxWidgets ( wxWidgets sources, no intermediate subfolder )
+ | - wxWidgets ( wxWidgets 2.8 sources, no intermediate subfolder ), or
  |
- | - wxWidgets29 ( wxWidgets 2.9 sources, only required if you want to build against unstable wx 2.9 )
+ | - wxWidgets30 ( wxWidgets 3.0 sources, no intermediate subfolder )
  |
  | - cryptopp ( Crypto++ sources, no intermediate subfolder )
  |
@@ -32,20 +32,20 @@
 If wxWidgets fails to compile, please read http://wiki.wxwidgets.org/Microsoft_Visual_CPP_Guide
 
 There is sometimes a problem with the cryptopp project in the release and debug build, if some projects fail to link
-and give you a warning about redefined symbols, go to the properties on the cryptopp project, configuration "release" and change
+and give you a warning about redefined symbols, go to the properties on the cryptopp project, configuration "Release" and change
 the "Configuration Properties"->"C/C++"->"Code generation"->"Runtime library" to "Multithreaded DLL (/MD)"
- in the release build or "Multithreaded Debug DLL (/MDd)" for the debug build. 
+in the release build or "Multithreaded Debug DLL (/MDd)" for the debug build.
 
 There are 3 solutions:
-1) aMule-MSVC10E.sln
+1) aMule-MSVC12E.sln
    which includes aMule, aMule tools and aMule's internal libs
-2) aMule-MSVC10E-ExtLibs.sln
+2) aMule-MSVC12E-ExtLibs.sln
    includes only wxWidgets and Crypto++ and builds a single library libext.lib from them. You must first build this solution before building aMule-MSVCE.sln
-3) aMule-MSVC10E-ExtLibs29.sln
-   same but using wxWidgets 2.9
+3) aMule-MSVC12E-ExtLibs30.sln
+   same but using wxWidgets 3.0
 
 
-The Debug/Release configs build against wxWidgets 2.8 (stable), Debug29/Release29 configs build against wxWidgets 2.9 (unstable)
+The Debug/Release configs build against wxWidgets 2.8, Debug30/Release30 configs build against wxWidgets 3.0
 
 To build aMule with GeoIP see libs\libGeoIP\readme.txt . 
 Without it you get an error building libGeoIP when you build the full solution.

aMule.tar.xz/platforms/Windows/MSVC12/aLinkCreator/aLinkCreator.vcxproj Changed

@@ -94,7 +94,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -150,7 +150,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets30\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>

aMule.tar.xz/platforms/Windows/MSVC12/aLinkCreator/alcc.vcxproj Changed

@@ -94,7 +94,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -150,7 +150,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets30\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>

aMule.tar.xz/platforms/Windows/MSVC12/aMule/aMule.vcxproj Changed

@@ -93,7 +93,7 @@
       <ForcedIncludeFiles>$(SolutionDir)PCH.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"All-Platform P2P Client Based on eMule\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"All-Platform P2P Client Based on eMule\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>
       </AdditionalOptions>
@@ -152,7 +152,7 @@
       <ForcedIncludeFiles>$(SolutionDir)PCH.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"All-Platform P2P Client Based on eMule\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"All-Platform P2P Client Based on eMule\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets30\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>

aMule.tar.xz/platforms/Windows/MSVC12/aMuleCMD/aMuleCMD.vcxproj Changed

@@ -91,7 +91,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Text Client\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Text Client\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -146,7 +146,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Text Client\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Text Client\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -188,6 +188,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\DataToText.cpp" />
     <ClCompile Include="..\..\..\..\src\ExternalConnector.cpp" />
     <ClCompile Include="..\..\..\..\src\LoggerConsole.cpp" />
     <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp" />
@@ -195,6 +196,7 @@
     <ClCompile Include="..\..\..\..\src\TextClient.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\DataToText.h" />
     <ClInclude Include="..\..\..\..\src\ExternalConnector.h" />
     <ClInclude Include="..\..\..\..\src\NetworkFunctions.h" />
     <ClInclude Include="..\..\..\..\src\OtherFunctions.h" />

aMule.tar.xz/platforms/Windows/MSVC12/aMuleCMD/aMuleCMD.vcxproj.filters Changed

aMule.tar.xz/platforms/Windows/MSVC12/aMuleD/aMuleD.vcxproj Changed

@@ -92,7 +92,7 @@
       <ForcedIncludeFiles>$(SolutionDir)PCH.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Daemon\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Daemon\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -149,7 +149,7 @@
       <ForcedIncludeFiles>$(SolutionDir)PCH.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Daemon\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Daemon\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>

aMule.tar.xz/platforms/Windows/MSVC12/aMuleGUI/aMuleGUI.vcxproj Changed

@@ -94,7 +94,7 @@
       <ForcedIncludeFiles>$(SolutionDir)PCH.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"aMule Remote GUI\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"aMule Remote GUI\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -151,7 +151,7 @@
       <ForcedIncludeFiles>$(SolutionDir)PCH.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Remote GUI\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Remote GUI\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets30\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -227,6 +227,7 @@
     <ClCompile Include="..\..\..\..\src\HTTPDownload.cpp" />
     <ClCompile Include="..\..\..\..\src\IP2Country.cpp" />
     <ClCompile Include="..\..\..\..\src\KadDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\utils\UInt128.cpp" />
     <ClCompile Include="..\..\..\..\src\KnownFile.cpp" />
     <ClCompile Include="..\..\..\..\src\Logger.cpp" />
     <ClCompile Include="..\..\..\..\src\MagnetURI.cpp" />
@@ -302,6 +303,7 @@
     <ClInclude Include="..\..\..\..\src\DownloadQueue.h" />
     <ClInclude Include="..\..\..\..\src\GenericClientListCtrl.h" />
     <ClInclude Include="..\..\..\..\src\include\common\MacrosProgramSpecific.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\utils\UInt128.h" />
     <ClInclude Include="..\..\..\..\src\libs\ec\cpp\ECID.h" />
     <ClInclude Include="..\..\..\..\src\ED2KLink.h" />
     <ClInclude Include="..\..\..\..\src\EditServerListDlg.h" />

aMule.tar.xz/platforms/Windows/MSVC12/aMuleGUI/aMuleGUI.vcxproj.filters Changed

aMule.tar.xz/platforms/Windows/MSVC12/aMuleWeb/aMuleWeb.vcxproj Changed

@@ -91,7 +91,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Web Server\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Web Server\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -146,7 +146,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Web Server\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Web Server\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>

aMule.tar.xz/platforms/Windows/MSVC12/ed2k/ed2k.vcxproj Changed

aMule.tar.xz/platforms/Windows/MSVC12/libs/libGeoIP/CountryFlags.cmd Added

@@ -0,0 +1,44 @@
+@echo off
+
+setlocal enableDelayedExpansion
+
+set FLAGSDIR=..\..\..\..\..\src\pixmaps\flags_xpm
+set COUNTRYFLAGSH=%FLAGSDIR%\CountryFlags.h
+
+echo #ifndef COUNTRY_FLAGS_H>%COUNTRYFLAGSH%
+echo #define COUNTRY_FLAGS_H>>%COUNTRYFLAGSH%
+echo.>>%COUNTRYFLAGSH%
+echo namespace flags {>>%COUNTRYFLAGSH%
+echo.>>%COUNTRYFLAGSH%
+
+rem Create #include directives
+for /R %FLAGSDIR% %%G in (*.xpm) do (
+	echo #include "%%~nxG">>%COUNTRYFLAGSH%
+)
+echo.>>%COUNTRYFLAGSH%
+
+rem Define the struct
+echo struct FlagXPMCode {>>%COUNTRYFLAGSH%
+echo const char **xpm;>>%COUNTRYFLAGSH%
+echo const char *code;>>%COUNTRYFLAGSH%
+echo };>>%COUNTRYFLAGSH%
+echo.>>%COUNTRYFLAGSH%
+
+rem Create the flag/code vector
+echo static struct FlagXPMCode flagXPMCodeVector[] = {>>%COUNTRYFLAGSH%
+for /R %FLAGSDIR% %%G in (*.xpm) do (
+	set ctry=%%~nG
+	if "!ctry!"=="do" set ctry=do_
+	echo { !ctry!, "%%~nG" },>>%COUNTRYFLAGSH%
+)
+echo };>>%COUNTRYFLAGSH%
+echo.>>%COUNTRYFLAGSH%
+
+rem Calculate the vector size
+echo static const int FLAGS_XPM_SIZE = (sizeof flagXPMCodeVector) / (sizeof flagXPMCodeVector[0]);>>%COUNTRYFLAGSH%
+
+rem Finish
+echo.>>%COUNTRYFLAGSH%
+echo } // namespace flags>>%COUNTRYFLAGSH%
+echo.>>%COUNTRYFLAGSH%
+echo #endif // COUNTRY_FLAGS_H>>%COUNTRYFLAGSH%

aMule.tar.xz/platforms/Windows/MSVC12/libs/libGeoIP/libGeoIP.vcxproj Changed

@@ -91,6 +91,17 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GeoIP_X.c;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="CountryFlags.cmd">
+      <FileType>Document</FileType>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CountryFlags.cmd</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating CountryFlags.h</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\src\pixmaps\flags_xpm\CountryFlags.h</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CountryFlags.cmd</Command>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating CountryFlags.h</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\src\pixmaps\flags_xpm\CountryFlags.h</Outputs>
+    </CustomBuild>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

aMule.tar.xz/platforms/Windows/MSVC12/libs/libGeoIP/libGeoIP.vcxproj.filters Changed

aMule.tar.xz/platforms/Windows/MSVC12/libs/libmuleec/libmuleec.vcxproj Changed

aMule.tar.xz/platforms/Windows/MSVC12/libs/libmuleec/libmuleec.vcxproj.filters Changed

aMule.tar.xz/platforms/Windows/MSVC12/wxCas/wxCas.vcxproj Changed

@@ -93,7 +93,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"Graphical aMule Statistics\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;wxUSE_NO_MANIFEST=1;VER_FILEDESCRIPTION_STR=\"Graphical aMule Statistics\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
@@ -148,7 +148,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"Graphical aMule Statistics\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__DEBUG__;_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"Graphical aMule Statistics\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets30\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>

aMule.tar.xz/po/amule.pot Changed

@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the aMule package.
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: aMule VERSION\n"
+"Project-Id-Version: aMule SVN\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: LL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,102 +43,102 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr ""
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr ""
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
 msgstr ""
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr ""
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -149,192 +148,192 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1044

aMule.tar.xz/po/ar.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2004-03-28 22:15+0300\n"
 "Last-Translator: saleh alhathal <hathalsal@hotmail.com>\n"
 "Language-Team: \n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -43,104 +43,104 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "فشل"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "معلومات"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "تاكيد الخروج"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "قبل إتصال خارجي جديد\n"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "معلومات"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -150,193 +150,193 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "ﻻ نضمن انه خالي من اﻻخطاء, قد يتسبب باعطال\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""

aMule.tar.xz/po/ast.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2009-11-04 21:31+0100\n"
 "Last-Translator: astur <malditoastur@gmail.com>\n"
 "Language-Team: Language ast <malditoastur@gmail.com>\n"
-"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Asturian\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -47,37 +47,51 @@
 "AVISU: Nun pues amestate a tí mesmu como una fonte pa un enllaz eD2k "
 "teniendo ID baxa."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Agora, saliendo de l'aplicación principal..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, fuzzy, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Matando instancia amuleweb con pid `%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, fuzzy, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Matando instancia amuleweb con pid `%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Falló"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Terminando núcleu."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Zarru d'aMule completáu."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultaos de depuración de memoria na salida d'aMule: "
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"La to llingua foi camudada a la de por defeutu del sistema, darréu d'un "
+"cambéu de configuración. Siéntolo."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -85,30 +99,16 @@
 "\n"
 "Configuración EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Contraseña fixada y conexones esternes habilitaes."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "ALERTA"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"La to llingua foi camudada a la de por defeutu del sistema, darréu d'un "
-"cambéu de configuración. Siéntolo."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -116,16 +116,16 @@
 "Nun tienes dengún sirvidor na llista de sirvidores.\n"
 "¿Quies que aMule descargue una nueva llista agora?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Descarga llista de sirvidores"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "sirvidor web corriendo con pid: %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -135,23 +135,23 @@
 "binariu d'amuleweb. Por favor instala'l paquete que contenga'l sirvidor web "
 "d'aMule o compila aMule usando --enable-webserver y executa make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "FALLU"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nun ye dable direicionar los puertos a la direición especificada: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "El puertu %u nun ta disponible. Tendrás IDBaxa\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -167,15 +167,15 @@
 "Comprueba la to rede y asegúrate de que'l puertu ta abiertu pa entrada y "
 "salida."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Fallu al criar el ficheru de RoblaOnline"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Fallu al criar el ficheru de RoblaOnline aMule"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -183,38 +183,38 @@
 "La llingua seleicionada nun paez tar instalada. (Nota: Tentará de ponese de "
 "toes formes)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Ye la primer vegada qu'anicies aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Esto ye una versión de preba, actualízate diariamente, y \n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "nun damos garantía si fraña daqué, ambura to casa,\n"

aMule.tar.xz/po/bg.po Changed

@@ -10,15 +10,16 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2004-02-07 21:55+0200\n"
-"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-05-31 11:44+0200\n"
+"Last-Translator: Sebastiano Pistore <olatusrooc@virgilio.it>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
+"Language: bg\n"
+"X-Generator: Poedit 1.8.7\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -47,103 +48,103 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Грешка"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr ""
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Потвърждение за изход"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr ""
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -153,192 +154,192 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""

aMule.tar.xz/po/ca.po Changed

@@ -14,14 +14,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2010-01-15 03:38+0200\n"
 "Last-Translator: simkin <simkin@ono.com>\n"
 "Language-Team: Català\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Language: Catalan\n"
 
@@ -53,37 +53,51 @@
 "AVÍS: No us podeu afegir com a font per a un enllaç eD2k mentre teniu ID "
 "Baixa."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Sortint del programa..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, fuzzy, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "S'està aturant el procés amuleweb amb pid `%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, fuzzy, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Aturant procés amuleweb amb pid `%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Fallades"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule Sortida: Finalitzant nucli."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Aturada aMule completada."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultat de la depuració de la memòria a la sortida de l'aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"S'ha establert l'idioma Predeterminat del Sistema a causa d'un canvi de "
+"configuració. Disculpeu."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Informació"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -91,30 +105,16 @@
 "\n"
 "Configuració EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Contrassenya definida i connexions externes activades."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "AVÍS"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"S'ha establert l'idioma Predeterminat del Sistema a causa d'un canvi de "
-"configuració. Disculpeu."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Informació"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -122,16 +122,16 @@
 "No teniu cap servidor a la llista de servidors.\n"
 "Voleu que l'aMule baixi una llista nova?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Baixada de la llista de servidors"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web executant-se al pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -142,23 +142,23 @@
 "servidor web de l'aMule, o compileu l'aMule usant la opció --enable-"
 "webserver i executeu make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "No s'han pogut vincular els ports a l'adreça especificada: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "El port %u no està disponible. Tindreu ID BAIXA\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -174,15 +174,15 @@
 "Comproveu la configuració de la xarxa per a assegurar-vos que el port està "
 "obert."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "No s'ha pogut crear el fitxer de la signatura en línia"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "No s'ha pogut crear el fitxer de la signatura en línia de l'aMule"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -190,37 +190,37 @@
 "L'idioma seleccionat no està instal·lat al PC. (Nota: s'intentarà establir "
 "igualment)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "És la primera vegada que executeu l'aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Aquesta és una versió de prova, actualitzada diàriament, i\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "no podem garantir que no trenqui res, cremi casa vostra,\n"

aMule.tar.xz/po/cs.po Changed

@@ -6,14 +6,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2010-08-01 01:11+0100\n"
 "Last-Translator: David Watzke <david@watzke.cz>\n"
 "Language-Team: cs <cs@li.org>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -45,37 +45,51 @@
 msgstr ""
 "VAROVÁNÍ: Nemůžete přidat sebe jako zdroj pro eD2k odkaz, když máte LowID."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Ukončuji hlavní aplikaci..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, fuzzy, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Ukončuji instanci amuleweb s PID `%ld'..."
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, fuzzy, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Zabíjím instanci amuleweb s PID `%ld'..."
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Selhal"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Ukončuji jádro."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Ukončení aMule dokončeno."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Vaše nastavení locale bylo změněno na výchozí systémové nastavení kvůli "
+"změně v konfiguraci. Pardon."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -83,68 +97,54 @@
 "\n"
 "Konfigurace EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Heslo nastaveno a externí připojení povoleno."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "VAROVÁNÍ"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Vaše nastavení locale bylo změněno na výchozí systémové nastavení kvůli "
-"změně v konfiguraci. Pardon."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "webserver běží s PID %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "CHYBA"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u je nedostupný. Budete mít LowID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -160,195 +160,195 @@
 "Zkontrolujte nastavení vaší sítě a ujistěte se, že je port v obou směrech "
 "otevřený."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Selhalo vytvoření OnlineSig souboru"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Selhalo vytvoření aMule OnlineSig souboru"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Toto je vaše první spuštění aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Toto je testovací verze, která je denně aktualizovaná a\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "my nezaručujeme, že nemůže nic pokazit, zapálit váš dům,\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 "nebo zabít vašeho psa. Nicméně i tak by *mělo* být její používání bezpečné.\n"

aMule.tar.xz/po/da.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2007-10-13 18:09+0200\n"
 "Last-Translator: Alex Thomsen Leth <alexl@stofanet.dk>\n"
 "Language-Team: aMule Team <http://www.amule.org>\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -43,104 +43,104 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Fejlede"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Bekræft afslut"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Accepter ydre forbindelser"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -150,184 +150,184 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "Vi giver ikke garanti for at det ikke vil ødelægge noget, brænde dit hus,\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053
 msgid "More information, support and new releases can found at our homepage,\n"

aMule.tar.xz/po/de.po Changed

@@ -12,14 +12,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-11-02 00:10+0100\n"
 "Last-Translator: Stu Redman <sturedman@amule.org>\n"
 "Language-Team:  <de@li.org>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: src/AddFriend.cpp:45
@@ -50,37 +50,51 @@
 "WARNUNG: Man kann sich nicht als Quelle für einen eD2k-Verweis hinzufügen "
 "während man eine niedrige ID hat."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Beende nun Hauptanwendung ..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Beende amuleweb-Instanz mit pid '%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Erzwinge Beenden der amuleweb-Instanz mit pid '%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Beende Programmkern."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule-Herunterfahren abgeschlossen."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Speicherfehlerbehebungsresultate für aMule-Beendung:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Deine Locale wurde wegen einer Konfigurationsänderung auf Systemstandard "
+"geändert. Sorry."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -88,30 +102,16 @@
 "\n"
 "EC-Konfiguration"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Passwort eingestellt und externe Verbindungen aktiviert."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Deine Locale wurde wegen einer Konfigurationsänderung auf Systemstandard "
-"geändert. Sorry."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -119,16 +119,16 @@
 "Es sind keinerlei Server in der Server-Liste.\n"
 "Soll aMule jetzt eine neue Liste herunterladen?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Server-Liste herunterladen"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "Webserver läuft mit pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -139,23 +139,23 @@
 "Paket, das amuleweb enthält, oder kompiliere aMule mit --enable-webserver "
 "neu."
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Kann Ports nicht mit der festgelegten Adresse verbinden: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u ist nicht erreichbar. Du wirst eine niedrige ID erhalten\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -171,15 +171,15 @@
 "Bitte überprüfe deine Netzwerkeinstellungen, um sicherzugehen, dass der Port "
 "für ein- und ausgehenden Traffic geöffnet ist."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Erstellen der OnlineSig-Datei gescheitert"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Erstellen der aMule OnlineSig-Datei gescheitert"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -187,42 +187,42 @@
 "Die ausgewählte Locale scheint nicht auf dem System installiert zu sein."
 "(INFO: Ich werde trotzdem versuchen, sie zu setzen)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Dies ist das erste Mal, dass du aMule %s startest"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Dies ist eine Testversion, täglich aktualisiert, und\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "wir garantieren nicht, dass sie keine Daten zerstört, dein Haus anzündet\n"

aMule.tar.xz/po/el.po Changed

@@ -6,14 +6,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-07-30 01:25-0600\n"
 "Last-Translator: Dimitris <dgalanak@yahoo.com>\n"
 "Language-Team: Greek\n"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/AddFriend.cpp:45
@@ -45,72 +45,72 @@
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν μπορείτε να προσθέσετε τον εαυτό σας σαν πηγή για έναν "
 "σύνδεσμο eD2k ενώ έχετε χαμηλή προτεραιότητα."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Όλα μια χαρά, έξοδος %s...\n"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Το κατέβασμα ολοκληρώθηκε"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Οι τοπικές ρυθμίσεις άλλαξαν στις προεπιλεγμένες του συστήματος λόγο μιας "
+"αλλαγής παραμέτρων. Sorry!"
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Πληροφορίες"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Έξοδος επιβεβαίωσης"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Οι τοπικές ρυθμίσεις άλλαξαν στις προεπιλεγμένες του συστήματος λόγο μιας "
-"αλλαγής παραμέτρων. Sorry!"
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Πληροφορίες"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -118,16 +118,16 @@
 "Δεν υπάρχουν διακομιστές στην λίστα.\n"
 "Θέλετε το aMule να κατεβάσει μία νέα λίστα τώρα;"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Κατέβασμα της λίστας διακομιστών"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "διακομιστής ιστού τρέχει με αριθμό διεργασίας %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -138,24 +138,24 @@
 "περιέχει τον διακομιστή ιστού του aMule, ή μεταφράστε το aMule "
 "χρησιμοποιώντας την παράμετρο --enable-webserver"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ΣΦΑΛΜΑ"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Δεν μπόρεσε να προσδέσει τις θύρες στην προσδιορισμένη διεύθυνση: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 "Η θύρα %u δεν είναι διαθέσιμη. Θα σας αποδωθεί LOWID (χαμηλή προτεραιότητα)\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -171,15 +171,15 @@
 "Ελέξτε το δίκτυο σας για να βεβαιωθήτε ότι η θύρα είναι ανοιχτή για είσοδο "
 "και έξοδο."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών του aMule"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -187,41 +187,41 @@
 "Οι επιλεγμένες τοπικές ρυθμίσεις δεν φαίνεται να είναι εγκατεστημένες στο "
 "σύστημά σας. (Σημ. Θα προσπαθήσω να τις θέσω ούτως ή άλλως)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Αυτή είναι η πρώτη φορά που τρέχετε το aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Αυτή η έκδοση είναι δοκιμαστική, και αναβαθμίζεται καθημερινά, και\n"

aMule.tar.xz/po/en_GB.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-07-08 02:22+0100\n"
 "Last-Translator: Dévai Tamás <devait@vnet.hu>\n"
 "Language-Team: aMule Team <http://www.amule.org>\n"
-"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -42,102 +42,102 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr ""
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr ""
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
 msgstr ""
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr ""
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -147,192 +147,192 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/amule.cpp:1045

aMule.tar.xz/po/es.po Changed

@@ -13,16 +13,15 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2015-12-25 16:01+0100\n"
-"Last-Translator: Civ Ysh K <civyshk@gmail.com>\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-09-12 12:14-0800\n"
+"Last-Translator: David Martínez Moreno <ender@debian.org>\n"
 "Language-Team: Spanish <mad.soft@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Language: es_ES\n"
 
@@ -32,7 +31,7 @@
 
 #: src/AddFriend.cpp:61
 msgid "You have to enter a valid IP and port!"
-msgstr "Has de introducir una IP y puerto válidos!"
+msgstr "¡Has de introducir una IP y puerto válidos!"
 
 #: src/AddFriend.cpp:61 src/AddFriend.cpp:67
 msgid "Information"
@@ -44,7 +43,7 @@
 
 #: src/amuleAppCommon.cpp:128
 msgid "Failed to open ED2KLinks file."
-msgstr "Imposible abrir el archivo de enlaces ED2K."
+msgstr "No se puede abrir el archivo de enlaces ED2K."
 
 #: src/amuleAppCommon.cpp:201
 msgid ""
@@ -54,37 +53,51 @@
 "ADVERTENCIA: No puedes añadirte a ti mismo como una fuente para un enlace "
 "eD2k teniendo ID baja."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Ahora, saliendo de aplicación principal..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Cerrando instancia amuleweb con pid '%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Matando instancia amulweb con pid '%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Error"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Terminando núcleo."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Cierre de aMule completado."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
-msgstr "Resultados de depuración de memoria en la salida de aMule: "
+msgstr "Resultados de depuración de memoria en la salida de aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Se ha cambiado tu idioma al predeterminado del sistema, debido a un cambio "
+"de configuración. Lo siento."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -92,30 +105,16 @@
 "\n"
 "Configuración EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Contraseña fijada y conexiones externas habilitadas."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "ALERTA"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Tu idioma ha sido cambiado al de por defecto de tu sistema, debido a un "
-"cambio de configuración. Lo siento."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -123,43 +122,43 @@
 "No tienes ningún servidor en la lista de servidores.\n"
 "¿Quieres que aMule descargue una nueva lista ahora?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Descarga lista de servidores"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web corriendo con pid: %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 "Has solicitado ejecutar el servidor web al inicio pero no se ha podido "
-"iniciar el binario de amuleweb. Por favor instala el paquete que contenga el "
-"servidor web de aMule o compila aMule usando --enable-webserver y ejecuta "
-"make install"
-
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+"iniciar el binario de amuleweb. Por favor, instala el paquete que contenga "
+"el servidor web de aMule, o compila aMule usando --enable-webserver y "
+"ejecuta make install"
+
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
-msgstr "Imposible direccionar los puertos a la dirección especificada: %s"
+msgstr "Imposible asociarse a los puertos de la dirección especificada: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Puerto %u no está disponible. Tendrás IDBaja\n"
+msgstr "El puerto %u no está disponible. Tendrás ID baja\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -168,22 +167,22 @@
 "\n"
 "Check your network to make sure the port is open for output and input."
 msgstr ""
-"Puerto %u no está disponible!\n"
+"¡El puerto %u no está disponible!\n"
 "\n"
-"Esto significa que tendrás IDBaja.\n"

aMule.tar.xz/po/et_EE.po Changed

@@ -9,14 +9,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-01-01 19:46+0200\n"
 "Last-Translator: \n"
 "Language-Team: Estonian <kde-i18n-doc@kde.org>\n"
-"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
@@ -48,37 +48,51 @@
 "HOIATUS: Sa ei saa ennast eD2k lingi jaoks allikana lisada ajal kui omad "
 "lowid'd."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Ok, lahkun põhiprogrammist..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Mõrvan amuleweb tegelase, protsessi id '%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Mõrvan amuleweb tegelase, protsessi id '%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Nurjunud"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Peatan tuuma."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule seiskamine lõpetatud."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "aMule väljumise mälu veajälituse tulemus:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Sinu keelelokaat muudeti süsteemi vaikeväärtuseks seoses konfiguratsiooni "
+"muudatustega. Sorry."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -86,30 +100,16 @@
 "\n"
 "EC seadistused"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Parool on määratud ja välised ühendused võimalikud."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "!!! HOIATUS !!!"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Sinu keelelokaat muudeti süsteemi vaikeväärtuseks seoses konfiguratsiooni "
-"muudatustega. Sorry."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -117,16 +117,16 @@
 "Serverite nimekirjas pole ühtegi serverit.\n"
 "Kas aMule võiks uue nimekirja tõmmata?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Serverite nimekiri tõmmatud"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web server töötab protsessi id'ga %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -137,23 +137,23 @@
 "serverit või kompileeri aMule kasutades võtit --enable-webserver ja seejärel "
 "make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "VIGA"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Ei suuda siduda porti määratud aadressiga: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u ei ole kasutatav. Sa saad LOWID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -168,15 +168,15 @@
 "Kasuta netstat programmi kontrollimaks kuna port vabaneb\n"
 "ja proovi amule uuesti käivitada."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Ei suutnud luua OnlineSig Faili"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Ei suutnud luua aMule OnlineSig Faili"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -184,45 +184,45 @@
 "Tundub et valitud keelelokaat pole sinu karpi installeritud. (Märkus: Ma "
 "proovin seda seada sellest hoolimata)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "See on aMule %s käivitamise esimene kord"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "See on testversioon, mida igapäevaselt uuendatakse ja\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "me ei anna mingit garantiid, et see ei lõhu midagi, ei süüta sinu elamist\n"

aMule.tar.xz/po/eu.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-11-04 23:17+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <librezale@librezale.org>\n"
@@ -46,37 +46,51 @@
 msgstr ""
 "KONTUZ: Ezin duzu zure burua ezarri eD2k lotura batean Id baxua duzunean."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Orain, aplikazio nagusia ixten..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "'%ld' pid-a duen amuleweb instantzia amaitzen ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "'%ld' pid-a duen amuleweb instantzia hiltzen ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule irteten: Muina ixten."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule itzaltzea osaturik."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "aMule ixtearen memoria arazte irteera:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Zure lokalak sistemako lehenetsira aldatu dira konfigurazio aldaketa bat "
+"dela eta. Barkatu."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Argb"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -84,30 +98,16 @@
 "\n"
 "EC konfigurazioa"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Pasahitza ezarria eta kanpo konexioak gaiturik."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "OHARRA"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Zure lokalak sistemako lehenetsira aldatu dira konfigurazio aldaketa bat "
-"dela eta. Barkatu."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Argb"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -115,16 +115,16 @@
 "Ez duzu zerbitzaririk zerbitzari zerrendan.\n"
 "aMulek zerrenda berri bat orain deskargatzea nahi al duzu?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Zerbitzari zerrenda deskargatu"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web zerbitzaria abiarazirik %d pid-arekin"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -134,23 +134,23 @@
 "da exekutatu. Mesedez instalatu amule web zerbitzaria duen paketea edo "
 "konpilatu ezazu amule --enable-webserver erabilian eta make install egin"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERROREA"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Ezin da atakak ezarritako helbidean ireki: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "%u ataka ez dago eskuragarri. IDBaxua izango duzu\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -166,15 +166,15 @@
 "Egiaztatu zure sarea ataka sarrera eta irteerarako irekirik dagoela "
 "ziurtatzeko."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Huts online sinadura fitxategia sortzerakoan"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Huts aMule online sinadura fitxategia sortzerakoan"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -182,39 +182,39 @@
 "Aukeratutako lokalak ez dirudi zure sisteman instalaturik. (Oharra: Hala ere "
 "erabiltzen saiatuko da)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "aMule %s abiarazten duzun lehen aldia da"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Bertsioa hau beta bertsio bat da, egunero eguneratzen da, eta\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "ez gara ezer apurtu, zure etxea erre, edo zure zakurra akatzen\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 "badu ere kargu egingo. Baina erabiltzeko ziurra izan *beharko* litzateke.\n"
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053

aMule.tar.xz/po/fi.po Changed

@@ -10,14 +10,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-11-11 10:38+0200\n"
 "Last-Translator: Tapio Rantala <tapio.rantala@iki.fi>\n"
 "Language-Team: aMule Team <http://www.amule.org>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: src/AddFriend.cpp:45
@@ -47,37 +47,51 @@
 msgstr ""
 "VAROITUS: Et voi lisätä itseäsi lähteeksi eD2k-linkkiin kun sinulla on LowID."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Pääohjelmaa suljetaan..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Lopetetaan amulewebin instanssi prosessinumerolla '%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Tuhotaan amulewebin instanssi prosessinumerolla '%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMulen poistuessa: Lopetetaan ydin."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule sammutettu."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Muistin virheiden etsinnän tulokset aMulen sulkeutuessa:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Maa-asetuksesi vaihdettiin järjestelmän oletuksiksi asetusmuutoksen takia. "
+"Pahoittelen."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -85,30 +99,16 @@
 "\n"
 "Etäyhteyksien asetukset"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Salasana asetettu ja etäyhteydet sallittu."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "VAROITUS"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Maa-asetuksesi vaihdettiin järjestelmän oletuksiksi asetusmuutoksen takia. "
-"Pahoittelen."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -116,16 +116,16 @@
 "Palvelinlistallasi ei ole palvelimia.\n"
 "Haluatko että aMule hakee uuden listan nyt?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Palvelinlistan lataus"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web-palvelin käynnissä prosessinumerolla %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -136,23 +136,23 @@
 "paketti tai käännä aMule käyttäen parametria --enable-webserver ja suorita "
 "make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "VIRHE"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Ei voitu sitoa portteja annettuun osoitteeseen: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Portti %u ei ole saatavilla. Sinulle annetaan LowID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -168,15 +168,15 @@
 "Tarkista yhteytesi varmistaaksesi että portti on avoinna sekä ulos että "
 "sisään."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Online-Signeeraustiedoston luonti epäonnistui"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "aMulen Online-Signeeraustiedoston luonti epäonnistui"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -184,40 +184,40 @@
 "Valittu maa-asetus ei näytä olevan asennettuna järjestelmääsi. (Huom: Yritän "
 "asettaa sen kuitenkin)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Tämä on ensimmäinen kerta kun käynnistät aMulen version %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Tämä versio on testiversio jota päivitetään päivittäin,\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "emmekä me anna takuuta ettei se riko mitään, polta taloasi,\n"

aMule.tar.xz/po/fr.po Changed

@@ -1,5 +1,5 @@
 # aMule i18n resource file.
-# Copyright (C) 2004 - 2014 aMule Team
+# Copyright (C) 2004 - 2016 aMule Team
 # This file is distributed under the same license as the aMule package.
 #
 # Translation of aMule to French
@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2014-02-15 13:05+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-08-20 22:40+0200\n"
 "Last-Translator: Dylan Aïssi <bob.dybian@gmail.com>\n"
 "Language-Team: Français\n"
 "MIME-Version: 1.0\n"
@@ -26,6 +26,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -55,37 +56,51 @@
 "AVERTISSEMENT : Vous ne pouvez pas vous ajouter vous-même en tant que source "
 "pour un lien eD2k alors que vous avez un LowID."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Et maintenant on quitte l'application principale…"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Interruption de l'instance amuleweb avec le pid '%ld' …"
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Mise à mort de l'instance amuleweb avec le pid '%ld' …"
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Échec"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit : Arrêt du noyau."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Fermeture d'aMule terminée."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Résultats du débogage de la mémoire pour la sortie d'aMule :"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Votre localisation à été remise par défaut à cause d'un changement dans la "
+"configuration. Désolé."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Infos"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -93,30 +108,16 @@
 "\n"
 "Configuration EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Mot de passe renseigné et connexions externes activées."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Votre localisation à été remise par défaut à cause d'un changement dans la "
-"configuration. Désolé."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Infos"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -124,16 +125,16 @@
 "Vous n'avez pas de serveurs dans votre liste de serveurs.\n"
 "Voulez vous qu'aMule télécharge une nouvelle liste maintenant ?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Téléchargement de la liste de serveurs."
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "serveur web s'exécutant avec le pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -144,23 +145,23 @@
 "serveur web aMule, ou compilez aMule en utilisant --enable-webserver et "
 "exécutez make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Impossible de lier les ports à l'adresse spécifiée : %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Le port %u n'est pas disponible. Vous serez LowID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -176,15 +177,15 @@
 "Vérifiez votre réseau pour être sûr que le port est ouvert en sortie et en "
 "entrée."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Échec de la création du fichier OnlineSig"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Échec de la création du fichier aMule OnlineSig"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -192,42 +193,42 @@
 "La localisation choisie semble ne pas être installer sur votre machine. "
 "(Note : Je tente de la forcer quant même)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "C'est la première fois que vous lancez aMule %s"
 
-#: src/amule.cpp:1037

aMule.tar.xz/po/gl.po Changed

@@ -20,14 +20,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-07-03 12:01+0100\n"
 "Last-Translator: Festor Wailon Dacoba <festor90@gmail.com>\n"
 "Language-Team: Galego <proxecto@trasno.net>\n"
-"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Galician\n"
@@ -61,72 +61,72 @@
 "AVISO: Non podes engadirte a ti mesmo como unha fonte para un enlace eD2k "
 "tendo ID baixa."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "OK, saíndo de %s...\n"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Erro"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Descarga rematada"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"O seu locale cambiou ao predeterminado do sistema debido a un troco na "
+"configuración. Síntoo."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Información"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Confirmación de saída"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Nova conexión externa aceptada"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "AVISO"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"O seu locale cambiou ao predeterminado do sistema debido a un troco na "
-"configuración. Síntoo."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Información"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -134,16 +134,16 @@
 "Non ten ningún servidor na lista de servidores.\n"
 "Quere que aMule descargue unha nova lista agora?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Descargar lista de servidores"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web executándose con pid: %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -154,23 +154,23 @@
 "aMule ou compile o aMule empregando o parámetro --enable-webserver e logo "
 "execute o make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERRO"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "No se puido vincular os portos a dirección especificada: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Porto %u non está dispoñible . Tes IDBAIXA\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -186,15 +186,15 @@
 "Comproba túa rede para cerciorarse de que o porto está aberto para a entrada "
 "e saída."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Fallou ao crear o ficheiro OnlineSig"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Fallou ao crear o ficheiro de aMule OnlineSig"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -202,39 +202,39 @@
 "O idioma seleccionado non parece estar instalado. (Nota: Tentarei poñelo de "
 "todos modos)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Esta é a primeira vez inicia aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Esta versión é unha versión en proba, actualizada, e\n"
 
-#: src/amule.cpp:1038

aMule.tar.xz/po/he.po Changed

@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-04-11 00:21+0300\n"
 "Last-Translator: Peace Kramer <kpeace1@gmail.com>\n"
 "Language-Team: Hebrew\n"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/AddFriend.cpp:45
@@ -45,105 +45,105 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "נכשל"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "הורדה הסתיימה"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "מידע"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "אישרור יצאיה"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "גישה חיצונית חדשה התקבלה"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "אזהרה"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "מידע"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -153,193 +153,193 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053
 msgid "More information, support and new releases can found at our homepage,\n"

aMule.tar.xz/po/hr.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2004-04-08 00:30+0100\n"
 "Last-Translator: Tea Lorenzmeier <tea1@gmx.net>\n"
 "Language-Team: www.aMule.org <forum@aMule.org>\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -43,104 +43,104 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Neuspjesno"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Potvrda izlaza"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Nova vanjska veza prihvacena\n"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr ""
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr ""
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -150,194 +150,194 @@
 "Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "ne dajemo nikakvu garanciju da nece nista unistiti, tvoju kucu zapaliti, \n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053
 msgid "More information, support and new releases can found at our homepage,\n"

aMule.tar.xz/po/hu.po Changed

@@ -6,15 +6,16 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2011-11-09 01:17+0100\n"
-"Last-Translator: Dévai Tamás <gonosztopi@amule.org>\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-04-11 20:35+0100\n"
+"Last-Translator: Balla Marcell <marcell.balla@gmx.at>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Basepath: .\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -44,37 +45,51 @@
 "FIGYELEM: Nem adhatod magad forrásként egy eD2k hivatkozáshoz amíg alacsony "
 "azonosítód (lowid) van."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Kilépés a fő alkalmazásból..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Az amuleweb instancia - melynek a pid-je '%ld' - bezárása ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Az amuleweb instancia - melynek a pid-je '%ld' - kivégzése ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Mag leállítása."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Az aMule leállítása befejezve"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Memória debug eredmények az aMule bezárásáról:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Nyelvi beállításaid egy konfigurációs változás miatt az alapértelmezettre "
+"lettek átállítva. Bocs."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Infó"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -82,30 +97,16 @@
 "\n"
 "EC beállítások"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Jelszó beállítva, külső kapcsolatok engedélyezve."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "FIGYELEM"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Nyelvi beállításaid egy konfigurációs változás miatt az alapértelmezettre "
-"lettek átállítva. Bocs."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Infó"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -113,16 +114,16 @@
 "Nincs egyetlen kiszolgáló sem a kiszolgáló-listádban.\n"
 "Szeretnéd, hogy az aMule letöltsön egy új listát most?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Kiszolgáló-lista letöltése"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web kiszolgáló fut, pid=%d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -133,23 +134,23 @@
 "vagy fordítsd az aMule-t a --enable-webserver kapcsolóval és futtasd a make "
 "install parancsot."
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "HIBA"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nem tudom a portokat a megadott címhez (%s) rendelni."
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "A %u port nem elérhető. Alacsony kliens azonosítót kapsz (LOWID)\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -165,15 +166,15 @@
 "Ellenőrízd a hálózatodat, hogy megbizonyosodj, hogy a port nyitva van kifelé "
 "és befelé egyaránt."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Online-Aláírás fájl létrehozása sikertelen"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Az aMule OnlineAláírás fájl létrehozása sikertelen"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -181,38 +182,38 @@
 "A kiválasztott nyelvi beállítások úgy látszik nincsenek telepítve a gépeden. "
 "(Megjegyzés: Mindenesetre mepróbálom ezt beállítani)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Ez az első alkalom, hogy az aMule %s-t futtatod"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ez egy teszt verzió, naponta frissítve, és\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047

aMule.tar.xz/po/it.po Changed

@@ -20,19 +20,18 @@
 # This file is distributed under the same license as the aMule package.
 msgid ""
 msgstr ""
-"Project-Id-Version: aMule\n"
+"Project-Id-Version: aMule 2.3.2\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2011-11-02 15:22+0100\n"
-"Last-Translator: Giuliano Manzitti <giuliano1979@hotmail.com>\n"
-"Language-Team:  <it@li.org>\n"
-"Language: it\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-05-19 11:46+0200\n"
+"Last-Translator: Sebastiano Pistore <olatusrooc@virgilio.it>\n"
+"Language-Team: it@li.org; Sebastiano Pistore; <sebastiano.pistore.info@aol."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
+"Language: it\n"
+"X-Generator: Poedit 1.8.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/AddFriend.cpp:45
@@ -53,7 +52,7 @@
 
 #: src/amuleAppCommon.cpp:128
 msgid "Failed to open ED2KLinks file."
-msgstr "Impossibile aprire il file ED2Links."
+msgstr "Impossibile aprire il link ED2K."
 
 #: src/amuleAppCommon.cpp:201
 msgid ""
@@ -63,54 +62,37 @@
 "ATTENZIONE: non è possibile aggiungere te stesso come fonte di un link eD2k "
 "finché avrai un ID basso."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Uscita dall'applicazione..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Sto terminando l'istanza di amuleweb con pid `%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Sto terminando l'istanza di amuleweb con pid `%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Fallito"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Chiusura core."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
-msgstr "Chiusura di aMule completa."
+msgstr "Chiusura di aMule completata."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Risultati del debug della memoria per l'uscita da aMule:"
 
-#: src/amule.cpp:433
-msgid ""
-"\n"
-"EC configuration"
-msgstr ""
-"\n"
-"Configurazione EC"
-
-#: src/amule.cpp:436
-msgid "Password set and external connections enabled."
-msgstr "Password stabilita, connessioni esterne abilitate."
-
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
-msgid "WARNING"
-msgstr "ATTENZIONE"
-
-#: src/amule.cpp:493
+#: src/amule.cpp:443
 msgid ""
 "Your locale has been changed to System Default due to a configuration "
 "change. Sorry."
@@ -119,13 +101,30 @@
 "predefinite dal sistema in conseguenza al cambio di configurazione. "
 "Spiacente."
 
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
 #: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
 #: src/ServerListCtrl.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:580
+#: src/amule.cpp:449
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Configurazione EC (External Connection)"
+
+#: src/amule.cpp:452
+msgid "Password set and external connections enabled."
+msgstr "Password stabilita, connessioni esterne abilitate."
+
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
+msgid "WARNING"
+msgstr "ATTENZIONE"
+
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -133,16 +132,16 @@
 "Non hai alcun server nella lista dei server.\n"
 "Vuoi che aMule scarichi una lista ora?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Scaricamento della lista server"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web server in esecuzione su pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -152,23 +151,23 @@
 "può essere eseguito. Installa il pacchetto aMule web server, o compila aMule "
 "con l'opzione --enable-webserver"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Impossibile aprire le porte sull'indirizzo specificato: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "La porta %u non è disponibile. Otterrai un ID basso\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -184,15 +183,15 @@
 "Controlla le impostazioni di rete e verifica che la porta sia aperta in "
 "ingresso e in uscita."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Impossibile creare il file per la firma in linea"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Impossibile creare il file per la firma in linea di aMule"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035

aMule.tar.xz/po/it_CH.po Changed

@@ -12,19 +12,18 @@
 # This file is distributed under the same license as the aMule package.
 msgid ""
 msgstr ""
-"Project-Id-Version: aMule\n"
+"Project-Id-Version: aMule 2.3.2\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2008-06-12 22:36+0100\n"
-"Last-Translator: Luca Pagliero <luca@lucapagliero.it>\n"
-"Language-Team: Italian_CH\n"
-"Language: it_CH\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-05-19 11:46+0200\n"
+"Last-Translator: Sebastiano Pistore <olatusrooc@virgilio.it>\n"
+"Language-Team: Italian_CH; Sebastiano Pistore; <sebastiano.pistore.info@aol."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Language: Italian_CH\n"
-"X-Poedit-Country: ITALY\n"
+"Language: it_CH\n"
+"X-Generator: Poedit 1.8.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/AddFriend.cpp:45
@@ -44,68 +43,48 @@
 msgstr "L'hash utente specificato non e' valido!"
 
 #: src/amuleAppCommon.cpp:128
-#, fuzzy
 msgid "Failed to open ED2KLinks file."
-msgstr "Impossibile aprire %s (%s)"
+msgstr "Impossibile aprire il link ed2k."
 
 #: src/amuleAppCommon.cpp:201
 msgid ""
 "WARNING: You can't add yourself as a source for an eD2k link while having a "
 "lowid."
 msgstr ""
+"ATTENZIONE: non è possibile aggiungere te stesso come fonte di un link eD2k "
+"finché avrai un ID basso."
 
-#: src/amule.cpp:229
-#, fuzzy
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
-msgstr ""
-"\n"
-"Ok, uscita in corso da %s...\n"
+msgstr "Uscita dall'applicazione..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
-msgstr ""
+msgstr "Sto terminando l'istanza di amuleweb con pid `%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
-msgstr ""
+msgstr "Sto terminando l'istanza di amuleweb con pid `%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Fallito"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
-msgstr ""
+msgstr "aMule OnExit: Chiusura core."
 
-#: src/amule.cpp:330
-#, fuzzy
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
-msgstr "Download completato"
+msgstr "Chiusura di aMule completata."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
-msgstr ""
-
-#: src/amule.cpp:433
-#, fuzzy
-msgid ""
-"\n"
-"EC configuration"
-msgstr "Chiedi conferma prima di uscire"
-
-#: src/amule.cpp:436
-#, fuzzy
-msgid "Password set and external connections enabled."
-msgstr "Accettata nuova connessione esterna"
-
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
-#: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
-msgid "WARNING"
-msgstr "ATTENZIONE"
+msgstr "Risultati del debug della memoria per l'uscita da aMule:"
 
-#: src/amule.cpp:493
+#: src/amule.cpp:443
 msgid ""
 "Your locale has been changed to System Default due to a configuration "
 "change. Sorry."
@@ -114,13 +93,30 @@
 "predefinite dal sistema in conseguenza al cambio di configurazione. "
 "Spiacente."
 
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
 #: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
 #: src/ServerListCtrl.cpp:149
 msgid "Info"
 msgstr "Info"
 
-#: src/amule.cpp:580
+#: src/amule.cpp:449
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Configurazione EC"
+
+#: src/amule.cpp:452
+msgid "Password set and external connections enabled."
+msgstr "Password stabilita, connessioni esterne abilitate."
+
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
+msgid "WARNING"
+msgstr "ATTENZIONE"
+
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -128,39 +124,42 @@
 "Non hai alcun server nella lista dei server.\n"
 "Vuoi che aMule scarichi una lista ora?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Server list download"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
-msgstr ""
+msgstr "web server in esecuzione su pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
-
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+"Hai scelto di lanciare il web server all'avvio, ma il programma amuleweb non "
+"può essere eseguito. Installa il pacchetto aMule web server, o compila aMule "
+"con l'opzione --enable-webserver"
+
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
-msgstr ""
+msgstr "ERRORE"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Impossibile associare porte all'indirizzo specificato: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "La porta %u non e' disponibile. Otterrai un LowID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format

aMule.tar.xz/po/ja.po Changed

@@ -6,14 +6,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-05-31 01:09+0900\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/AddFriend.cpp:45
@@ -43,72 +43,72 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "OK、%s を終了中です…\n"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "失敗しました"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "ダウンロード完了"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"申し訳ありませんが、設定の変更を行ったため、あなたのロケールはシステム標準に"
+"変更されました。"
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "情報"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "終了の確認"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "新しい外部接続を認められました"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "警告"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"申し訳ありませんが、設定の変更を行ったため、あなたのロケールはシステム標準に"
-"変更されました。"
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "情報"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -116,39 +116,39 @@
 "サーバリストにはサーバが一つも入っていません。今aMuleに新しいサーバリストをダ"
 "ウンロードしますか？"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "サーバリストのダウンロード"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "指定したアドレスにポートをバインドできませんでした: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "ポート%uは利用できません。あなたにはLOWIDが与えられます\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -163,15 +163,15 @@
 "\n"
 "ネットワークを調べ、ポートが入出力に対して開いているか確認してください。"
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "オンライン証明ファイルの生成に失敗しました"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "aMuleのオンライン証明ファイルの生成に失敗しました"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -179,41 +179,41 @@
 "選択したロケールはあなたのシステムにインストールされていないようです。（注"
 "意：いずれにせよ設定を試みます）"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "初めてaMule %sを起動しています"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "このバージョンはテスト・バージョンで、毎日更新されているものです。\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047

aMule.tar.xz/po/ko_KR.po Changed

@@ -6,14 +6,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2007-09-12 16:04+0900\n"
 "Last-Translator: Hyunju Kang <rexington@gmail.com>\n"
 "Language-Team: Korean <hoenny@daum.net>\n"
-"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: Korean\n"
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
@@ -46,71 +46,71 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "좋아, 나가는중 %s...\n"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "실패"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"지역정보(로케일)가 설정 변경으로 인해 시스템 기본값으로 변경되었습니다. 죄송"
+"합니다."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "정보"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "종료 확인"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "새로운 외부연결이 승인되었습니다."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "경고"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"지역정보(로케일)가 설정 변경으로 인해 시스템 기본값으로 변경되었습니다. 죄송"
-"합니다."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "정보"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -118,39 +118,39 @@
 "서버 목록에 서버가 없습니다.\n"
 "새로운 서버목록을 내려 받으시겠습니까?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "서버 목록 내려받기"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "포트 %u는 사용할 수 없습니다. 낮은아이디를 가질것입니다.\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -165,15 +165,15 @@
 "\n"
 "나가고 들어오는것에 대해 포트가 열려있는지 통신망을 체크하세요. "
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "온라인서명 파일을 생성하지 못함"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "어뮬 온라인서명 파일을 생성하지 못함"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -181,39 +181,39 @@
 "컴퓨터에 선택한 지역정보(로케일)가 설치 않된것 같습니다. (주의: 어쨌든 설정하"
 "겠습니다)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "이번에 어뮬 %s를 처음 실행했습니다."
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "이 버전은 테스트 버젼으로, 매일 업데이트되며, \n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"

aMule.tar.xz/po/lt.po Changed

@@ -6,14 +6,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-06-08 10:44+0100\n"
 "Last-Translator: Dovydas Sankauskas <laisve@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konf.lt>\n"
-"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
@@ -47,72 +47,72 @@
 "DĖMESIO: jei jūsų ID yra žemas, negalite įdėti savęs prie eD2k nuorodos "
 "šaltinių."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Darbas baigiamas %s...\n"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Nepavyko"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Atsiuntimas baigtas"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Pasikeitus parinktims aplinkos kalba buvo pakeista į sistemoje numatytą "
+"kalbą."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Informacija"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Baigimo patvirtinimas"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Naujas išorinis ryšys priimtas"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "DĖMESIO"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Pasikeitus parinktims aplinkos kalba buvo pakeista į sistemoje numatytą "
-"kalbą."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Informacija"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -120,16 +120,16 @@
 "Serverių sąraše nėra nei vieno serverio.\n"
 "Ar pageidaujate, kad aMule dabar atsiųstų naują sąrašą?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Serverių sąrašo siuntimas"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "žiniatinklio serverio pid yra %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -140,23 +140,23 @@
 "arba sukompiliuokite aMule su --enable-webserver parinktimi ir paleiskite "
 "„make install“."
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "KLAIDA"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nepavyko susieti prievadų su nurodytu adresu: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Prievadas %u neprieinamas. Gavote žemą ID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -173,15 +173,15 @@
 "Patikrinkite sistemines tinklo parinktis ir įsitikinkite, kad nurodytas "
 "prievadas atviras tiek išsiuntimui, tiek priėmimui."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Nepavyko sukurti keičiamo parašo failo"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Nepavyko sukurti keičiamo aMule parašo failo"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -189,38 +189,38 @@
 "Nurodyta lokalė jūsų kompiuteryje neįdiegta. (Dėmesio: šiaip ar taip vis "
 "tiek pabandysime naudoti nurodytą lokalę)."
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "aMule paleista pirmą kartą %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ši versija yra darbinė versija, atnaujinama kasdien, ir\n"
 
-#: src/amule.cpp:1038

aMule.tar.xz/po/nl.po Changed

@@ -10,14 +10,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-11-11 03:26+0100\n"
 "Last-Translator: Frank van der Loo <f.vanderloo@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
@@ -50,37 +50,51 @@
 "WAARSCHUWING: U kunt uzelf niet toevoegen als bron voor een eD2k link "
 "terwijl u een laag id hebt."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Hoofdapp wordt nu afgesloten..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Amuleweb-instantie met pid '%ld' wordt afgesloten ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Amuleweb-instantie met pid '%ld' wordt gedood ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Mislukt"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Kern wordt afgesloten."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule is afgesloten."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Geheugen debug resultaten voor het afsluiten van aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"De taalinstelling is veranderd in Systeem Standaard vanwege een configuratie "
+"wijziging. Sorry."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -88,30 +102,16 @@
 "\n"
 "EV configuratie"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Wachtwoord ingesteld en externe verbindingen ingeschakeld."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "WAARSCHUWING"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"De taalinstelling is veranderd in Systeem Standaard vanwege een configuratie "
-"wijziging. Sorry."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -119,16 +119,16 @@
 "U heeft geen servers in de serverlijst.\n"
 "Wilt u dat aMule nu een nieuwe lijst download?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Download van serverlijst"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "webserver draait met pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -138,23 +138,23 @@
 "amuleweb kan niet gestart worden. Installeer a.u.b. het pakket met de aMule "
 "webserver, of compileer aMule met --enable-webserver en draai make install."
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "FOUT"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Kon geen poorten koppelen aan het opgegeven adres: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Poort %u is niet beschikbaar. U krijgt een LAAG ID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -170,15 +170,15 @@
 "Controleer uw netwerk en zorg ervoor dat de poort open is voor in- en "
 "uitgaand verkeer."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Kon OnlineHandtekening Bestand niet maken"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Kon aMule OnlineHandtekening Bestand niet maken"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -186,40 +186,40 @@
 "De gekozen locale lijkt niet ge?nstalleerd te zijn op uw pc. (Let op: Ik "
 "probeer het toch in te stellen)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Dit is de eerste keer dat u aMule %s draait"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Dit is een test versie, dagelijks geupdatet, en\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "we geven geen garantie dat het niks kapot maakt, uw huis in brand steekt,\n"

aMule.tar.xz/po/nn.po Changed

@@ -10,14 +10,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-06-10 23:09+0200\n"
 "Last-Translator: Hallvor Brunstad <Hallvor_1976@yahoo.com>\n"
 "Language-Team:  <i18n-nn@lister.ping.uio.no>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -50,72 +50,72 @@
 "ÅTVARING: Du kan ikkje leggje deg sjølv til som kjelde for ei eD2k lenkje "
 "medan du har ein lågid."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Ok,·avsluttar·%s...\n"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Mislukka"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Nedlasting fullført"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Dine lokale innstilingar har vorte endra til opprinnelege "
+"systeminnstillingar på grunn av konfigurasjonsending. Beklager."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Stadfesting av avslutting"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "Ny ekstern kopling akseptert"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "ÅTVARING"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Dine lokale innstilingar har vorte endra til opprinnelege "
-"systeminnstillingar på grunn av konfigurasjonsending. Beklager."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -123,16 +123,16 @@
 "Du har ingen tenarar i tenarlista.\n"
 "Vil du at aMule skal laste ned ei ny liste no?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Nedlasting av tenarliste"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "vevtenar køyrer på pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -142,23 +142,23 @@
 "køyrast. Installer pakken som inneheld vevtenaren til aMule, eller kompiler "
 "aMule med --enable-webserver og køyr make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "FEIL"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Greidde ikkje å knyte portar til adressa: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port·%u er ikkje tilgjengeleg. Du vil få LågID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -174,15 +174,15 @@
 "Sjekk nettverket ditt for å vere viss på at porten er open for inn- og "
 "utgåande trafikk."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Greidde ikkje å lage OnlineSigfil"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Greidde ikkje å lage aMule si OnlineSigfil."
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -190,39 +190,39 @@
 "Dei valte lokale innstillingane ser ikkje ut til å vere installerte på "
 "maskina di. (Merk: Eg freistar å setje dei likevel)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Dette er første gongen du køyrer aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Denne utgåva er ei testutgåve, oppdatert dagleg, og\n"
 
-#: src/amule.cpp:1038

aMule.tar.xz/po/pl.po Changed

@@ -12,15 +12,15 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2010-08-19 01:21+0100\n"
 "Last-Translator: Michał Trzebiatowski <hippie_1968@hotmail.com>\n"
 "Language-Team: translationproject.org/team/pl.html <translation-team-"
 "pl@lists.sourceforge.net>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
@@ -54,37 +54,51 @@
 msgstr ""
 "UWAGA: Nie możesz dodać samego siebie jako źródło linku ed2k, gdy masz lowid."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Teraz, zakańczam główną aplikację..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, fuzzy, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Zakańczam instancję amuleweb z pid `%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, fuzzy, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Zabiłam instancję amuleweb z pid `%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Nieudane"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Zakończenie jądra."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Zamykanie aMule zakończone."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Wyniki debugu pamięci dla wyjścia aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Twoje ustawienia lokalne zostały zmienione na domyślne systemowe w związku "
+"ze zmianą konfiguracji. Przepraszamy."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Informacje"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -92,30 +106,16 @@
 "\n"
 "Konfiguracja EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Ustawione hasło i włączone połączenia zewnętrzne."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "UWAGA"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Twoje ustawienia lokalne zostały zmienione na domyślne systemowe w związku "
-"ze zmianą konfiguracji. Przepraszamy."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Informacje"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -123,16 +123,16 @@
 "Nie masz żadnego serwera na twojej liście serwerów.\n"
 "Czy chcesz, żeby aMule pobrał nową listę teraz?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Pobieranie listy serwerów"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "serwer sieciowy uruchomiony na pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -143,23 +143,23 @@
 "sieciowy aMule lub skompiluj aMule używając --enable-webserver i uruchom "
 "make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "BŁĄD"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nie można było powiązać portów z określonym adresem: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u jest niedostępny. Będziesz mieć LowID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -175,15 +175,15 @@
 "Sprawdź swoją sieć aby mieć pewność, że port jest otwarty dla wejścia i "
 "wyjścia."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Nie udało się utworzyć pliku podpisu online"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Nie udało się utworzyć pliku podpisu online aMule"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -191,41 +191,41 @@
 "Wybrane lokale wydają się być niezainstalowane. (Uwaga: I tak spróbuję je "
 "ustawić)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Po raz pierwszy uruchomiłeś aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ta wersja jest aktualizowaną codziennie wersją testową i\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""

aMule.tar.xz/po/pt_BR.po Changed

@@ -12,14 +12,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-12-13 23:14-0300\n"
 "Last-Translator: felipe augusto <flipeicl@gmail.com>\n"
 "Language-Team: Português (Brasileiro) <pt@li.org>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Portuguese\n"
@@ -54,37 +54,51 @@
 "CUIDADO: Você não pode adicionar você mesmo como uma fonte para uma ligação "
 "eD2k quando tem um lowid."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Agora, deixando a aplicação principal..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Terminando instância amuleweb com o pid '%ld'..."
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Matando a instância amuleweb com o pid '%ld'..."
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Falha"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Finalizando o núcleo."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Encerramento do aMule completo."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultados da depuração da memória para a saída do aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Seu locale foi alterado para o padrão do Sistema devido a mudança na "
+"configuração. Desculpe."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -92,30 +106,16 @@
 "\n"
 "Configuração EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Senha definida e conexões externas habilitadas."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "CUIDADO"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Seu locale foi alterado para o padrão do Sistema devido a mudança na "
-"configuração. Desculpe."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -123,16 +123,16 @@
 "Você não tem nenhum servidor na lista de servidor.\n"
 "Você quer que o aMule baixe uma nova lista agora?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Lista de servidor baixada"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web server rodando no pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -142,23 +142,23 @@
 "não pode ser rodado. Por favor instale o pacote contendo o aMule web server, "
 "ou compile o aMule usando --enable-webserver e rode make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERRO"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Não foi possível conectar às portas desse endereço: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Porta %u não disponível. Você ficará com LOWID (id baixa)\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -173,16 +173,16 @@
 "\n"
 "Verifique sua rede para ver se essa porta está aberta para entrada e saída."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Falha ao criar o arquivo OnlineSig"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Falha ao criar o arquivo OnlineSig do aMule"
 
 # src/amuled.cpp:1246:
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -190,39 +190,39 @@
 "Parece que o idioma selecionado não está instalado no seu computador. (Nota: "
 "eu irei defini-lo mesmo assim)."
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Essa é a primeira vez que você executa o aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Essa é uma versão de testes, atualizada diariamente, e\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "não daremos garantia se ela quebrar algo, queimar sua casa,\n"

aMule.tar.xz/po/pt_PT.po Changed

@@ -14,14 +14,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-06-18 14:15+0000\n"
 "Last-Translator: Luís Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: src/AddFriend.cpp:45
@@ -52,37 +52,51 @@
 "AVISO: Não se pode adicionar a si próprio como fonte para um link eD2k "
 "enquanto tiver lowid."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "A fechar a aplicação..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "A terminar instância do amuleweb com o pid '%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "A matar instância do amuleweb com o pid '%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Falhas"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: A terminar núcleo."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule terminado."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Resultados da depuração de memória para a saída do aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"O seu idioma foi alterado para a predefinição do sistema devido a uma "
+"mudança de configuração. Desculpe."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Informação"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -90,30 +104,16 @@
 "\n"
 "Configuração das LE"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Palavra-passe definida e permitidas as ligações externas."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "AVISO"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"O seu idioma foi alterado para a predefinição do sistema devido a uma "
-"mudança de configuração. Desculpe."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Informação"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -121,16 +121,16 @@
 "Não tem nenhum servidor na lista de servidores.\n"
 "Quer que o aMule faça o download de uma lista nova agora?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "A fazer download da lista de servidores"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "servidor web a executar no pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -140,23 +140,23 @@
 "ser lançado. Por favor, instale o pacote que contém o servidor web ou "
 "compile o aMule com --enable-webserver e execute make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ERRO"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Não foi possível associar os portos ao endereço especificado: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "O porto %u não está disponível. Ficará com LOWID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -172,15 +172,15 @@
 "Verifique a sua rede para se certificar de que o porto está aberto para "
 "leitura e escrita."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Erro ao criar o ficheiro da Assinatura Online"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Erro a criar o ficheiro da Assinatura Online do aMule"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -188,37 +188,37 @@
 "O idioma seleccionado parece não estar instalado no seu computador. (Nota: "
 "de qualquer das formas, irei tentar activá-lo)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Esta é a primeira vez que executa o aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Esta é uma versão de testes actualizada diariamente e\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "não há qualquer garantia de que não irá partir nada, pegar fogo à sua casa,\n"

aMule.tar.xz/po/ro.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2014-12-27 10:03+0200\n"
 "Last-Translator: Angelescu Constantin <titus0818@yahoo.com>\n"
 "Language-Team: Angelescu Constantin <titus0818@yahoo.com>\n"
@@ -46,37 +46,51 @@
 "ATENȚIE: Nu vă puteți adăuga ca sursă pentru o legătură eD2k cât timp aveți "
 "lowid."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Acum, se oprește aplicația principală..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Se termină instanța amuleweb cu pid '%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Se omoară instanța amuleweb cu pid '%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Eșuat"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule la ieșire: Se închide nucleul."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule închidere terminată."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Rezultatele depanării memoriei pentru ieșirea aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Limba dumneavoastră a fost schimbată la cea implicită a sistemului datorită "
+"schimbării configurației. Regretăm."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -84,30 +98,16 @@
 "\n"
 "configurație EC"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Configurarea parolei și conexiunile externe sunt activate."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "ATENȚIE"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Limba dumneavoastră a fost schimbată la cea implicită a sistemului datorită "
-"schimbării configurației. Regretăm."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -115,16 +115,16 @@
 "Nu aveți nici un server în lista serverelor.\n"
 "Doriți ca aMule să descarce o nouă listă acum?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Lista serverelor s-a descărcat"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "server web rulând pe pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -134,23 +134,23 @@
 "nu poate fi rulat. Instalați pachetul care conține serverul web aMule, sau "
 "compilați aMule utilizând --enable-webserver și apoi rulați make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "EROARE"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nu se pot lega porturile la adresa specificată: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Portul %u nu este disponibil. Veți fi LOWID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -166,15 +166,15 @@
 "Verificați rețeaua pentru a vă asigura că portul este deschis pentru intrare "
 "și ieșire."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "A eșuat crearea fișierului Semnătură Online"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "A eșuat crearea fișierului aMule Semnătură Online"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -182,42 +182,42 @@
 "Localizarea selectată se pare că nu este instalată pe computer. (Notă: Se va "
 "încerca configurarea acesteia oricum)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Aceasta este prima dată când rulați aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Această versiune este o versiune de testare, actualizată zilnic și\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "nu vă dăm nici un fel de garanție dacă nu se va strica nimic, ardeți-vă "
 "casa,\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 "sau omorâți-vă câinele. Dar * ar trebui să fie * sigur de utilizat oricum.\n"

aMule.tar.xz/po/ru.po Changed

@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-06-19 18:31+0100\n"
 "Last-Translator: Radist Morse <radist.morse@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -56,37 +56,51 @@
 "ПРЕДУПРЕЖДЕНИЕ: Вы не можете добавить себя в качестве источника для eD2k "
 "ссылки если у вас lowid."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Выходим из основного приложения..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Завершаем процесс amuleweb с pid `%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Убиваем процесс amuleweb с pid `%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Неудачно"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Прекращаем работу ядра."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "выключение aMule завершено."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Результаты дебага памяти при выходе из aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"В связи со сменой версии, значение вашей локали было изменено на значение по "
+"умолчанию. Извините."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Сведения"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -94,30 +108,16 @@
 "\n"
 "EC конфигурация"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Пароль задан и внешние соединения разрешены."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "ПРЕДУПРЕЖДЕНИЕ"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"В связи со сменой версии, значение вашей локали было изменено на значение по "
-"умолчанию. Извините."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Сведения"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -125,16 +125,16 @@
 "Ваш список серверов пуст.\n"
 "Скачать новый список?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Загрузить список серверов"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "веб-сервер работает с pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -144,23 +144,23 @@
 "может быть запущен. Установите пакет содержащий веб-сервер aMule или "
 "скомпилируйте его с опцией --enable-webserver и запустите make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Невозможно связать порты с указанными адресами: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Порт %u не доступен. У вас будет LowID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -175,15 +175,15 @@
 "\n"
 "Проверьте вашу сетевую конфигурацию, убедитесь что необходимый порт открыт."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Не удалось создать aMule OnlineSig файл"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Не удалось создать aMule OnlineSig файл"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -191,44 +191,44 @@
 "Выбранная локаль отсутствует в вашей системе (тем не менее, будет "
 "произведена попытка ее использовать)."
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Это первый запуск aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Эта версия является тестовой и обновляется ежедневно.\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "мы не предоставляем никаких гарантий на случай каких либо повреждений, "
 "пожара \n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 "или же смерти вашей любимой собачки. И все же использование ее *должно* быть "
 "безопасным. \n"

aMule.tar.xz/po/sl.po Changed

@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-04-26 01:08+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -49,37 +49,51 @@
 "OPOZORILO: če imete nizek ID, sebe ne morete dodati kot vira za povezavo "
 "eD2k."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Sedaj, zapuščanje glavnega programa ..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Končanje izvoda amuleweb s PID »%ld« ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Ubijanje izvoda amuleweb s PID »%ld« ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Neuspeh"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Končevanje jedra."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Zaustavitev aMule zaključena."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Rezultati razhroščevanja pomnilnika za izhod iz aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Vaše področne nastavitve so bile spremenjene na sistemsko privzete zaradi "
+"spremembe v nastavitvah. Oprostite."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Podatki"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -87,30 +101,16 @@
 "\n"
 "Nastavitev zunanje povezave"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Geslo je bilo nastavljeno in zunanje povezave omogočene."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "OPOZORILO"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Vaše področne nastavitve so bile spremenjene na sistemsko privzete zaradi "
-"spremembe v nastavitvah. Oprostite."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Podatki"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -118,16 +118,16 @@
 "Na seznamu strežnikov nimate nobenega strežnika.\n"
 "Ali želite, da aMule zdaj pridobi nov seznam?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Prejemanje seznama strežnikov"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "spletni strežnik teče s PID %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -138,23 +138,23 @@
 "ali pa prevedite aMule z možnostjo »--enable-webserver« in ga znova namestite "
 "z »make install«."
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "NAPAKA"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Vrat ni bilo moč povezati z navedenim naslovom: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Vrata %u niso razpoložljiva. Imeli boste nizek ID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -169,15 +169,15 @@
 "\n"
 "Preverite omrežje in se prepričajte, da so vrata odprta za izhod in vhod."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Ni bilo mogoče ustvariti datoteke spletnega podpisa"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Ni bilo mogoče ustvariti aMule datoteke spletnega podpisa"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -185,40 +185,40 @@
 "Kot kaže izbrana področna nastavitev ni nameščena na vašem računalniku. "
 "(Opomba: vseeno se jo bo poskusilo nastaviti)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "To je vaš prvi zagon aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "To je testna različica, posodobljena dnevno in\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "ne dajemo zagotovila, da ne bo ničesar poškodovala, zažgala vaše hiše\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "ali ubila vašega psa. Vendar bi vseeno morala biti varna za uporabo.\n"
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053

aMule.tar.xz/po/sq.po Changed

@@ -10,15 +10,15 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-04-20 20:41+0200\n"
 "Last-Translator: Fation  <dj_barthezz@linuxmail.org lushnja_corps@hotmail."
 "com>\n"
 "Language-Team: Shqip <en@li.org>\n"
-"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -49,72 +49,72 @@
 "lowid."
 msgstr ""
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 #, fuzzy
 msgid "Now, exiting main app..."
 msgstr ""
 "\n"
 "Ne rregull, duke dalur %s...\n"
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "E Deshtuar"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 #, fuzzy
 msgid "aMule shutdown completed."
 msgstr "Shkarkimi Perfundoi"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Vendndodhja juaj eshte ndryshuar tek System Default i pershtatur per nje "
+"nderrim konfigurimi. Me vjen keq."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Informacion"
+
+#: src/amule.cpp:449
 #, fuzzy
 msgid ""
 "\n"
 "EC configuration"
 msgstr "Konfirmimi i daljes"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 #, fuzzy
 msgid "Password set and external connections enabled."
 msgstr "U pranua nje lidhje e jashtme e re"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "KUJDES"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Vendndodhja juaj eshte ndryshuar tek System Default i pershtatur per nje "
-"nderrim konfigurimi. Me vjen keq."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Informacion"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -122,39 +122,39 @@
 "Ju nuk keni asnje server ne listen e serverave tuaj.\n"
 "Deshironi qe aMule te shkarkoje nje liste te re tani?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Shkarkim per listen e serverave"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr ""
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr ""
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Nuk mund te lidh portat tek adresa e dhene: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Porta %u nuk eshte me vlere. Ju do te keni ID te ulet\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -170,15 +170,15 @@
 "KOntrolloni rrjetin tuaj per tu siguruar qe porta eshte hapur per hyrje dhe "
 "dalje."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Deshtoi te krijoje failin per Firmen Online"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Deshtoi te krijoje failin per Firmen Online te aMule-s"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -186,42 +186,42 @@
 "Vendi i zgjedur duket se nuk do te instalohet ne kutine tuaj. (Shenim: Une "
 "do te mundohem ta vendos ate)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Kjo eshte hera e pare qe ju po persorni aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Ky eshte nje version per testim,i azhornuar per dite, dhe\n"
 
-#: src/amule.cpp:1038

aMule.tar.xz/po/sv.po Changed

@@ -1,19 +1,21 @@
 # Swedish tranlation for aMule
 # This file is distributed under the same license as the amule package.
-# Daniel Nylander <po@danielnylander.se>, 2007.
+# raffe, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2007-03-12 22:49+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-05-18 09:44+0100\n"
+"Last-Translator: raffe <raffe@localhost.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -32,82 +34,79 @@
 msgstr "Angiven userhash är inte giltig!"
 
 #: src/amuleAppCommon.cpp:128
-#, fuzzy
 msgid "Failed to open ED2KLinks file."
-msgstr "Kunde inte öppna skalfil: %s"
+msgstr "Kunde inte öppna ED2KLinks-filen"
 
 #: src/amuleAppCommon.cpp:201
 msgid ""
 "WARNING: You can't add yourself as a source for an eD2k link while having a "
 "lowid."
 msgstr ""
+"VARNING: Du kan inte lägga till dig själv som källa för en eD2k-länk när du "
+"har lowid."
 
-#: src/amule.cpp:229
-#, fuzzy
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
-msgstr ""
-"\n"
-"Ok, avslutar %s...\n"
+msgstr "Nu, avslutar huvudapplikationen..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
-msgstr ""
+msgstr "Avslutar  amuleweb-instansen med pid '%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
-msgstr ""
+msgstr "Dödar amuleweb-instansen med pid '%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
-msgstr ""
+msgstr "aMule VidAvslut: Avslutar huvudprogrammet."
 
-#: src/amule.cpp:330
-#, fuzzy
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
-msgstr "aMule är inte ansluten!"
+msgstr "aMules avslutning slutförd"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
+msgstr "Minnes-debug-resultat för aMules avslut"
+
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
+"Din plats har ändrats till systemets standard på grund av en "
+"konfigurationsändring. Ledsen."
 
-#: src/amule.cpp:433
-#, fuzzy
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Info"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
-msgstr "Bekräfta avslutning"
+msgstr ""
+"\n"
+"EC-konfiguration"
 
-#: src/amule.cpp:436
-#, fuzzy
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
-msgstr "Acceptera externa anslutningar"
+msgstr "Lösenord sparad och extern anslutning aktiverad."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Din lokal har ändrats till systemets standardlokal på grund av en "
-"konfigurationsändring. Ursäkta."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Info"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -115,40 +114,42 @@
 "Du har inga servrar i serverlistan.\n"
 "Vill du att aMule ska hämta en ny lista nu?"
 
-#: src/amule.cpp:581
-#, fuzzy
+#: src/amule.cpp:590
 msgid "Server list download"
-msgstr "Serverlista"
+msgstr "Serverlista hämtad"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
-msgstr ""
+msgstr "webbservern kör på pid %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
 "aMule using --enable-webserver and run make install"
 msgstr ""
-
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+"Du vill köra webbservern vid uppstart, men binärfilen amuleweb kan inte "
+"köras. Vänligen installera paketet med aMule webservern eller compilera "
+"aMule med --enable-webserver och kör make install"
+
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
-msgstr ""
+msgstr "FEL"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
-msgstr ""
+msgstr "Kunde inte binda portarna till specificerad adress: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port %u är inte tillgänglig. Du kommer att bli LOWID\n"

aMule.tar.xz/po/tr.po Changed

@@ -8,17 +8,16 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
-"PO-Revision-Date: 2012-03-23 10:36+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
+"PO-Revision-Date: 2016-08-24 17:06+0200\n"
 "Last-Translator: \n"
 "Language-Team: Turkish <li@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Poedit-Language: Turkish\n"
-"X-Poedit-Country: TURKEY\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: src/AddFriend.cpp:45
 msgid "Add a Friend"
@@ -48,37 +47,51 @@
 "UYARI: DüşükID olduğunuz sürece kendinizi bir kaynak olarak eD2k "
 "bağlantılarına ekleyemezsiniz."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Ana uygulamadan çıkılıyor..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Amuleweb oturumu pid `%ld' ile sonlandırılıyor..."
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Amuleweb oturumu pid `%ld' ile öldürülüyor..."
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Başarısız"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule Çıkışında: Çekirdek imha ediliyor."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule kapatılma işlemi tamamlandı."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "aMule çıkışı için hafıza hata raporlama sonuçları:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Bir yapılandırma değişikliği nedeniyle dil ayarınız 'Sistem Varsayılanı'na "
+"çevrildi. Üzgünüm. Vallahi..."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Bilgi"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -86,30 +99,16 @@
 "\n"
 "EC yapılandırması"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Parola ayarlandı ve dış bağlantılar etkinleştirildi."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "UYARI"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Bir yapılandırma değişikliği nedeniyle dil ayarınız 'Sistem Varsayılanı'na "
-"çevrildi. Üzgünüm. Vallahi..."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Bilgi"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -117,16 +116,16 @@
 "Sunucu listesinde mevcut bir sunucu yok.\n"
 "aMule'nin yeni bir liste indirmesini ister misiniz?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Sunucu listesi indirme"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "web sunucusu pid %d üzerinde çalışıyor"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -137,23 +136,23 @@
 "aMule' yi --enable-webserver komutu ile derleyip make install komutunu "
 "çalıştırın"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "HATA"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Belirtilen şu adrese portlar bağlanamıyor: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Port. %u kullanılamıyor. DÜŞÜKID alacaksınız.\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -169,15 +168,15 @@
 "Ağ ayarlarınıza göz atarak portun giriş ve çıkışlar için açık olup "
 "olmadığını denetleyiniz."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Çevrim içi İmza dosyası oluşturma başarısız."
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "aMule Çevrim içi İmza dosyası oluşturma başarısız."
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -185,38 +184,38 @@
 "Seçilen yerelleştirme görünüşe göre bilgisayarınızda yüklü değil. (Not: Bunu "
 "yine de yapmaya çalışacağım)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Hoş geldiniz! aMule %s sürümünü ilk kez kullanıyorsunuz."
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Bu sürüm bir deneme sürümü, her gün güncellenir ve\n"

aMule.tar.xz/po/uk.po Changed

@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2008-12-17 11:21+0200\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Ukrainian\n"
@@ -49,37 +49,51 @@
 "ЗАСТЕРЕЖЕННЯ: ви не можете додати себе як джерело для eD2k-посилання маючи "
 "LowID."
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "Тепер, виходимо з головної програми..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, fuzzy, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "Вбиваю екземпляр amuleweb з pid `%ld' ... "
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, fuzzy, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "Вбиваю екземпляр amuleweb з pid `%ld' ... "
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "Невдалі"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule OnExit: Завершується core."
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "Завершення роботи aMule закінчене."
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "Наслідки зневадження пам'яті для виходу aMule:"
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Ваша локаль змінена на системну за замовчуванням із-за зміни налаштувань. "
+"Вибачте."
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "Інфо"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -87,30 +101,16 @@
 "\n"
 "Налаштування зовнішніх з'єднань"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "Пароль встановлений та дозволені зовнішні з'єднання."
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "ЗАСТЕРЕЖЕННЯ"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
-"Ваша локаль змінена на системну за замовчуванням із-за зміни налаштувань. "
-"Вибачте."
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "Інфо"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -118,16 +118,16 @@
 "Ви не маєте жодного серверу в переліку серверів.\n"
 "Хочете, щоб aMule звантажив зараз новий?"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "Звантажити перелік серверів"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "Веб-сервер запущений з %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -137,23 +137,23 @@
 "бути запущено. Будь ласка, встановіть пакунок, що містить веб-сервер aMule, "
 "зберіть aMule з --enable-webserver та виконайте make install"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "ПОМИЛКА"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "Неможливо прив'язати порт до визначеної адреси: %s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "Порт %u недоступний. Ви будете мати LowID\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -168,15 +168,15 @@
 "\n"
 "Перевірте вашу мережу, щоб впевнитись, що порт відкритий."
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "Неможливо створити файл онлайн-підпису"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "Неможливо створити файл онлайн-підпису aMule"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -184,40 +184,40 @@
 "Обрана локаль здається не встановлена. (примітка: спроба встановити її в "
 "будь-якому випадку)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "Ви запускаєте aMule %s вперше"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "Це тестова версія, оновлюється щодня, та\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 "ми не даємо жодної гарантії, якщо вона щось пошкодить, спалить ваш будинок,\n"

aMule.tar.xz/po/zh_CN.po Changed

@@ -11,14 +11,14 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-04-21 12:10+1000\n"
 "Last-Translator: YiQi <u4781098@anu.edu.au>\n"
 "Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.0\n"
 
@@ -48,37 +48,49 @@
 "lowid."
 msgstr "警告：在低 ID 的情况下，你不能添加自己作为 ed2k 链接的源。"
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "现在，正在退出主程序..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, fuzzy, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "杀死 pid 为 '%ld' 的 amuleweb 进程..."
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, fuzzy, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "杀死 pid 为 '%ld' 的 amuleweb 进程..."
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "失败"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule 正在退出：中止内核。"
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "aMule 已经关闭。"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "aMule 退出的内存 Debug 结果："
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr "对不起，由于配置变动，您的地区设置已经变为系统默认值。"
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "信息"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -86,28 +98,16 @@
 "\n"
 "EC 配置"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "密码已设置，启用远程连接。"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "警告"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr "对不起，由于配置变动，您的地区设置已经变为系统默认值。"
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "信息"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -115,16 +115,16 @@
 "在服务器列表中没有任何服务器。\n"
 "需要 aMule 现在就下载一个新的列表吗？"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "服务器列表已下载"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "Web 服务器正在运行，进程编号为 %d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -134,23 +134,23 @@
 "务器的 aMule 版本，或者使用 --enable-webserver 选项编译 aMule，然后运行 make "
 "install 进行安装"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "错误"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "无法绑定端口到指定的地址：%s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "端口 %u 已被占用，你会成为低 ID。\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -165,15 +165,15 @@
 "\n"
 "请检测网络设置以确保端口可用于输入输出。"
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "创建在线统计文件失败"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "创建 aMule 在线统计文件失败"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
@@ -181,36 +181,36 @@
 "您所选择的地区设置在您的计算机上似乎没有安装。(注意：我还是会尝试您所选择的地"
 "区设置。)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "这是您第一次运行 aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "此版本是测试版，更新频繁， \n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "我们无法承诺它不会损坏任何东西，烧毁您的房子，\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "或杀死你的狗，但 * 一般来讲 * 它应该是安全的。\n"

aMule.tar.xz/po/zh_TW.po Changed

@@ -20,7 +20,7 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: http://forum.amule.org/index.php?board=40.0\n"
-"POT-Creation-Date: 2014-11-25 15:48+0100\n"
+"POT-Creation-Date: 2016-04-11 11:33+0200\n"
 "PO-Revision-Date: 2011-11-11 01:29+0800\n"
 "Last-Translator: Wayne Su <mstarmstar@gmail.com>\n"
 "Language-Team: \n"
@@ -59,37 +59,49 @@
 "lowid."
 msgstr "警告：LowID 時不可以將自己加入 eD2k 連結來源。"
 
-#: src/amule.cpp:229
+#: src/amule.cpp:230
 msgid "Now, exiting main app..."
 msgstr "正在離開主程式..."
 
-#: src/amule.cpp:248
+#: src/amule.cpp:249
 #, c-format
 msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr "正在終止 pid %ld 的 amuleweb 執行緒..."
 
-#: src/amule.cpp:251
+#: src/amule.cpp:252
 #, c-format
 msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr "正在強行終止 pid %ld 的 amuleweb 執行緒..."
 
-#: src/amule.cpp:253 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
+#: src/amule.cpp:254 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:95
 msgid "Failed"
 msgstr "失敗"
 
-#: src/amule.cpp:259
+#: src/amule.cpp:260
 msgid "aMule OnExit: Terminating core."
 msgstr "aMule 離開中：正在終止主程式。"
 
-#: src/amule.cpp:330
+#: src/amule.cpp:333
 msgid "aMule shutdown completed."
 msgstr "已關閉 aMule 。"
 
-#: src/amule.cpp:334
+#: src/amule.cpp:337
 msgid "Memory debug results for aMule exit:"
 msgstr "離開 aMule 時記憶體除錯結果："
 
-#: src/amule.cpp:433
+#: src/amule.cpp:443
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr "對不起，由於版本變更，您的地區設定已經被變更爲系統預設值。"
+
+#: src/amule.cpp:443 src/amule.cpp:1058 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
+#: src/ServerListCtrl.cpp:149
+msgid "Info"
+msgstr "資訊"
+
+#: src/amule.cpp:449
 msgid ""
 "\n"
 "EC configuration"
@@ -97,28 +109,16 @@
 "\n"
 "外部連線設定"
 
-#: src/amule.cpp:436
+#: src/amule.cpp:452
 msgid "Password set and external connections enabled."
 msgstr "密碼已設定，外部連線已啟用。"
 
-#: src/amule.cpp:447 src/KadDlg.cpp:183 src/KadDlg.cpp:189
+#: src/amule.cpp:463 src/KadDlg.cpp:183 src/KadDlg.cpp:189
 #: src/PrefsUnifiedDlg.cpp:747 src/SharedFilesCtrl.cpp:318
 msgid "WARNING"
 msgstr "警告"
 
-#: src/amule.cpp:493
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr "對不起，由於版本變更，您的地區設定已經被變更爲系統預設值。"
-
-#: src/amule.cpp:495 src/amule.cpp:1049 src/CatDialog.cpp:141
-#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:346
-#: src/ServerListCtrl.cpp:149
-msgid "Info"
-msgstr "資訊"
-
-#: src/amule.cpp:580
+#: src/amule.cpp:589
 msgid ""
 "You don't have any server in the server list.\n"
 "Do you want aMule to download a new list now?"
@@ -126,16 +126,16 @@
 "在伺服器清單中沒有任何伺服器。\n"
 "要讓 aMule 現在就下載一個新的嗎？"
 
-#: src/amule.cpp:581
+#: src/amule.cpp:590
 msgid "Server list download"
 msgstr "已下載伺服器清單"
 
-#: src/amule.cpp:650
+#: src/amule.cpp:659
 #, c-format
 msgid "web server running on pid %d"
 msgstr "執行中的網站伺服器 pid：%d"
 
-#: src/amule.cpp:654
+#: src/amule.cpp:663
 msgid ""
 "You requested to run web server on startup, but the amuleweb binary cannot "
 "be run. Please install the package containing aMule web server, or compile "
@@ -144,23 +144,23 @@
 "您要求啟動時執行網站伺服器，但系統無法執行 amuleweb。請安裝含有 aMule 網站伺"
 "服器的套件，或於編譯 aMule 程式碼時加入 --enable-webserver 選項"
 
-#: src/amule.cpp:655 src/amule.cpp:769 src/amule.cpp:1060
-#: src/amule-remote-gui.cpp:304 src/amule-remote-gui.cpp:326
-#: src/amule-remote-gui.cpp:328 src/amule-remote-gui.cpp:641
+#: src/amule.cpp:664 src/amule.cpp:778 src/amule.cpp:1069
+#: src/amule-remote-gui.cpp:308 src/amule-remote-gui.cpp:330
+#: src/amule-remote-gui.cpp:332 src/amule-remote-gui.cpp:644
 msgid "ERROR"
 msgstr "錯誤"
 
-#: src/amule.cpp:737
+#: src/amule.cpp:746
 #, c-format
 msgid "Could not bind ports to the specified address: %s"
 msgstr "無法選定使用此位址的通訊埠：%s"
 
-#: src/amule.cpp:761
+#: src/amule.cpp:770
 #, c-format
 msgid "Port %u is not available. You will be LOWID\n"
 msgstr "通訊埠 %u 已被佔用。您會變成 LOWID。\n"
 
-#: src/amule.cpp:767
+#: src/amule.cpp:776
 #, c-format
 msgid ""
 "Port %u is not available!\n"
@@ -175,51 +175,51 @@
 "\n"
 "請檢查網路設定以確保通訊埠可正常使用。"
 
-#: src/amule.cpp:846
+#: src/amule.cpp:855
 msgid "Failed to create OnlineSig File"
 msgstr "無法建立線上簽名識別檔"
 
-#: src/amule.cpp:854
+#: src/amule.cpp:863
 msgid "Failed to create aMule OnlineSig File"
 msgstr "無法建立 aMule 線上簽名識別檔"
 
-#: src/amule.cpp:1026
+#: src/amule.cpp:1035
 msgid ""
 "The selected locale seems not to be installed on your box. (Note: I'll try "
 "to set it anyway)"
 msgstr ""
 "在您的電腦上似乎沒有安裝您所選取的地區設定。 (但仍會採用您所選擇的設定)"
 
-#: src/amule.cpp:1035
+#: src/amule.cpp:1044
 #, c-format
 msgid "This is the first time you run aMule %s"
 msgstr "這是您第一次執行 aMule %s"
 
-#: src/amule.cpp:1037
+#: src/amule.cpp:1046
 msgid "This version is a testing version, updated daily, and\n"
 msgstr "這個版本是測試版，每日有更新，\n"
 
-#: src/amule.cpp:1038
+#: src/amule.cpp:1047
 msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr "但我們無法擔保它不會造成任何損害、燒掉您的房子、\n"
 
-#: src/amule.cpp:1039
+#: src/amule.cpp:1048
 msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr "或害死您的狗。但一般來講它「應該」是安全的。\n"
 
-#: src/amule.cpp:1044
+#: src/amule.cpp:1053
 msgid "More information, support and new releases can found at our homepage,\n"
 msgstr "在我們的網頁可找到更多資訊、使用者支援以及程式最新版本：\n"
 
-#: src/amule.cpp:1045
+#: src/amule.cpp:1054
 msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"

aMule.tar.xz/src/BaseClient.cpp Changed

@@ -723,10 +723,7 @@
 
 bool CUpDownClient::SendHelloPacket()
 {
-	if (m_socket == NULL) {
-		wxFAIL;
-		return true;
-	}
+	wxCHECK(m_socket != NULL, true);
 
 	// if IP is filtered, don't greet him but disconnect...
 	if (theApp->ipfilter->IsFiltered(m_socket->GetPeerInt())) {
@@ -749,12 +746,9 @@
 	return true;
 }
 
-void CUpDownClient::SendMuleInfoPacket(bool bAnswer, bool OSInfo) {
-
-	if (m_socket == NULL){
-		wxFAIL;
-		return;
-	}
+void CUpDownClient::SendMuleInfoPacket(bool bAnswer, bool OSInfo)
+{
+	wxCHECK2(m_socket != NULL, return);
 
 	CPacket* packet = NULL;
 	CMemFile data;
@@ -1015,10 +1009,7 @@
 
 void CUpDownClient::SendHelloAnswer()
 {
-	if (m_socket == NULL){
-		wxFAIL;
-		return;
-	}
+	wxCHECK2(m_socket != NULL, return);
 
 	CMemFile data(128);
 	SendHelloTypePacket(&data);
@@ -2051,12 +2042,13 @@
 	}
 }
 
-void CUpDownClient::SendPublicKeyPacket(){
+void CUpDownClient::SendPublicKeyPacket()
+{
 	// send our public key to the client who requested it
-	if (m_socket == NULL || credits == NULL || m_SecureIdentState != IS_KEYANDSIGNEEDED){
-		wxFAIL;
-		return;
-	}
+	wxCHECK2(m_socket != NULL, return);
+	wxCHECK2(credits != NULL, return);
+	wxCHECK2(m_SecureIdentState == IS_KEYANDSIGNEEDED, return);
+
 	if (!theApp->CryptoAvailable())
 		return;
 
@@ -2072,12 +2064,12 @@
 }
 
 
-void CUpDownClient::SendSignaturePacket(){
+void CUpDownClient::SendSignaturePacket()
+{
 	// signate the public key of this client and send it
-	if (m_socket == NULL || credits == NULL || m_SecureIdentState == 0){
-		wxFAIL;
-		return;
-	}
+	wxCHECK2(m_socket != NULL, return);
+	wxCHECK2(credits != NULL, return);
+	wxCHECK2(m_SecureIdentState != 0, return);
 
 	if (!theApp->CryptoAvailable()) {
 		return;
@@ -2114,10 +2106,8 @@
 	byte achBuffer[250];
 
 	uint8 siglen = theApp->clientcredits->CreateSignature(credits, achBuffer,  250, ChallengeIP, byChaIPKind );
-	if (siglen == 0){
-		wxFAIL;
-		return;
-	}
+	wxCHECK2(siglen != 0, return);
+
 	CMemFile data;
 	data.WriteUInt8(siglen);
 	data.Write(achBuffer, siglen);
@@ -2138,9 +2128,18 @@
 {
 	theApp->clientlist->AddTrackClient(this);
 
-	if (m_socket == NULL || credits == NULL || pachPacket[0] != nSize-1
-		|| nSize == 0 || nSize > 250){
-		wxFAIL;
+	wxCHECK2(m_socket != NULL, return);
+	wxCHECK2(credits != NULL, return);
+	if (pachPacket[0] != nSize - 1) {
+		AddDebugLogLineN(logClient, CFormat(wxT("Inconsistent packet size (%d != %d)")) % pachPacket[0] % (nSize - 1));
+		return;
+	}
+	if (nSize == 0) {
+		AddDebugLogLineN(logClient, wxT("Invalid packet size (0)"));
+		return;
+	}
+	if (nSize > 250) {
+		AddDebugLogLineN(logClient, CFormat(wxT("Invalid packet size (%d > 250)")) % nSize);
 		return;
 	}
 	if (!theApp->CryptoAvailable())
@@ -2165,8 +2164,14 @@
 {
 	// here we spread the good guys from the bad ones ;)
 
-	if (m_socket == NULL || credits == NULL || nSize == 0 || nSize > 250){
-		wxFAIL;
+	wxCHECK2(m_socket != NULL, return);
+	wxCHECK2(credits != NULL, return);
+	if (nSize == 0) {
+		AddDebugLogLineN(logClient, wxT("Invalid packet size (0)"));
+		return;
+	}
+	if (nSize > 250) {
+		AddDebugLogLineN(logClient, CFormat(wxT("Invalid packet size (%d > 250)")) % nSize);
 		return;
 	}
 
@@ -2175,8 +2180,9 @@
 		byChaIPKind = 0;
 	else if (pachPacket[0] == nSize-2 && (m_bySupportSecIdent & 2) > 0) //v2
 		byChaIPKind = pachPacket[nSize-1];
-	else{
-		wxFAIL;
+	else {
+		// Unknown or invalid format
+		AddDebugLogLineN(logClient, wxT("Invalid or unknown challenge format - ignoring"));
 		return;
 	}
 
@@ -2210,36 +2216,35 @@
 	m_dwLastSignatureIP = GetIP();
 }
 
-void CUpDownClient::SendSecIdentStatePacket(){
+void CUpDownClient::SendSecIdentStatePacket()
+{
+	wxCHECK2(credits != NULL, return);
+
 	// check if we need public key and signature
-	if (credits){
-		uint8 nValue = 0;
-		if (theApp->CryptoAvailable()){
-			if (credits->GetSecIDKeyLen() == 0) {
-				nValue = IS_KEYANDSIGNEEDED;
-			} else if (m_dwLastSignatureIP != GetIP()) {
-				nValue = IS_SIGNATURENEEDED;
-			}
+	uint8 nValue = 0;
+	if (theApp->CryptoAvailable()){
+		if (credits->GetSecIDKeyLen() == 0) {
+			nValue = IS_KEYANDSIGNEEDED;
+		} else if (m_dwLastSignatureIP != GetIP()) {
+			nValue = IS_SIGNATURENEEDED;
 		}
-		if (nValue == 0){
-			AddDebugLogLineN( logClient, wxT("Not sending SecIdentState Packet, because State is Zero") );
-			return;
-		}
-		// crypt: send random data to sign
-		uint32 dwRandom = rand()+1;
-		credits->m_dwCryptRndChallengeFor = dwRandom;
+	}
+	if (nValue == 0){
+		AddDebugLogLineN( logClient, wxT("Not sending SecIdentState Packet, because State is Zero") );
+		return;
+	}
+	// crypt: send random data to sign
+	uint32 dwRandom = rand()+1;
+	credits->m_dwCryptRndChallengeFor = dwRandom;
 
-		CMemFile data;
-		data.WriteUInt8(nValue);
-		data.WriteUInt32(dwRandom);
-		CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_SECIDENTSTATE);
+	CMemFile data;
+	data.WriteUInt8(nValue);
+	data.WriteUInt32(dwRandom);
+	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_SECIDENTSTATE);
 
-		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_SECIDENTSTATE to ") + GetFullIP() );
-		SendPacket(packet,true,true);
-	} else {
-		wxFAIL;
-	}
+	theStats::AddUpOverheadOther(packet->GetPacketSize());
+	AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_SECIDENTSTATE to ") + GetFullIP() );
+	SendPacket(packet,true,true);

aMule.tar.xz/src/CFile.cpp Changed

@@ -39,7 +39,7 @@
 #endif
 
 // standard
-#if defined(__WINDOWS__ ) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
 #	include <io.h>
 #	ifndef __SALFORDC__
 #		define   WIN32_LEAN_AND_MEAN
@@ -92,14 +92,14 @@
 #	define   O_BINARY    (0)
 #endif  //__UNIX__
 
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 #include <wx/msw/mslu.h>
 #endif
 
 
 // The following defines handle different names across platforms,
 // and ensures that we use 64b IO on windows (only 32b by default).
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 	#define FLUSH_FD(x)			_commit(x)
 	#define SEEK_FD(x, y, z)		_lseeki64(x, y, z)
 	#define TELL_FD(x)			_telli64(x)
@@ -271,7 +271,7 @@
 	}
 
 	// Windows needs wide character file names
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 	m_fd = _wopen(m_filePath.GetRaw().c_str(), flags, accessMode);
 #else
 	Unicode2CharBuf tmpFileName = filename2char(m_filePath.GetRaw());
@@ -427,7 +427,7 @@
 {
 	MULE_VALIDATE_STATE(IsOpened(), wxT("CFile: Cannot set length when no file is open."));
 
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 #ifdef _MSC_VER
 // MSVC has a 64bit version
 	bool result = _chsize_s(m_fd, new_len) == 0;

aMule.tar.xz/src/CatDialog.cpp Changed

aMule.tar.xz/src/DirectoryTreeCtrl.cpp Changed

aMule.tar.xz/src/DownloadClient.cpp Changed

@@ -616,8 +616,6 @@
 		return;
 	}
 
-	uint8 version = GetVBTTags() ? 2 : 1;
-
 	if (m_DownloadBlocks_list.empty()) {
 		// Barry - instead of getting 3, just get how many is needed
 		uint16 count = m_MaxBlockRequests - m_PendingBlocks_list.size();
@@ -685,9 +683,9 @@
 					pblock->fRecovered = 0;
 					m_PendingBlocks_list.push_back(pblock);
 				}
-			}	else {
+			} else {
 				// WTF, we just freed blocks.
-				wxFAIL;
+				wxFAIL_MSG(wxT("No free blocks to request after freeing some blocks"));
 				return;
 			}
 		} else {
@@ -700,126 +698,117 @@
 
 	CPacket* packet = NULL;
 
-	switch (version) {
-		case 2: {
-			// ED2Kv2 packet...
-			// Most common scenario: hash + blocks to request + every one
-			// having 2 uint32 tags
+	if (GetVBTTags()) {
+		// ED2Kv2 packet...
+		// Most common scenario: hash + blocks to request + every one
+		// having 2 uint32 tags
 
-			uint8 nBlocks = m_PendingBlocks_list.size();
-			if (nBlocks > m_MaxBlockRequests) {
-				nBlocks = m_MaxBlockRequests;
-			}
+		uint8 nBlocks = m_PendingBlocks_list.size();
+		if (nBlocks > m_MaxBlockRequests) {
+			nBlocks = m_MaxBlockRequests;
+		}
 
-			CMemFile data(16 + 1 + nBlocks*((2+4)*2));
+		CMemFile data(16 + 1 + nBlocks*((2+4)*2));
 
-			data.WriteHash(m_reqfile->GetFileHash());
+		data.WriteHash(m_reqfile->GetFileHash());
 
-			data.WriteUInt8(nBlocks);
+		data.WriteUInt8(nBlocks);
 
-			std::list<Pending_Block_Struct*>::iterator it = m_PendingBlocks_list.begin();
-			while (nBlocks) {
-				wxASSERT(it != m_PendingBlocks_list.end());
-				wxASSERT( (*it)->block->StartOffset <= (*it)->block->EndOffset );
-				(*it)->fZStreamError = 0;
-				(*it)->fRecovered = 0;
-				CTagVarInt(/*Noname*/0,(*it)->block->StartOffset).WriteTagToFile(&data);
-				CTagVarInt(/*Noname*/0,(*it)->block->EndOffset).WriteTagToFile(&data);
-				++it;
-				nBlocks--;
-			}
+		std::list<Pending_Block_Struct*>::iterator it = m_PendingBlocks_list.begin();
+		while (nBlocks) {
+			wxASSERT(it != m_PendingBlocks_list.end());
+			wxASSERT( (*it)->block->StartOffset <= (*it)->block->EndOffset );
+			(*it)->fZStreamError = 0;
+			(*it)->fRecovered = 0;
+			CTagVarInt(/*Noname*/0,(*it)->block->StartOffset).WriteTagToFile(&data);
+			CTagVarInt(/*Noname*/0,(*it)->block->EndOffset).WriteTagToFile(&data);
+			++it;
+			nBlocks--;
+		}
 
-			packet = new CPacket(data, OP_ED2KV2HEADER, OP_REQUESTPARTS);
-			AddDebugLogLineN( logLocalClient, CFormat(wxT("Local Client ED2Kv2: OP_REQUESTPARTS(%i) to %s"))
-				% (m_PendingBlocks_list.size()<m_MaxBlockRequests ? m_PendingBlocks_list.size() : m_MaxBlockRequests) % GetFullIP() );
+		packet = new CPacket(data, OP_ED2KV2HEADER, OP_REQUESTPARTS);
+		AddDebugLogLineN( logLocalClient, CFormat(wxT("Local Client ED2Kv2: OP_REQUESTPARTS(%i) to %s"))
+				  % (m_PendingBlocks_list.size()<m_MaxBlockRequests ? m_PendingBlocks_list.size() : m_MaxBlockRequests) % GetFullIP() );
 
-			break;
-		}
-		case 1: {
-			wxASSERT(m_MaxBlockRequests == STANDARD_BLOCKS_REQUEST);
-
-			//#warning Kry - I dont specially like this approach, we iterate one time too many
-
-			bool bHasLongBlocks =  false;
-
-			std::list<Pending_Block_Struct*>::iterator it = m_PendingBlocks_list.begin();
-			for (uint32 i = 0; i != m_MaxBlockRequests; i++){
-				if (it != m_PendingBlocks_list.end()) {
-					Pending_Block_Struct* pending = *it++;
-					wxASSERT( pending->block->StartOffset <= pending->block->EndOffset );
-					if (pending->block->StartOffset > 0xFFFFFFFF || pending->block->EndOffset > 0xFFFFFFFF){
-						bHasLongBlocks = true;
-						if (!SupportsLargeFiles()){
-							// Requesting a large block from a client that doesn't support large files?
-							wxFAIL;
-							if (!GetSentCancelTransfer()){
-								CPacket* cancel_packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
-								theStats::AddUpOverheadFileRequest(cancel_packet->GetPacketSize());
-								AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + GetFullIP() );
-								SendPacket(cancel_packet,true,true);
-								SetSentCancelTransfer(1);
-							}
-							SetDownloadState(DS_ERROR);
+	} else {
+		wxASSERT(m_MaxBlockRequests == STANDARD_BLOCKS_REQUEST);
+
+		//#warning Kry - I dont specially like this approach, we iterate one time too many
+
+		bool bHasLongBlocks =  false;
+
+		std::list<Pending_Block_Struct*>::iterator it = m_PendingBlocks_list.begin();
+		for (uint32 i = 0; i != m_MaxBlockRequests; i++){
+			if (it != m_PendingBlocks_list.end()) {
+				Pending_Block_Struct* pending = *it++;
+				wxASSERT( pending->block->StartOffset <= pending->block->EndOffset );
+				if (pending->block->StartOffset > 0xFFFFFFFF || pending->block->EndOffset > 0xFFFFFFFF){
+					bHasLongBlocks = true;
+					if (!SupportsLargeFiles()){
+						// Requesting a large block from a client that doesn't support large files?
+						if (!GetSentCancelTransfer()){
+							CPacket* cancel_packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
+							theStats::AddUpOverheadFileRequest(cancel_packet->GetPacketSize());
+							AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + GetFullIP() );
+							SendPacket(cancel_packet,true,true);
+							SetSentCancelTransfer(1);
 						}
-						break;
+						SetDownloadState(DS_ERROR);
+						return;
 					}
+					break;
 				}
 			}
+		}
 
-			CMemFile data(16 /*Hash*/ + (m_MaxBlockRequests*(bHasLongBlocks ? 8 : 4) /* uint32/64 start*/) + (3*(bHasLongBlocks ? 8 : 4)/* uint32/64 end*/));
-			data.WriteHash(m_reqfile->GetFileHash());
-
-			it = m_PendingBlocks_list.begin();
-			for (uint32 i = 0; i != m_MaxBlockRequests; i++) {
-				if (it != m_PendingBlocks_list.end()) {
-					Pending_Block_Struct* pending = *it++;
-					wxASSERT( pending->block->StartOffset <= pending->block->EndOffset );
-					pending->fZStreamError = 0;
-					pending->fRecovered = 0;
-					if (bHasLongBlocks) {
-						data.WriteUInt64(pending->block->StartOffset);
-					} else {
-						data.WriteUInt32(pending->block->StartOffset);
-					}
+		CMemFile data(16 /*Hash*/ + (m_MaxBlockRequests*(bHasLongBlocks ? 8 : 4) /* uint32/64 start*/) + (3*(bHasLongBlocks ? 8 : 4)/* uint32/64 end*/));
+		data.WriteHash(m_reqfile->GetFileHash());
+
+		it = m_PendingBlocks_list.begin();
+		for (uint32 i = 0; i != m_MaxBlockRequests; i++) {
+			if (it != m_PendingBlocks_list.end()) {
+				Pending_Block_Struct* pending = *it++;
+				wxASSERT( pending->block->StartOffset <= pending->block->EndOffset );
+				pending->fZStreamError = 0;
+				pending->fRecovered = 0;
+				if (bHasLongBlocks) {
+					data.WriteUInt64(pending->block->StartOffset);
 				} else {
-					if (bHasLongBlocks) {
-						data.WriteUInt64(0);
-					} else {
-						data.WriteUInt32(0);
-					}
+					data.WriteUInt32(pending->block->StartOffset);
+				}
+			} else {
+				if (bHasLongBlocks) {
+					data.WriteUInt64(0);
+				} else {
+					data.WriteUInt32(0);
 				}
 			}
+		}
 
-			it = m_PendingBlocks_list.begin();
-			for (uint32 i = 0; i != m_MaxBlockRequests; i++) {
-				if (it != m_PendingBlocks_list.end()) {
-					Requested_Block_Struct* block = (*it++)->block;
-					if (bHasLongBlocks) {
-						data.WriteUInt64(block->EndOffset+1);
-					} else {
-						data.WriteUInt32(block->EndOffset+1);
-					}
+		it = m_PendingBlocks_list.begin();
+		for (uint32 i = 0; i != m_MaxBlockRequests; i++) {
+			if (it != m_PendingBlocks_list.end()) {
+				Requested_Block_Struct* block = (*it++)->block;
+				if (bHasLongBlocks) {

aMule.tar.xz/src/DownloadListCtrl.cpp Changed

aMule.tar.xz/src/ECSpecialMuleTags.cpp Changed

aMule.tar.xz/src/ExternalConnector.cpp Changed

aMule.tar.xz/src/GenericClientListCtrl.cpp Changed

aMule.tar.xz/src/GetTickCount.cpp Changed

aMule.tar.xz/src/IPFilter.cpp Changed

aMule.tar.xz/src/IPFilterScanner.cpp Changed

@@ -53,7 +53,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -70,7 +70,7 @@
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
+typedef unsigned char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 #endif /* ! C99 */
@@ -181,7 +181,7 @@
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-    
+
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -243,7 +243,7 @@
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -730,7 +730,7 @@
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-    
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -854,7 +854,7 @@
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
 #line 106 "./IPFilterScanner.l"
 
 
@@ -1288,7 +1288,7 @@
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
+
 	yy_current_state = (yy_start);
 	yy_current_state += YY_AT_BOL();
 
@@ -1343,7 +1343,7 @@
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-    
+
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yyiptext */
@@ -1386,7 +1386,7 @@
 
 {
 	int c;
-    
+
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1455,12 +1455,12 @@
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- * 
+ *
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void yyiprestart  (FILE * input_file )
 {
-    
+
 	if ( ! YY_CURRENT_BUFFER ){
         yyipensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1473,11 +1473,11 @@
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- * 
+ *
  */
     void yyip_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-    
+
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		yyippop_buffer_state();
@@ -1517,13 +1517,13 @@
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
+ *
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE yyip_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	b = (YY_BUFFER_STATE) yyipalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yyip_create_buffer()" );
@@ -1546,11 +1546,11 @@
 
 /** Destroy the buffer.
  * @param b a buffer created with yyip_create_buffer()
- * 
+ *
  */
     void yyip_delete_buffer (YY_BUFFER_STATE  b )
 {
-    
+
 	if ( ! b )
 		return;
 
@@ -1566,7 +1566,7 @@
 #ifndef __cplusplus
 extern int isatty (int );
 #endif /* __cplusplus */
-    
+
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyiprestart() or at EOF.
@@ -1575,7 +1575,7 @@
 
 {
 	int oerrno = errno;
-    
+
 	yyip_flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1591,13 +1591,13 @@
     }
 
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
+
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
+ *
  */
     void yyip_flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -1626,7 +1626,7 @@
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *  
+ *
  */
 void yyippush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -1656,7 +1656,7 @@
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *  
+ *
  */
 void yyippop_buffer_state (void)
 {
@@ -1680,7 +1680,7 @@
 static void yyipensure_buffer_stack (void)
 {
 	int num_to_alloc;
-    
+
 	if (!(yy_buffer_stack)) {

aMule.tar.xz/src/KadDlg.cpp Changed

aMule.tar.xz/src/KnownFileList.cpp Changed

aMule.tar.xz/src/LibSocketAsio.cpp Changed

aMule.tar.xz/src/LibSocketWX.cpp Changed

aMule.tar.xz/src/Logger.h Changed

aMule.tar.xz/src/Makefile.am Changed

aMule.tar.xz/src/MuleCollection.h Changed

aMule.tar.xz/src/MuleListCtrl.cpp Changed

aMule.tar.xz/src/MuleNotebook.cpp Changed

@@ -36,12 +36,13 @@
 BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook)
 	EVT_RIGHT_DOWN(CMuleNotebook::OnRMButton)
 
-	EVT_MENU(MP_CLOSE_TAB,			CMuleNotebook::OnPopupClose)
-	EVT_MENU(MP_CLOSE_ALL_TABS,		CMuleNotebook::OnPopupCloseAll)
+	EVT_MENU(MP_CLOSE_TAB,		CMuleNotebook::OnPopupClose)
+	EVT_MENU(MP_CLOSE_ALL_TABS,	CMuleNotebook::OnPopupCloseAll)
 	EVT_MENU(MP_CLOSE_OTHER_TABS,	CMuleNotebook::OnPopupCloseOthers)
 
 	// Madcat - tab closing engine
-	EVT_LEFT_UP(CMuleNotebook::OnMouseLeftRelease)
+	EVT_LEFT_UP(CMuleNotebook::OnMouseButtonRelease)
+	EVT_MIDDLE_UP(CMuleNotebook::OnMouseButtonRelease)
 	EVT_MOTION(CMuleNotebook::OnMouseMotion)
 END_EVENT_TABLE()
 
@@ -197,7 +198,7 @@
 }
 
 
-void CMuleNotebook::OnMouseLeftRelease(wxMouseEvent &event)
+void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event)
 {
 
 	if (GetImageList() == NULL) {
@@ -212,8 +213,9 @@
 	long flags = 0;
 	int tab = HitTest(wxPoint(xpos,ypos),&flags);
 
-	if ((tab != -1) &&  (flags == wxNB_HITTEST_ONICON)) {
-		// User did click on a 'x'
+	if ((tab != -1) &&  (((flags == wxNB_HITTEST_ONICON) && event.LeftUp()) ||
+			((flags == wxNB_HITTEST_ONLABEL) && event.MiddleUp()))) {
+		// User did click on a 'x' or middle click on the label
 		DeletePage(tab);
 	} else {
 		// Is not a 'x'. Send this event up.

aMule.tar.xz/src/MuleNotebook.h Changed

aMule.tar.xz/src/MuleVersion.h Added

@@ -0,0 +1,168 @@
+//							-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2016 aMule Team ( admin@amule.org / http://www.amule.org )
+//
+// Any parts of this program derived from the xMule, lMule or eMule project,
+// or contributed by third-party developers are copyrighted by their
+// respective authors.
+//
+// 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 MULEVERSION_H
+#define MULEVERSION_H
+
+#ifdef HAVE_CONFIG_H
+#	include "config.h"			// Needed for VERSION and ASIO_SOCKETS
+#else
+#	include "common/ClientVersion.h"	// Needed for VERSION otherwise
+#endif
+
+#ifdef ASIO_SOCKETS
+#	define MULEVERSION_RETVAL_BEGIN		wxString ver(
+#	define MULEVERSION_RETVAL_END		);
+#	define MULEVERSION_BOOST_VERSION	ver += wxT(" and Boost ") + MuleBoostVersion;
+#	define MULEVERSION_ADD_BEGIN		ver +=
+#	define MULEVERSION_ADD_END		;
+#	define MULEVERSION_RETURN_RESULT	return ver;
+
+/**
+ * Version of Boost aMule is compiled with.
+ *
+ * This variable exists only if aMule is compiled with Boost.Asio networking.
+ * Defined in LibSocketAsio.cpp.
+ */
+extern wxString MuleBoostVersion;
+
+#else
+#	define MULEVERSION_RETVAL_BEGIN		return wxString(
+#	define MULEVERSION_RETVAL_END
+#	define MULEVERSION_BOOST_VERSION
+#	define MULEVERSION_ADD_BEGIN
+#	define MULEVERSION_ADD_END
+#	define MULEVERSION_RETURN_RESULT	);
+#endif
+
+
+/**
+ * Returns a description of the version of aMule being used.
+ *
+ * @return A detailed description of the aMule version, including wx information.
+ *
+ * Use this rather than just using the VERSION or CURRENT_VERSION_LONG
+ * constants, when displaying information to the user. The purpose is to
+ * help with debugging.
+ */
+inline wxString GetMuleVersion()
+{
+	MULEVERSION_RETVAL_BEGIN
+		wxT(VERSION)
+		wxT(" compiled with ")
+
+// Figure out the toolkit used by wxWidgets...
+#if defined(__WXGTK__)
+#	if defined(__WXGTK30__)
+#		define MULEVERSION_WXTOOLKIT	wxT("GTK3")
+#	elif defined(__WXGTK20__)
+#		define MULEVERSION_WXTOOLKIT	wxT("GTK2")
+#	else
+#		define MULEVERSION_WXTOOLKIT	wxT("GTK")
+#	endif
+#elif defined(__WXOSX__)
+#	if defined(__WXOSX_CARBON__)
+#		define MULEVERSION_WXTOOLKIT	wxT("OSX Carbon")
+#	elif defined(__WXOSX_COCOA__)
+#		define MULEVERSION_WXTOOLKIT	wxT("OSX Cocoa")
+#	elif defined(__WXOSX_IPHONE__)
+#		define MULEVERSION_WXTOOLKIT	wxT("OSX iPhone")
+#	else
+#		define MULEVERSION_WXTOOLKIT	wxT("OSX")
+#	endif
+#elif defined(__WXCOCOA__)
+#		define MULEVERSION_WXTOOLKIT	wxT("Cocoa")
+#elif defined(__WXMAC__)
+#		define MULEVERSION_WXTOOLKIT	wxT("Mac")
+#elif defined(__WXMSW__) || defined(__WINDOWS__)
+#	if defined(__VISUALC__)
+#		define MULEVERSION_WXTOOLKIT	wxT("MSW VC")
+#	elif defined(__WXMICROWIN__)
+#		define MULEVERSION_WXTOOLKIT	wxT("MicroWin")
+#	else
+#		define MULEVERSION_WXTOOLKIT	wxT("MSW")
+#	endif
+#elif defined(__NANOX__)
+#		define MULEVERSION_WXTOOLKIT	wxT("NanoX")
+#elif defined(__WXMOTIF__)
+#		define MULEVERSION_WXTOOLKIT	wxT("Motif")
+#elif defined(__WXMGL__)
+#		define MULEVERSION_WXTOOLKIT	wxT("MGL")
+#elif defined(__WXPM__)
+#		define MULEVERSION_WXTOOLKIT	wxT("PM")
+#elif defined(__WXDFB__)
+#		define MULEVERSION_WXTOOLKIT	wxT("DirectFB")
+#elif defined(__WXX11__)
+#		define MULEVERSION_WXTOOLKIT	wxT("X11")
+#endif
+
+// ...and describe it.
+#if defined(__WXBASE__)
+		wxT("wxBase")
+#	ifdef MULEVERSION_WXTOOLKIT
+		wxT("(") MULEVERSION_WXTOOLKIT wxT(")")
+#	endif
+#elif defined(__WXUNIVERSAL__)
+		wxT("wxUniversal")
+#	ifdef MULEVERSION_WXTOOLKIT
+		wxT("(") MULEVERSION_WXTOOLKIT wxT(")")
+#	endif
+#else
+#	ifdef MULEVERSION_WXTOOLKIT
+		wxT("wx") MULEVERSION_WXTOOLKIT
+#	else
+		wxT("wxWidgets")
+#	endif
+#endif
+
+		// wxWidgets version
+		wxT(" v") wxSTRINGIZE_T(wxMAJOR_VERSION) wxT(".") wxSTRINGIZE_T(wxMINOR_VERSION) wxT(".") wxSTRINGIZE_T(wxRELEASE_NUMBER)
+	MULEVERSION_RETVAL_END
+
+	// Describe Boost version, if compiled with Boost.Asio
+	MULEVERSION_BOOST_VERSION
+
+#if defined(__DEBUG__) || defined(SVNDATE)
+	MULEVERSION_ADD_BEGIN
+#	ifdef __DEBUG__
+		wxT(" (Debugging)")
+#	endif
+#	ifdef SVNDATE
+		wxT(" (Snapshot: ") wxT(SVNDATE) wxT(")")
+#	endif
+	MULEVERSION_ADD_END
+#endif
+
+	MULEVERSION_RETURN_RESULT
+}
+
+#undef MULEVERSION_RETVAL_BEGIN
+#undef MULEVERSION_RETVAL_END
+#undef MULEVERSION_BOOST_VERSION
+#undef MULEVERSION_ADD_BEGIN
+#undef MULEVERSION_ADD_END
+#undef MULEVERSION_RETURN_RESULT
+#undef MULEVERSION_WXTOOLKIT
+
+#endif /* MULEVERSION_H */

aMule.tar.xz/src/NetworkFunctions.cpp Changed

@@ -2,7 +2,7 @@
 // This file is part of the aMule Project.
 //
 // Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
-// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2016 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002-2011 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -26,6 +26,8 @@
 
 #include "NetworkFunctions.h"	// Interface declaration
 #include "amuleIPV4Address.h"
+#include <common/Macros.h>	// Needed for itemsof()
+
 
 bool StringIPtoUint32(const wxString &strIP, uint32& Ip)
 {
@@ -89,95 +91,62 @@
 	return 0;
 }
 
-/**
- * Used to store the ranges.
- */
-struct IPRange
-{
-	const wxChar *addr;
-	unsigned int mask;
-	bool isLAN;
+
+struct filter_st {
+	uint32 addr;		// Address in anti-host order.
+	uint32 mask;		// Mask in anti-host order.
 };
 
 
-const IPRange ranges[] = {
-//	Here is reserved blocks from RFC 3330 at http://www.rfc-editor.org/rfc/rfc3330.txt
+static filter_st reserved_ranges[] = {
+//	Here are the reserved blocks from RFC 3330 at http://www.rfc-editor.org/rfc/rfc3330.txt
 //
-//Address Block                      Present Use                           Reference
-//----------------------------------------------------------------------------------
-{ wxT("0.0.0.0"),        8, false }, // "This" Network             [RFC1700, page 4]
-{ wxT("10.0.0.0"),       8, true  }, // Private-Use Networks               [RFC1918]
-// Acording to RFC3330, 24.* and 14.* must be parsed as normal ips.
-//{ wxT("14.0.0.0"),       8, false }, // Public-Data Networks     [RFC1700, page 181]
-//{ wxT("24.0.0.0"),       8, false }, // Cable Television Networks                 --
-{ wxT("39.0.0.0"),       8, false }, // Reserved but subject
-                                     //    to allocation                   [RFC1797]
-{ wxT("127.0.0.0"),      8, false }, // Loopback                   [RFC1700, page 5]
-{ wxT("128.0.0.0"),     16, false }, // Reserved but subject
-                                     //    to allocation                          --
-{ wxT("169.254.0.0"),   16, false }, // Link Local                                --
-{ wxT("172.16.0.0"),    12, true  }, // Private-Use Networks               [RFC1918]
-{ wxT("191.255.0.0"),   16, false }, // Reserved but subject
-                                     //    to allocation                          --
-{ wxT("192.0.0.0"),     24, false }, // Reserved but subject
-                                     //    to allocation                          --
-{ wxT("192.0.2.0"),     24, false }, // Test-Net
-{ wxT("192.88.99.0"),   24, false }, // 6to4 Relay Anycast                 [RFC3068]
-{ wxT("192.168.0.0"),   16, true  }, // Private-Use Networks               [RFC1918]
-{ wxT("198.18.0.0"),    15, false }, // Network Interconnect
-                                     //    Device Benchmark Testing        [RFC2544]
-{ wxT("223.255.255.0"), 24, false }, // Reserved but subject
-                                     //    to allocation                          --
-{ wxT("224.0.0.0"),      4, false }, // Multicast                          [RFC3171]
-{ wxT("240.0.0.0"),      4, false }  // Reserved for Future Use    [RFC1700, page 4]
+//                                         Address Block      Present Use                                     Reference
+//---------------------------------------------------------------------------------------------------------------------
+	{ 0x00000000, 0x000000ff },	// 0.0.0.0/8          "This" Network                          [RFC1700, page 4]
+	// According to RFC3330, 14.* and 24.* must be parsed as normal IPs.
+	// { 0x0000000e, 0x000000ff },	// 14.0.0.0/8         Public-Data Networks                  [RFC1700, page 181]
+	// { 0x00000018, 0x000000ff },	// 24.0.0.0/8         Cable Television Networks                              --
+	{ 0x00000027, 0x000000ff },	// 39.0.0.0/8         Reserved but subject to allocation              [RFC1797]
+	{ 0x0000007f, 0x000000ff },	// 127.0.0.0/8        Loopback                                [RFC1700, page 5]
+	{ 0x00000080, 0x0000ffff },	// 128.0.0.0/16       Reserved but subject to allocation                     --
+	{ 0x0000fea9, 0x0000ffff },	// 169.254.0.0/16     Link Local                                             --
+	{ 0x0000ffbf, 0x0000ffff },	// 191.255.0.0/16     Reserved but subject to allocation                     --
+	{ 0x000000c0, 0x00ffffff },	// 192.0.0.0/24       Reserved but subject to allocation                     --
+	{ 0x000200c0, 0x00ffffff },	// 192.0.2.0/24       Test-Net
+	{ 0x006358c0, 0x00ffffff },	// 192.88.99.0/24     6to4 Relay Anycast                              [RFC3068]
+	{ 0x000012c6, 0x0000feff },	// 198.18.0.0/15      Network Interconnect Device Benchmark Testing   [RFC2544]
+	{ 0x00ffffdf, 0x00ffffff },	// 223.255.255.0/24   Reserved but subject to allocation                     --
+	{ 0x000000e0, 0x000000f0 },	// 224.0.0.0/4        Multicast                                       [RFC3171]
+	{ 0x000000f0, 0x000000f0 }	// 240.0.0.0/4        Reserved for Future Use                 [RFC1700, page 4]
 };
 
 
-struct filter_st {
-	uint32 addr;		// Address and mask in anti-host order.
-	uint32 mask;
+// Private-Use Networks [RFC1918]
+static filter_st lan_ranges[] = {
+	{ 0x0000000a, 0x000000ff },	// 10.0.0.0/8
+	{ 0x000010ac, 0x0000f0ff },	// 172.16.0.0/12
+	{ 0x0000a8c0, 0x0000ffff }	// 192.168.0.0/16
 };
 
-const unsigned int number_of_ranges = sizeof(ranges) / sizeof(IPRange);
-static filter_st filters[number_of_ranges];
-
-
-// This function is used to initialize the IP filter
-bool SetupFilter()
-{
-	for (unsigned int i = 0; i < number_of_ranges; ++i) {
-		filters[i].addr = StringIPtoUint32( ranges[i].addr );
-		filters[i].mask = ~wxUINT32_SWAP_ALWAYS((1 << (32 - ranges[i].mask)) - 1);
-	}
-	return true;
-}
-
-
-// This is a little trick to ensure that the filter-list is initialized before
-// it gets used, while not risking threading problems.
-static bool filterSetup = SetupFilter();
 
-
-bool IsGoodIP(uint32 IP, bool filterLAN)
+bool IsGoodIP(uint32 ip, bool filterLAN) throw()
 {
-	for (unsigned int i = 0; i < number_of_ranges; ++i) {
-		if (((IP ^ filters[i].addr) & filters[i].mask) == 0) {
-			if ( filterLAN || !ranges[i].isLAN ) {
-				return false;
-			}
+	for (unsigned int i = 0; i < itemsof(reserved_ranges); ++i) {
+		if (((ip ^ reserved_ranges[i].addr) & reserved_ranges[i].mask) == 0) {
+			return false;
 		}
 	}
 
-	return true;
+	return !(filterLAN && IsLanIP(ip));
 }
 
 bool IsLanIP(uint32_t ip) throw()
 {
-	for (unsigned int i = 0; i < number_of_ranges; i++) {
-		if (((ip ^ filters[i].addr) & filters[i].mask) == 0) {
-			return ranges[i].isLAN;
+	for (unsigned int i = 0; i < itemsof(lan_ranges); ++i) {
+		if (((ip ^ lan_ranges[i].addr) & lan_ranges[i].mask) == 0) {
+			return true;
 		}
 	}
 	return false;
 }
-// File_checked_for_headers

aMule.tar.xz/src/NetworkFunctions.h Changed

@@ -2,7 +2,7 @@
 // This file is part of the aMule Project.
 //
 // Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
-// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2016 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002-2011 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -90,6 +90,8 @@
 
 	return ip;
 }
+
+
 /**
  * Parses a String-IHost and returns the IP or 0 if it was invalid.
  *
@@ -100,6 +102,7 @@
  */
 uint32 StringHosttoUint32(const wxString &Host);
 
+
 /**
  * Checks for invalid IP-values.
  *
@@ -109,19 +112,23 @@
  *
  * Note: IP must be in anti-host order (BE on LE platform, LE on BE platform).
  */
-bool IsGoodIP( uint32 IP, bool filterLAN );
+bool IsGoodIP( uint32 IP, bool filterLAN ) throw();
+
 
-inline bool IsGoodIPPort(uint32 nIP, uint16 nPort)
+inline bool IsGoodIPPort(uint32 nIP, uint16 nPort) throw()
 {
 	return IsGoodIP(nIP, true) && nPort!=0;
 }
 
 #define HIGHEST_LOWID_ED2K_KAD		16777216
 
-inline bool IsLowID(uint32 id) {
+
+inline bool IsLowID(uint32 id)
+{
 	return (id < HIGHEST_LOWID_ED2K_KAD);
 }
 
+
 /**
  * Checks for LAN IPs.
  *

aMule.tar.xz/src/OtherFunctions.cpp Changed

@@ -54,53 +54,6 @@
 #endif
 
 
-wxString GetMuleVersion()
-{
-	wxString ver(wxT(VERSION));
-
-	ver += wxT(" compiled with ");
-
-
-	// Figure out the wx build-type
-	#if   defined(__WXGTK20__)
-		ver += wxT("wxGTK2");
-	#elif defined(__WXGTK__)
-		ver += wxT("wxGTK1");
-	// 2.9 has different builds for OSX: Carbon and Cocoa
-	#elif defined(__WXOSX_CARBON__)
-		ver += wxT("wxOSX Carbon");
-	#elif defined(__WXOSX_COCOA__)
-		ver += wxT("wxOSX Cocoa");
-	// different Cocoa port, "not been updated very actively since beginning 2008"
-	#elif defined(__WXCOCOA__)
-		ver += wxT("wxCocoa");
-	// 2.8 Mac
-	#elif defined(__WXMAC__)
-		ver += wxT("wxMac");
-	#elif defined(__WXBASE__)
-		ver += wxT("wxBase");
-	#elif defined(__WINDOWS__) && defined(__VISUALC__)
-		ver += wxT("wxMSW VC");
-	#elif defined(__WINDOWS__)
-		ver += wxT("wxMSW");
-	#endif
-
-	ver += CFormat(wxT(" v%d.%d.%d")) % wxMAJOR_VERSION % wxMINOR_VERSION % wxRELEASE_NUMBER;
-
-	if (!MuleBoostVersion.IsEmpty()) {
-		ver += wxT(" and Boost ") + MuleBoostVersion;
-	}
-
-#ifdef __DEBUG__
-	ver += wxT(" (Debugging)");
-#endif
-
-#ifdef SVNDATE
-	ver += CFormat(wxT(" (Snapshot: %s)")) % wxT(SVNDATE);
-#endif
-
-	return ver;
-}
 
 
 // Formats a filesize in bytes to make it suitable for displaying
@@ -1121,7 +1074,7 @@
 
 /*************************** Locale specific stuff ***************************/
 
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 #	define	SETWINLANG(LANG, SUBLANG)
 #else
 #	define	SETWINLANG(LANG, SUBLANG) \
@@ -1151,7 +1104,7 @@
 {
 	locale.Init(language, wxLOCALE_LOAD_DEFAULT);
 
-#if defined(__WXMAC__) || defined(__WINDOWS__ )
+#if defined(__WXMAC__) || defined(__WINDOWS__)
 	locale.AddCatalogLookupPathPrefix(JoinPaths(wxStandardPaths::Get().GetDataDir(), wxT("locale")));
 #endif
 	locale.AddCatalog(wxT(PACKAGE));
@@ -1209,7 +1162,7 @@
 {
 	wxString pass_plain;
 	CMD4Hash password;
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 	pass_plain = char2unicode(getpass("Enter password for mule connection: "));
 #else
 	//#warning This way, pass enter is not hidden on windows. Bad thing.

aMule.tar.xz/src/OtherFunctions.h Changed

aMule.tar.xz/src/Parser.cpp Changed

@@ -1,20 +1,20 @@
 /* A Bison parser, made by GNU Bison 2.4.2.  */
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
-   
+
       Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 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
    the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.  */
 
@@ -27,7 +27,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */

aMule.tar.xz/src/PartFile.cpp Changed

@@ -269,7 +269,7 @@
 	wxASSERT(m_A4AFsrclist.empty());
 }
 
-void CPartFile::CreatePartFile()
+void CPartFile::CreatePartFile(bool isImporting)
 {
 	// use lowest free partfilenumber for free file (InterCeptor)
 	int i = 0;
@@ -285,7 +285,7 @@
 
 	m_PartPath = m_fullname.RemoveExt();
 	bool fileCreated;
-	if (thePrefs::GetAllocFullFile()) {
+	if (thePrefs::GetAllocFullFile() || !thePrefs::CreateFilesSparse()) {
 		fileCreated = m_hpartfile.Create(m_PartPath, true);
 		m_hpartfile.Close();
 	} else {
@@ -298,7 +298,7 @@
 
 	SetFilePath(thePrefs::GetTempDir());
 
-	if (thePrefs::GetAllocFullFile()) {
+	if (!isImporting && thePrefs::GetAllocFullFile()) {
 		SetStatus(PS_ALLOCATING);
 		CThreadScheduler::AddTask(new CAllocateFileTask(this, thePrefs::AddNewFilesPaused()));
 	} else {
@@ -534,7 +534,7 @@
 						// Start Changes by Slugfiller for better exception handling
 
 						wxCharBuffer tag_ansi_name = newtag.GetName().ToAscii();
-						char gap_mark = tag_ansi_name ? tag_ansi_name[0u] : 0;
+						char gap_mark = tag_ansi_name.data() ? tag_ansi_name[0u] : 0;
 						if ( newtag.IsInt() && (newtag.GetName().Length() > 1) &&
 							((gap_mark == FT_GAPSTART) ||
 							 (gap_mark == FT_GAPEND))) {

aMule.tar.xz/src/PartFile.h Changed

aMule.tar.xz/src/PartFileConvert.cpp Changed

aMule.tar.xz/src/PartFileConvertDlg.cpp Changed

aMule.tar.xz/src/PlatformSpecific.cpp Changed

aMule.tar.xz/src/PlatformSpecific.h Changed

aMule.tar.xz/src/Preferences.cpp Changed

@@ -189,6 +189,7 @@
 bool		CPreferences::s_SecIdent;
 bool		CPreferences::s_ExtractMetaData;
 bool		CPreferences::s_allocFullFile;
+bool		CPreferences::s_createFilesSparse;
 wxString	CPreferences::s_CustomBrowser;
 bool		CPreferences::s_BrowserTab;
 CPath		CPreferences::s_OSDirectory;
@@ -874,7 +875,7 @@
 		} else {
 			dataDir = wxStandardPaths::Get().GetResourcesDir();
 		}
-#if !defined(__WINDOWS__ ) && !defined(__WXMAC__)
+#if !defined(__WINDOWS__) && !defined(__WXMAC__)
 		dataDir = dataDir.BeforeLast(wxT('/')) + wxT("/amule");
 #endif
 		wxString systemDir(JoinPaths(dataDir,folder));
@@ -1067,7 +1068,7 @@
 	 **/
 	NewCfgItem(IDC_TEMPFILES,	(new Cfg_Path(  wxT("/eMule/TempDir"),	s_tempdir, appdir + wxT("Temp") )));
 
-	#if defined(__WXMAC__) || defined(__WINDOWS__ )
+	#if defined(__WXMAC__) || defined(__WINDOWS__)
 		wxString incpath = wxStandardPaths::Get().GetDocumentsDir();
 		if (incpath.IsEmpty()) {
 			// There is a built-in possibility for this call to fail, though I can't imagine a reason for that.
@@ -1257,6 +1258,7 @@
 	s_MiscList.push_back( new Cfg_Str( wxT("/eMule/StatsServerURL"),		s_StatsServerURL,	wxT("http://ed2k.shortypower.dyndns.org/?hash=") ) );
 
 	s_MiscList.push_back( new Cfg_Bool( wxT("/ExternalConnect/TransmitOnlyUploadingClients"),	s_TransmitOnlyUploadingClients, false ) );
+	s_MiscList.push_back( new Cfg_Bool( wxT("/eMule/CreateSparseFiles"),		s_createFilesSparse, true ) );
 
 #ifndef AMULE_DAEMON
 	// Colors have been moved from global prefs to CStatisticsDlg
@@ -1474,7 +1476,7 @@
 	CTextFile sdirfile;
 	if (sdirfile.Open(s_configDir + wxT("shareddir.dat"), CTextFile::write)) {
 		for (size_t i = 0; i < shareddir_list.size(); ++i) {
-			sdirfile.WriteLine(CPath::ToUniv(shareddir_list[i]), wxConvUTF8);
+			sdirfile.WriteLine(shareddir_list[i].GetRaw(), wxConvUTF8);
 		}
 
 	}
@@ -1705,7 +1707,7 @@
 wxString CPreferences::GetBrowser()
 {
 	wxString cmd(s_CustomBrowser);
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 	if( s_BrowserTab ) {
 		// This is certainly not the best way to do it, but I'm lazy
 		if ((wxT("mozilla") == cmd.Right(7)) || (wxT("firefox") == cmd.Right(7))
@@ -1722,7 +1724,7 @@
 			cmd += wxT(" -remote 'openURLs(%s,new-tab)'");
 		}
 	}
-#endif /* !__WINDOWS__  */
+#endif /* !__WINDOWS__ */
 	return cmd;
 }
 
@@ -1782,12 +1784,12 @@
 		wxArrayString lines = file.ReadLines(txtReadDefault, wxConvUTF8);
 
 		for (size_t i = 0; i < lines.size(); ++i) {
-			CPath path = CPath::FromUniv(lines[i]);
+			CPath path(lines[i]);
 
 			if (path.DirExists()) {
 				shareddir_list.push_back(path);
 			} else {
-				AddLogLineN(CFormat(_("Dropping non-existing shared directory: %s")) % path.GetRaw());
+				AddLogLineN(CFormat(_("Dropping non-existing shared directory: %s")) % path.GetPrintable());
 			}
 		}
 	}

aMule.tar.xz/src/Preferences.h Changed

aMule.tar.xz/src/PrefsUnifiedDlg.cpp Changed

@@ -243,9 +243,9 @@
 
 		if (pages[i].m_function == PreferencesGeneralTab) {
 			// This must be done now or pages won't Fit();
-			#ifdef __WINDOWS__ 
+			#ifdef __WINDOWS__
 				CastChild(IDC_BROWSERTABS, wxCheckBox)->Enable(false);
-			#endif /* __WINDOWS__  */
+			#endif /* __WINDOWS__ */
 			CastChild(IDC_PREVIEW_NOTE, wxStaticText)->SetLabel(_("The following variables will be substituted:\n    %PARTFILE - full path to the file\n    %PARTNAME - file name only"));
 			#ifdef __WXMAC__
 				FindWindow(IDC_ENABLETRAYICON)->Show(false);
@@ -521,6 +521,9 @@
 	}
 #endif
 
+	m_verticalToolbar = thePrefs::VerticalToolbar();
+	m_toolbarOrientationChanged = false;
+
 	return true;
 }
 
@@ -780,6 +783,13 @@
 	Show(false);
 	// restore state of server tab if necessary
 	EnableServerTab(thePrefs::GetNetworkED2K());
+
+	if (m_toolbarOrientationChanged) {
+			theApp->amuledlg->Create_Toolbar(m_verticalToolbar);
+			// Update the first tool (conn button)
+			theApp->amuledlg->ShowConnectionState();
+			theApp->amuledlg->Layout();
+	}
 }
 
 
@@ -920,6 +930,7 @@
 			break;
 
 		case IDC_VERTTOOLBAR:
+			m_toolbarOrientationChanged = (m_verticalToolbar != value);
 			theApp->amuledlg->Create_Toolbar(value);
 			// Update the first tool (conn button)
 			theApp->amuledlg->ShowConnectionState();
@@ -1036,7 +1047,7 @@
 			return;
 	}
 	wxString wildcard = CFormat(_("Executable%s"))
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 		% wxT(" (*.exe)|*.exe");
 #else
 		% wxT("|*");

aMule.tar.xz/src/PrefsUnifiedDlg.h Changed

aMule.tar.xz/src/Proxy.cpp Changed

aMule.tar.xz/src/SafeFile.cpp Changed

aMule.tar.xz/src/Scanner.cpp Changed

@@ -34,7 +34,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -51,7 +51,7 @@
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
+typedef unsigned char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 #endif /* ! C99 */
@@ -162,7 +162,7 @@
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
-    
+
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
@@ -224,7 +224,7 @@
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -640,7 +640,7 @@
 #endif
 
     static void yyunput (int c,char *buf_ptr  );
-    
+
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
@@ -761,7 +761,7 @@
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
+
 #line 40 "./Scanner.l"
 
 
@@ -1281,7 +1281,7 @@
 {
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
+
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
@@ -1335,7 +1335,7 @@
     static void yyunput (int c, register char * yy_bp )
 {
 	register char *yy_cp;
-    
+
     yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
@@ -1378,7 +1378,7 @@
 
 {
 	int c;
-    
+
 	*(yy_c_buf_p) = (yy_hold_char);
 
 	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1445,12 +1445,12 @@
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- * 
+ *
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void yyrestart  (FILE * input_file )
 {
-    
+
 	if ( ! YY_CURRENT_BUFFER ){
         yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
@@ -1463,11 +1463,11 @@
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- * 
+ *
  */
     void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
-    
+
 	/* TODO. We should be able to replace this entire function body
 	 * with
 	 *		yypop_buffer_state();
@@ -1507,13 +1507,13 @@
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
+ *
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
-    
+
 	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1536,11 +1536,11 @@
 
 /** Destroy the buffer.
  * @param b a buffer created with yy_create_buffer()
- * 
+ *
  */
     void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
-    
+
 	if ( ! b )
 		return;
 
@@ -1556,7 +1556,7 @@
 #ifndef __cplusplus
 extern int isatty (int );
 #endif /* __cplusplus */
-    
+
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
@@ -1565,7 +1565,7 @@
 
 {
 	int oerrno = errno;
-    
+
 	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
@@ -1581,13 +1581,13 @@
     }
 
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
+
 	errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
+ *
  */
     void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
@@ -1616,7 +1616,7 @@
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *  
+ *
  */
 void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
@@ -1646,7 +1646,7 @@
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *  
+ *
  */
 void yypop_buffer_state (void)
 {
@@ -1670,7 +1670,7 @@
 static void yyensure_buffer_stack (void)
 {
 	int num_to_alloc;
-    
+
 	if (!(yy_buffer_stack)) {

aMule.tar.xz/src/Scanner.h Changed

aMule.tar.xz/src/TextClient.cpp Changed

aMule.tar.xz/src/ThreadTasks.cpp Changed

aMule.tar.xz/src/TransferWnd.cpp Changed

aMule.tar.xz/src/Types.h Changed

aMule.tar.xz/src/UploadBandwidthThrottler.cpp Changed

aMule.tar.xz/src/UploadQueue.cpp Changed

aMule.tar.xz/src/amule.cpp Changed

aMule.tar.xz/src/amule.h Changed

@@ -34,10 +34,10 @@
 
 #include "Types.h"		// Needed for int32, uint16 and uint64
 #include <map>
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 	#include <signal.h>
 //	#include <wx/unix/execute.h>
-#endif // __WINDOWS__ 
+#endif // __WINDOWS__
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"		// Needed for ASIO_SOCKETS
@@ -443,14 +443,14 @@
 	#define AMULED28_EVENTLOOP
 
 	// wx 2.8 also needs extra socket code, unless we have ASIO sockets
-	// 
+	//
 	#ifdef HAVE_CONFIG_H
 	#	include "config.h"		// defines ASIO_SOCKETS
 	#endif
 
 	#ifndef ASIO_SOCKETS
 		// MSW: can't run amuled with 2.8 without ASIO sockets, just get it compiled
-		#ifndef __WINDOWS__ 
+		#ifndef __WINDOWS__
 			#define AMULED28_SOCKETS
 		#endif
 	#endif
@@ -494,7 +494,7 @@
 // which stops working with wx 2.9.5.
 // So disable it there (no idea if this has a noticeable impact).
 
-#if !wxCHECK_VERSION(2, 9, 5) && !defined(__WINDOWS__ )
+#if !wxCHECK_VERSION(2, 9, 5) && !defined(__WINDOWS__)
 #define AMULED_APPTRAITS
 #endif

aMule.tar.xz/src/amuleAppCommon.cpp Changed

@@ -35,9 +35,9 @@
 #include <wx/config.h>			// Do_not_auto_remove (win32)
 #include <wx/fileconf.h>
 
-#include "amule.h"				// Interface declarations.
+#include "amule.h"			// Interface declarations.
 #include <common/Format.h>		// Needed for CFormat
-#include "CFile.h"				// Needed for CFile
+#include "CFile.h"			// Needed for CFile
 #include "ED2KLink.h"			// Needed for command line passing of links
 #include "FileLock.h"			// Needed for CFileLock
 #include "GuiEvents.h"			// Needed for Notify_*
@@ -46,6 +46,7 @@
 #include "MagnetURI.h"			// Needed for CMagnetURI
 #include "Preferences.h"
 #include "ScopedPtr.h"
+#include "MuleVersion.h"		// Needed for GetMuleVersion()
 
 #ifndef CLIENT_GUI
 #include "DownloadQueue.h"
@@ -229,7 +230,7 @@
 	cmdline.AddSwitch(wxT("e"), wxT("ec-config"), wxT("Configure EC (External Connections)."));
 #else
 
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 	// MSW shows help otions in a dialog box, and the formatting doesn't fit there
 #define HELPTAB wxT("\t")
 #else
@@ -251,7 +252,7 @@
 	// Change webserver path. This is also a config option, so this switch will go at some time.
 	cmdline.AddOption(wxT("w"), wxT("use-amuleweb"), wxT("Specify location of amuleweb binary."));
 #endif
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 	cmdline.AddSwitch(wxT("d"), wxT("disable-fatal"), wxT("Do not handle fatal exception."));
 // Keep stdin open to run valgrind --gen_suppressions
 	cmdline.AddSwitch(wxT("i"), wxT("enable-stdin"), wxT("Do not disable stdin."));
@@ -293,10 +294,10 @@
 	}
 
 	// Backtracing works in MSW.
-	// Problem is just that the backtraces are useless, because apparently the context gets lost 
+	// Problem is just that the backtraces are useless, because apparently the context gets lost
 	// in the try/catch somewhere.
 	// So leave it out.
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 	#if wxUSE_ON_FATAL_EXCEPTION
 		if ( !cmdline.Found(wxT("disable-fatal")) ) {
 			// catch fatal exceptions
@@ -413,7 +414,7 @@
 	}
 #endif
 
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 	// Close standard-input
 	if ( !cmdline.Found(wxT("enable-stdin")) )	{
 		// The full daemon will close all std file-descriptors by itself,

aMule.tar.xz/src/amuleDlg.cpp Changed

@@ -76,11 +76,12 @@
 #endif
 #include "IPFilter.h"
 
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 #include "aMule.xpm"
 #endif
 
 #include "kademlia/kademlia/Kademlia.h"
+#include "MuleVersion.h"	// Needed for GetMuleVersion()
 
 #ifdef ENABLE_IP2COUNTRY
 #include "IP2Country.h"		// Needed for IP2Country
@@ -210,7 +211,7 @@
 	wxInitAllImageHandlers();
 	Apply_Clients_Skin();
 
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 	wxSystemOptions::SetOption(wxT("msw.remap"), 0);
 #endif
 
@@ -1059,7 +1060,7 @@
 void CamuleDlg::OnMinimize(wxIconizeEvent& evt)
 {
 // Evil Hack: check if the mouse is inside the window
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 	if (GetScreenRect().Contains(wxGetMousePosition()))
 #endif
 	{
@@ -1213,7 +1214,7 @@
 	wxString userDir(JoinPaths(thePrefs::GetConfigDir(), wxT("skins")) + wxFileName::GetPathSeparator());
 
 	wxStandardPathsBase &spb(wxStandardPaths::Get());
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 	wxString dataDir(spb.GetPluginsDir());
 #elif defined(__WXMAC__)
 		wxString dataDir(spb.GetDataDir());

aMule.tar.xz/src/amuled.cpp Changed

aMule.tar.xz/src/kademlia/kademlia/Kademlia.cpp Changed

aMule.tar.xz/src/kademlia/kademlia/Kademlia.h Changed

aMule.tar.xz/src/kademlia/kademlia/Search.cpp Changed

@@ -1054,64 +1054,35 @@
 		return;
 	}
 
-	// the file name of the current search response is stored in "name"
-	// the list of words the user entered is stored in "m_words"
-	// so the file name now gets parsed for all the words entered by the user (even repetitive ones):
-
-	// Step 1: Get the words of the response file name
-	WordList listFileNameWords;
-	CSearchManager::GetWords(name, &listFileNameWords, true);
-
-	// Step 2: Look for each entered search word in those present in the filename
-	bool bFileNameMatchesSearch = true;  // this will be set to "false", if not all search words are found in the file name
-
-	for (WordList::const_iterator itSearchWords = m_words.begin(); itSearchWords != m_words.end(); ++itSearchWords) {
-		bool bSearchWordPresent = false;
-		for (WordList::iterator itFileNameWords = listFileNameWords.begin(); itFileNameWords != listFileNameWords.end(); ++itFileNameWords) {
-			if (!itFileNameWords->CmpNoCase(*itSearchWords)) {
-				listFileNameWords.erase(itFileNameWords);  // remove not to find same word twice
-				bSearchWordPresent = true;
-				break;  // found word, go on using the next searched word
-			}
-		}
-		if (!bSearchWordPresent) {
-			bFileNameMatchesSearch = false;  // not all search words were found in the file name
-			break;
-		}
-	}
-
-	// Step 3: Accept result only if all(!) words are found
-	if (bFileNameMatchesSearch) {
-		TagPtrList taglist;
+	TagPtrList taglist;
 
-		if (!format.IsEmpty()) {
-			taglist.push_back(new CTagString(TAG_FILEFORMAT, format));
-		}
-		if (!artist.IsEmpty()) {
-			taglist.push_back(new CTagString(TAG_MEDIA_ARTIST, artist));
-		}
-		if (!album.IsEmpty()) {
-			taglist.push_back(new CTagString(TAG_MEDIA_ALBUM, album));
-		}
-		if (!title.IsEmpty()) {
-			taglist.push_back(new CTagString(TAG_MEDIA_TITLE, title));
-		}
-		if (length) {
-			taglist.push_back(new CTagVarInt(TAG_MEDIA_LENGTH, length));
-		}
-		if (bitrate) {
-			taglist.push_back(new CTagVarInt(TAG_MEDIA_BITRATE, bitrate));
-		}
-		if (availability) {
-			taglist.push_back(new CTagVarInt(TAG_SOURCES, availability));
-		}
+	if (!format.IsEmpty()) {
+		taglist.push_back(new CTagString(TAG_FILEFORMAT, format));
+	}
+	if (!artist.IsEmpty()) {
+		taglist.push_back(new CTagString(TAG_MEDIA_ARTIST, artist));
+	}
+	if (!album.IsEmpty()) {
+		taglist.push_back(new CTagString(TAG_MEDIA_ALBUM, album));
+	}
+	if (!title.IsEmpty()) {
+		taglist.push_back(new CTagString(TAG_MEDIA_TITLE, title));
+	}
+	if (length) {
+		taglist.push_back(new CTagVarInt(TAG_MEDIA_LENGTH, length));
+	}
+	if (bitrate) {
+		taglist.push_back(new CTagVarInt(TAG_MEDIA_BITRATE, bitrate));
+	}
+	if (availability) {
+		taglist.push_back(new CTagVarInt(TAG_SOURCES, availability));
+	}
 
-		m_answers++;
-		theApp->searchlist->KademliaSearchKeyword(m_searchID, &answer, name, size, type, publishInfo, taglist);
+	m_answers++;
+	theApp->searchlist->KademliaSearchKeyword(m_searchID, &answer, name, size, type, publishInfo, taglist);
 
-		// Free tags memory
-		deleteTagPtrListEntries(&taglist);
-	}
+	// Free tags memory
+	deleteTagPtrListEntries(&taglist);
 }
 
 void CSearch::SendFindValue(CContact *contact, bool reaskMore)

aMule.tar.xz/src/kademlia/net/KademliaUDPListener.cpp Changed

@@ -70,7 +70,6 @@
 
 #include <wx/tokenzr.h>
 
-#define THIS_DEBUG_IS_JUST_FOR_KRY_DONT_TOUCH_IT_KTHX 0
 
 #define CHECK_PACKET_SIZE(OP, SIZE) \
 	if (lenPacket OP (uint32_t)(SIZE)) \
@@ -155,7 +154,7 @@
 			wxASSERT(targetKey.IsEmpty());
 		}
 	} else {
-		wxFAIL;
+		wxFAIL;	// can never happen
 	}
 }
 
@@ -524,7 +523,9 @@
 	uint8_t contactVersion = 0;
 	CUInt128 contactID;
 	bool addedOrUpdated = AddContact2(packetData, lenPacket, ip, port, &contactVersion, senderKey, validReceiverKey, true, true, NULL, &contactID); // might change (udp)port, validReceiverKey
-	wxASSERT(contactVersion >= 2);
+	if (contactVersion < 2) {
+		throw wxString(CFormat(wxT("***NOTE: Received invalid Kademlia2 version (%u) in %s")) % contactVersion % wxString::FromAscii(__FUNCTION__));
+	}
 #ifdef __DEBUG__
 	if (dbgOldUDPPort != port) {
 		AddDebugLogLineN(logClientKadUDP, CFormat(wxT("KadContact %s uses his internal (%u) instead external (%u) UDP Port")) % KadIPToString(ip) % port % dbgOldUDPPort);
@@ -1598,6 +1599,9 @@
 	theApp->clientudp->SendPacket(packet, wxUINT32_SWAP_ALWAYS(destinationHost), destinationPort, true, cryptKey, true, targetKey.GetKeyValue(theApp->GetPublicIP(false)));
 }
 
+#if 0
+// This function is called only from CKademlia::FindNodeIDByIP (currently unused)
+// TODO if ever enabled: the contact version in SendMyDetails *must* be > 1
 bool CKademliaUDPListener::FindNodeIDByIP(CKadClientSearcher* requester, uint32_t ip, uint16_t tcpPort, uint16_t udpPort)
 {
 	// send a hello packet to the given IP in order to get a HELLO_RES with the NodeID
@@ -1608,6 +1612,7 @@
 	m_fetchNodeIDRequests.push_back(sRequest);
 	return true;
 }
+#endif
 
 void CKademliaUDPListener::ExpireClientSearch(CKadClientSearcher* expireImmediately)
 {
@@ -1650,7 +1655,6 @@
 	CUInt128 challenge(GetRandomUint128());
 	if (challenge == 0) {
 		// hey there is a 2^128 chance that this happens ;)
-		wxFAIL;
 		challenge = 1;
 	}
 	// Put the target we want into the packet. This is our challenge
@@ -1663,9 +1667,9 @@
 	AddLegacyChallenge(contactID, challenge, ip, KADEMLIA2_REQ);
 }
 
+#if 0
 void CKademliaUDPListener::DebugClientOutput(const wxString& place, uint32 kad_ip, uint32 port, const byte* data, int len)
 {
-#if THIS_DEBUG_IS_JUST_FOR_KRY_DONT_TOUCH_IT_KTHX
 	uint32 ip = wxUINT32_SWAP_ALWAYS(kad_ip);
 	printf("Error on %s received from: %s\n",(const char*)unicode2char(place),(const char*)unicode2char(Uint32_16toStringIP_Port(ip,port)));
 	if (data) {
@@ -1684,13 +1688,6 @@
 		client->SetConnectionReason(wxT("Error on ") + place);
 		client->TryToConnect(true);
 	}
-#else
-	// No need for warnings for the rest of us.
-	(void)place;
-	(void)kad_ip;
-	(void)port;
-	(void)data;
-	(void)len;
-#endif
 }
+#endif
 // File_checked_for_headers

aMule.tar.xz/src/kademlia/net/KademliaUDPListener.h Changed

@@ -83,7 +83,7 @@
 	virtual void ProcessPacket(const uint8_t* data, uint32_t lenData, uint32_t ip, uint16_t port, bool validReceiverKey, const CKadUDPKey& senderKey);
 	void SendPacket(const CMemFile& data, uint8_t opcode, uint32_t destinationHost, uint16_t destinationPort, const CKadUDPKey& targetKey, const CUInt128* cryptTargetID);
 
-	bool FindNodeIDByIP(CKadClientSearcher *requester, uint32_t ip, uint16_t tcpPort, uint16_t udpPort);
+//	bool FindNodeIDByIP(CKadClientSearcher *requester, uint32_t ip, uint16_t tcpPort, uint16_t udpPort);
 	void ExpireClientSearch(CKadClientSearcher *expireImmediately = NULL);
 private:
 	static SSearchTerm* CreateSearchExpressionTree(CMemFile& bio, int iLevel);
@@ -127,7 +127,7 @@
 	void ProcessFirewalled2Request		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
 
 	// Debug
-	void DebugClientOutput(const wxString& place, uint32_t kad_ip, uint32_t port, const uint8_t* data = NULL, int len = 0);
+//	void DebugClientOutput(const wxString& place, uint32_t kad_ip, uint32_t port, const uint8_t* data = NULL, int len = 0);
 
 	typedef std::list<FetchNodeID_Struct>	FetchNodeIDList;
 	FetchNodeIDList m_fetchNodeIDRequests;

aMule.tar.xz/src/kademlia/routing/RoutingZone.cpp Changed

aMule.tar.xz/src/libs/common/MuleDebug.cpp Changed

aMule.tar.xz/src/libs/common/Path.cpp Changed

@@ -26,7 +26,7 @@
 #include "StringFunctions.h"		// Needed for filename2char()
 
 #include <wx/file.h>
-#if defined __WINDOWS__  || defined __IRIX__
+#if defined __WINDOWS__ || defined __IRIX__
 #	include <wx/ffile.h>
 #endif
 #include <wx/utils.h>
@@ -38,7 +38,7 @@
 // case-insensitive cmp for that platform. TODO:
 // Perhaps it would be better to simply lowercase
 // m_filesystem in the constructor ...
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 	#define PATHCMP(a, b)		wxStricmp(a, b)
 	#define PATHNCMP(a, b, n)	wxStrnicmp(a, b, n)
 #else
@@ -149,19 +149,11 @@
 /** Does the actual work of adding a postfix ... */
 wxString DoAddPostfix(const wxString& src, const wxString& postfix)
 {
-	const wxFileName srcFn(src);
-	wxString result = srcFn.GetName() + postfix;
+	wxFileName fn(src);
 
-	if (srcFn.HasExt()) {
-		result += wxT(".") + srcFn.GetExt();
-	}
-
-	wxString path = srcFn.GetPath();
-	if (path.Length()) {
-		return path + wxFileName::GetPathSeparator() + result;
-	}
+	fn.SetName(fn.GetName() + postfix);
 
-	return result;
+	return fn.GetFullPath();
 }
 
 /** Removes the last extension of a filename. */
@@ -178,7 +170,7 @@
 /** Readies a path for use with wxAccess.. */
 wxString DoCleanPath(const wxString& path)
 {
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 	// stat fails on windows if there are trailing path-separators.
 	wxString cleanPath = StripSeparators(path, wxString::trailing);
 
@@ -237,7 +229,7 @@
 	}
 
 	wxCharBuffer fn = filename2char(filename);
-	if (fn) {
+	if (fn.data()) {
 		// Filename is valid in the current locale. This means that
 		// it either originated from a (wx)system-call, or from a
 		// user with a properly setup system.
@@ -249,7 +241,7 @@
 		// saved as UTF8, even if the system is not unicode enabled,
 		// preserving the original filename till the user has fixed
 		// his system ...
-#ifdef __WINDOWS__ 
+#ifdef __WINDOWS__
 		// Magic fails on Windows where we always work with wide char file names.
 		m_filesystem = DeepCopy(filename);
 		m_printable = m_filesystem;
@@ -277,20 +269,16 @@
 CPath CPath::FromUniv(const wxString& path)
 {
 	wxCharBuffer fn = path.mb_str(wxConvISO8859_1);
-
 	return CPath(wxConvFile.cMB2WC(fn));
-
 }
 
 
 wxString CPath::ToUniv(const CPath& path)
 {
 	// The logic behind this is that by saving the filename
-	// as a raw bytestream (which is what ISO8859-1 amounts
-	// to), we can always recreate the on-disk filename, as
-	// if we had read it using wx functions.
+	// as a raw bytestream, we can always recreate the on-disk filename,
+	// as if we had read it using wx functions.
 	wxCharBuffer fn = path.m_filesystem.mb_str(wxConvFile);
-
 	return wxConvISO8859_1.cMB2WC(fn);
 }
 
@@ -583,7 +571,7 @@
 
 	if (CPath::CloneFile(src, dst, true)) {
 		// Try to ensure that the backup gets physically written
-#if defined __WINDOWS__  || defined __IRIX__
+#if defined __WINDOWS__ || defined __IRIX__
 		wxFFile backupFile;
 #else
 		wxFile backupFile;

aMule.tar.xz/src/libs/ec/abstracts/ECCodes.abstract Changed

aMule.tar.xz/src/libs/ec/cpp/ECCodes.h Changed

aMule.tar.xz/src/libs/ec/cpp/ECTag.cpp Changed

@@ -71,7 +71,7 @@
 		NewData();
 		memcpy(m_tagData, data, m_dataLen);
 	} else {
-		wxASSERT(length == 0);
+		EC_ASSERT(length == 0);
 		m_dataLen = 0;
 		m_tagData = NULL;
 	}
@@ -353,7 +353,8 @@
  *
  * @param tag a CECTag class instance to add.
  * @return \b true if tag was really added,
- * \b false when it was omitted through valuemap.
+ * \b false when it was omitted through valuemap or the limit for children
+ * is exceeded.
  */
 bool CECTag::AddTag(const CECTag& tag, CValueMap* valuemap)
 {
@@ -361,7 +362,9 @@
 		return valuemap->AddTag(tag, this);
 	}
 	// cannot have more than 64k tags
-	wxASSERT(m_tagList.size() < 0xffff);
+	if (m_tagList.size() >= 0xffff) {
+		return false;
+	}
 
 	// First add an empty tag.
 	m_tagList.push_back(CECEmptyTag());
@@ -451,7 +454,7 @@
 	ec_tagname_t tmp_tagName = (m_tagName << 1) | (m_tagList.empty() ? 0 : 1);
 	ec_tagtype_t type = m_dataType;
 	ec_taglen_t tagLen = GetTagLen();
-	wxASSERT(type != EC_TAGTYPE_UNKNOWN);
+	EC_ASSERT(type != EC_TAGTYPE_UNKNOWN);
 
 	if (!socket.WriteNumber(&tmp_tagName, sizeof(ec_tagname_t))) return false;
 	if (!socket.WriteNumber(&type, sizeof(ec_tagtype_t))) return false;
@@ -489,7 +492,6 @@
 
 bool CECTag::WriteChildren(CECSocket& socket) const
 {
-	wxASSERT(m_tagList.size() < 0xFFFF);
 	uint16 tmp = (uint16)m_tagList.size();
 	if (!socket.WriteNumber(&tmp, sizeof(tmp))) return false;
 	for (const_iterator it = begin(); it != end(); ++it) {

aMule.tar.xz/src/libs/ec/java/ECCodes.java Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.de.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.es.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.fr.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.hu.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.it.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.ro.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.ru.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.tr.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alc.zh_TW.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.de.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.es.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.fr.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.hu.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.it.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.ro.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.ru.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.tr.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/docs/alcc.zh_TW.1 Changed

aMule.tar.xz/src/utils/aLinkCreator/src/alcframe.cpp Changed

aMule.tar.xz/src/utils/aLinkCreator/src/alcpix.cpp Changed

@@ -35,7 +35,7 @@
       wxBitmap bitmap(m_about_xpm);
       return bitmap;
     }
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
   else if (name == wxT("alc"))
     {
       wxBitmap bitmap(m_alc_xpm);
@@ -361,7 +361,7 @@
     "JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX"
   };
 
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 const char *
 AlcPix::m_alc_xpm[]=
   { /* XPM */
@@ -543,7 +543,7 @@
     "c.c.c.c.c.c.    . . . .     c.c.c.c.c.c.    . .         c.c.c.c.",
     "c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c."
   };
-#endif /* !__WINDOWS__  */
+#endif /* !__WINDOWS__ */
 
 const char *
 AlcPix::m_copy_xpm[]=
@@ -1565,7 +1565,7 @@
     "                                                                "
   };
 
-#ifndef __WINDOWS__ 
+#ifndef __WINDOWS__
 const char *
 AlcPix::m_alc_xpm[]=
   { /* XPM */
@@ -1747,7 +1747,7 @@
     "c.c.c.c.c.c.    . . . .     c.c.c.c.c.c.    . .         c.c.c.c.",
     "c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c.c."
   };
-#endif /* !__WINDOWS__  */
+#endif /* !__WINDOWS__ */
 
 const char *
 AlcPix::m_copy_xpm[]=

aMule.tar.xz/src/utils/aLinkCreator/src/alcpix.h Changed

aMule.tar.xz/src/utils/cas/docs/cas.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.de.1 Changed

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH CAS 1 "November 2011" "cas v0.8" "aMule Hilfsprogramme"
+.TH CAS 1 "September 2016" "cas v0.8" "aMule Hilfsprogramme"
 .als B_untranslated B
 .als RB_untranslated RB
 .SH NAME
@@ -17,9 +17,10 @@
 .B_untranslated cas
 .RB_untranslated [ \-h ]
 .SH BESCHREIBUNG
-\fBcas\fP is a program for displaying the contents of your aMule online
-signature file to console (in a human readable form). For this to work, you
-must enable the "Online Signature" option in aMule's preferences.
+\fBcas\fP ist ein Program zum Anzeigen des Inhaltes deiner aMule Online
+Signaturdatei in der Konsole (in von Menschen lesbarem Format). Damit dies
+funktioniert, musst du die "Online\-Signatur" Option in den aMule
+Einstellungen aktivieren.
 .TP 
 .B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
 Erstellt das Bild der Online Signatur.  Optional kannst du

aMule.tar.xz/src/utils/cas/docs/cas.es.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.fr.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.hu.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.it.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.ro.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.ru.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.tr.1 Changed

aMule.tar.xz/src/utils/cas/docs/cas.zh_TW.1 Changed

aMule.tar.xz/src/utils/fileview/FileView.cpp Changed

aMule.tar.xz/src/utils/fileview/KadFiles.cpp Changed

aMule.tar.xz/src/utils/fileview/Print.cpp Changed

aMule.tar.xz/src/utils/plasmamule/plasma-applet-plasmamule.cpp Changed

aMule.tar.xz/src/utils/plasmamule/qt-emc.cpp Changed

aMule.tar.xz/src/utils/scripts/denoiser.rules Changed

aMule.tar.xz/src/utils/scripts/linkcvs Deleted

@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# This file is part of the aMule project.
-#
-# Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
-# Copyright (c) 2004-2011 Jacobo Vilella (Jacobo221)
-#
-# 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
-#
-
-###################################################################
-#                                                                 #
-#     linkcvs will link the whole cvs tree to the given path      #
-#  allowing keeping several compilations from a single cvs tree   #
-#                                                                 #
-#    Warning: This script overwrites old files in target_path     #
-#                                                                 #
-###################################################################
-#                                                                 #
-#           Script valid as of 4rd June 2004 aMule CVS            #
-#         Suggestions go to Jacobo221 at @amule dot .org          #
-#                                                                 #
-###################################################################
-#                                                                 #
-#     This code is distributed under terms of the GPL License     #
-#               http://www.gnu.org/copyleft/gpl.html              #
-#                                                                 #
-###################################################################
-#                                                                 #
-#   EXEC is a list of the files which will be called as scripts   #
-#       EXEC_NUMBER is the amount of EXEC files in the list       #
-#    EXEC_PREFIX is the command to prefix the call of the EXEC    #
-#   EXEC_POSTFIX is the command to postfix the call of the EXEC   #
-#    COPY is a list of files which will be copies, not linked     #
-#         Priviledge order (max to min): EXEC, COPY, CVS          #
-#                                                                 #
-###################################################################
-
-EXEC_NUMBER=0
-# The follwing four lines were needed for aMule versions previous to 2.0.0
-# EXEC_NUMBER=1
-# EXEC=("autogen.sh")
-# EXEC_PREFIX=("original=\`readlink src/SharedFileList.h\` && cp -d --remove-destination \"\$original\" src/ && ")
-# EXEC_POSTFIX=("ln -sf \"\$original\" src/SharedFileList.h")
-COPY=""
-
-if [ $# -ne 2 ]; then
-        echo "`basename $0`: invalid number of arguments"
-        echo "Try \``basename $0` <cvs_tree_path> <target_path>'"
-	exit 1
-elif [ ! -e "$1" ]; then
-        echo "`basename $0`: $1 doesn't exist!"
-	exit 2
-elif [ ! -d "${1}/CVS" ]; then
-        echo "`basename $0`: $1 isn't a CVS tree!"
-	exit 3
-elif [ ! -e "${1}/CVS/Entries" ]; then
-        echo "`basename $0`: $1 has no Entries file!"
-	exit 4
-fi
-
-SOURCE="$1"
-TARGET="$2"
-
-if [ "`echo \"$SOURCE\" | cut -c 1`" != "/" ] && [ "`echo \"$SOURCE\" | cut -c 1`" != "~" ]; then
-                                        SOURCE="`pwd`/$SOURCE"
-fi
-if [ "`echo \"$TARGET\" | cut -c 1`" != "/" ] && [ "`echo \"$TARGET\" | cut -c 1`" != "~" ]; then
-                                        TARGET="`pwd`/$TARGET"
-fi
-
-cvs_rec()
-{
-	local FILES=`cat "${SOURCE}/$1"/CVS/Entries | cut -f 2 -d "/" -s`
-	# Alternative option would be to place `grep "^D/"` and `grep "^"`
-	for file in $FILES; do
-		if [ -d "${SOURCE}/${1}/$file" ]; then
-			mkdir -p "${TARGET}/${1}/$file"
-			cvs_rec "${1}/$file"
-		else
-			target="${TARGET}/${subfile/$SOURCE}/${1}"
-			if [ ! -e "${SOURCE}/${1}/$file" ]; then
-                                echo "${SOURCE}/${1}/$file not found!"
-                        else
-                                ln -sf "${SOURCE}/${1}/$file" "$target"
-                        fi
-		fi
-	done
-}
-
-if [ ! -e "$TARGET" ]; then
-        echo -n "$TARGET doesn't exist. Should I create it? [y/n]"
-        read -s -n 1 opt
-        if [ $opt = Y -o $opt = y ]; then
-                echo " Copying..."
-                mkdir -p "$TARGET"
-        else
-                echo "`basename $0`: target_path invalid"
-                exit 5
-        fi
-fi
-
-cvs_rec ""
-
-for file in $COPY; do
-        mkdir -p "${TARGET}/`dirname $file`"
-        for subfile in ${SOURCE}/$file; do
-                if [ ! -e "$subfile" ]; then
-                        echo "$subfile not found!"
-                else
-                        # -d --remove-destination is esential for links handling
-                        cp -d --remove-destination "$subfile" "${TARGET}/${subfile/$SOURCE}"
-                fi
-        done
-done
-
-i=0
-while [ "$i" -lt "$EXEC_NUMBER" ]; do
-        mkdir -p "${TARGET}/`dirname $file`"
-        for subfile in "${SOURCE}"/${EXEC[$i]}; do
-                if [ ! -e "$subfile" ]; then
-                        echo "$subfile not found!"
-                else
-                        target="${TARGET}/${subfile/$SOURCE}"
-                        rm -f "$target" # Necessary in case $target is a link
-			echo ${EXEC_PREFIX[$i]} > "$target"
-                        echo -n "$subfile && " >> "$target"
-			echo ${EXEC_POSTFIX[$i]} >> "$target"
-                        chmod a+x "$target"
-                fi
-        done
-	i=`expr $i + 1`
-done
-

aMule.tar.xz/src/utils/scripts/sanity Changed

@@ -239,10 +239,10 @@
 	def initialize
 		super
 
-		@name  = "WxFailUsagesy"
+		@name  = "WxFailUsage"
 		@title = "Always failing wxASSERT()"
 		@type  = "Good Practice"
-		@desc  = "Use wxFAIL instead of an always failing wxASSERT()."
+		@desc  = "Use wxFAIL_MSG() instead of an always failing wxASSERT()."
 	end
 
 	def parse_file(file, lines)
@@ -257,6 +257,31 @@
 
 
 
+class NoMoreWxFail < SanityCheck
+	def initialize
+		super
+
+		@name  = "NoMoreWxFail"
+		@title = "wxFAIL needs an explanation"
+		@type  = "Good Practice"
+		@desc  = "Use wxFAIL_MSG() instead of wxFAIL to provide a description of what happened. "
+		@desc += "Or even better, use one of the wxCHECK*() or wxASSERT*() macros if applicable. "
+		@desc += "An assertion of type 'wxAssertFailure' without description does not say much, "
+		@desc += "please provide a short explanation of what went wrong."
+	end
+
+	def parse_file(file, lines)
+		results = lines.select do |line|
+			line.text =~ /\bwxFAIL\b/ and not
+			line.text =~ /\/\/\s*wxFAIL\b/
+		end
+
+		add_results( file, results )
+	end
+end
+
+
+
 class PassByValue < SanityCheck
 	def initialize
 		super
@@ -664,6 +689,7 @@
 filterList.push LoopOnConstant.new
 filterList.push MissingImplementation.new
 filterList.push WxFailUsage.new
+filterList.push NoMoreWxFail.new
 
 
 # Sort enabled filters by type and name. The reason why this is done here is

aMule.tar.xz/src/utils/scripts/version_bumper Changed

@@ -33,7 +33,7 @@
 	echo -e "\tUpdates current version to 2.1.1 $autodetect old version$ -> version_bumper 2.1.1"
 	echo " - This script is buggy and can kill your dog. Be careful. -"
 else
-	if test x"`ls configure.in`" = x""; then
+	if test x"`ls configure.ac`" = x""; then
 		echo "This script must be run on aMule base directory."
 	else
 		OLD_VERSION=$1
@@ -51,7 +51,7 @@
 			else
 				echo "Bumping from $OLD_VERSION to $NEW_VERSION"
 				#Command:
-				sed -i "s/$OLD_VERSION/$NEW_VERSION/g" aMule.app/Contents/Info.plist configure.in src/include/common/ClientVersion.h docs/Doxyfile aMule.spec po/*.po
+				sed -i "s/$OLD_VERSION/$NEW_VERSION/g" aMule.app/Contents/Info.plist configure.ac src/include/common/ClientVersion.h docs/Doxyfile aMule.spec po/*.po
 				sed -i -r "s/VERSION_MJR\s+(0x0)?`echo $OLD_VERSION | cut -d "." -f 1`/VERSION_MJR\t\t`echo $NEW_VERSION | cut -d "." -f 1`/g" src/include/common/ClientVersion.h
 				sed -i -r "s/VERSION_MIN\s+(0x0)?`echo $OLD_VERSION | cut -d "." -f 2`/VERSION_MIN\t\t`echo $NEW_VERSION | cut -d "." -f 2`/g" src/include/common/ClientVersion.h
 				sed -i -r "s/VERSION_UPDATE\s+(0x0)?`echo $OLD_VERSION | cut -d "." -f 3`/VERSION_UPDATE\t\t`echo $NEW_VERSION | cut -d "." -f 3`/g" src/include/common/ClientVersion.h

aMule.tar.xz/src/utils/scripts/whitespace_fixer Changed

aMule.tar.xz/src/utils/scripts/wikify_latest_changelog Changed

aMule.tar.xz/src/utils/scripts/year_bumper Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.de.1 Changed

@@ -3,19 +3,20 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH WXCAS 1 "November 2011" wxCas "aMule Hilfsprogramme"
+.TH WXCAS 1 "September 2016" wxCas "aMule Hilfsprogramme"
 .als B_untranslated B
 .SH NAME
 wxcas \- wx c aMule statistics
 .SH SYNTAX
 .B_untranslated wxcas
 .SH BESCHREIBUNG
-\fBwxcas\fP is a program for displaying the contents of your online signature
-file in a nice wx Window on your Desktop.  For this to work, you must enable
-the "Online Signature" option in aMule's preferences.
+\fBwxcas\fP ist ein Programm zum Anzeigen des Inhaltes deiner Online
+Signaturdatei in einem hübschen wx Fenster auf deinem Desktop.  Damit dies
+funktioniert, musst du die "Online\-Signatur" Option in den aMule
+Einstellungen aktivieren.
 
-Based on Pedro de Oliveira's \fBcas\fP(1).  \fBwxcas\fP was written by ThePolish
-<thepolish@vipmail.ru>
+Basierend auf Pedro de Oliveira's \fBcas\fP(1).  \fBwxcas\fP wurde geschrieben von
+ThePolish <thepolish@vipmail.ru>
 
 Dieses Programm hat keine Parameter.
 .SH "FEHLER MELDEN"

aMule.tar.xz/src/utils/wxCas/docs/wxcas.es.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.fr.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.hu.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.it.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.ro.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.ru.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.tr.1 Changed

aMule.tar.xz/src/utils/wxCas/docs/wxcas.zh_TW.1 Changed

aMule.tar.xz/src/utils/wxCas/src/wxcas.cpp Changed

aMule.tar.xz/src/utils/wxCas/src/wxcascte.cpp Changed

aMule.tar.xz/src/utils/wxCas/src/wxcasframe.cpp Changed

aMule.tar.xz/src/utils/wxCas/src/wxcasframe.h Changed

aMule.tar.xz/src/utils/wxCas/src/wxcaspix.cpp Changed

aMule.tar.xz/src/utils/wxCas/src/wxcaspix.h Changed

aMule.tar.xz/src/utils/xas/docs/xas.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.de.1 Changed

@@ -3,21 +3,22 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH XAS 1 "November 2011" "xas v1.9" "aMule Hilfsprogramme"
+.TH XAS 1 "September 2016" "xas v1.9" "aMule Hilfsprogramme"
 .als B_untranslated B
 .SH NAME
 xas \- X\-Chat aMule Statistics
 .SH SYNTAX
 \fBKeine\fP
 .SH BESCHREIBUNG
-\fBxas\fP is a plugin for xchat. For loading see your xchat
-documentation. After loading type /xas and it will send statistics to the
-channel you are in. These are taken from your Online Signature file.  For
-this to work, you must enable the "Online Signature" option in aMule's
-preferences.
+\fBxas\fP ist ein Plugin für xchat. Zum Laden lese deine xchat
+Dokumentation. Nach dem Laden tippe /xas und es wird Statistiken in den
+Kanal senden in dem du gerade bist. Diese werden aus deiner Online
+Signaturdatei gelesen.  Damit dies funktioniert, musst du die
+"Online\-Signatur" Option in den aMule Einstellungen aktivieren.
 
-To enable it on every startup of xchat you can just run the autstart\-xas
-script (in /usr/bin if you installed with \-\-prefix=/usr).
+Um es bei jedem Start von xchat zu aktivieren, kannst du das autostart\-xas
+Skript verwenden (welches unter /usr/bin liegt, wenn du mit \-\-prefix=/usr
+installiert hast).
 
 \fBxas\fP wurde ursprünglich von niet geschrieben
 .SH "FEHLER MELDEN"

aMule.tar.xz/src/utils/xas/docs/xas.es.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.fr.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.hu.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.it.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.ro.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.ru.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.tr.1 Changed

aMule.tar.xz/src/utils/xas/docs/xas.zh_TW.1 Changed

aMule.tar.xz/src/webserver/src/WebInterface.cpp Changed

aMule.tar.xz/src/webserver/src/WebInterface.h Changed

aMule.tar.xz/src/webserver/src/WebServer.cpp Changed

aMule.tar.xz/src/webserver/src/WebSocket.cpp Changed

aMule.tar.xz/src/webserver/src/php_amule_lib.cpp Changed

aMule.tar.xz/src/webserver/src/php_core_lib.cpp Changed

aMule.tar.xz/src/webserver/src/php_parser.h Changed

@@ -1,20 +1,20 @@
 /* A Bison parser, made by GNU Bison 2.4.2.  */
 
 /* Skeleton interface for Bison's Yacc-like parsers in C
-   
+
       Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 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
    the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.  */
 
@@ -27,7 +27,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */

aMule.tar.xz/src/webserver/src/php_syntree.cpp Changed

aMule.tar.xz/unittests/muleunit/main.cpp Changed

aMule.tar.xz/unittests/muleunit/test.h Changed

@@ -129,6 +129,26 @@
 
 
 /**
+ * Helperfunction that converts basic types to strings.
+ */
+template <typename TYPE>
+wxString StringFrom(const TYPE& value)
+{
+	return wxString() << value;
+}
+
+inline wxString StringFrom(unsigned long long value)
+{
+	return wxString::Format(wxT("%") wxLongLongFmtSpec wxT("u"), value);
+}
+
+inline wxString StringFrom(signed long long value)
+{
+	return wxString::Format(wxT("%") wxLongLongFmtSpec wxT("i"), value);
+}
+
+
+/**
  * Test class containing all macros to do unit testing.
  * A test object represents a test that will be executed. Once it has been
  * executed, it reports all failures in the testPartResult linked list.
@@ -208,26 +228,6 @@
 };
 
 
-/**
- * Helperfunction that converts basic types to strings.
- */
-template <typename TYPE>
-wxString StringFrom(const TYPE& value)
-{
-	return wxString() << value;
-}
-
-inline wxString StringFrom(unsigned long long value)
-{
-	return wxString::Format(wxT("%") wxLongLongFmtSpec wxT("u"), value);
-}
-
-inline wxString StringFrom(signed long long value)
-{
-	return wxString::Format(wxT("%") wxLongLongFmtSpec wxT("i"), value);
-}
-
-
 #define THROW_TEST_FAILURE(message) \
 	throw CTestFailureException(message, wxT(__FILE__), __LINE__)

aMule.tar.xz/unittests/muleunit/testcase.cpp Changed

aMule.tar.xz/unittests/tests/CTagTest.cpp Changed

@@ -275,7 +275,7 @@
 	}
 
 	for (uint64 i = 0; i < packet_len; i++) {
-		CONTEXT(wxString::Format(wxT("Comparing serialized byte #%d"), i));
+		CONTEXT(wxString::Format(wxT("Comparing serialized byte #%") wxLongLongFmtSpec wxT("u"), i));
 
 		ASSERT_EQUALS(packet[i], buf[i]);
 	}
@@ -391,7 +391,7 @@
 	TagPtrList::iterator it = taglist.begin();
 
 	CMD4Hash hash;
-	ASSERT_TRUE(hash.Decode("000102030405060708090A0B0C0D0E0F"));
+	ASSERT_TRUE(hash.Decode(std::string("000102030405060708090A0B0C0D0E0F")));
 
 	CheckTagData(*it++, TAG_SOURCETYPE, valid_tag_value(hash));
 
@@ -421,7 +421,7 @@
 
 		newbuf.Seek(0, wxFromStart);
 		for (size_t i = 0; i < packet_len; i++) {
-			CONTEXT(wxString::Format(wxT("Comparing byte #%d"), i));
+			CONTEXT(wxString::Format(wxT("Comparing byte #%d"), static_cast<int>(i)));
 
 			ASSERT_EQUALS(packet[i], newbuf.ReadUInt8());
 		}
@@ -576,7 +576,8 @@
 		buf.WriteUInt8(0x01); // single char string
 		buf.WriteUInt8(0x00); //
 
-		buf.WriteUInt8(it_name->first.GetChar(0)); // Write string first char
+		wxCharBuffer b = wxConvISO8859_1.cWC2MB(it_name->first);
+		buf.WriteUInt8(((const char *)b)[0]); // Write string first char
 		buf.WriteUInt8(counter++); // write tag value
 	}
 
@@ -664,7 +665,7 @@
 
 	counter = 0;
 	for (TagNamesByInt::iterator it_name = tagNames.begin(); it_name != tagNames.end(); ++it_name) {
-		CONTEXT(wxString::Format(wxT("Reading tag#%d"), counter));
+		CONTEXT(wxString::Format(wxT("Reading tag#%") wxLongLongFmtSpec wxT("u"), counter));
 		CTag* newtag = new CTag(buf, true);
 		CheckTagName(it_name->first, newtag);
 		CheckTagValue( valid_tag_value( counter ), newtag);

aMule.tar.xz/unittests/tests/FileDataIOTest.cpp Changed

@@ -335,13 +335,13 @@
 
 	void run() {
 		const unsigned char CanaryData = 170;
-		const char canaryBlock[] = { CanaryData };
+		const unsigned char canaryBlock[] = { CanaryData };
 
 		CFileDataIO* file = this->m_predefFile;
 
 		for (size_t j = 0; j < TEST_LENGTH + 1 - SIZE; ++j) {
 			// Clear before, after and at the target byte(s)
-			for (int t = -SIZE; t < (int)(2*SIZE); ++t) {
+			for (int t = -static_cast<int>(SIZE); t < (int)(2*SIZE); ++t) {
 				if ((j + t) < TEST_LENGTH && ((int)j + t) >= 0) {
 					file->Seek(j + t, wxFromStart);
 					ASSERT_EQUALS(j + t, file->GetPosition());
@@ -362,7 +362,7 @@
 			ASSERT_EQUALS(j + SIZE, file->GetPosition());
 
 			// Check before, after and at the target byte
-			for (int t = -SIZE; t < (int)(2*SIZE); ++t) {
+			for (int t = -static_cast<int>(SIZE); t < (int)(2*SIZE); ++t) {
 				if ((j + t) < TEST_LENGTH && ((int)j + t) >= 0) {
 					if (t) {
 						if (t < 0 || t >= (int)SIZE) {
@@ -534,7 +534,7 @@
 			CONTEXT(wxString(wxT("Testing string: '")) << testData[str].str << wxT("'"));
 
 			for (size_t enc = 0; enc < ArraySize(encodings); ++enc) {
-				CONTEXT(wxString::Format(wxT("Testing encoding: %i"), encodings[enc]));
+				CONTEXT(wxString::Format(wxT("Testing encoding: %i"), encodings[enc].id));
 
 				const wxChar* curStr = testData[str].str;
 				size_t strLen = testData[str].lengths[(encodings[enc].id == utf8strNone) ? 0 : 1];
@@ -577,7 +577,7 @@
 
 		CAssertOff silence;
 		for (size_t enc = 0; enc < ArraySize(encodings); ++enc) {
-			CONTEXT(wxString::Format(wxT("Testing encoding against poisoning: %i"), encodings[enc]));
+			CONTEXT(wxString::Format(wxT("Testing encoding against poisoning: %i"), encodings[enc].id));
 
 			//////////////////////////////////////////////
 			// Check if we guard against "poisoning".

aMule.tar.xz/unittests/tests/FormatTest.cpp Changed

aMule.tar.xz/unittests/tests/Makefile.am Changed

@@ -8,7 +8,7 @@
 AM_CPPFLAGS = $(MULECPPFLAGS) -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)/src -I$(top_srcdir)/src/libs -I$(top_srcdir)/src/include $(MUCPPFLAGS) $(WXBASE_CPPFLAGS)
 AM_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 AM_LDFLAGS = $(MULELDFLAGS)
-LDADD = $(WXBASE_LIBS) ../muleunit/libmuleunit.a
+LDADD = ../muleunit/libmuleunit.a $(WXBASE_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in
 TESTS = CUInt128Test RangeMapTest FormatTest StringFunctionsTest NetworkFunctionsTest FileDataIOTest PathTest TextFileTest CTagTest
@@ -32,7 +32,9 @@
 
 # Tests for the various network functions.
 NetworkFunctionsTest_SOURCES = NetworkFunctionsTest.cpp $(top_srcdir)/src/NetworkFunctions.cpp $(top_srcdir)/src/LibSocket.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c
-NetworkFunctionsTest_CPPFLAGS = $(AM_CPPFLAGS) -DEC_REMOTE # Needed to avoid compiling the http-thread
+NetworkFunctionsTest_CPPFLAGS = $(BOOST_CPPFLAGS) $(AM_CPPFLAGS) -DEC_REMOTE # Needed to avoid compiling the http-thread
+NetworkFunctionsTest_LDFLAGS = $(BOOST_SYSTEM_LDFLAGS) $(AM_LDFLAGS)
+NetworkFunctionsTest_LDADD = $(BOOST_SYSTEM_LIBS) $(LDADD)
 
 # Tests for the classes that implement the CFileDataIO interface
 FileDataIOTest_SOURCES = FileDataIOTest.cpp $(top_srcdir)/src/SafeFile.cpp $(top_srcdir)/src/CFile.cpp $(top_srcdir)/src/MemFile.cpp $(top_srcdir)/src/kademlia/utils/UInt128.cpp $(top_srcdir)/src/libs/common/StringFunctions.cpp $(top_srcdir)/src/Tag.cpp $(top_srcdir)/src/libs/common/Path.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c

aMule.tar.xz/unittests/tests/NetworkFunctionsTest.cpp Changed

@@ -5,6 +5,11 @@
 
 using namespace muleunit;
 
+// Needed for Boost-enabled build
+namespace MuleNotify {
+	void HandleNotificationAlways(const class CMuleNotiferBase&) {}
+};
+
 DECLARE_SIMPLE(NetworkFunctions)
 
 TEST(NetworkFunctions, StringIPtoUint32)
@@ -132,3 +137,48 @@
 	ASSERT_EQUALS(27u, dummyIP);
 }
 
+
+// Testing the IsGoodIP() and IsLanIP() functions
+TEST(NetworkFunctions, IsGoodIP)
+{
+	struct {
+		wxString	ip;
+		bool		isgood;
+		bool		islan;
+	} ipList[] = {
+		{ wxT("0.0.0.0"),	false,	false	},
+		{ wxT("0.0.0.1"),	false,	false	},
+		{ wxT("0.0.1.0"),	false,	false	},
+		{ wxT("0.1.0.0"),	false,	false	},
+		{ wxT("1.0.0.0"),	true,	false	},
+		{ wxT("10.0.0.1"),	true,	true	},
+		{ wxT("10.0.1.0"),	true,	true	},
+		{ wxT("10.1.0.0"),	true,	true	},
+		{ wxT("14.156.39.4"),	true,	false	},
+		{ wxT("24.93.63.177"),	true,	false	},
+		{ wxT("172.15.0.0"),	true,	false	},
+		{ wxT("172.16.0.0"),	true,	true	},
+		{ wxT("172.17.0.0"),	true,	true	},
+		{ wxT("172.31.0.0"),	true,	true	},
+		{ wxT("172.32.0.0"),	true,	false	},
+		{ wxT("192.88.98.176"),	true,	false	},
+		{ wxT("192.88.99.175"),	false,	false	},
+		{ wxT("192.88.100.17"),	true,	false	},
+		{ wxT("192.167.0.0"),	true,	false	},
+		{ wxT("192.168.0.0"),	true,	true	},
+		{ wxT("192.168.255.255"), true, true	},
+		{ wxT("192.169.0.0"),	true,	false	},
+		{ wxT("198.17.0.0"),	true,	false	},
+		{ wxT("198.18.0.0"),	false,	false	},
+		{ wxT("198.19.0.0"),	false,	false	},
+		{ wxT("198.20.0.0"),	true,	false	}
+	};
+
+	unsigned int ip;
+	for (unsigned int i = 0; i < itemsof(ipList); i++) {
+		ASSERT_TRUE(StringIPtoUint32(ipList[i].ip, ip));
+		ASSERT_EQUALS(ipList[i].isgood, IsGoodIP(ip, false));
+		ASSERT_EQUALS(ipList[i].islan, IsLanIP(ip));
+		ASSERT_EQUALS(ipList[i].isgood && !ipList[i].islan, IsGoodIP(ip, true));
+	}
+}

aMule.tar.xz/unittests/tests/PathTest.cpp Changed

@@ -7,6 +7,12 @@
 
 using namespace muleunit;
 
+#if 0
+/*
+ * The validity of this test is at least questionable. The result depends on
+ * - the current system locale and character encoding used, and
+ * - the way wxConvFileName reports error conditions and its fallback behaviour.
+
 struct STestStr
 {
 	//! Specifies the "source" of the string (user/fs)
@@ -56,7 +62,8 @@
 		return src;
 	}
 }
-
+*/
+#endif
 
 wxString StringFrom(const CPath& prt)
 {
@@ -113,6 +120,9 @@
 		ASSERT_EQUALS(tmp, CPath());
 	}
 
+#if 0
+/*
+ * See the note above
 
 	for (size_t i = 0; i < ArraySize(g_fromFSTests); ++i) {
 		const wxString input = g_fromFSTests[i].input;
@@ -124,14 +134,16 @@
 		CPath tmp(input);
 
 		ASSERT_TRUE(tmp.IsOk());
-		ASSERT_EQUALS(tmp, CPath(input));
+		ASSERT_EQUALS(CPath(input), tmp);
 
-		ASSERT_EQUALS(tmp.GetRaw(), ::GetExpectedString(input));
-		ASSERT_EQUALS(tmp.GetPrintable(), result);
+		ASSERT_EQUALS(::GetExpectedString(input), tmp.GetRaw());
+		ASSERT_EQUALS(result, tmp.GetPrintable());
 
-		ASSERT_EQUALS(tmp.GetFullName(), tmp);
-		ASSERT_EQUALS(tmp.GetPath(), CPath());
+		ASSERT_EQUALS(tmp, tmp.GetFullName());
+		ASSERT_EQUALS(CPath(), tmp.GetPath());
 	}
+*/
+#endif
 }
 
 
@@ -143,36 +155,17 @@
 		CPath a(tmpPath);
 
 		ASSERT_TRUE(a.IsOk());
-		ASSERT_EQUALS(a.GetRaw(), tmpPath);
-		ASSERT_EQUALS(a.GetPrintable(), tmpPath);
-		ASSERT_EQUALS(a.GetPath(), CPath());
-		ASSERT_EQUALS(a.GetFullName(), CPath(tmpPath));
-
-		CPath b(a);
-		ASSERT_TRUE(b.IsOk());
-		ASSERT_EQUALS(b.GetRaw(), tmpPath);
-		ASSERT_EQUALS(b.GetPrintable(), tmpPath);
-		ASSERT_EQUALS(b.GetPath(), CPath());
-		ASSERT_EQUALS(b.GetFullName(), CPath(tmpPath));
-
-		ASSERT_EQUALS(a, b);
-	}
-
-	{
-		CPath a(tmpPath);
-
-		ASSERT_TRUE(a.IsOk());
-		ASSERT_EQUALS(a.GetRaw(), tmpPath);
-		ASSERT_EQUALS(a.GetPrintable(), tmpPath);
-		ASSERT_EQUALS(a.GetPath(), CPath());
-		ASSERT_EQUALS(a.GetFullName(), CPath(tmpPath));
+		ASSERT_EQUALS(tmpPath, a.GetRaw());
+		ASSERT_EQUALS(tmpPath, a.GetPrintable());
+		ASSERT_EQUALS(CPath(), a.GetPath());
+		ASSERT_EQUALS(CPath(tmpPath), a.GetFullName());
 
 		CPath b(a);
 		ASSERT_TRUE(b.IsOk());
-		ASSERT_EQUALS(b.GetRaw(), tmpPath);
-		ASSERT_EQUALS(b.GetPrintable(), tmpPath);
-		ASSERT_EQUALS(b.GetPath(), CPath());
-		ASSERT_EQUALS(b.GetFullName(), CPath(tmpPath));
+		ASSERT_EQUALS(tmpPath, b.GetRaw());
+		ASSERT_EQUALS(tmpPath, b.GetPrintable());
+		ASSERT_EQUALS(CPath(), b.GetPath());
+		ASSERT_EQUALS(CPath(tmpPath), b.GetFullName());
 
 		ASSERT_EQUALS(a, b);
 	}
@@ -200,18 +193,18 @@
 		ASSERT_FALSE(b.IsOk());
 
 		a = CPath(tmpPath1);
-		ASSERT_EQUALS(a.GetRaw(), tmpPath1);
-		ASSERT_EQUALS(a.GetPrintable(), tmpPath1);
-		ASSERT_EQUALS(a.GetPath(), CPath());
-		ASSERT_EQUALS(a.GetFullName(), CPath(tmpPath1));
+		ASSERT_EQUALS(tmpPath1, a.GetRaw());
+		ASSERT_EQUALS(tmpPath1, a.GetPrintable());
+		ASSERT_EQUALS(CPath(), a.GetPath());
+		ASSERT_EQUALS(CPath(tmpPath1), a.GetFullName());
 		ASSERT_TRUE(a.IsOk());
 		ASSERT_TRUE(a != b);
 
 		b = a;
-		ASSERT_EQUALS(b.GetRaw(), tmpPath1);
-		ASSERT_EQUALS(b.GetPrintable(), tmpPath1);
-		ASSERT_EQUALS(b.GetPath(), CPath());
-		ASSERT_EQUALS(b.GetFullName(), CPath(tmpPath1));
+		ASSERT_EQUALS(tmpPath1, b.GetRaw());
+		ASSERT_EQUALS(tmpPath1, b.GetPrintable());
+		ASSERT_EQUALS(CPath(), b.GetPath());
+		ASSERT_EQUALS(CPath(tmpPath1), b.GetFullName());
 		ASSERT_TRUE(a.IsOk());
 		ASSERT_TRUE(b.IsOk());
 		ASSERT_EQUALS(a, b);
@@ -221,14 +214,14 @@
 		ASSERT_TRUE(b.IsOk());
 		ASSERT_TRUE(a != b);
 
-		ASSERT_EQUALS(a.GetRaw(), tmpPath2);
-		ASSERT_EQUALS(a.GetPrintable(), tmpPath2);
-		ASSERT_EQUALS(a.GetPath(), CPath());
-		ASSERT_EQUALS(a.GetFullName(), CPath(tmpPath2));
-		ASSERT_EQUALS(b.GetRaw(), tmpPath1);
-		ASSERT_EQUALS(b.GetPrintable(), tmpPath1);
-		ASSERT_EQUALS(b.GetPath(), CPath());
-		ASSERT_EQUALS(b.GetFullName(), CPath(tmpPath1));
+		ASSERT_EQUALS(tmpPath2, a.GetRaw());
+		ASSERT_EQUALS(tmpPath2, a.GetPrintable());
+		ASSERT_EQUALS(CPath(), a.GetPath());
+		ASSERT_EQUALS(CPath(tmpPath2), a.GetFullName());
+		ASSERT_EQUALS(tmpPath1, b.GetRaw());
+		ASSERT_EQUALS(tmpPath1, b.GetPrintable());
+		ASSERT_EQUALS(CPath(), b.GetPath());
+		ASSERT_EQUALS(CPath(tmpPath1), b.GetFullName());
 	}
 
 // See note in CPath::operator==
@@ -317,36 +310,36 @@
 TEST(CPath, GetPath_FullName)
 {
 	{
-		ASSERT_EQUALS(CPath().GetPath(), CPath());
-		ASSERT_EQUALS(CPath().GetFullName(), CPath());
+		ASSERT_EQUALS(CPath(), CPath().GetPath());
+		ASSERT_EQUALS(CPath(), CPath().GetFullName());
 	}
 
 	{
 		const CPath path = Norm(wxT("/home/mule/"));
 
-		ASSERT_EQUALS(path.GetPath(), Norm(wxT("/home/mule")));
-		ASSERT_EQUALS(path.GetFullName(), CPath());
+		ASSERT_EQUALS(Norm(wxT("/home/mule")), path.GetPath());
+		ASSERT_EQUALS(CPath(), path.GetFullName());
 	}
 
 	{
 		const CPath path = Norm(wxT("/home/mule"));
 
-		ASSERT_EQUALS(path.GetPath(), Norm(wxT("/home")));
-		ASSERT_EQUALS(path.GetFullName(), Norm(wxT("mule")));
+		ASSERT_EQUALS(Norm(wxT("/home")), path.GetPath());
+		ASSERT_EQUALS(Norm(wxT("mule")), path.GetFullName());
 	}
 
 	{
 		const CPath path = Norm(wxT("mule"));
 
-		ASSERT_EQUALS(path.GetPath(), CPath());
-		ASSERT_EQUALS(path.GetFullName(), Norm(wxT("mule")));
+		ASSERT_EQUALS(CPath(), path.GetPath());
+		ASSERT_EQUALS(Norm(wxT("mule")), path.GetFullName());
 	}
 
 	{
 		const CPath path = Norm(wxT("mule.ext"));
 
-		ASSERT_EQUALS(path.GetPath(), CPath());
-		ASSERT_EQUALS(path.GetFullName(), Norm(wxT("mule.ext")));
+		ASSERT_EQUALS(CPath(), path.GetPath());
+		ASSERT_EQUALS(Norm(wxT("mule.ext")), path.GetFullName());
 	}
 }
 
@@ -355,19 +348,19 @@
 {
 	const CPath initial = CPath(wxT(" /a\"b*c* <d>?e|\\:f "));

aMule.tar.xz/unittests/tests/RangeMapTest.cpp Changed

@@ -118,7 +118,7 @@
 		// Test that the correct iterator was returned
 		ASSERT_TRUE(it.keyStart() <= start);
 		ASSERT_TRUE(it.keyEnd() >= end);
-		ASSERT_EQUALS(*it, value);
+		ASSERT_EQUALS(value, *it);
 
 		// Check the resulting map
 		ASSERT_EQUALS(result, StringFrom(m_map));
@@ -153,7 +153,7 @@
 		// Test that the correct iterator was returned
 		ASSERT_TRUE(it.keyStart() <= start);
 		ASSERT_TRUE(it.keyEnd() >= end);
-		ASSERT_EQUALS(*it, value);
+		ASSERT_EQUALS(value, *it);
 
 		// Check the resulting map
 		ASSERT_EQUALS(result, StringFrom(m_mmaps[type]));
@@ -787,26 +787,26 @@
 		TestRangeMap mapA = m_mmaps[CONT];
 		TestRangeMap mapB = m_mmaps[SSAME];
 
-		ASSERT_EQUALS(mapA, m_mmaps[CONT]);
-		ASSERT_EQUALS(mapB, m_mmaps[SSAME]);
+		ASSERT_EQUALS(m_mmaps[CONT], mapA);
+		ASSERT_EQUALS(m_mmaps[SSAME], mapB);
 
 		std::swap(mapA, mapB);
 
-		ASSERT_EQUALS(mapB, m_mmaps[CONT]);
-		ASSERT_EQUALS(mapA, m_mmaps[SSAME]);
+		ASSERT_EQUALS(m_mmaps[CONT], mapB);
+		ASSERT_EQUALS(m_mmaps[SSAME], mapA);
 	}
 
 	{
 		TestRangeMap mapA = m_mmaps[CONT];
 		TestRangeMap mapB = m_mmaps[SSAME];
 
-		ASSERT_EQUALS(mapA, m_mmaps[CONT]);
-		ASSERT_EQUALS(mapB, m_mmaps[SSAME]);
+		ASSERT_EQUALS(m_mmaps[CONT], mapA);
+		ASSERT_EQUALS(m_mmaps[SSAME], mapB);
 
 		mapA.swap(mapB);
 
-		ASSERT_EQUALS(mapB, m_mmaps[CONT]);
-		ASSERT_EQUALS(mapA, m_mmaps[SSAME]);
+		ASSERT_EQUALS(m_mmaps[CONT], mapB);
+		ASSERT_EQUALS(m_mmaps[SSAME], mapA);
 	}
 }

aMule.tar.xz/unittests/tests/TextFileTest.cpp Changed

@@ -62,6 +62,8 @@
 
 TEST(TextFile, ReadLines)
 {
+	ASSERT_TRUE(CPath::DirExists(wxSTRINGIZE_T(SRCDIR)));
+
 	{
 		CONTEXT(wxT("Checking default parameters"));
 
@@ -191,7 +193,7 @@
 			ASSERT_TRUE(file.Open(wxT("testfile.txt"), CTextFile::write));
 
 			for (size_t i = 0; i < ArraySize(lines); ++i) {
-				CONTEXT(wxString::Format(wxT("Writing the %i'th line."), i));
+				CONTEXT(wxString::Format(wxT("Writing the %i'th line."), static_cast<int>(i)));
 
 				ASSERT_TRUE(file.WriteLine(lines[i]));
 			}
@@ -205,7 +207,7 @@
 			ASSERT_FALSE(file.Eof());
 
 			for (size_t i = 0; i < ArraySize(lines); ++i) {
-				CONTEXT(wxString::Format(wxT("Reading the %i'th line."), i));
+				CONTEXT(wxString::Format(wxT("Reading the %i'th line."), static_cast<int>(i)));
 
 				ASSERT_EQUALS(lines[i], file.GetNextLine());
 			}
@@ -232,7 +234,7 @@
 			ASSERT_FALSE(file.Eof());
 
 			for (size_t i = 0; i < ArraySize(lines); ++i) {
-				CONTEXT(wxString::Format(wxT("Reading the %i'th line."), i));
+				CONTEXT(wxString::Format(wxT("Reading the %i'th line."), static_cast<int>(i)));
 
 				ASSERT_EQUALS(lines[i], file.GetNextLine());
 			}
@@ -241,4 +243,3 @@
 		}
 	}
 } testInstance;
-

Changes of Revision 42